xdp: Directly use ida_alloc()/free() APIs

Use ida_alloc() / ida_free() instead of the deprecated ida_simple_get() /
ida_simple_remove().

Signed-off-by: Ke Liu <liuke94@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Link: https://lore.kernel.org/bpf/20220527064609.2358482-1-liuke94@huawei.com

diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index f01ef6bda3909b7fe9b9f573bcd0e96111ef8723..869b9b9b9fad6268f11e4b8b7f2cf18ec19c7feb 100644 (file)
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -57,7 +57,7 @@ static int xdp_umem_addr_map(struct xdp_umem *umem, struct page **pages,
 static void xdp_umem_release(struct xdp_umem *umem)
 {
        umem->zc = false;
-       ida_simple_remove(&umem_ida, umem->id);
+       ida_free(&umem_ida, umem->id);
 
        xdp_umem_addr_unmap(umem);
        xdp_umem_unpin_pages(umem);
@@ -242,7 +242,7 @@ struct xdp_umem *xdp_umem_create(struct xdp_umem_reg *mr)
        if (!umem)
                return ERR_PTR(-ENOMEM);
 
-       err = ida_simple_get(&umem_ida, 0, 0, GFP_KERNEL);
+       err = ida_alloc(&umem_ida, GFP_KERNEL);
        if (err < 0) {
                kfree(umem);
                return ERR_PTR(err);
@@ -251,7 +251,7 @@ struct xdp_umem *xdp_umem_create(struct xdp_umem_reg *mr)
 
        err = xdp_umem_reg(umem, mr);
        if (err) {
-               ida_simple_remove(&umem_ida, umem->id);
+               ida_free(&umem_ida, umem->id);
                kfree(umem);
                return ERR_PTR(err);
        }