update kernel headers from net-next

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 178e20c3888529b0417af5c7912bcda592b887a4..76bdb27b892247ae65548cea8219a77d9b1e9dad 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -81,6 +81,7 @@ enum bpf_cmd {
        BPF_OBJ_GET,
        BPF_PROG_ATTACH,
        BPF_PROG_DETACH,
+       BPF_PROG_TEST_RUN,
 };
 
 enum bpf_map_type {
@@ -96,6 +97,8 @@ enum bpf_map_type {
        BPF_MAP_TYPE_LRU_HASH,
        BPF_MAP_TYPE_LRU_PERCPU_HASH,
        BPF_MAP_TYPE_LPM_TRIE,
+       BPF_MAP_TYPE_ARRAY_OF_MAPS,
+       BPF_MAP_TYPE_HASH_OF_MAPS,
 };
 
 enum bpf_prog_type {
@@ -152,6 +155,7 @@ union bpf_attr {
                __u32   value_size;     /* size of value in bytes */
                __u32   max_entries;    /* max number of entries in a map */
                __u32   map_flags;      /* prealloc or not */
+               __u32   inner_map_fd;   /* fd pointing to the inner map */
        };
 
        struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
@@ -186,6 +190,17 @@ union bpf_attr {
                __u32           attach_type;
                __u32           attach_flags;
        };
+
+       struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */
+               __u32           prog_fd;
+               __u32           retval;
+               __u32           data_size_in;
+               __u32           data_size_out;
+               __aligned_u64   data_in;
+               __aligned_u64   data_out;
+               __u32           repeat;
+               __u32           duration;
+       } test;
 } __attribute__((aligned(8)));
 
 /* BPF helper function descriptions:
@@ -456,6 +471,18 @@ union bpf_attr {
  *     Return:
  *       > 0 length of the string including the trailing NUL on success
  *       < 0 error
+ *
+ * u64 bpf_bpf_get_socket_cookie(skb)
+ *     Get the cookie for the socket stored inside sk_buff.
+ *     @skb: pointer to skb
+ *     Return: 8 Bytes non-decreasing number on success or 0 if the socket
+ *     field is missing inside sk_buff
+ *
+ * u32 bpf_get_socket_uid(skb)
+ *     Get the owner uid of the socket stored inside sk_buff.
+ *     @skb: pointer to skb
+ *     Return: uid of the socket owner on success or 0 if the socket pointer
+ *     inside sk_buff is NULL
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -503,7 +530,9 @@ union bpf_attr {
        FN(get_numa_node_id),           \
        FN(skb_change_head),            \
        FN(xdp_adjust_head),            \
-       FN(probe_read_str),
+       FN(probe_read_str),             \
+       FN(get_socket_cookie),          \
+       FN(get_socket_uid),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index 2ad3585b417aeb13177200b337e2113e26f46e50..0c8af618b4701252b12ebce59b767d5eaf4516f7 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -65,8 +65,12 @@ enum devlink_command {
 #define DEVLINK_CMD_ESWITCH_MODE_SET /* obsolete, never use this! */ \
        DEVLINK_CMD_ESWITCH_SET
 
-       /* add new commands above here */
+       DEVLINK_CMD_DPIPE_TABLE_GET,
+       DEVLINK_CMD_DPIPE_ENTRIES_GET,
+       DEVLINK_CMD_DPIPE_HEADERS_GET,
+       DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
 
+       /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
 };
@@ -148,10 +152,71 @@ enum devlink_attr {
        DEVLINK_ATTR_ESWITCH_MODE,              /* u16 */
        DEVLINK_ATTR_ESWITCH_INLINE_MODE,       /* u8 */
 
+       DEVLINK_ATTR_DPIPE_TABLES,              /* nested */
+       DEVLINK_ATTR_DPIPE_TABLE,               /* nested */
+       DEVLINK_ATTR_DPIPE_TABLE_NAME,          /* string */
+       DEVLINK_ATTR_DPIPE_TABLE_SIZE,          /* u64 */
+       DEVLINK_ATTR_DPIPE_TABLE_MATCHES,       /* nested */
+       DEVLINK_ATTR_DPIPE_TABLE_ACTIONS,       /* nested */
+       DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,      /* u8 */
+
+       DEVLINK_ATTR_DPIPE_ENTRIES,             /* nested */
+       DEVLINK_ATTR_DPIPE_ENTRY,               /* nested */
+       DEVLINK_ATTR_DPIPE_ENTRY_INDEX,         /* u64 */
+       DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES,  /* nested */
+       DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES, /* nested */
+       DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,       /* u64 */
+
+       DEVLINK_ATTR_DPIPE_MATCH,               /* nested */
+       DEVLINK_ATTR_DPIPE_MATCH_VALUE,         /* nested */
+       DEVLINK_ATTR_DPIPE_MATCH_TYPE,          /* u32 */
+
+       DEVLINK_ATTR_DPIPE_ACTION,              /* nested */
+       DEVLINK_ATTR_DPIPE_ACTION_VALUE,        /* nested */
+       DEVLINK_ATTR_DPIPE_ACTION_TYPE,         /* u32 */
+
+       DEVLINK_ATTR_DPIPE_VALUE,
+       DEVLINK_ATTR_DPIPE_VALUE_MASK,
+       DEVLINK_ATTR_DPIPE_VALUE_MAPPING,       /* u32 */
+
+       DEVLINK_ATTR_DPIPE_HEADERS,             /* nested */
+       DEVLINK_ATTR_DPIPE_HEADER,              /* nested */
+       DEVLINK_ATTR_DPIPE_HEADER_NAME,         /* string */
+       DEVLINK_ATTR_DPIPE_HEADER_ID,           /* u32 */
+       DEVLINK_ATTR_DPIPE_HEADER_FIELDS,       /* nested */
+       DEVLINK_ATTR_DPIPE_HEADER_GLOBAL,       /* u8 */
+       DEVLINK_ATTR_DPIPE_HEADER_INDEX,        /* u32 */
+
+       DEVLINK_ATTR_DPIPE_FIELD,               /* nested */
+       DEVLINK_ATTR_DPIPE_FIELD_NAME,          /* string */
+       DEVLINK_ATTR_DPIPE_FIELD_ID,            /* u32 */
+       DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH,      /* u32 */
+       DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE,  /* u32 */
+
+       DEVLINK_ATTR_PAD,
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,
        DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
 };
 
+/* Mapping between internal resource described by the field and system
+ * structure
+ */
+enum devlink_dpipe_field_mapping_type {
+       DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE,
+       DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX,
+};
+
+/* Match type - specify the type of the match */
+enum devlink_dpipe_match_type {
+       DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT,
+};
+
+/* Action type - specify the action type */
+enum devlink_dpipe_action_type {
+       DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY,
+};
+
 #endif /* _LINUX_DEVLINK_H_ */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index b0bdbd6e16c047f81a16bc69161d020721cf5b6d..2bb46f08ef6b3fd6ffdaa150e0479f4071b0ef11 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -536,11 +536,18 @@ enum {
 #define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)
 
 /* GTP section */
+
+enum ifla_gtp_role {
+       GTP_ROLE_GGSN = 0,
+       GTP_ROLE_SGSN,
+};
+
 enum {
        IFLA_GTP_UNSPEC,
        IFLA_GTP_FD0,
        IFLA_GTP_FD1,
        IFLA_GTP_PDP_HASHSIZE,
+       IFLA_GTP_ROLE,
        __IFLA_GTP_MAX,
 };
 #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 75eed60890b4e5834c50885e58e94606da5b7373..5c08b222cb2887664d42f2bb36aa1513c5fc0508 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -184,6 +184,7 @@ enum {
        DEVCONF_ENHANCED_DAD,
        DEVCONF_ADDR_GEN_MODE,
        DEVCONF_DISABLE_POLICY,
+       DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN,
        DEVCONF_MAX
 };
 

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 86c605b9168943d8be74fb60871e7e79665cce40..a96db837e049680582c62b79c01041f44244b38c 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -122,6 +122,8 @@ enum {
 
        RTM_NEWNETCONF = 80,
 #define RTM_NEWNETCONF RTM_NEWNETCONF
+       RTM_DELNETCONF,
+#define RTM_DELNETCONF RTM_DELNETCONF
        RTM_GETNETCONF = 82,
 #define RTM_GETNETCONF RTM_GETNETCONF
 

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 008cf5f91c2034f4bb7119cd20e4032554fc5def..4a169febc9753ca4549063d2f2eba7eff2f92154 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -115,6 +115,7 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_PR_SUPPORTED      113
 #define SCTP_DEFAULT_PRINFO    114
 #define SCTP_PR_ASSOC_STATUS   115
+#define SCTP_PR_STREAM_STATUS  116
 #define SCTP_RECONFIG_SUPPORTED        117
 #define SCTP_ENABLE_STREAM_RESET       118
 #define SCTP_RESET_STREAMS     119

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 41631d35812be8d1e36921b659a4dff892a3ca1e..9b8de52db582cedf62073a2324434f8e6353c7c8 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -568,6 +568,7 @@ enum {
        NET_IPV6_PROXY_NDP=23,
        NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
        NET_IPV6_ACCEPT_RA_FROM_LOCAL=26,
+       NET_IPV6_ACCEPT_RA_RT_INFO_MIN_PLEN=27,
        __NET_IPV6_MAX
 };