From: Russ Anderson <rja@sgi.com>
To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Tony Luck <tony.luck@intel.com>,
Christoph Lameter <clameter@sgi.com>, Russ Anderson <rja@sgi.com>
Subject: [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c v5
Date: Fri, 16 May 2008 19:22:45 +0000 [thread overview]
Message-ID: <20080516192244.GD7885@sgi.com> (raw)
In-Reply-To: <20080502004155.GB12006@sgi.com>
Minor source code cleanup of page flags in mm/page_alloc.c.
Move the definition of the groups of bits to page-flags.h.
The purpose of this clean up is that the next patch will
conditionally add a page flag to the groups. Doing that
in a header file is cleaner than adding #ifdefs to the
C code.
Signed-off-by: Russ Anderson <rja@sgi.com>
---
include/linux/page-flags.h | 23 +++++++++++++++++++++++
mm/page_alloc.c | 34 +++-------------------------------
2 files changed, 26 insertions(+), 31 deletions(-)
Index: linus/mm/page_alloc.c
=================================--- linus.orig/mm/page_alloc.c 2008-05-15 12:58:58.429776893 -0500
+++ linus/mm/page_alloc.c 2008-05-16 12:25:20.494096186 -0500
@@ -237,16 +237,7 @@ static void bad_page(struct page *page)
printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
KERN_EMERG "Backtrace:\n");
dump_stack();
- page->flags &= ~(1 << PG_lru |
- 1 << PG_private |
- 1 << PG_locked |
- 1 << PG_active |
- 1 << PG_dirty |
- 1 << PG_reclaim |
- 1 << PG_slab |
- 1 << PG_swapcache |
- 1 << PG_writeback |
- 1 << PG_buddy );
+ page->flags &= ~PAGE_FLAGS_CLEAR_WHEN_BAD;
set_page_count(page, 0);
reset_page_mapcount(page);
page->mapping = NULL;
@@ -463,16 +454,7 @@ static inline int free_pages_check(struc
(page->mapping != NULL) |
(page_get_page_cgroup(page) != NULL) |
(page_count(page) != 0) |
- (page->flags & (
- 1 << PG_lru |
- 1 << PG_private |
- 1 << PG_locked |
- 1 << PG_active |
- 1 << PG_slab |
- 1 << PG_swapcache |
- 1 << PG_writeback |
- 1 << PG_reserved |
- 1 << PG_buddy ))))
+ (page->flags & PAGE_FLAGS_CHECK_AT_FREE)))
bad_page(page);
if (PageDirty(page))
__ClearPageDirty(page);
@@ -616,17 +598,7 @@ static int prep_new_page(struct page *pa
(page->mapping != NULL) |
(page_get_page_cgroup(page) != NULL) |
(page_count(page) != 0) |
- (page->flags & (
- 1 << PG_lru |
- 1 << PG_private |
- 1 << PG_locked |
- 1 << PG_active |
- 1 << PG_dirty |
- 1 << PG_slab |
- 1 << PG_swapcache |
- 1 << PG_writeback |
- 1 << PG_reserved |
- 1 << PG_buddy ))))
+ (page->flags & PAGE_FLAGS_CHECK_AT_PREP)))
bad_page(page);
/*
Index: linus/include/linux/page-flags.h
=================================--- linus.orig/include/linux/page-flags.h 2008-05-15 12:58:26.265815299 -0500
+++ linus/include/linux/page-flags.h 2008-05-16 12:25:20.494096186 -0500
@@ -306,5 +306,28 @@ static inline void __ClearPageTail(struc
}
#endif /* !PAGEFLAGS_EXTENDED */
+
+#define PAGE_FLAGS (1 << PG_lru | 1 << PG_private | 1 << PG_locked | \
+ 1 << PG_buddy | 1 << PG_writeback | \
+ 1 << PG_slab | 1 << PG_swapcache | 1 << PG_active)
+
+/*
+ * Flags checked in bad_page(). Pages on the free list should not have
+ * these flags set. It they are, there is a problem.
+ */
+#define PAGE_FLAGS_CLEAR_WHEN_BAD (PAGE_FLAGS | 1 << PG_reclaim | 1 << PG_dirty)
+
+/*
+ * Flags checked when a page is freed. Pages being freed should not have
+ * these flags set. It they are, there is a problem.
+ */
+#define PAGE_FLAGS_CHECK_AT_FREE (PAGE_FLAGS | 1 << PG_reserved)
+
+/*
+ * Flags checked when a page is freed. Pages being freed should not have
+ * these flags set. It they are, there is a problem.
+ */
+#define PAGE_FLAGS_CHECK_AT_PREP (PAGE_FLAGS | 1 << PG_reserved | 1 << PG_dirty)
+
#endif /* !__GENERATING_BOUNDS_H */
#endif /* PAGE_FLAGS_H */
--
Russ Anderson, OS RAS/Partitioning Project Lead
SGI - Silicon Graphics Inc rja@sgi.com
next prev parent reply other threads:[~2008-05-16 19:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-02 0:41 [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c Russ Anderson
2008-05-09 15:10 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c v3 Russ Anderson
2008-05-13 23:02 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c v4 Russ Anderson
2008-05-14 20:28 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c Linus Torvalds
2008-05-14 21:30 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c v4 Russ Anderson
2008-05-16 19:22 ` Russ Anderson [this message]
2008-05-16 20:42 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c Linus Torvalds
2008-06-09 16:18 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c v6 Russ Anderson
2008-06-09 18:22 ` [PATCH 1/3] mm: Minor clean-up of page flags in mm/page_alloc.c Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080516192244.GD7885@sgi.com \
--to=rja@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=clameter@sgi.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox