--- /dev/null
+From d0272f5404773a60cbc17c2277affdbbf8d99c67 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 27 Jun 2019 21:37:19 +0300
+Subject: devlink: fix libc and kernel headers collision
+
+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 {
+ ^~~~~~~
+
+Move the sys/sysinfo.h userspace header before kernel headers, and
+suppress the indirect include of linux/sysinfo.h.
+
+Cc: Aya Levin <ayal@mellanox.com>
+Cc: Moshe Shemesh <moshe@mellanox.com>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ devlink/devlink.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/devlink/devlink.c b/devlink/devlink.c
+index 97b9373..5618ba2 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 /* avoid collision with musl header */
+ #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"
+++ /dev/null
-From a7cd7badedcb643dc1adb41edeb4cf8e4d9ec063 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Tue, 19 Mar 2019 10:36:56 -0700
-Subject: uapi: add CAKE FWMARK
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- include/uapi/linux/pkt_sched.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
-index 1eb572e..7ee74c3 100644
---- a/include/uapi/linux/pkt_sched.h
-+++ b/include/uapi/linux/pkt_sched.h
-@@ -1021,6 +1021,7 @@ enum {
- TCA_CAKE_INGRESS,
- TCA_CAKE_ACK_FILTER,
- TCA_CAKE_SPLIT_GSO,
-+ TCA_CAKE_FWMARK,
- __TCA_CAKE_MAX
- };
- #define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1)
-
-From 5ebfe1f6fea2bb3bfccf4cf93829516caaa0233d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
-Date: Mon, 18 Mar 2019 01:30:45 +0100
-Subject: [PATCH] q_cake: Add support for setting the fwmark option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This adds support for the newly added fwmark option to CAKE, which allows
-overriding the tin selection from the per-packet firewall marks. The fwmark
-field is a bitmask that is applied to the fwmark to select the tin.
-
-Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
----
- man/man8/tc-cake.8 | 16 ++++++++++++++++
- tc/q_cake.c | 24 ++++++++++++++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/man/man8/tc-cake.8 b/man/man8/tc-cake.8
-index eda436e1..8c57eadd 100644
---- a/man/man8/tc-cake.8
-+++ b/man/man8/tc-cake.8
-@@ -91,6 +91,10 @@ TIME |
- LIMIT ]
- .br
- [
-+.BR fwmark
-+MASK ]
-+.br
-+[
- .BR ptm
- |
- .BR atm
-@@ -524,6 +528,18 @@ preset on the modern Internet is firmly discouraged.
- .br
- Voice (CS7, CS6, EF, VA, TOS4), 25% threshold, reduced Codel interval.
-
-+.PP
-+.B fwmark
-+MASK
-+.br
-+ This options turns on fwmark-based overriding of CAKE's tin selection.
-+If set, the option specifies a bitmask that will be applied to the fwmark
-+associated with each packet. If the result of this masking is non-zero, the
-+result will be right-shifted by the number of least-significant unset bits in
-+the mask value, and the result will be used as a the tin number for that packet.
-+This can be used to set policies in a firewall script that will override CAKE's
-+built-in tin selection.
-+
- .SH OTHER PARAMETERS
- .B memlimit
- LIMIT
-diff --git a/tc/q_cake.c b/tc/q_cake.c
-index e827e3f1..307a12c0 100644
---- a/tc/q_cake.c
-+++ b/tc/q_cake.c
-@@ -82,6 +82,7 @@ static void explain(void)
- " [ split-gso* | no-split-gso ]\n"
- " [ ack-filter | ack-filter-aggressive | no-ack-filter* ]\n"
- " [ memlimit LIMIT ]\n"
-+" [ fwmark MASK ]\n"
- " [ ptm | atm | noatm* ] [ overhead N | conservative | raw* ]\n"
- " [ mpu N ] [ ingress | egress* ]\n"
- " (* marks defaults)\n");
-@@ -106,6 +107,7 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv,
- int autorate = -1;
- int ingress = -1;
- int overhead = 0;
-+ int fwmark = -1;
- int wash = -1;
- int nat = -1;
- int atm = -1;
-@@ -332,6 +334,16 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv,
- "Illegal value for \"memlimit\": \"%s\"\n", *argv);
- return -1;
- }
-+ } else if (strcmp(*argv, "fwmark") == 0) {
-+ unsigned int fwm;
-+
-+ NEXT_ARG();
-+ if (get_u32(&fwm, *argv, 0)) {
-+ fprintf(stderr,
-+ "Illegal value for \"fwmark\": \"%s\"\n", *argv);
-+ return -1;
-+ }
-+ fwmark = fwm;
- } else if (strcmp(*argv, "help") == 0) {
- explain();
- return -1;
-@@ -376,6 +388,9 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv,
- if (memlimit)
- addattr_l(n, 1024, TCA_CAKE_MEMORY, &memlimit,
- sizeof(memlimit));
-+ if (fwmark != -1)
-+ addattr_l(n, 1024, TCA_CAKE_FWMARK, &fwmark,
-+ sizeof(fwmark));
- if (nat != -1)
- addattr_l(n, 1024, TCA_CAKE_NAT, &nat, sizeof(nat));
- if (wash != -1)
-@@ -409,6 +424,7 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
- struct rtattr *tb[TCA_CAKE_MAX + 1];
- unsigned int interval = 0;
- unsigned int memlimit = 0;
-+ unsigned int fwmark = 0;
- __u64 bandwidth = 0;
- int ack_filter = 0;
- int split_gso = 0;
-@@ -507,6 +523,10 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
- RTA_PAYLOAD(tb[TCA_CAKE_RTT]) >= sizeof(__u32)) {
- interval = rta_getattr_u32(tb[TCA_CAKE_RTT]);
- }
-+ if (tb[TCA_CAKE_FWMARK] &&
-+ RTA_PAYLOAD(tb[TCA_CAKE_FWMARK]) >= sizeof(__u32)) {
-+ fwmark = rta_getattr_u32(tb[TCA_CAKE_FWMARK]);
-+ }
-
- if (wash)
- print_string(PRINT_FP, NULL, "wash ", NULL);
-@@ -559,6 +579,10 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
- sprint_size(memlimit, b1));
- }
-
-+ if (fwmark)
-+ print_uint(PRINT_FP, NULL, "fwmark 0x%x ", fwmark);
-+ print_0xhex(PRINT_JSON, "fwmark", NULL, fwmark);
-+
- return 0;
- }
-
projects / openwrt / openwrt.git / commitdiff