Commit ad4b3fb7 authored by Christoffer Dall's avatar Christoffer Dall Committed by Linus Torvalds
Browse files

mm: Fix PageHead when !CONFIG_PAGEFLAGS_EXTENDED

Unfortunately with !CONFIG_PAGEFLAGS_EXTENDED, (!PageHead) is false, and
(PageHead) is true, for tail pages.  If this is indeed the intended
behavior, which I doubt because it breaks cache cleaning on some ARM
systems, then the nomenclature is highly problematic.

This patch makes sure PageHead is only true for head pages and PageTail
is only true for tail pages, and neither is true for non-compound pages.

[ This buglet seems ancient - seems to have been introduced back in Apr
  2008 in commit 6a1e7f77

: "pageflags: convert to the use of new
  macros".  And the reason nobody noticed is because the PageHead()
  tests are almost all about just sanity-checking, and only used on
  pages that are actual page heads.  The fact that the old code returned
  true for tail pages too was thus not really noticeable.   - Linus ]
Signed-off-by: default avatarChristoffer Dall <cdall@cs.columbia.edu>
Acked-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Will Deacon <Will.Deacon@arm.com>
Cc: Steve Capper <Steve.Capper@arm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: stable@kernel.org  # 2.6.26+
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 637704cb
...@@ -362,7 +362,7 @@ static inline void ClearPageCompound(struct page *page) ...@@ -362,7 +362,7 @@ static inline void ClearPageCompound(struct page *page)
* pages on the LRU and/or pagecache. * pages on the LRU and/or pagecache.
*/ */
TESTPAGEFLAG(Compound, compound) TESTPAGEFLAG(Compound, compound)
__PAGEFLAG(Head, compound) __SETPAGEFLAG(Head, compound) __CLEARPAGEFLAG(Head, compound)
/* /*
* PG_reclaim is used in combination with PG_compound to mark the * PG_reclaim is used in combination with PG_compound to mark the
...@@ -374,8 +374,14 @@ __PAGEFLAG(Head, compound) ...@@ -374,8 +374,14 @@ __PAGEFLAG(Head, compound)
* PG_compound & PG_reclaim => Tail page * PG_compound & PG_reclaim => Tail page
* PG_compound & ~PG_reclaim => Head page * PG_compound & ~PG_reclaim => Head page
*/ */
#define PG_head_mask ((1L << PG_compound))
#define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim)) #define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim))
static inline int PageHead(struct page *page)
{
return ((page->flags & PG_head_tail_mask) == PG_head_mask);
}
static inline int PageTail(struct page *page) static inline int PageTail(struct page *page)
{ {
return ((page->flags & PG_head_tail_mask) == PG_head_tail_mask); return ((page->flags & PG_head_tail_mask) == PG_head_tail_mask);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment