[PATCH 2/3] mm/page_alloc: add a helper function to check page before alloc/free

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Yaowei Bai <bywxiaobai@163.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] mm/page_alloc: add a helper function to check page before alloc/free
Date	Sat, 22 Aug 2015 10:00:02 +0200
Message-ID	<q0bSy-4j2-1@gated-at.bofh.it> (permalink)
References	<q0bIS-47B-13@gated-at.bofh.it>
X-Original-To	akpm@linux-foundation.org, mgorman@suse.de, vbabka@suse.cz, mhocko@suse.com, js1304@gmail.com, hannes@cmpxchg.org, alexander.h.duyck@redhat.com, sasha.levin@oracle.com
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=rdSDVCV9BzNGd3iiNo 9oMDj7hoF8Ub/bQUA3o1Me3hU=; b=A1lz8k7/Zas0LVSso8Vhubb665+vZY+ZaZ q918i/UGdKt/JkBe4BCEEuM5pfJ8GQC7BdDwoGDdemhfMxFqUczND2e5IluJi0fv LRSBIVNLmhKEpkwUeOlzQqIc0gYlOc/iBEwX0SJ/PBhjhAGfQUqnkF0yuUFGbyfm AaUuPJmOM=
X-Mailer	git-send-email 1.9.1
X-Cm-Transid	C8CowEB5LkLWJ9hV9KBhAQ--.88S4
X-Coremail-Antispam	1Uf129KBjvJXoWxAw17Jr4kKFy7CrW5GF15Jwb_yoW5CrW3pa 1xCas7Aa1rtFn8Krs7Jr1DuF1rAFn3tayxAa43Gwn3tFySvr4ay34xCF1Yqr1fCFWxAryj qF4UJr1ru3W5u3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bYxhdUUUUU=
X-Originating-IP	[121.238.252.42]
X-Cm-Senderinfo	xe1z5x5dretxi6rwjhhfrp/1tbisB9eT1UL2uvu2AAAsn
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	103
Organization	linux.* mail to news gateway
X-Original-Cc	linux-mm@kvack.org, linux-kernel@vger.kernel.org
X-Original-Date	Sat, 22 Aug 2015 15:40:11 +0800
X-Original-Message-ID	<1440229212-8737-2-git-send-email-bywxiaobai@163.com>
X-Original-References	<1440229212-8737-1-git-send-email-bywxiaobai@163.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1211423

Show key headers only | View raw

The major portion of check_new_page() and free_pages_check() are same,
introduce a helper function check_one_page() for readablity.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
---
 mm/page_alloc.c | 54 +++++++++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c22b133..a0839de 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -707,7 +707,7 @@ out:
 	zone->free_area[order].nr_free++;
 }
 
-static inline int free_pages_check(struct page *page)
+static inline int check_one_page(struct page *page, bool free)
 {
 	const char *bad_reason = NULL;
 	unsigned long bad_flags = 0;
@@ -718,10 +718,16 @@ static inline int free_pages_check(struct page *page)
 		bad_reason = "non-NULL mapping";
 	if (unlikely(atomic_read(&page->_count) != 0))
 		bad_reason = "nonzero _count";
-	if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) {
-		bad_reason = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set";
-		bad_flags = PAGE_FLAGS_CHECK_AT_FREE;
-	}
+	if (free)
+		if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) {
+			bad_reason = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set";
+			bad_flags = PAGE_FLAGS_CHECK_AT_FREE;
+		}
+	else
+		if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_PREP)) {
+			bad_reason = "PAGE_FLAGS_CHECK_AT_PREP flag set";
+			bad_flags = PAGE_FLAGS_CHECK_AT_PREP;
+		}
 #ifdef CONFIG_MEMCG
 	if (unlikely(page->mem_cgroup))
 		bad_reason = "page still charged to cgroup";
@@ -730,6 +736,17 @@ static inline int free_pages_check(struct page *page)
 		bad_page(page, bad_reason, bad_flags);
 		return 1;
 	}
+	return 0;
+}
+
+static inline int free_pages_check(struct page *page)
+{
+	int ret=0;
+
+	ret=check_one_page(page, true);
+	if (ret)
+		return ret;
+
 	page_cpupid_reset_last(page);
 	if (page->flags & PAGE_FLAGS_CHECK_AT_PREP)
 		page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
@@ -1287,32 +1304,7 @@ static inline void expand(struct zone *zone, struct page *page,
  */
 static inline int check_new_page(struct page *page)
 {
-	const char *bad_reason = NULL;
-	unsigned long bad_flags = 0;
-
-	if (unlikely(page_mapcount(page)))
-		bad_reason = "nonzero mapcount";
-	if (unlikely(page->mapping != NULL))
-		bad_reason = "non-NULL mapping";
-	if (unlikely(atomic_read(&page->_count) != 0))
-		bad_reason = "nonzero _count";
-	if (unlikely(page->flags & __PG_HWPOISON)) {
-		bad_reason = "HWPoisoned (hardware-corrupted)";
-		bad_flags = __PG_HWPOISON;
-	}
-	if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_PREP)) {
-		bad_reason = "PAGE_FLAGS_CHECK_AT_PREP flag set";
-		bad_flags = PAGE_FLAGS_CHECK_AT_PREP;
-	}
-#ifdef CONFIG_MEMCG
-	if (unlikely(page->mem_cgroup))
-		bad_reason = "page still charged to cgroup";
-#endif
-	if (unlikely(bad_reason)) {
-		bad_page(page, bad_reason, bad_flags);
-		return 1;
-	}
-	return 0;
+	return check_one_page(page, false);
 }
 
 static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
-- 
1.9.1


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] mm/page_alloc: add a helper function to check page before alloc/free Yaowei Bai <bywxiaobai@163.com> - 2015-08-22 10:00 +0200
  Re: [PATCH 2/3] mm/page_alloc: add a helper function to check page  before alloc/free Michal Hocko <mhocko@kernel.org> - 2015-08-24 12:50 +0200

csiph-web