[v4,6/6] net/af_xdp: make compatible with libbpf v0.8.0
Checks
Commit Message
From: Ciara Loftus <ciara.loftus@intel.com>
libbpf v0.8.0 deprecates the bpf_get_link_xdp_id() and
bpf_set_link_xdp_fd() functions. Use meson to detect if
bpf_xdp_attach() is available and if so, use the recommended
replacement functions bpf_xdp_query_id(), bpf_xdp_attach()
and bpf_xdp_detach().
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
doc/guides/rel_notes/release_22_11.rst | 4 +++
drivers/net/af_xdp/meson.build | 5 ++++
drivers/net/af_xdp/rte_eth_af_xdp.c | 38 +++++++++++++++++++++++++-
3 files changed, 46 insertions(+), 1 deletion(-)
Comments
On 10/6/2022 7:26 AM, Andrew Rybchenko wrote:
> From: Ciara Loftus <ciara.loftus@intel.com>
>
> libbpf v0.8.0 deprecates the bpf_get_link_xdp_id() and
> bpf_set_link_xdp_fd() functions. Use meson to detect if
> bpf_xdp_attach() is available and if so, use the recommended
> replacement functions bpf_xdp_query_id(), bpf_xdp_attach()
> and bpf_xdp_detach().
>
> Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
<...>
> diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
> index 9d5ffab96b..858047989e 100644
> --- a/drivers/net/af_xdp/meson.build
> +++ b/drivers/net/af_xdp/meson.build
> @@ -64,4 +64,9 @@ if build
> dependencies : bpf_dep)
> cflags += ['-DRTE_NET_AF_XDP_LIBBPF_OBJ_OPEN']
> endif
> + if cc.has_function('bpf_xdp_attach',
> + prefix : '#include <bpf/libbpf.h>',
> + dependencies : bpf_dep)
> + cflags += ['-DRTE_NET_AF_XDP_LIBBPF_XDP_ATTACH']
> + endif
meson is not detecting functions, I am getting following log, any idea
what is going wrong:
Run-time dependency libxdp found: YES 1.2.2
Run-time dependency libbpf found: YES 0.8.1
Has header "linux/if_xdp.h" : YES
Has header "xdp/xsk.h" : YES
Has header "bpf/bpf.h" : YES
Checking for function "xsk_socket__create_shared" with dependencies
libxdp, libbpf: NO
Checking for function "bpf_object__next_program" with dependency libbpf: NO
Checking for function "bpf_xdp_attach" with dependency libbpf: NO
On 10/7/2022 6:19 PM, Ferruh Yigit wrote:
> On 10/6/2022 7:26 AM, Andrew Rybchenko wrote:
>> From: Ciara Loftus <ciara.loftus@intel.com>
>>
>> libbpf v0.8.0 deprecates the bpf_get_link_xdp_id() and
>> bpf_set_link_xdp_fd() functions. Use meson to detect if
>> bpf_xdp_attach() is available and if so, use the recommended
>> replacement functions bpf_xdp_query_id(), bpf_xdp_attach()
>> and bpf_xdp_detach().
>>
>> Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
>> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>
> <...>
>
>> diff --git a/drivers/net/af_xdp/meson.build
>> b/drivers/net/af_xdp/meson.build
>> index 9d5ffab96b..858047989e 100644
>> --- a/drivers/net/af_xdp/meson.build
>> +++ b/drivers/net/af_xdp/meson.build
>> @@ -64,4 +64,9 @@ if build
>> dependencies : bpf_dep)
>> cflags += ['-DRTE_NET_AF_XDP_LIBBPF_OBJ_OPEN']
>> endif
>> + if cc.has_function('bpf_xdp_attach',
>> + prefix : '#include <bpf/libbpf.h>',
>> + dependencies : bpf_dep)
>> + cflags += ['-DRTE_NET_AF_XDP_LIBBPF_XDP_ATTACH']
>> + endif
>
> meson is not detecting functions, I am getting following log, any idea
> what is going wrong:
>
> Run-time dependency libxdp found: YES 1.2.2
> Run-time dependency libbpf found: YES 0.8.1
> Has header "linux/if_xdp.h" : YES
> Has header "xdp/xsk.h" : YES
> Has header "bpf/bpf.h" : YES
> Checking for function "xsk_socket__create_shared" with dependencies
> libxdp, libbpf: NO
> Checking for function "bpf_object__next_program" with dependency libbpf: NO
> Checking for function "bpf_xdp_attach" with dependency libbpf: NO
>
It is OK, this was my environment issue, libbpf.so permission was wrong
although I compile and installed from source, anyway latest log:
Run-time dependency libxdp found: YES 1.2.2
Run-time dependency libbpf found: YES 0.8.1
Has header "linux/if_xdp.h" : YES
Has header "xdp/xsk.h" : YES
Has header "bpf/bpf.h" : YES
Checking for function "xsk_socket__create_shared" with dependencies
libxdp, libbpf: YES
Checking for function "bpf_object__next_program" with dependency libbpf:
YES
Checking for function "bpf_xdp_attach" with dependency libbpf: YES
@@ -78,6 +78,10 @@ New Features
Added new rte_flow action which allows application to re-route packets
directly to the kernel without software involvement.
+* **Updated AF_XDP PMD.**
+
+ * Made compatible with libbpf v0.8.0 (when used with libxdp).
+
* **Updated Intel iavf driver.**
* Added flow subscription support.
@@ -64,4 +64,9 @@ if build
dependencies : bpf_dep)
cflags += ['-DRTE_NET_AF_XDP_LIBBPF_OBJ_OPEN']
endif
+ if cc.has_function('bpf_xdp_attach',
+ prefix : '#include <bpf/libbpf.h>',
+ dependencies : bpf_dep)
+ cflags += ['-DRTE_NET_AF_XDP_LIBBPF_XDP_ATTACH']
+ endif
endif
@@ -866,6 +866,40 @@ eth_stats_reset(struct rte_eth_dev *dev)
return 0;
}
+#ifdef RTE_NET_AF_XDP_LIBBPF_XDP_ATTACH
+
+static int link_xdp_prog_with_dev(int ifindex, int fd, __u32 flags)
+{
+ return bpf_xdp_attach(ifindex, fd, flags, NULL);
+}
+
+static int
+remove_xdp_program(struct pmd_internals *internals)
+{
+ uint32_t curr_prog_id = 0;
+ int ret;
+
+ ret = bpf_xdp_query_id(internals->if_index, XDP_FLAGS_UPDATE_IF_NOEXIST,
+ &curr_prog_id);
+ if (ret != 0) {
+ AF_XDP_LOG(ERR, "bpf_xdp_query_id failed\n");
+ return ret;
+ }
+
+ ret = bpf_xdp_detach(internals->if_index, XDP_FLAGS_UPDATE_IF_NOEXIST,
+ NULL);
+ if (ret != 0)
+ AF_XDP_LOG(ERR, "bpf_xdp_detach failed\n");
+ return ret;
+}
+
+#else
+
+static int link_xdp_prog_with_dev(int ifindex, int fd, __u32 flags)
+{
+ return bpf_set_link_xdp_fd(ifindex, fd, flags);
+}
+
static int
remove_xdp_program(struct pmd_internals *internals)
{
@@ -886,6 +920,8 @@ remove_xdp_program(struct pmd_internals *internals)
return ret;
}
+#endif
+
static void
xdp_umem_destroy(struct xsk_umem_info *umem)
{
@@ -1205,7 +1241,7 @@ load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map)
}
/* Link the program with the given network device */
- ret = bpf_set_link_xdp_fd(if_index, prog_fd,
+ ret = link_xdp_prog_with_dev(if_index, prog_fd,
XDP_FLAGS_UPDATE_IF_NOEXIST);
if (ret) {
AF_XDP_LOG(ERR, "Failed to set prog fd %d on interface\n",