[v3] net/af_xdp: fix missing UMEM feature

Message ID 20230928092553.339452-1-shibin.koikkara.reeny@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series [v3] net/af_xdp: fix missing UMEM feature |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/intel-Functional success Functional PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-sample-apps-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS

Commit Message

Koikkara Reeny, Shibin Sept. 28, 2023, 9:25 a.m. UTC
  Shared UMEM feature is missing in the af_xdp driver build
after the commit 33d66940e9ba ("build: use C11 standard").

Runtime Error log while using Shared UMEM feature:
rte_pmd_af_xdp_probe(): Initializing pmd_af_xdp for net_af_xdp0
init_internals(): Shared UMEM feature not available. Check kernel
and libbpf version
rte_pmd_af_xdp_probe(): Failed to init internals
vdev_probe(): failed to initialize net_af_xdp0 device
EAL: Bus (vdev) probe failed.

Reason for the missing UMEM feature is because the C11 standard
doesn't include the GNU compiler extensions typeof and asm, used
by the libbpf and libxdp header files.

Meson error log:
 In file included from
dpdk/build/meson-private/tmpf74nkhqd/testfile.c:5:
/usr/local/include/bpf/xsk.h: In function 'xsk_prod_nb_free':
/usr/local/include/bpf/xsk.h:165:26: error: expected ';' before '___p1'
  165 |         r->cached_cons = libbpf_smp_load_acquire(r->consumer);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~
/usr/local/include/bpf/xsk.h:165:26: error: 'asm' undeclared (first use
in this function)
...
/usr/local/include/bpf/xsk.h:199:9: error: unknown type name 'typeof'
  199 |         libbpf_smp_store_release(prod->producer, *prod->producer
      + nb);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~

Fix is to provide alternative keywords by using Option Controlling C
Dialect [1].

Fixes: 33d66940e9ba ("build: use C11 standard")

[1] https://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html

v3: Used alternative keywords fix.
v2: Added original commit causing the issue.
Signed-off-by: Shibin Koikkara Reeny <shibin.koikkara.reeny@intel.com>
---
 drivers/net/af_xdp/meson.build | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
  

Comments

Bruce Richardson Sept. 28, 2023, 9:32 a.m. UTC | #1
On Thu, Sep 28, 2023 at 09:25:53AM +0000, Shibin Koikkara Reeny wrote:
> Shared UMEM feature is missing in the af_xdp driver build
> after the commit 33d66940e9ba ("build: use C11 standard").
> 
> Runtime Error log while using Shared UMEM feature:
> rte_pmd_af_xdp_probe(): Initializing pmd_af_xdp for net_af_xdp0
> init_internals(): Shared UMEM feature not available. Check kernel
> and libbpf version
> rte_pmd_af_xdp_probe(): Failed to init internals
> vdev_probe(): failed to initialize net_af_xdp0 device
> EAL: Bus (vdev) probe failed.
> 
> Reason for the missing UMEM feature is because the C11 standard
> doesn't include the GNU compiler extensions typeof and asm, used
> by the libbpf and libxdp header files.
> 
> Meson error log:
>  In file included from
> dpdk/build/meson-private/tmpf74nkhqd/testfile.c:5:
> /usr/local/include/bpf/xsk.h: In function 'xsk_prod_nb_free':
> /usr/local/include/bpf/xsk.h:165:26: error: expected ';' before '___p1'
>   165 |         r->cached_cons = libbpf_smp_load_acquire(r->consumer);
>       |                          ^~~~~~~~~~~~~~~~~~~~~~~
> /usr/local/include/bpf/xsk.h:165:26: error: 'asm' undeclared (first use
> in this function)
> ...
> /usr/local/include/bpf/xsk.h:199:9: error: unknown type name 'typeof'
>   199 |         libbpf_smp_store_release(prod->producer, *prod->producer
>       + nb);
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~
> 
> Fix is to provide alternative keywords by using Option Controlling C
> Dialect [1].
> 

Minor nit, this patch provides the alternative keywords using macros rather than any
C dialect options.

> Fixes: 33d66940e9ba ("build: use C11 standard")
> 
> [1] https://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html
> 
> v3: Used alternative keywords fix.
> v2: Added original commit causing the issue.
> Signed-off-by: Shibin Koikkara Reeny <shibin.koikkara.reeny@intel.com>
> ---

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  
Ferruh Yigit Sept. 29, 2023, 11:45 a.m. UTC | #2
On 9/28/2023 10:32 AM, Bruce Richardson wrote:
> On Thu, Sep 28, 2023 at 09:25:53AM +0000, Shibin Koikkara Reeny wrote:
>> Shared UMEM feature is missing in the af_xdp driver build
>> after the commit 33d66940e9ba ("build: use C11 standard").
>>
>> Runtime Error log while using Shared UMEM feature:
>> rte_pmd_af_xdp_probe(): Initializing pmd_af_xdp for net_af_xdp0
>> init_internals(): Shared UMEM feature not available. Check kernel
>> and libbpf version
>> rte_pmd_af_xdp_probe(): Failed to init internals
>> vdev_probe(): failed to initialize net_af_xdp0 device
>> EAL: Bus (vdev) probe failed.
>>
>> Reason for the missing UMEM feature is because the C11 standard
>> doesn't include the GNU compiler extensions typeof and asm, used
>> by the libbpf and libxdp header files.
>>
>> Meson error log:
>>  In file included from
>> dpdk/build/meson-private/tmpf74nkhqd/testfile.c:5:
>> /usr/local/include/bpf/xsk.h: In function 'xsk_prod_nb_free':
>> /usr/local/include/bpf/xsk.h:165:26: error: expected ';' before '___p1'
>>   165 |         r->cached_cons = libbpf_smp_load_acquire(r->consumer);
>>       |                          ^~~~~~~~~~~~~~~~~~~~~~~
>> /usr/local/include/bpf/xsk.h:165:26: error: 'asm' undeclared (first use
>> in this function)
>> ...
>> /usr/local/include/bpf/xsk.h:199:9: error: unknown type name 'typeof'
>>   199 |         libbpf_smp_store_release(prod->producer, *prod->producer
>>       + nb);
>>       |         ^~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Fix is to provide alternative keywords by using Option Controlling C
>> Dialect [1].
>>
> 
> Minor nit, this patch provides the alternative keywords using macros rather than any
> C dialect options.
> 

Fixed while merging.

>> Fixes: 33d66940e9ba ("build: use C11 standard")
>>
>> [1] https://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html
>>
>> v3: Used alternative keywords fix.
>> v2: Added original commit causing the issue.
>> Signed-off-by: Shibin Koikkara Reeny <shibin.koikkara.reeny@intel.com>
>> ---
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 

Applied to dpdk-next-net/main, thanks.
  

Patch

diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 9a8dbb4d49..9f33e57fa2 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -48,6 +48,14 @@  endif
 
 if build
   xsk_check_prefix = '''
+#ifndef typeof
+#define typeof __typeof__
+#endif
+
+#ifndef asm
+#define asm __asm__
+#endif
+
 #ifdef RTE_NET_AF_XDP_LIBXDP
 #include <xdp/xsk.h>
 #else
@@ -56,17 +64,17 @@  if build
   '''
 
   if cc.has_function('xsk_socket__create_shared', prefix : xsk_check_prefix,
-                     dependencies : ext_deps)
+                     dependencies : ext_deps, args: cflags)
       cflags += ['-DRTE_NET_AF_XDP_SHARED_UMEM']
   endif
   if cc.has_function('bpf_object__next_program',
                      prefix : '#include <bpf/libbpf.h>',
-                     dependencies : bpf_dep)
+                     dependencies : bpf_dep, args: cflags)
       cflags += ['-DRTE_NET_AF_XDP_LIBBPF_OBJ_OPEN']
   endif
   if cc.has_function('bpf_xdp_attach',
                      prefix : '#include <bpf/libbpf.h>',
-                     dependencies : bpf_dep)
+                     dependencies : bpf_dep, args: cflags)
       cflags += ['-DRTE_NET_AF_XDP_LIBBPF_XDP_ATTACH']
   endif
 endif