Update kernel headers and add xdp_diag.h

Update kernel headers to commit:
c829f5f52db9 ("cxgb4: cxgb4_tc_u32: use struct_size() in kvzalloc()")

and import xdp_diag.h for the next patch.

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index fb541e160509331ee4b79f34502bb9aa27d13e72..9fdd9c740c75f3b6439f95a25ae28b31790cd9b1 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -14,6 +14,7 @@
 /* Extended instruction set based on top of classic BPF */
 
 /* instruction classes */
+#define BPF_JMP32      0x06    /* jmp mode in word width */
 #define BPF_ALU64      0x07    /* alu mode in double word width */
 
 /* ld/ldx fields */
@@ -2540,6 +2541,7 @@ struct __sk_buff {
        __bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
        __u64 tstamp;
        __u32 wire_len;
+       __u32 gso_segs;
 };
 
 struct bpf_tunnel_key {

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 6d0fad9011d4c08c18642a7fed0c407a519d7337..d0a33d79dc221379ae23fba1bca40034b65417f5 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -89,13 +89,6 @@ enum devlink_command {
        DEVLINK_CMD_REGION_DEL,
        DEVLINK_CMD_REGION_READ,
 
-       DEVLINK_CMD_HEALTH_REPORTER_GET,
-       DEVLINK_CMD_HEALTH_REPORTER_SET,
-       DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
-       DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
-       DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
-       DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
-
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -292,24 +285,6 @@ enum devlink_attr {
        DEVLINK_ATTR_REGION_CHUNK_ADDR,         /* u64 */
        DEVLINK_ATTR_REGION_CHUNK_LEN,          /* u64 */
 
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT,              /* nested */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_PAIR,         /* nested */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_NAME,         /* string */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE,        /* nested */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_ARRAY,  /* nested */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_TYPE,   /* u8 */
-       DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_DATA,   /* dynamic */
-
-       DEVLINK_ATTR_HEALTH_REPORTER,                   /* nested */
-       DEVLINK_ATTR_HEALTH_REPORTER_NAME,              /* string */
-       DEVLINK_ATTR_HEALTH_REPORTER_STATE,             /* u8 */
-       DEVLINK_ATTR_HEALTH_REPORTER_ERR,               /* u64 */
-       DEVLINK_ATTR_HEALTH_REPORTER_RECOVER,           /* u64 */
-       DEVLINK_ATTR_HEALTH_REPORTER_DUMP_AVAIL,        /* u8 */
-       DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,           /* u64 */
-       DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,   /* u64 */
-       DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,      /* u8 */
-
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
index cb247a5df6ea6e45e40836a396eee60d21d1a412..cf8d5d471c05e1c97a20f4b5f7d5905dbb41e348 100644 (file)
--- a/include/uapi/linux/icmpv6.h
+++ b/include/uapi/linux/icmpv6.h
@@ -108,6 +108,8 @@ struct icmp6hdr {
 #define ICMPV6_MOBILE_PREFIX_SOL       146
 #define ICMPV6_MOBILE_PREFIX_ADV       147
 
+#define ICMPV6_MRDISC_ADV              151
+
 /*
  *     Codes for Destination Unreachable
  */

diff --git a/include/uapi/linux/if_bonding.h b/include/uapi/linux/if_bonding.h
index 61a1bf6e865e8b41aa1f5bd8ce188f513f58e143..790585f0e61b5b252a03bd558694dc4c8921246b 100644 (file)
--- a/include/uapi/linux/if_bonding.h
+++ b/include/uapi/linux/if_bonding.h
@@ -117,6 +117,30 @@ struct ad_info {
        __u8 partner_system[ETH_ALEN];
 };
 
+/* Embedded inside LINK_XSTATS_TYPE_BOND */
+enum {
+       BOND_XSTATS_UNSPEC,
+       BOND_XSTATS_3AD,
+       __BOND_XSTATS_MAX
+};
+#define BOND_XSTATS_MAX (__BOND_XSTATS_MAX - 1)
+
+/* Embedded inside BOND_XSTATS_3AD */
+enum {
+       BOND_3AD_STAT_LACPDU_RX,
+       BOND_3AD_STAT_LACPDU_TX,
+       BOND_3AD_STAT_LACPDU_UNKNOWN_RX,
+       BOND_3AD_STAT_LACPDU_ILLEGAL_RX,
+       BOND_3AD_STAT_MARKER_RX,
+       BOND_3AD_STAT_MARKER_TX,
+       BOND_3AD_STAT_MARKER_RESP_RX,
+       BOND_3AD_STAT_MARKER_RESP_TX,
+       BOND_3AD_STAT_MARKER_UNKNOWN_RX,
+       BOND_3AD_STAT_PAD,
+       __BOND_3AD_STAT_MAX
+};
+#define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1)
+
 #endif /* _LINUX_IF_BONDING_H */
 
 /*

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 484ddf833f0771a78c97d892b0ccc088c223a137..bfe7f9e6eae37c9c582bb29f770dbe685d4a2ecf 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -923,6 +923,7 @@ enum {
 enum {
        LINK_XSTATS_TYPE_UNSPEC,
        LINK_XSTATS_TYPE_BRIDGE,
+       LINK_XSTATS_TYPE_BOND,
        __LINK_XSTATS_TYPE_MAX
 };
 #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 1d30d7978efcdd50e026651a7c714bc27aeda616..ac079abcb8b222338efffe881b96f26246edf2cd 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -292,10 +292,11 @@ struct sockaddr_in {
 #define        IN_LOOPBACK(a)          ((((long int) (a)) & 0xff000000) == 0x7f000000)
 
 /* Defines for Multicast INADDR */
-#define INADDR_UNSPEC_GROUP    0xe0000000U     /* 224.0.0.0   */
-#define INADDR_ALLHOSTS_GROUP  0xe0000001U     /* 224.0.0.1   */
-#define INADDR_ALLRTRS_GROUP    0xe0000002U    /* 224.0.0.2 */
-#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU    /* 224.0.0.255 */
+#define INADDR_UNSPEC_GROUP            0xe0000000U     /* 224.0.0.0   */
+#define INADDR_ALLHOSTS_GROUP          0xe0000001U     /* 224.0.0.1   */
+#define INADDR_ALLRTRS_GROUP           0xe0000002U     /* 224.0.0.2 */
+#define INADDR_ALLSNOOPERS_GROUP       0xe000006aU     /* 224.0.0.106 */
+#define INADDR_MAX_LOCAL_GROUP         0xe00000ffU     /* 224.0.0.255 */
 #endif
 
 /* <asm/byteorder.h> contains the htonl type stuff.. */

diff --git a/include/uapi/linux/xdp_diag.h b/include/uapi/linux/xdp_diag.h
new file mode 100644 (file)
index 0000000..78b2591
--- /dev/null
+++ b/include/uapi/linux/xdp_diag.h
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * xdp_diag: interface for query/monitor XDP sockets
+ * Copyright(c) 2019 Intel Corporation.
+ */
+
+#ifndef _LINUX_XDP_DIAG_H
+#define _LINUX_XDP_DIAG_H
+
+#include <linux/types.h>
+
+struct xdp_diag_req {
+       __u8    sdiag_family;
+       __u8    sdiag_protocol;
+       __u16   pad;
+       __u32   xdiag_ino;
+       __u32   xdiag_show;
+       __u32   xdiag_cookie[2];
+};
+
+struct xdp_diag_msg {
+       __u8    xdiag_family;
+       __u8    xdiag_type;
+       __u16   pad;
+       __u32   xdiag_ino;
+       __u32   xdiag_cookie[2];
+};
+
+#define XDP_SHOW_INFO          (1 << 0) /* Basic information */
+#define XDP_SHOW_RING_CFG      (1 << 1)
+#define XDP_SHOW_UMEM          (1 << 2)
+#define XDP_SHOW_MEMINFO       (1 << 3)
+
+enum {
+       XDP_DIAG_NONE,
+       XDP_DIAG_INFO,
+       XDP_DIAG_UID,
+       XDP_DIAG_RX_RING,
+       XDP_DIAG_TX_RING,
+       XDP_DIAG_UMEM,
+       XDP_DIAG_UMEM_FILL_RING,
+       XDP_DIAG_UMEM_COMPLETION_RING,
+       XDP_DIAG_MEMINFO,
+       __XDP_DIAG_MAX,
+};
+
+#define XDP_DIAG_MAX (__XDP_DIAG_MAX - 1)
+
+struct xdp_diag_info {
+       __u32   ifindex;
+       __u32   queue_id;
+};
+
+struct xdp_diag_ring {
+       __u32   entries; /*num descs */
+};
+
+#define XDP_DU_F_ZEROCOPY (1 << 0)
+
+struct xdp_diag_umem {
+       __u64   size;
+       __u32   id;
+       __u32   num_pages;
+       __u32   chunk_size;
+       __u32   headroom;
+       __u32   ifindex;
+       __u32   queue_id;
+       __u32   flags;
+       __u32   refs;
+};
+
+#endif /* _LINUX_XDP_DIAG_H */