From: Michal Hocko <mhocko@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Vlastimil Babka <vbabka@suse.cz>, David Rientjes <rientjes@google.com>, Mel Gorman <mgorman@suse.de>, Johannes Weiner <hannes@cmpxchg.org>, Al Viro <viro@zeniv.linux.org.uk>, <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Michal Hocko <mhocko@suse.com>, Tom Herbert <tom@herbertland.com>, Eric Dumazet <eric.dumazet@gmail.com> Subject: [PATCH 3/9] rhashtable: simplify a strange allocation pattern Date: Mon, 30 Jan 2017 10:49:34 +0100 [thread overview] Message-ID: <20170130094940.13546-4-mhocko@kernel.org> (raw) In-Reply-To: <20170130094940.13546-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> alloc_bucket_locks allocation pattern is quite unusual. We are preferring vmalloc when CONFIG_NUMA is enabled. The rationale is that vmalloc will respect the memory policy of the current process and so the backing memory will get distributed over multiple nodes if the requester is configured properly. At least that is the intention, in reality rhastable is shrunk and expanded from a kernel worker so no mempolicy can be assumed. Let's just simplify the code and use kvmalloc helper, which is a transparent way to use kmalloc with vmalloc fallback, if the caller is allowed to block and use the flag otherwise. Cc: Tom Herbert <tom@herbertland.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Michal Hocko <mhocko@suse.com> --- lib/rhashtable.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 32d0ad058380..1a487ea70829 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -77,16 +77,9 @@ static int alloc_bucket_locks(struct rhashtable *ht, struct bucket_table *tbl, size = min_t(unsigned int, size, tbl->size >> 1); if (sizeof(spinlock_t) != 0) { - tbl->locks = NULL; -#ifdef CONFIG_NUMA - if (size * sizeof(spinlock_t) > PAGE_SIZE && - gfp == GFP_KERNEL) - tbl->locks = vmalloc(size * sizeof(spinlock_t)); -#endif - if (gfp != GFP_KERNEL) - gfp |= __GFP_NOWARN | __GFP_NORETRY; - - if (!tbl->locks) + if (gfpflags_allow_blocking(gfp)) + tbl->locks = kvmalloc(size * sizeof(spinlock_t), gfp); + else tbl->locks = kmalloc_array(size, sizeof(spinlock_t), gfp); if (!tbl->locks) -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Vlastimil Babka <vbabka@suse.cz>, David Rientjes <rientjes@google.com>, Mel Gorman <mgorman@suse.de>, Johannes Weiner <hannes@cmpxchg.org>, Al Viro <viro@zeniv.linux.org.uk>, linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>, Michal Hocko <mhocko@suse.com>, Tom Herbert <tom@herbertland.com>, Eric Dumazet <eric.dumazet@gmail.com> Subject: [PATCH 3/9] rhashtable: simplify a strange allocation pattern Date: Mon, 30 Jan 2017 10:49:34 +0100 [thread overview] Message-ID: <20170130094940.13546-4-mhocko@kernel.org> (raw) In-Reply-To: <20170130094940.13546-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> alloc_bucket_locks allocation pattern is quite unusual. We are preferring vmalloc when CONFIG_NUMA is enabled. The rationale is that vmalloc will respect the memory policy of the current process and so the backing memory will get distributed over multiple nodes if the requester is configured properly. At least that is the intention, in reality rhastable is shrunk and expanded from a kernel worker so no mempolicy can be assumed. Let's just simplify the code and use kvmalloc helper, which is a transparent way to use kmalloc with vmalloc fallback, if the caller is allowed to block and use the flag otherwise. Cc: Tom Herbert <tom@herbertland.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Michal Hocko <mhocko@suse.com> --- lib/rhashtable.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 32d0ad058380..1a487ea70829 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -77,16 +77,9 @@ static int alloc_bucket_locks(struct rhashtable *ht, struct bucket_table *tbl, size = min_t(unsigned int, size, tbl->size >> 1); if (sizeof(spinlock_t) != 0) { - tbl->locks = NULL; -#ifdef CONFIG_NUMA - if (size * sizeof(spinlock_t) > PAGE_SIZE && - gfp == GFP_KERNEL) - tbl->locks = vmalloc(size * sizeof(spinlock_t)); -#endif - if (gfp != GFP_KERNEL) - gfp |= __GFP_NOWARN | __GFP_NORETRY; - - if (!tbl->locks) + if (gfpflags_allow_blocking(gfp)) + tbl->locks = kvmalloc(size * sizeof(spinlock_t), gfp); + else tbl->locks = kmalloc_array(size, sizeof(spinlock_t), gfp); if (!tbl->locks) -- 2.11.0 -- 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:[~2017-01-30 9:50 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-30 9:49 [PATCH 0/6 v3] kvmalloc Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 9:49 ` [PATCH 1/9] mm: introduce kv[mz]alloc helpers Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 9:49 ` [PATCH 2/9] mm: support __GFP_REPEAT in kvmalloc_node for >32kB Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 9:49 ` Michal Hocko [this message] 2017-01-30 9:49 ` [PATCH 3/9] rhashtable: simplify a strange allocation pattern Michal Hocko 2017-01-30 14:04 ` Vlastimil Babka 2017-01-30 14:04 ` Vlastimil Babka 2017-01-30 9:49 ` [PATCH 4/9] ila: " Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 15:21 ` Vlastimil Babka 2017-01-30 15:21 ` Vlastimil Babka 2017-01-30 9:49 ` [PATCH 5/9] treewide: use kv[mz]alloc* rather than opencoded variants Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 10:21 ` Leon Romanovsky 2017-01-30 10:21 ` Leon Romanovsky 2017-01-30 16:14 ` Vlastimil Babka 2017-01-30 16:14 ` Vlastimil Babka 2017-01-30 16:14 ` Vlastimil Babka 2017-01-30 19:24 ` Kees Cook 2017-01-30 19:24 ` Kees Cook 2017-01-30 19:24 ` Kees Cook 2017-01-30 9:49 ` [PATCH 6/9] net: use kvmalloc with __GFP_REPEAT rather than open coded variant Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 16:36 ` Vlastimil Babka 2017-01-30 16:36 ` Vlastimil Babka 2017-01-30 9:49 ` [PATCH 7/9] md: use kvmalloc rather than opencoded variant Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 16:42 ` Vlastimil Babka 2017-01-30 16:42 ` Vlastimil Babka 2017-02-01 17:29 ` Mikulas Patocka 2017-02-01 17:29 ` Mikulas Patocka 2017-02-01 17:58 ` Michal Hocko 2017-02-01 17:58 ` Michal Hocko 2017-01-30 9:49 ` [PATCH 8/9] bcache: use kvmalloc Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 16:47 ` Vlastimil Babka 2017-01-30 16:47 ` Vlastimil Babka 2017-01-30 17:25 ` Michal Hocko 2017-01-30 17:25 ` Michal Hocko 2017-01-30 9:49 ` [PATCH 9/9] net, bpf: use kvzalloc helper Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 17:20 ` Michal Hocko 2017-01-30 17:20 ` Michal Hocko 2017-02-05 10:23 ` [PATCH 0/6 v3] kvmalloc Michal Hocko 2017-02-05 10:23 ` Michal Hocko 2017-03-06 10:30 [PATCH 0/6 v5] kvmalloc Michal Hocko 2017-03-06 10:30 ` [PATCH 3/9] rhashtable: simplify a strange allocation pattern Michal Hocko 2017-03-06 10:30 ` Michal Hocko
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=20170130094940.13546-4-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=eric.dumazet@gmail.com \ --cc=hannes@cmpxchg.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=mhocko@suse.com \ --cc=rientjes@google.com \ --cc=tom@herbertland.com \ --cc=vbabka@suse.cz \ --cc=viro@zeniv.linux.org.uk \ /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.