Update kernel headers

Update kernel headers to commit:
    32affa5578f0 ("fib: rules: no longer hold RTNL in fib_nl_dumprule()")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 109ad86f772cfaf76b6d873677c5c9bbe6b77699..869abfd950884d7cfff9f02c2bd092a1dbeccc43 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1662,8 +1662,10 @@ union bpf_attr {
        } query;
 
        struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
-               __u64 name;
-               __u32 prog_fd;
+               __u64           name;
+               __u32           prog_fd;
+               __u32           :32;
+               __aligned_u64   cookie;
        } raw_tracepoint;
 
        struct { /* anonymous struct for BPF_BTF_LOAD */

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index aaac24380bf1755d68403c78f633cba2259af268..80051b8c35207c3a1265d26d6a492f0fd5117175 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -686,6 +686,7 @@ enum devlink_port_function_attr {
        DEVLINK_PORT_FN_ATTR_OPSTATE,   /* u8 */
        DEVLINK_PORT_FN_ATTR_CAPS,      /* bitfield32 */
        DEVLINK_PORT_FN_ATTR_DEVLINK,   /* nested */
+       DEVLINK_PORT_FN_ATTR_MAX_IO_EQS,        /* u32 */
 
        __DEVLINK_PORT_FUNCTION_ATTR_MAX,
        DEVLINK_PORT_FUNCTION_ATTR_MAX = __DEVLINK_PORT_FUNCTION_ATTR_MAX - 1

diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index edaea41cc38d11204b83ce66734dad1ef43b1cec..b69183e609eccc94867cec6f8eb68e1b5f983662 100644 (file)
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -161,6 +161,13 @@ enum {
 
 #define IFLA_VTI_MAX   (__IFLA_VTI_MAX - 1)
 
+/* Historically, tunnel flags have been defined as __be16 and now there are
+ * no free bits left. It is strongly advised to switch the already existing
+ * userspace code to the new *_BIT definitions from down below, as __be16
+ * can't be simply cast to a wider type on LE systems. All new flags and
+ * code must use *_BIT only.
+ */
+
 #define TUNNEL_CSUM            __cpu_to_be16(0x01)
 #define TUNNEL_ROUTING         __cpu_to_be16(0x02)
 #define TUNNEL_KEY             __cpu_to_be16(0x04)
@@ -182,4 +189,31 @@ enum {
                (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT | \
                TUNNEL_GTP_OPT)
 
+enum {
+       IP_TUNNEL_CSUM_BIT              = 0U,
+       IP_TUNNEL_ROUTING_BIT,
+       IP_TUNNEL_KEY_BIT,
+       IP_TUNNEL_SEQ_BIT,
+       IP_TUNNEL_STRICT_BIT,
+       IP_TUNNEL_REC_BIT,
+       IP_TUNNEL_VERSION_BIT,
+       IP_TUNNEL_NO_KEY_BIT,
+       IP_TUNNEL_DONT_FRAGMENT_BIT,
+       IP_TUNNEL_OAM_BIT,
+       IP_TUNNEL_CRIT_OPT_BIT,
+       IP_TUNNEL_GENEVE_OPT_BIT,       /* OPTIONS_PRESENT */
+       IP_TUNNEL_VXLAN_OPT_BIT,        /* OPTIONS_PRESENT */
+       IP_TUNNEL_NOCACHE_BIT,
+       IP_TUNNEL_ERSPAN_OPT_BIT,       /* OPTIONS_PRESENT */
+       IP_TUNNEL_GTP_OPT_BIT,          /* OPTIONS_PRESENT */
+
+       IP_TUNNEL_VTI_BIT,
+       IP_TUNNEL_SIT_ISATAP_BIT        = IP_TUNNEL_VTI_BIT,
+
+       /* Flags starting from here are not available via the old UAPI */
+       IP_TUNNEL_PFCP_OPT_BIT,         /* OPTIONS_PRESENT */
+
+       __IP_TUNNEL_FLAG_NUM,
+};
+
 #endif /* _IF_TUNNEL_H_ */

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index c2e6f3be51a1c7df8a1a80929dd4ec5d58f07a83..a0da2632f27416506118f67913288a847400ba2e 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -56,6 +56,10 @@ struct mptcp_info {
        __u64   mptcpi_bytes_received;
        __u64   mptcpi_bytes_acked;
        __u8    mptcpi_subflows_total;
+       __u8    reserved[3];
+       __u32   mptcpi_last_data_sent;
+       __u32   mptcpi_last_data_recv;
+       __u32   mptcpi_last_ack_recv;
 };
 
 /* MPTCP Reset reason codes, rfc8684 */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index ea277039f89dc4d11d94268a55c124dadfe59134..229fc925ec3a299ece747c77076feb9afe193c90 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -587,6 +587,10 @@ enum {
                                         * TCA_FLOWER_KEY_ENC_OPT_GTP_
                                         * attributes
                                         */
+       TCA_FLOWER_KEY_ENC_OPTS_PFCP,   /* Nested
+                                        * TCA_FLOWER_KEY_ENC_IPT_PFCP
+                                        * attributes
+                                        */
        __TCA_FLOWER_KEY_ENC_OPTS_MAX,
 };
 
@@ -636,6 +640,16 @@ enum {
 #define TCA_FLOWER_KEY_ENC_OPT_GTP_MAX \
                (__TCA_FLOWER_KEY_ENC_OPT_GTP_MAX - 1)
 
+enum {
+       TCA_FLOWER_KEY_ENC_OPT_PFCP_UNSPEC,
+       TCA_FLOWER_KEY_ENC_OPT_PFCP_TYPE,               /* u8 */
+       TCA_FLOWER_KEY_ENC_OPT_PFCP_SEID,               /* be64 */
+       __TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX,
+};
+
+#define TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX \
+               (__TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX - 1)
+
 enum {
        TCA_FLOWER_KEY_MPLS_OPTS_UNSPEC,
        TCA_FLOWER_KEY_MPLS_OPTS_LSE,