From: Michal Hocko <mhocko@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: <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>, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH 4/9] ila: simplify a strange allocation pattern Date: Mon, 6 Mar 2017 11:30:27 +0100 [thread overview] Message-ID: <20170306103032.2540-5-mhocko@kernel.org> (raw) In-Reply-To: <20170306103032.2540-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> alloc_ila_locks seemed to c&p from alloc_bucket_locks allocation pattern which is quite unusual. The default allocation size is 320 * sizeof(spinlock_t) which is sub page unless lockdep is enabled when the performance benefit is really questionable and not worth the subtle code IMHO. Also note that the context when we call ila_init_net (modprobe or a task creating a net namespace) has to be properly configured. Let's just simplify the code and use kvmalloc helper which is a transparent way to use kmalloc with vmalloc fallback. Cc: Tom Herbert <tom@herbertland.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Michal Hocko <mhocko@suse.com> --- net/ipv6/ila/ila_xlat.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index af8f52ee7180..2fd5ca151dcf 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c @@ -41,13 +41,7 @@ static int alloc_ila_locks(struct ila_net *ilan) size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU); if (sizeof(spinlock_t) != 0) { -#ifdef CONFIG_NUMA - if (size * sizeof(spinlock_t) > PAGE_SIZE) - ilan->locks = vmalloc(size * sizeof(spinlock_t)); - else -#endif - ilan->locks = kmalloc_array(size, sizeof(spinlock_t), - GFP_KERNEL); + ilan->locks = kvmalloc(size * sizeof(spinlock_t), GFP_KERNEL); if (!ilan->locks) return -ENOMEM; for (i = 0; i < size; i++) -- 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: 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>, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH 4/9] ila: simplify a strange allocation pattern Date: Mon, 6 Mar 2017 11:30:27 +0100 [thread overview] Message-ID: <20170306103032.2540-5-mhocko@kernel.org> (raw) In-Reply-To: <20170306103032.2540-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> alloc_ila_locks seemed to c&p from alloc_bucket_locks allocation pattern which is quite unusual. The default allocation size is 320 * sizeof(spinlock_t) which is sub page unless lockdep is enabled when the performance benefit is really questionable and not worth the subtle code IMHO. Also note that the context when we call ila_init_net (modprobe or a task creating a net namespace) has to be properly configured. Let's just simplify the code and use kvmalloc helper which is a transparent way to use kmalloc with vmalloc fallback. Cc: Tom Herbert <tom@herbertland.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Michal Hocko <mhocko@suse.com> --- net/ipv6/ila/ila_xlat.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index af8f52ee7180..2fd5ca151dcf 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c @@ -41,13 +41,7 @@ static int alloc_ila_locks(struct ila_net *ilan) size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU); if (sizeof(spinlock_t) != 0) { -#ifdef CONFIG_NUMA - if (size * sizeof(spinlock_t) > PAGE_SIZE) - ilan->locks = vmalloc(size * sizeof(spinlock_t)); - else -#endif - ilan->locks = kmalloc_array(size, sizeof(spinlock_t), - GFP_KERNEL); + ilan->locks = kvmalloc(size * sizeof(spinlock_t), GFP_KERNEL); if (!ilan->locks) return -ENOMEM; for (i = 0; i < size; i++) -- 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-03-06 10:32 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-06 10:30 [PATCH 0/6 v5] kvmalloc Michal Hocko 2017-03-06 10:30 ` Michal Hocko 2017-03-06 10:30 ` [PATCH 1/9] mm: introduce kv[mz]alloc helpers Michal Hocko 2017-03-06 10:30 ` Michal Hocko 2017-06-02 7:17 ` Levin, Alexander (Sasha Levin) 2017-06-02 7:17 ` Levin, Alexander (Sasha Levin) 2017-06-02 7:28 ` Michal Hocko 2017-06-02 7:28 ` Michal Hocko 2017-06-02 7:40 ` Levin, Alexander (Sasha Levin) 2017-06-02 7:40 ` Levin, Alexander (Sasha Levin) 2017-06-02 7:50 ` Michal Hocko 2017-06-02 7:50 ` Michal Hocko 2017-03-06 10:30 ` [PATCH 2/9] mm: support __GFP_REPEAT in kvmalloc_node for >32kB Michal Hocko 2017-03-06 10:30 ` Michal Hocko 2017-04-07 0:45 ` Shakeel Butt 2017-04-07 0:45 ` Shakeel Butt 2017-04-07 7:40 ` Michal Hocko 2017-04-07 7:40 ` 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 2017-03-06 10:30 ` Michal Hocko [this message] 2017-03-06 10:30 ` [PATCH 4/9] ila: " Michal Hocko 2017-03-06 10:33 ` [PATCH 5/9] xattr: zero out memory copied to userspace in getxattr Michal Hocko 2017-03-06 10:33 ` Michal Hocko 2017-03-06 10:33 ` [PATCH 6/9] treewide: use kv[mz]alloc* rather than opencoded variants Michal Hocko 2017-03-06 10:33 ` Michal Hocko 2017-03-06 10:33 ` [PATCH 7/9] net: use kvmalloc with __GFP_REPEAT rather than open coded variant Michal Hocko 2017-03-06 10:33 ` Michal Hocko 2017-03-30 23:21 ` Shakeel Butt 2017-03-30 23:21 ` Shakeel Butt 2017-03-31 8:46 ` Michal Hocko 2017-03-31 8:46 ` Michal Hocko 2017-03-06 10:33 ` [PATCH 8/9] md: use kvmalloc rather than opencoded variant Michal Hocko 2017-03-06 10:33 ` Michal Hocko 2017-03-06 10:33 ` [PATCH 9/9] bcache: use kvmalloc Michal Hocko 2017-03-06 10:33 ` Michal Hocko -- strict thread matches above, loose matches on Subject: below -- 2017-01-30 9:49 [PATCH 0/6 v3] kvmalloc Michal Hocko 2017-01-30 9:49 ` [PATCH 4/9] ila: simplify a strange allocation pattern Michal Hocko 2017-01-30 9:49 ` Michal Hocko 2017-01-30 15:21 ` Vlastimil Babka 2017-01-30 15:21 ` Vlastimil Babka
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=20170306103032.2540-5-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=eric.dumazet@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.com \ --cc=tom@herbertland.com \ --cc=vbabka@suse.cz \ /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.