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 4/6] ila: simplify a strange allocation pattern Date: Thu, 12 Jan 2017 16:37:15 +0100 [thread overview] Message-ID: <20170112153717.28943-5-mhocko@kernel.org> (raw) In-Reply-To: <20170112153717.28943-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> 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: 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 4/6] ila: simplify a strange allocation pattern Date: Thu, 12 Jan 2017 16:37:15 +0100 [thread overview] Message-ID: <20170112153717.28943-5-mhocko@kernel.org> (raw) In-Reply-To: <20170112153717.28943-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> 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-01-12 15:46 UTC|newest] Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-12 15:37 [PATCH 0/6 v3] kvmalloc Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 15:37 ` [PATCH 1/6] mm: introduce kv[mz]alloc helpers Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-16 4:34 ` John Hubbard 2017-01-16 4:34 ` John Hubbard 2017-01-16 8:47 ` Michal Hocko 2017-01-16 8:47 ` Michal Hocko 2017-01-16 19:09 ` John Hubbard 2017-01-16 19:09 ` John Hubbard 2017-01-16 19:40 ` Michal Hocko 2017-01-16 19:40 ` Michal Hocko 2017-01-16 21:15 ` John Hubbard 2017-01-16 21:15 ` John Hubbard 2017-01-16 21:48 ` Michal Hocko 2017-01-16 21:48 ` Michal Hocko 2017-01-16 21:57 ` John Hubbard 2017-01-16 21:57 ` John Hubbard 2017-01-17 7:51 ` Michal Hocko 2017-01-17 7:51 ` Michal Hocko 2017-01-18 5:59 ` John Hubbard 2017-01-18 5:59 ` John Hubbard 2017-01-18 8:21 ` Michal Hocko 2017-01-18 8:21 ` Michal Hocko 2017-01-19 8:37 ` John Hubbard 2017-01-19 8:37 ` John Hubbard 2017-01-19 8:45 ` Michal Hocko 2017-01-19 8:45 ` Michal Hocko 2017-01-19 9:09 ` John Hubbard 2017-01-19 9:09 ` John Hubbard 2017-01-19 9:56 ` Michal Hocko 2017-01-19 9:56 ` Michal Hocko 2017-01-19 21:28 ` John Hubbard 2017-01-19 21:28 ` John Hubbard 2017-01-26 12:09 ` Michal Hocko 2017-01-26 12:09 ` Michal Hocko 2017-01-30 8:42 ` Vlastimil Babka 2017-01-30 8:42 ` Vlastimil Babka 2017-01-12 15:37 ` [PATCH 2/6] mm: support __GFP_REPEAT in kvmalloc_node for >=64kB Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 16:12 ` Michael S. Tsirkin 2017-01-12 16:12 ` Michael S. Tsirkin 2017-01-14 2:42 ` Tetsuo Handa 2017-01-14 2:42 ` Tetsuo Handa 2017-01-14 8:45 ` Michal Hocko 2017-01-14 8:45 ` Michal Hocko 2017-01-24 15:40 ` Michael S. Tsirkin 2017-01-24 15:40 ` Michael S. Tsirkin 2017-01-12 15:37 ` [PATCH 3/6] rhashtable: simplify a strange allocation pattern Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 15:37 ` Michal Hocko [this message] 2017-01-12 15:37 ` [PATCH 4/6] ila: " Michal Hocko 2017-01-12 15:37 ` [PATCH 5/6] treewide: use kv[mz]alloc* rather than opencoded variants Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 15:57 ` David Sterba 2017-01-12 15:57 ` David Sterba 2017-01-12 15:57 ` David Sterba 2017-01-12 16:05 ` Christian Borntraeger 2017-01-12 16:05 ` Christian Borntraeger 2017-01-12 16:05 ` Christian Borntraeger 2017-01-12 16:54 ` Ilya Dryomov 2017-01-12 16:54 ` Ilya Dryomov 2017-01-12 16:54 ` Ilya Dryomov 2017-01-12 17:18 ` Michal Hocko 2017-01-12 17:18 ` Michal Hocko 2017-01-12 17:18 ` Michal Hocko 2017-01-12 17:00 ` Dan Williams 2017-01-12 17:00 ` Dan Williams 2017-01-12 17:00 ` Dan Williams 2017-01-12 17:26 ` Kees Cook 2017-01-12 17:26 ` Kees Cook 2017-01-12 17:26 ` Kees Cook 2017-01-12 17:37 ` Michal Hocko 2017-01-12 17:37 ` Michal Hocko 2017-01-12 17:37 ` Michal Hocko 2017-01-20 13:41 ` Vlastimil Babka 2017-01-20 13:41 ` Vlastimil Babka 2017-01-20 13:41 ` Vlastimil Babka 2017-01-24 15:00 ` Michal Hocko 2017-01-24 15:00 ` Michal Hocko 2017-01-24 15:00 ` Michal Hocko 2017-01-25 11:15 ` Vlastimil Babka 2017-01-25 11:15 ` Vlastimil Babka 2017-01-25 11:15 ` Vlastimil Babka 2017-01-25 13:09 ` Michal Hocko 2017-01-25 13:09 ` Michal Hocko 2017-01-25 13:09 ` Michal Hocko 2017-01-25 13:40 ` Ilya Dryomov 2017-01-25 13:40 ` Ilya Dryomov 2017-01-25 13:40 ` Ilya Dryomov 2017-01-12 17:29 ` Michal Hocko 2017-01-12 17:29 ` Michal Hocko 2017-01-12 17:29 ` Michal Hocko 2017-01-14 3:01 ` Tetsuo Handa 2017-01-14 3:01 ` Tetsuo Handa 2017-01-14 8:49 ` Michal Hocko 2017-01-14 8:49 ` Michal Hocko 2017-01-12 20:14 ` Boris Ostrovsky 2017-01-12 20:14 ` Boris Ostrovsky 2017-01-12 20:14 ` Boris Ostrovsky 2017-01-13 1:11 ` Dilger, Andreas 2017-01-13 1:11 ` Dilger, Andreas 2017-01-13 1:11 ` Dilger, Andreas 2017-01-14 10:56 ` Leon Romanovsky 2017-01-14 10:56 ` Leon Romanovsky 2017-01-16 7:33 ` Michal Hocko 2017-01-16 7:33 ` Michal Hocko 2017-01-16 7:33 ` Michal Hocko 2017-01-16 8:28 ` Leon Romanovsky 2017-01-16 8:28 ` Leon Romanovsky 2017-01-16 8:18 ` Tariq Toukan 2017-01-16 8:18 ` Tariq Toukan 2017-01-16 8:18 ` Tariq Toukan 2017-01-12 15:37 ` [RFC PATCH 6/6] net: use kvmalloc with __GFP_REPEAT rather than open coded variant Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-12 15:37 ` Michal Hocko 2017-01-24 15:17 ` [PATCH 0/6 v3] kvmalloc Michal Hocko 2017-01-24 15:17 ` Michal Hocko 2017-01-24 16:00 ` Eric Dumazet 2017-01-24 16:00 ` Eric Dumazet 2017-01-25 13:10 ` Michal Hocko 2017-01-25 13:10 ` Michal Hocko 2017-01-24 19:17 ` Alexei Starovoitov 2017-01-24 19:17 ` Alexei Starovoitov 2017-01-25 13:10 ` Michal Hocko 2017-01-25 13:10 ` Michal Hocko 2017-01-25 13:21 ` Michal Hocko 2017-01-25 13:21 ` 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=20170112153717.28943-5-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.