From e784526c5148215151c08b8993d951e2a11a70ca Mon Sep 17 00:00:00 2001
From: xiewen3 <xiewen3@motorola.com>
Date: Tue, 16 May 2023 22:54:06 +0800
Subject: [PATCH] LUR: Revert "BACKPORT: mm: VM_BUG_ON lru page flags"

The LRU function is not compatible with GKI,
causing GKI to fail to start, so revert.

This reverts commit 99ec8c955ce7d24ae76309db23e6920a7a920466.

Change-Id: I471a06616d85d9e4216ee38f9145d2dd7b333b4a
Reviewed-on: https://gerrit.mot.com/2609766
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 include/linux/mm_inline.h | 4 ----
 mm/swap.c                 | 2 ++
 mm/vmscan.c               | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 24dbfcfe4a6d..3cdbd538aa5f 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -65,8 +65,6 @@ static inline enum lru_list page_lru_base_type(struct page *page)
  */
 static __always_inline void __clear_page_lru_flags(struct page *page)
 {
-	VM_BUG_ON_PAGE(!PageLRU(page), page);
-
 	__ClearPageLRU(page);
 
 	/* this shouldn't happen, so leave the flags to bad_page() */
@@ -88,8 +86,6 @@ static __always_inline enum lru_list page_lru(struct page *page)
 {
 	enum lru_list lru;
 
-	VM_BUG_ON_PAGE(PageActive(page) && PageUnevictable(page), page);
-
 	if (PageUnevictable(page))
 		lru = LRU_UNEVICTABLE;
 	else {
diff --git a/mm/swap.c b/mm/swap.c
index 34bedd0e7619..dda66aeb7b11 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -66,6 +66,7 @@ static void __page_cache_release(struct page *page)
 
 		spin_lock_irqsave(&pgdat->lru_lock, flags);
 		lruvec = mem_cgroup_page_lruvec(page, pgdat);
+		VM_BUG_ON_PAGE(!PageLRU(page), page);
 		del_page_from_lru_list(page, lruvec);
 		__clear_page_lru_flags(page);
 		spin_unlock_irqrestore(&pgdat->lru_lock, flags);
@@ -817,6 +818,7 @@ void release_pages(struct page **pages, int nr)
 			}
 
 			lruvec = mem_cgroup_page_lruvec(page, locked_pgdat);
+			VM_BUG_ON_PAGE(!PageLRU(page), page);
 			del_page_from_lru_list(page, lruvec);
 			__clear_page_lru_flags(page);
 		}
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 084f48f95afd..8c32f6d7a317 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -4562,6 +4562,7 @@ void check_move_unevictable_pages(struct pagevec *pvec)
 			continue;
 
 		if (page_evictable(page)) {
+			VM_BUG_ON_PAGE(PageActive(page), page);
 			del_page_from_lru_list(page, lruvec);
 			ClearPageUnevictable(page);
 			add_page_to_lru_list(page, lruvec);