From: Mel Gorman <mgorman@suse.de> To: Johannes Weiner <hannes@cmpxchg.org> Cc: Andrew Morton <akpm@linux-foundation.org>, Dave Hansen <dave.hansen@intel.com>, Rik van Riel <riel@redhat.com>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@suse.de> Subject: [PATCH 4/7] mm: Annotate page cache allocations Date: Fri, 13 Dec 2013 14:10:04 +0000 [thread overview] Message-ID: <1386943807-29601-5-git-send-email-mgorman@suse.de> (raw) In-Reply-To: <1386943807-29601-1-git-send-email-mgorman@suse.de> Annotations will be used for fair zone allocation policy. Patch is mostly taken from a link posted by Johannes on IRC. It's not perfect because all callers of these paths are not guaranteed to be allocating pages for page cache. However, it's probably close enough to cover all cases that matter with minimal distortion. Not-signed-off --- include/linux/gfp.h | 4 +++- include/linux/pagemap.h | 2 +- mm/filemap.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 9b4dd49..f69e4cb 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -35,6 +35,7 @@ struct vm_area_struct; #define ___GFP_NO_KSWAPD 0x400000u #define ___GFP_OTHER_NODE 0x800000u #define ___GFP_WRITE 0x1000000u +#define ___GFP_PAGECACHE 0x2000000u /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -92,6 +93,7 @@ struct vm_area_struct; #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */ #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */ #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */ +#define __GFP_PAGECACHE ((__force gfp_t)___GFP_PAGECACHE) /* Page cache allocation */ /* * This may seem redundant, but it's a way of annotating false positives vs. @@ -99,7 +101,7 @@ struct vm_area_struct; */ #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK) -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */ +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */ #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /* This equals 0, but use constants in case they ever change */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e3dea75..bda4845 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -221,7 +221,7 @@ extern struct page *__page_cache_alloc(gfp_t gfp); #else static inline struct page *__page_cache_alloc(gfp_t gfp) { - return alloc_pages(gfp, 0); + return alloc_pages(gfp | __GFP_PAGECACHE, 0); } #endif diff --git a/mm/filemap.c b/mm/filemap.c index b7749a9..5bb9225 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -517,6 +517,8 @@ struct page *__page_cache_alloc(gfp_t gfp) int n; struct page *page; + gfp |= __GFP_PAGECACHE; + if (cpuset_do_page_mem_spread()) { unsigned int cpuset_mems_cookie; do { -- 1.8.4
WARNING: multiple messages have this Message-ID (diff)
From: Mel Gorman <mgorman@suse.de> To: Johannes Weiner <hannes@cmpxchg.org> Cc: Andrew Morton <akpm@linux-foundation.org>, Dave Hansen <dave.hansen@intel.com>, Rik van Riel <riel@redhat.com>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@suse.de> Subject: [PATCH 4/7] mm: Annotate page cache allocations Date: Fri, 13 Dec 2013 14:10:04 +0000 [thread overview] Message-ID: <1386943807-29601-5-git-send-email-mgorman@suse.de> (raw) In-Reply-To: <1386943807-29601-1-git-send-email-mgorman@suse.de> Annotations will be used for fair zone allocation policy. Patch is mostly taken from a link posted by Johannes on IRC. It's not perfect because all callers of these paths are not guaranteed to be allocating pages for page cache. However, it's probably close enough to cover all cases that matter with minimal distortion. Not-signed-off --- include/linux/gfp.h | 4 +++- include/linux/pagemap.h | 2 +- mm/filemap.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 9b4dd49..f69e4cb 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -35,6 +35,7 @@ struct vm_area_struct; #define ___GFP_NO_KSWAPD 0x400000u #define ___GFP_OTHER_NODE 0x800000u #define ___GFP_WRITE 0x1000000u +#define ___GFP_PAGECACHE 0x2000000u /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -92,6 +93,7 @@ struct vm_area_struct; #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */ #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */ #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */ +#define __GFP_PAGECACHE ((__force gfp_t)___GFP_PAGECACHE) /* Page cache allocation */ /* * This may seem redundant, but it's a way of annotating false positives vs. @@ -99,7 +101,7 @@ struct vm_area_struct; */ #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK) -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */ +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */ #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /* This equals 0, but use constants in case they ever change */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e3dea75..bda4845 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -221,7 +221,7 @@ extern struct page *__page_cache_alloc(gfp_t gfp); #else static inline struct page *__page_cache_alloc(gfp_t gfp) { - return alloc_pages(gfp, 0); + return alloc_pages(gfp | __GFP_PAGECACHE, 0); } #endif diff --git a/mm/filemap.c b/mm/filemap.c index b7749a9..5bb9225 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -517,6 +517,8 @@ struct page *__page_cache_alloc(gfp_t gfp) int n; struct page *page; + gfp |= __GFP_PAGECACHE; + if (cpuset_do_page_mem_spread()) { unsigned int cpuset_mems_cookie; do { -- 1.8.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-12-13 14:11 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-13 14:10 [RFC PATCH 0/7] Configurable fair allocation zone policy v2r6 Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-13 14:10 ` [PATCH 1/7] mm: page_alloc: exclude unreclaimable allocations from zone fairness policy Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-13 15:45 ` Rik van Riel 2013-12-13 15:45 ` Rik van Riel 2013-12-13 14:10 ` [PATCH 2/7] mm: page_alloc: Break out zone page aging distribution into its own helper Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-13 15:46 ` Rik van Riel 2013-12-13 15:46 ` Rik van Riel 2013-12-16 20:16 ` Johannes Weiner 2013-12-16 20:16 ` Johannes Weiner 2013-12-13 14:10 ` [PATCH 3/7] mm: page_alloc: Use zone node IDs to approximate locality Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-16 13:20 ` Rik van Riel 2013-12-16 13:20 ` Rik van Riel 2013-12-16 20:25 ` Johannes Weiner 2013-12-16 20:25 ` Johannes Weiner 2013-12-17 11:13 ` Mel Gorman 2013-12-17 11:13 ` Mel Gorman 2013-12-17 15:38 ` Johannes Weiner 2013-12-17 15:38 ` Johannes Weiner 2013-12-17 16:08 ` Mel Gorman 2013-12-17 16:08 ` Mel Gorman 2013-12-17 20:11 ` Johannes Weiner 2013-12-17 20:11 ` Johannes Weiner 2013-12-17 21:03 ` Mel Gorman 2013-12-17 21:03 ` Mel Gorman 2013-12-17 22:31 ` Johannes Weiner 2013-12-17 22:31 ` Johannes Weiner 2013-12-13 14:10 ` Mel Gorman [this message] 2013-12-13 14:10 ` [PATCH 4/7] mm: Annotate page cache allocations Mel Gorman 2013-12-16 15:20 ` Rik van Riel 2013-12-16 15:20 ` Rik van Riel 2013-12-13 14:10 ` [PATCH 5/7] mm: page_alloc: Make zone distribution page aging policy configurable Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-16 19:25 ` Rik van Riel 2013-12-16 19:25 ` Rik van Riel 2013-12-16 20:42 ` Johannes Weiner 2013-12-16 20:42 ` Johannes Weiner 2013-12-17 15:29 ` Mel Gorman 2013-12-17 15:29 ` Mel Gorman 2013-12-17 15:54 ` Johannes Weiner 2013-12-17 15:54 ` Johannes Weiner 2013-12-17 16:14 ` Mel Gorman 2013-12-17 16:14 ` Mel Gorman 2013-12-17 17:43 ` Johannes Weiner 2013-12-17 17:43 ` Johannes Weiner 2013-12-17 21:22 ` Mel Gorman 2013-12-17 21:22 ` Mel Gorman 2013-12-17 22:57 ` Johannes Weiner 2013-12-17 22:57 ` Johannes Weiner 2013-12-17 23:24 ` Mel Gorman 2013-12-17 23:24 ` Mel Gorman 2013-12-13 14:10 ` [PATCH 6/7] mm: page_alloc: Only account batch allocations requests that are eligible Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-16 20:52 ` Johannes Weiner 2013-12-16 20:52 ` Johannes Weiner 2013-12-17 11:20 ` Mel Gorman 2013-12-17 11:20 ` Mel Gorman 2013-12-17 15:43 ` Johannes Weiner 2013-12-17 15:43 ` Johannes Weiner 2013-12-17 16:06 ` Mel Gorman 2013-12-17 16:06 ` Mel Gorman 2013-12-13 14:10 ` [PATCH 7/7] mm: page_alloc: Default allow file pages to use remote nodes for fair allocation policy Mel Gorman 2013-12-13 14:10 ` Mel Gorman 2013-12-13 17:04 ` Johannes Weiner 2013-12-13 17:04 ` Johannes Weiner 2013-12-13 19:20 ` Mel Gorman 2013-12-13 19:20 ` Mel Gorman 2013-12-13 22:15 ` Johannes Weiner 2013-12-13 22:15 ` Johannes Weiner 2013-12-17 16:04 ` Mel Gorman 2013-12-17 16:04 ` Mel Gorman 2013-12-16 19:26 ` Rik van Riel 2013-12-16 19:26 ` Rik van Riel 2013-12-17 15:07 ` [RFC PATCH 0/7] Configurable fair allocation zone policy v2r6 Zlatko Calusic 2013-12-17 15:07 ` Zlatko Calusic 2013-12-17 21:23 ` Mel Gorman 2013-12-17 21:23 ` Mel Gorman 2013-12-21 16:03 ` Zlatko Calusic 2013-12-21 16:03 ` Zlatko Calusic 2013-12-23 10:26 ` Mel Gorman 2013-12-23 10:26 ` Mel Gorman
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=1386943807-29601-5-git-send-email-mgorman@suse.de \ --to=mgorman@suse.de \ --cc=akpm@linux-foundation.org \ --cc=dave.hansen@intel.com \ --cc=hannes@cmpxchg.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=riel@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.