Commit ab101c55 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

neighbour: use kvzalloc()/kvfree() 



mm layer is providing convenient functions, we do not have
to work around old limitations.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Gilad Naaman <gnaaman@drivenets.com>
Reviewed-by: default avatarJoe Damato <jdamato@fastly.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20241022150059.1345406-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 63afe0c2

net/core/neighbour.c

+2 −17
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/slab.h>

#include <linux/kmemleak.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -538,14 +537,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift) 
	ret = kmalloc(sizeof(*ret), GFP_ATOMIC);

	if (!ret)

		return NULL;

	if (size <= PAGE_SIZE) {

		buckets = kzalloc(size, GFP_ATOMIC);

	} else {

		buckets = (struct neighbour __rcu **)

			  __get_free_pages(GFP_ATOMIC | __GFP_ZERO,

					   get_order(size));

		kmemleak_alloc(buckets, size, 1, GFP_ATOMIC);

	}

	buckets = kvzalloc(size, GFP_ATOMIC);

	if (!buckets) {

		kfree(ret);

		return NULL;
@@ -562,15 +554,8 @@ static void neigh_hash_free_rcu(struct rcu_head *head) 
	struct neigh_hash_table *nht = container_of(head,

						    struct neigh_hash_table,

						    rcu);

	size_t size = (1 << nht->hash_shift) * sizeof(struct neighbour *);

	struct neighbour __rcu **buckets = nht->hash_buckets;



	if (size <= PAGE_SIZE) {

		kfree(buckets);

	} else {

		kmemleak_free(buckets);

		free_pages((unsigned long)buckets, get_order(size));

	}

	kvfree(nht->hash_buckets);

	kfree(nht);

}