Commit 6a571895 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski
Browse files

xdp: Remove usage of the deprecated ida_simple_xx() API 



ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range() is inclusive. So a -1 has been added when needed.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/8e889d18a6c881b09db4650d4b30a62d76f4fe77.1705734073.git.christophe.jaillet@wanadoo.fr


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

net/core/xdp.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void __xdp_mem_allocator_rcu_free(struct rcu_head *rcu) 
	xa = container_of(rcu, struct xdp_mem_allocator, rcu);



	/* Allow this ID to be reused */

	ida_simple_remove(&mem_id_pool, xa->mem.id);

	ida_free(&mem_id_pool, xa->mem.id);



	kfree(xa);

}
@@ -242,7 +242,7 @@ static int __mem_id_cyclic_get(gfp_t gfp) 
	int id;



again:

	id = ida_simple_get(&mem_id_pool, mem_id_next, MEM_ID_MAX, gfp);

	id = ida_alloc_range(&mem_id_pool, mem_id_next, MEM_ID_MAX - 1, gfp);

	if (id < 0) {

		if (id == -ENOSPC) {

			/* Cyclic allocator, reset next id */
@@ -317,7 +317,7 @@ static struct xdp_mem_allocator *__xdp_reg_mem_model(struct xdp_mem_info *mem, 
	/* Insert allocator into ID lookup table */

	ptr = rhashtable_insert_slow(mem_id_ht, &id, &xdp_alloc->node);

	if (IS_ERR(ptr)) {

		ida_simple_remove(&mem_id_pool, mem->id);

		ida_free(&mem_id_pool, mem->id);

		mem->id = 0;

		errno = PTR_ERR(ptr);

		goto err;