[PATCH v2] selftests: netfilter: fix a build error on openSUSE

[PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Geliang Tang]

This patch fixed the following build error on openSUSE Leap 15.3:

=======================================================================
 gcc     nf-queue.c -lmnl -o tools/testing/selftests/netfilter/nf-queue
 nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
  #include <libmnl/libmnl.h>
           ^~~~~~~~~~~~~~~~~
 compilation terminated.
=======================================================================

It is because libmnl.h is put in the directory of
"/usr/include/libmnl/libmnl/" on openSUSE, not "/usr/include/libmnl/":

 > rpm -ql libmnl-devel
 /usr/include/libmnl
 /usr/include/libmnl/libmnl
 /usr/include/libmnl/libmnl/libmnl.h
 /usr/lib64/libmnl.so
 /usr/lib64/pkgconfig/libmnl.pc

Suggested-by: Kai Liu <kai.liu@suse.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
v2:
 - use pkg-config
---
 tools/testing/selftests/netfilter/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
index e4f845dd942b..8136c1fab7ab 100644
--- a/tools/testing/selftests/netfilter/Makefile
+++ b/tools/testing/selftests/netfilter/Makefile
@@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
 	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
 	conntrack_vrf.sh nft_synproxy.sh
 
+CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
 LDLIBS = -lmnl
 TEST_GEN_FILES =  nf-queue
 
-- 
2.34.1

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Shuah Khan]

On 3/1/22 10:29 PM, Geliang Tang wrote:
> This patch fixed the following build error on openSUSE Leap 15.3:
> 
> =======================================================================
>   gcc     nf-queue.c -lmnl -o tools/testing/selftests/netfilter/nf-queue
>   nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
>    #include <libmnl/libmnl.h>
>             ^~~~~~~~~~~~~~~~~
>   compilation terminated.
> =======================================================================
> 
> It is because libmnl.h is put in the directory of
> "/usr/include/libmnl/libmnl/" on openSUSE, not "/usr/include/libmnl/":
> 
>   > rpm -ql libmnl-devel
>   /usr/include/libmnl
>   /usr/include/libmnl/libmnl
>   /usr/include/libmnl/libmnl/libmnl.h
>   /usr/lib64/libmnl.so
>   /usr/lib64/pkgconfig/libmnl.pc
> 
> Suggested-by: Kai Liu <kai.liu@suse.com>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> v2:
>   - use pkg-config
> ---
>   tools/testing/selftests/netfilter/Makefile | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
> index e4f845dd942b..8136c1fab7ab 100644
> --- a/tools/testing/selftests/netfilter/Makefile
> +++ b/tools/testing/selftests/netfilter/Makefile
> @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
>   	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
>   	conntrack_vrf.sh nft_synproxy.sh
>   
> +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
>   LDLIBS = -lmnl
>   TEST_GEN_FILES =  nf-queue
>   
> 

Adding Pablo to the thread.

Pablo,

This looks good to me. I can take this through linux-kselftest tree.
Let me know either way.

Or if it is going through netfilter tree:
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Pablo Neira Ayuso]

On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
> On 3/1/22 10:29 PM, Geliang Tang wrote:
> > This patch fixed the following build error on openSUSE Leap 15.3:
> > 
> > =======================================================================
> >   gcc     nf-queue.c -lmnl -o tools/testing/selftests/netfilter/nf-queue
> >   nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
> >    #include <libmnl/libmnl.h>
> >             ^~~~~~~~~~~~~~~~~
> >   compilation terminated.
> > =======================================================================
> > 
> > It is because libmnl.h is put in the directory of
> > "/usr/include/libmnl/libmnl/" on openSUSE, not "/usr/include/libmnl/":
> > 
> >   > rpm -ql libmnl-devel
> >   /usr/include/libmnl
> >   /usr/include/libmnl/libmnl
> >   /usr/include/libmnl/libmnl/libmnl.h
> >   /usr/lib64/libmnl.so
> >   /usr/lib64/pkgconfig/libmnl.pc
> > 
> > Suggested-by: Kai Liu <kai.liu@suse.com>
> > Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> > ---
> > v2:
> >   - use pkg-config
> > ---
> >   tools/testing/selftests/netfilter/Makefile | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
> > index e4f845dd942b..8136c1fab7ab 100644
> > --- a/tools/testing/selftests/netfilter/Makefile
> > +++ b/tools/testing/selftests/netfilter/Makefile
> > @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
> >   	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
> >   	conntrack_vrf.sh nft_synproxy.sh
> > +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
> >   LDLIBS = -lmnl
> >   TEST_GEN_FILES =  nf-queue
> > 
> 
> Adding Pablo to the thread.
> 
> Pablo,
> 
> This looks good to me. I can take this through linux-kselftest tree.
> Let me know either way.
> 
> Or if it is going through netfilter tree:
> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

If this does not cause any issue when running tests in any other
distros, then it is fine with me.

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Shuah Khan]

On 3/2/22 11:00 AM, Pablo Neira Ayuso wrote:
> On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
>> On 3/1/22 10:29 PM, Geliang Tang wrote:
>>> This patch fixed the following build error on openSUSE Leap 15.3:
>>>
>>> =======================================================================
>>>    gcc     nf-queue.c -lmnl -o tools/testing/selftests/netfilter/nf-queue
>>>    nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
>>>     #include <libmnl/libmnl.h>
>>>              ^~~~~~~~~~~~~~~~~
>>>    compilation terminated.
>>> =======================================================================
>>>
>>> It is because libmnl.h is put in the directory of
>>> "/usr/include/libmnl/libmnl/" on openSUSE, not "/usr/include/libmnl/":
>>>
>>>    > rpm -ql libmnl-devel
>>>    /usr/include/libmnl
>>>    /usr/include/libmnl/libmnl
>>>    /usr/include/libmnl/libmnl/libmnl.h
>>>    /usr/lib64/libmnl.so
>>>    /usr/lib64/pkgconfig/libmnl.pc
>>>
>>> Suggested-by: Kai Liu <kai.liu@suse.com>
>>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>>> ---
>>> v2:
>>>    - use pkg-config
>>> ---
>>>    tools/testing/selftests/netfilter/Makefile | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
>>> index e4f845dd942b..8136c1fab7ab 100644
>>> --- a/tools/testing/selftests/netfilter/Makefile
>>> +++ b/tools/testing/selftests/netfilter/Makefile
>>> @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
>>>    	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
>>>    	conntrack_vrf.sh nft_synproxy.sh
>>> +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
>>>    LDLIBS = -lmnl
>>>    TEST_GEN_FILES =  nf-queue
>>>
>>
>> Adding Pablo to the thread.
>>
>> Pablo,
>>
>> This looks good to me. I can take this through linux-kselftest tree.
>> Let me know either way.
>>
>> Or if it is going through netfilter tree:
>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> 
> If this does not cause any issue when running tests in any other
> distros, then it is fine with me.
> 

I tested this on Ubuntu 21.10 and worked for me. I will apply this for
Linux 5.18-rc1 then.

thanks,
-- Shuah

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Shuah Khan]

On 3/3/22 12:10 PM, Shuah Khan wrote:
> On 3/2/22 11:00 AM, Pablo Neira Ayuso wrote:
>> On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
>>> On 3/1/22 10:29 PM, Geliang Tang wrote:
>>>> This patch fixed the following build error on openSUSE Leap 15.3:
>>>>
>>>> =======================================================================
>>>>    gcc     nf-queue.c -lmnl -o tools/testing/selftests/netfilter/nf-queue
>>>>    nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
>>>>     #include <libmnl/libmnl.h>
>>>>              ^~~~~~~~~~~~~~~~~
>>>>    compilation terminated.
>>>> =======================================================================
>>>>
>>>> It is because libmnl.h is put in the directory of
>>>> "/usr/include/libmnl/libmnl/" on openSUSE, not "/usr/include/libmnl/":
>>>>
>>>>    > rpm -ql libmnl-devel
>>>>    /usr/include/libmnl
>>>>    /usr/include/libmnl/libmnl
>>>>    /usr/include/libmnl/libmnl/libmnl.h
>>>>    /usr/lib64/libmnl.so
>>>>    /usr/lib64/pkgconfig/libmnl.pc
>>>>
>>>> Suggested-by: Kai Liu <kai.liu@suse.com>
>>>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>>>> ---
>>>> v2:
>>>>    - use pkg-config
>>>> ---
>>>>    tools/testing/selftests/netfilter/Makefile | 1 +
>>>>    1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
>>>> index e4f845dd942b..8136c1fab7ab 100644
>>>> --- a/tools/testing/selftests/netfilter/Makefile
>>>> +++ b/tools/testing/selftests/netfilter/Makefile
>>>> @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
>>>>        ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
>>>>        conntrack_vrf.sh nft_synproxy.sh
>>>> +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
>>>>    LDLIBS = -lmnl
>>>>    TEST_GEN_FILES =  nf-queue
>>>>
>>>
>>> Adding Pablo to the thread.
>>>
>>> Pablo,
>>>
>>> This looks good to me. I can take this through linux-kselftest tree.
>>> Let me know either way.
>>>
>>> Or if it is going through netfilter tree:
>>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
>>
>> If this does not cause any issue when running tests in any other
>> distros, then it is fine with me.
>>
> 
> I tested this on Ubuntu 21.10 and worked for me. I will apply this for
> Linux 5.18-rc1 then.
> 

Applied to linux-kselftest next for Linux 5.18-rc1.

thanks,
-- Shuah

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Jan Engelhardt]

On Wednesday ** 2022-03-02 19:00 **, Pablo Neira Ayuso wrote:


>On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
>> On 3/1/22 10:29 PM, Geliang Tang wrote:
>> > This patch fixed the following build error on openSUSE Leap 15.3:
>> >   nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
>> >    #include <libmnl/libmnl.h>
>> > diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
>> > index e4f845dd942b..8136c1fab7ab 100644
>> > --- a/tools/testing/selftests/netfilter/Makefile
>> > +++ b/tools/testing/selftests/netfilter/Makefile
>> > @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
>> >   	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
>> >   	conntrack_vrf.sh nft_synproxy.sh
>> > +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
>> >   LDLIBS = -lmnl
>> >   TEST_GEN_FILES =  nf-queue
>> 
>> Adding Pablo to the thread.
>> This looks good to me. I can take this through linux-kselftest tree.
>> Or if it is going through netfilter tree:
>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
>
>If this does not cause any issue when running tests in any other
>distros, then it is fine with me.

Since a pkgconfig file exists, it ought to be used. That also means
you need the same/similar incantation in LDLIBS, with
`pkg-config --libs libmnl`.

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Pablo Neira Ayuso]

On Tue, Apr 25, 2023 at 11:14:55AM +0200, Jan Engelhardt wrote:
> 
> On Wednesday ** 2022-03-02 19:00 **, Pablo Neira Ayuso wrote:
> 
> 
> >On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
> >> On 3/1/22 10:29 PM, Geliang Tang wrote:
> >> > This patch fixed the following build error on openSUSE Leap 15.3:
> >> >   nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
> >> >    #include <libmnl/libmnl.h>
> >> > diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
> >> > index e4f845dd942b..8136c1fab7ab 100644
> >> > --- a/tools/testing/selftests/netfilter/Makefile
> >> > +++ b/tools/testing/selftests/netfilter/Makefile
> >> > @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
> >> >   	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
> >> >   	conntrack_vrf.sh nft_synproxy.sh
> >> > +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
> >> >   LDLIBS = -lmnl
> >> >   TEST_GEN_FILES =  nf-queue
> >> 
> >> Adding Pablo to the thread.
> >> This looks good to me. I can take this through linux-kselftest tree.
> >> Or if it is going through netfilter tree:
> >> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> >
> >If this does not cause any issue when running tests in any other
> >distros, then it is fine with me.
> 
> Since a pkgconfig file exists, it ought to be used. That also means
> you need the same/similar incantation in LDLIBS, with
> `pkg-config --libs libmnl`.

Patch?

Re: [PATCH v2] selftests: netfilter: fix a build error on openSUSE

[Jeremy Sowden]

[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]

On 2023-04-25, at 18:32:45 +0200, Pablo Neira Ayuso wrote:
> On Tue, Apr 25, 2023 at 11:14:55AM +0200, Jan Engelhardt wrote:
> > On Wednesday ** 2022-03-02 19:00 **, Pablo Neira Ayuso wrote:
> > >On Wed, Mar 02, 2022 at 10:11:11AM -0700, Shuah Khan wrote:
> > >> On 3/1/22 10:29 PM, Geliang Tang wrote:
> > >> > This patch fixed the following build error on openSUSE Leap 15.3:
> > >> >   nf-queue.c:13:10: fatal error: libmnl/libmnl.h: No such file or directory
> > >> >    #include <libmnl/libmnl.h>
> > >> > diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
> > >> > index e4f845dd942b..8136c1fab7ab 100644
> > >> > --- a/tools/testing/selftests/netfilter/Makefile
> > >> > +++ b/tools/testing/selftests/netfilter/Makefile
> > >> > @@ -8,6 +8,7 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
> > >> >   	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
> > >> >   	conntrack_vrf.sh nft_synproxy.sh
> > >> > +CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
> > >> >   LDLIBS = -lmnl
> > >> >   TEST_GEN_FILES =  nf-queue
> > >>
> > >> Adding Pablo to the thread.
> > >> This looks good to me. I can take this through linux-kselftest tree.
> > >> Or if it is going through netfilter tree:
> > >> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> > >
> > >If this does not cause any issue when running tests in any other
> > >distros, then it is fine with me.
> >
> > Since a pkgconfig file exists, it ought to be used. That also means
> > you need the same/similar incantation in LDLIBS, with `pkg-config
> > --libs libmnl`.

I would also avoid hard-coding pkg-config and remove the unnecessary
SUSE-specific default for CFLAGS.

> Patch?

Following shortly.

J.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH nf] selftests: netfilter: fix libmnl pkg-config usage

[Jeremy Sowden]

1. Don't hard-code pkg-config
2. Remove distro-specific default for CFLAGS
3. Use pkg-config for LDLIBS

Fixes: a50a88f026fb ("selftests: netfilter: fix a build error on openSUSE")
Suggested-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 tools/testing/selftests/netfilter/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
index 4504ee07be08..3686bfa6c58d 100644
--- a/tools/testing/selftests/netfilter/Makefile
+++ b/tools/testing/selftests/netfilter/Makefile
@@ -8,8 +8,11 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \
 	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
 	conntrack_vrf.sh nft_synproxy.sh rpath.sh
 
-CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
-LDLIBS = -lmnl
+HOSTPKG_CONFIG := pkg-config
+
+CFLAGS += $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null)
+LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)
+
 TEST_GEN_FILES =  nf-queue connect_close
 
 include ../lib.mk
-- 
2.39.2

Re: [PATCH nf] selftests: netfilter: fix libmnl pkg-config usage

[Jan Engelhardt]

On Tuesday 2023-04-25 23:11, Jeremy Sowden wrote:

>1. Don't hard-code pkg-config
>2. Remove distro-specific default for CFLAGS
>3. Use pkg-config for LDLIBS


>+CFLAGS += $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null)
>+LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)

Ah yes, this looks better and looks modeled upon selftests/bpf/Makefile.
Speaking of which, there's a space missing over there.

tools/testing/selftests/bpf/Makefile:HOSTPKG_CONFIG := pkg-config
tools/testing/selftests/bpf/Makefile:   $(Q)$(CC) $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null) \
tools/testing/selftests/bpf/Makefile:             $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)