Commit 847f716f authored May 08, 2017 by Michal Hocko Committed by Linus Torvalds May 08, 2017

net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern

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.

Link: http://lkml.kernel.org/r/20170306103032.2540-5-mhocko@kernel.org


Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Tom Herbert <tom@herbertland.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 43ca5bc4

net/ipv6/ila/ila_xlat.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -41,13 +41,7 @@ static int alloc_ila_locks(struct ila_net *ilan)
	size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU);		size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU);

	if (sizeof(spinlock_t) != 0) {		if (sizeof(spinlock_t) != 0) {
	#ifdef CONFIG_NUMA		ilan->locks = kvmalloc(size * sizeof(spinlock_t), GFP_KERNEL);
	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);
	if (!ilan->locks)		if (!ilan->locks)
	return -ENOMEM;		return -ENOMEM;
	for (i = 0; i < size; i++)		for (i = 0; i < size; i++)

Admin message