* [PATCH] devlink: fix libc and kernel headers collision
@ 2019-05-30 15:32 Baruch Siach
2019-06-03 5:58 ` Jiri Pirko
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Baruch Siach @ 2019-05-30 15:32 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, Baruch Siach, Aya Levin, Moshe Shemesh
Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
use the sys/sysinfo.h header for the sysinfo(2) system call. But since
iproute2 carries a local version of the kernel struct sysinfo, this
causes a collision with libc that do not rely on kernel defined sysinfo
like musl libc:
In file included from devlink.c:25:0:
.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
struct sysinfo {
^~~~~~~
In file included from ../include/uapi/linux/kernel.h:5:0,
from ../include/uapi/linux/netlink.h:5,
from ../include/uapi/linux/genetlink.h:6,
from devlink.c:21:
../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
struct sysinfo {
^~~~~~~
Rely on the kernel header alone to avoid kernel and userspace headers
collision of definitions.
Cc: Aya Levin <ayal@mellanox.com>
Cc: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
devlink/devlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 436935f88bda..d7a6ce94f0e6 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -22,7 +22,7 @@
#include <linux/devlink.h>
#include <libmnl/libmnl.h>
#include <netinet/ether.h>
-#include <sys/sysinfo.h>
+#include <linux/sysinfo.h>
#include <sys/queue.h>
#include "SNAPSHOT.h"
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] devlink: fix libc and kernel headers collision
2019-05-30 15:32 [PATCH] devlink: fix libc and kernel headers collision Baruch Siach
@ 2019-06-03 5:58 ` Jiri Pirko
2019-06-03 9:02 ` Petr Vorel
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-06-03 5:58 UTC (permalink / raw)
To: Baruch Siach; +Cc: Stephen Hemminger, netdev, Aya Levin, Moshe Shemesh
Thu, May 30, 2019 at 05:32:27PM CEST, baruch@tkos.co.il wrote:
>Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
>use the sys/sysinfo.h header for the sysinfo(2) system call. But since
>iproute2 carries a local version of the kernel struct sysinfo, this
>causes a collision with libc that do not rely on kernel defined sysinfo
>like musl libc:
>
>In file included from devlink.c:25:0:
>.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
> struct sysinfo {
> ^~~~~~~
>In file included from ../include/uapi/linux/kernel.h:5:0,
> from ../include/uapi/linux/netlink.h:5,
> from ../include/uapi/linux/genetlink.h:6,
> from devlink.c:21:
>../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
> struct sysinfo {
> ^~~~~~~
>
>Rely on the kernel header alone to avoid kernel and userspace headers
>collision of definitions.
>
>Cc: Aya Levin <ayal@mellanox.com>
>Cc: Moshe Shemesh <moshe@mellanox.com>
>Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Jiri Pirko <jiri@mellanox.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] devlink: fix libc and kernel headers collision
2019-05-30 15:32 [PATCH] devlink: fix libc and kernel headers collision Baruch Siach
2019-06-03 5:58 ` Jiri Pirko
@ 2019-06-03 9:02 ` Petr Vorel
2019-06-04 16:45 ` Stephen Hemminger
2019-06-04 16:47 ` Stephen Hemminger
3 siblings, 0 replies; 6+ messages in thread
From: Petr Vorel @ 2019-06-03 9:02 UTC (permalink / raw)
To: Baruch Siach; +Cc: Stephen Hemminger, netdev, Aya Levin, Moshe Shemesh
Hi,
> Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
> use the sys/sysinfo.h header for the sysinfo(2) system call. But since
> iproute2 carries a local version of the kernel struct sysinfo, this
> causes a collision with libc that do not rely on kernel defined sysinfo
> like musl libc:
> In file included from devlink.c:25:0:
> .../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
> struct sysinfo {
> ^~~~~~~
> In file included from ../include/uapi/linux/kernel.h:5:0,
> from ../include/uapi/linux/netlink.h:5,
> from ../include/uapi/linux/genetlink.h:6,
> from devlink.c:21:
> ../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
> struct sysinfo {
> ^~~~~~~
> Rely on the kernel header alone to avoid kernel and userspace headers
> collision of definitions.
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Kind regards,
Petr
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] devlink: fix libc and kernel headers collision
2019-05-30 15:32 [PATCH] devlink: fix libc and kernel headers collision Baruch Siach
2019-06-03 5:58 ` Jiri Pirko
2019-06-03 9:02 ` Petr Vorel
@ 2019-06-04 16:45 ` Stephen Hemminger
2019-06-04 16:47 ` Stephen Hemminger
3 siblings, 0 replies; 6+ messages in thread
From: Stephen Hemminger @ 2019-06-04 16:45 UTC (permalink / raw)
To: Baruch Siach; +Cc: netdev, Aya Levin, Moshe Shemesh
On Thu, 30 May 2019 18:32:27 +0300
Baruch Siach <baruch@tkos.co.il> wrote:
> Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
> use the sys/sysinfo.h header for the sysinfo(2) system call. But since
> iproute2 carries a local version of the kernel struct sysinfo, this
> causes a collision with libc that do not rely on kernel defined sysinfo
> like musl libc:
>
> In file included from devlink.c:25:0:
> .../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
> struct sysinfo {
> ^~~~~~~
> In file included from ../include/uapi/linux/kernel.h:5:0,
> from ../include/uapi/linux/netlink.h:5,
> from ../include/uapi/linux/genetlink.h:6,
> from devlink.c:21:
> ../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
> struct sysinfo {
> ^~~~~~~
>
> Rely on the kernel header alone to avoid kernel and userspace headers
> collision of definitions.
>
> Cc: Aya Levin <ayal@mellanox.com>
> Cc: Moshe Shemesh <moshe@mellanox.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Ok, applied. Note that musl libc is not officially supported or tested
as part of iproute2. I will take patches to fix build and bugs, but you
are on your own if you must use it.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] devlink: fix libc and kernel headers collision
2019-05-30 15:32 [PATCH] devlink: fix libc and kernel headers collision Baruch Siach
` (2 preceding siblings ...)
2019-06-04 16:45 ` Stephen Hemminger
@ 2019-06-04 16:47 ` Stephen Hemminger
2019-06-04 17:47 ` Baruch Siach
3 siblings, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2019-06-04 16:47 UTC (permalink / raw)
To: Baruch Siach; +Cc: netdev, Aya Levin, Moshe Shemesh
On Thu, 30 May 2019 18:32:27 +0300
Baruch Siach <baruch@tkos.co.il> wrote:
> Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
> use the sys/sysinfo.h header for the sysinfo(2) system call. But since
> iproute2 carries a local version of the kernel struct sysinfo, this
> causes a collision with libc that do not rely on kernel defined sysinfo
> like musl libc:
>
> In file included from devlink.c:25:0:
> .../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
> struct sysinfo {
> ^~~~~~~
> In file included from ../include/uapi/linux/kernel.h:5:0,
> from ../include/uapi/linux/netlink.h:5,
> from ../include/uapi/linux/genetlink.h:6,
> from devlink.c:21:
> ../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
> struct sysinfo {
> ^~~~~~~
>
> Rely on the kernel header alone to avoid kernel and userspace headers
> collision of definitions.
>
> Cc: Aya Levin <ayal@mellanox.com>
> Cc: Moshe Shemesh <moshe@mellanox.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Sorry this breaks the glibc build.
CC devlink.o
devlink.c: In function ‘format_logtime’:
devlink.c:6124:8: warning: implicit declaration of function ‘sysinfo’; did you mean ‘psiginfo’? [-Wimplicit-function-declaration]
err = sysinfo(&s_info);
^~~~~~~
psiginfo
I backed out the patch now (before pushing it).
Please fix and resubmit.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] devlink: fix libc and kernel headers collision
2019-06-04 16:47 ` Stephen Hemminger
@ 2019-06-04 17:47 ` Baruch Siach
0 siblings, 0 replies; 6+ messages in thread
From: Baruch Siach @ 2019-06-04 17:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, Aya Levin, Moshe Shemesh
Hi Stephen,
On Tue, Jun 04 2019, Stephen Hemminger wrote:
> On Thu, 30 May 2019 18:32:27 +0300
> Baruch Siach <baruch@tkos.co.il> wrote:
>
>> Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
>> use the sys/sysinfo.h header for the sysinfo(2) system call. But since
>> iproute2 carries a local version of the kernel struct sysinfo, this
>> causes a collision with libc that do not rely on kernel defined sysinfo
>> like musl libc:
>>
>> In file included from devlink.c:25:0:
>> .../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
>> struct sysinfo {
>> ^~~~~~~
>> In file included from ../include/uapi/linux/kernel.h:5:0,
>> from ../include/uapi/linux/netlink.h:5,
>> from ../include/uapi/linux/genetlink.h:6,
>> from devlink.c:21:
>> ../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
>> struct sysinfo {
>> ^~~~~~~
>>
>> Rely on the kernel header alone to avoid kernel and userspace headers
>> collision of definitions.
>>
>> Cc: Aya Levin <ayal@mellanox.com>
>> Cc: Moshe Shemesh <moshe@mellanox.com>
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>
> Sorry this breaks the glibc build.
>
>
> CC devlink.o
> devlink.c: In function ‘format_logtime’:
> devlink.c:6124:8: warning: implicit declaration of function ‘sysinfo’; did you mean ‘psiginfo’? [-Wimplicit-function-declaration]
> err = sysinfo(&s_info);
> ^~~~~~~
> psiginfo
>
> I backed out the patch now (before pushing it).
> Please fix and resubmit.
I can't think of anything better than this ugly fix:
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 436935f88bda..02e648ef64b3 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -18,11 +18,12 @@
#include <limits.h>
#include <errno.h>
#include <inttypes.h>
+#include <sys/sysinfo.h>
+#define _LINUX_SYSINFO_H
#include <linux/genetlink.h>
#include <linux/devlink.h>
#include <libmnl/libmnl.h>
#include <netinet/ether.h>
-#include <sys/sysinfo.h>
#include <sys/queue.h>
#include "SNAPSHOT.h"
Would that be acceptable?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-06-04 17:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-30 15:32 [PATCH] devlink: fix libc and kernel headers collision Baruch Siach
2019-06-03 5:58 ` Jiri Pirko
2019-06-03 9:02 ` Petr Vorel
2019-06-04 16:45 ` Stephen Hemminger
2019-06-04 16:47 ` Stephen Hemminger
2019-06-04 17:47 ` Baruch Siach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).