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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/8e889d18a6c881b09db4650d4b30a62d76f4fe77.1705734073.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/xdp.c b/net/core/xdp.c
index 4869c1c2d8f3d9ca7e33a1d7d56f450a49f37096..27b585f3fa81a6340f9809b899014712381f2b13 100644 (file)
--- a/net/core/xdp.c
+++ b/net/core/xdp.c
@@ -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;