Skip to content

Commit df8c94d

Browse files
kiryltorvalds
authored andcommitted
page-flags: define behavior of FS/IO-related flags on compound pages
It seems we don't have compound page on FS/IO path currently. Use PF_NO_COMPOUND to catch if we have. The odd exception is PG_dirty: sound uses compound pages and maps them with PTEs. PF_NO_COMPOUND triggers VM_BUG_ON() in set_page_dirty() on handling shared fault. Let's use PF_HEAD for PG_dirty. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Rik van Riel <riel@redhat.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Christoph Lameter <cl@linux.com> Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Steve Capper <steve.capper@linaro.org> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Jerome Marchand <jmarchan@redhat.com> Cc: Jérôme Glisse <jglisse@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 48c935a commit df8c94d

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

include/linux/page-flags.h

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,16 @@ static inline int __TestClearPage##uname(struct page *page) { return 0; }
257257
TESTSETFLAG_FALSE(uname) TESTCLEARFLAG_FALSE(uname)
258258

259259
__PAGEFLAG(Locked, locked, PF_NO_TAIL)
260-
PAGEFLAG(Error, error, PF_ANY) TESTCLEARFLAG(Error, error, PF_ANY)
260+
PAGEFLAG(Error, error, PF_NO_COMPOUND) TESTCLEARFLAG(Error, error, PF_NO_COMPOUND)
261261
PAGEFLAG(Referenced, referenced, PF_ANY) TESTCLEARFLAG(Referenced, referenced, PF_ANY)
262262
__SETPAGEFLAG(Referenced, referenced, PF_ANY)
263-
PAGEFLAG(Dirty, dirty, PF_ANY) TESTSCFLAG(Dirty, dirty, PF_ANY)
264-
__CLEARPAGEFLAG(Dirty, dirty, PF_ANY)
263+
PAGEFLAG(Dirty, dirty, PF_HEAD) TESTSCFLAG(Dirty, dirty, PF_HEAD)
264+
__CLEARPAGEFLAG(Dirty, dirty, PF_HEAD)
265265
PAGEFLAG(LRU, lru, PF_ANY) __CLEARPAGEFLAG(LRU, lru, PF_ANY)
266266
PAGEFLAG(Active, active, PF_ANY) __CLEARPAGEFLAG(Active, active, PF_ANY)
267267
TESTCLEARFLAG(Active, active, PF_ANY)
268268
__PAGEFLAG(Slab, slab, PF_ANY)
269-
PAGEFLAG(Checked, checked, PF_ANY) /* Used by some filesystems */
269+
PAGEFLAG(Checked, checked, PF_NO_COMPOUND) /* Used by some filesystems */
270270
PAGEFLAG(Pinned, pinned, PF_ANY) TESTSCFLAG(Pinned, pinned, PF_ANY) /* Xen */
271271
PAGEFLAG(SavePinned, savepinned, PF_ANY); /* Xen */
272272
PAGEFLAG(Foreign, foreign, PF_ANY); /* Xen */
@@ -292,12 +292,15 @@ PAGEFLAG(OwnerPriv1, owner_priv_1, PF_ANY)
292292
* Only test-and-set exist for PG_writeback. The unconditional operators are
293293
* risky: they bypass page accounting.
294294
*/
295-
TESTPAGEFLAG(Writeback, writeback, PF_ANY) TESTSCFLAG(Writeback, writeback, PF_ANY)
296-
PAGEFLAG(MappedToDisk, mappedtodisk, PF_ANY)
295+
TESTPAGEFLAG(Writeback, writeback, PF_NO_COMPOUND)
296+
TESTSCFLAG(Writeback, writeback, PF_NO_COMPOUND)
297+
PAGEFLAG(MappedToDisk, mappedtodisk, PF_NO_COMPOUND)
297298

298299
/* PG_readahead is only used for reads; PG_reclaim is only for writes */
299-
PAGEFLAG(Reclaim, reclaim, PF_ANY) TESTCLEARFLAG(Reclaim, reclaim, PF_ANY)
300-
PAGEFLAG(Readahead, reclaim, PF_ANY) TESTCLEARFLAG(Readahead, reclaim, PF_ANY)
300+
PAGEFLAG(Reclaim, reclaim, PF_NO_COMPOUND)
301+
TESTCLEARFLAG(Reclaim, reclaim, PF_NO_COMPOUND)
302+
PAGEFLAG(Readahead, reclaim, PF_NO_COMPOUND)
303+
TESTCLEARFLAG(Readahead, reclaim, PF_NO_COMPOUND)
301304

302305
#ifdef CONFIG_HIGHMEM
303306
/*
@@ -413,7 +416,7 @@ static inline int PageUptodate(struct page *page)
413416
static inline void __SetPageUptodate(struct page *page)
414417
{
415418
smp_wmb();
416-
__set_bit(PG_uptodate, &(page)->flags);
419+
__set_bit(PG_uptodate, &page->flags);
417420
}
418421

419422
static inline void SetPageUptodate(struct page *page)
@@ -424,7 +427,7 @@ static inline void SetPageUptodate(struct page *page)
424427
* uptodate are actually visible before PageUptodate becomes true.
425428
*/
426429
smp_wmb();
427-
set_bit(PG_uptodate, &(page)->flags);
430+
set_bit(PG_uptodate, &page->flags);
428431
}
429432

430433
CLEARPAGEFLAG(Uptodate, uptodate, PF_ANY)

0 commit comments

Comments
 (0)