Update kernel headers

Update kernel headers to commit
    56794b5862c5 ("Merge branch 'mlx5-health-syndrome'")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 535272c7b3124ecc9aca1479de101717360cfd07..0cfb64a8b3c2bac608f9926eddbef9ff8d7e6969 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -6913,6 +6913,12 @@ enum {
        BPF_SOCK_OPS_ALL_CB_FLAGS       = 0x7F,
 };
 
+enum {
+       SK_BPF_CB_TX_TIMESTAMPING       = 1<<0,
+       SK_BPF_CB_MASK                  = (SK_BPF_CB_TX_TIMESTAMPING - 1) |
+                                          SK_BPF_CB_TX_TIMESTAMPING
+};
+
 /* List of known BPF sock_ops operators.
  * New entries can only be added at the end
  */
@@ -7025,6 +7031,29 @@ enum {
                                         * by the kernel or the
                                         * earlier bpf-progs.
                                         */
+       BPF_SOCK_OPS_TSTAMP_SCHED_CB,   /* Called when skb is passing
+                                        * through dev layer when
+                                        * SK_BPF_CB_TX_TIMESTAMPING
+                                        * feature is on.
+                                        */
+       BPF_SOCK_OPS_TSTAMP_SND_SW_CB,  /* Called when skb is about to send
+                                        * to the nic when SK_BPF_CB_TX_TIMESTAMPING
+                                        * feature is on.
+                                        */
+       BPF_SOCK_OPS_TSTAMP_SND_HW_CB,  /* Called in hardware phase when
+                                        * SK_BPF_CB_TX_TIMESTAMPING feature
+                                        * is on.
+                                        */
+       BPF_SOCK_OPS_TSTAMP_ACK_CB,     /* Called when all the skbs in the
+                                        * same sendmsg call are acked
+                                        * when SK_BPF_CB_TX_TIMESTAMPING
+                                        * feature is on.
+                                        */
+       BPF_SOCK_OPS_TSTAMP_SENDMSG_CB, /* Called when every sendmsg syscall
+                                        * is triggered. It's used to correlate
+                                        * sendmsg timestamp with corresponding
+                                        * tskey.
+                                        */
 };
 
 /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
@@ -7091,6 +7120,7 @@ enum {
        TCP_BPF_SYN_IP          = 1006, /* Copy the IP[46] and TCP header */
        TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
        TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
+       SK_BPF_CB_FLAGS         = 1009, /* Get or set sock ops flags in socket */
 };
 
 enum {

diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h
index 229a77ffab075fe3d2eb9226b88d5638d03af741..9aea26872ebfcefa1e8dda242b2c06ed44334d46 100644 (file)
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -182,7 +182,7 @@ struct canfd_frame {
 /*
  * defined bits for canxl_frame.flags
  *
- * The canxl_frame.flags element contains two bits CANXL_XLF and CANXL_SEC
+ * The canxl_frame.flags element contains three bits CANXL_[XLF|SEC|RRS]
  * and shares the relative position of the struct can[fd]_frame.len element.
  * The CANXL_XLF bit ALWAYS needs to be set to indicate a valid CAN XL frame.
  * As a side effect setting this bit intentionally breaks the length checks
@@ -192,6 +192,7 @@ struct canfd_frame {
  */
 #define CANXL_XLF 0x80 /* mandatory CAN XL frame flag (must always be set!) */
 #define CANXL_SEC 0x01 /* Simple Extended Content (security/segmentation) */
+#define CANXL_RRS 0x02 /* Remote Request Substitution */
 
 /* the 8-bit VCID is optionally placed in the canxl_frame.prio element */
 #define CANXL_VCID_OFFSET 16 /* bit offset of VCID in prio element */

diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 00e9890ca3c0555c44aeffb8b7fd35c76bb0403f..2df6e4035d50b7388b4766ea8e1a7c71aa51a068 100644 (file)
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -70,6 +70,9 @@ enum {
        FRA_DSCP,       /* dscp */
        FRA_FLOWLABEL,  /* flowlabel */
        FRA_FLOWLABEL_MASK,     /* flowlabel mask */
+       FRA_SPORT_MASK, /* sport mask */
+       FRA_DPORT_MASK, /* dport mask */
+       FRA_DSCP_MASK,  /* dscp mask */
        __FRA_MAX
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 79e97dd1fcdc8b803c0e0d080993a9dd3b5fdee2..9330d5b763e24087f0715a1a67f1755eaf4204e3 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1436,6 +1436,7 @@ enum {
        IFLA_GENEVE_TTL_INHERIT,
        IFLA_GENEVE_DF,
        IFLA_GENEVE_INNER_PROTO_INHERIT,
+       IFLA_GENEVE_PORT_RANGE,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)
@@ -1448,6 +1449,11 @@ enum ifla_geneve_df {
        GENEVE_DF_MAX = __GENEVE_DF_END - 1,
 };
 
+struct ifla_geneve_port_range {
+       __be16 low;
+       __be16 high;
+};
+
 /* Bareudp section  */
 enum {
        IFLA_BAREUDP_UNSPEC,

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 6c652145d8e704bbf2d144482b7d5ad827fb9545..085bb13970307852ae754e7a4ac27d7ca3fecd7b 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -307,6 +307,7 @@ enum {
 #define RTPROT_MROUTED         17      /* Multicast daemon */
 #define RTPROT_KEEPALIVED      18      /* Keepalived daemon */
 #define RTPROT_BABEL           42      /* Babel daemon */
+#define RTPROT_OVN             84      /* OVN daemon */
 #define RTPROT_OPENR           99      /* Open Routing (Open/R) Routes */
 #define RTPROT_BGP             186     /* BGP Routes */
 #define RTPROT_ISIS            187     /* ISIS Routes */

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 848c7784e684c03bdf743e42594317f3d889d83f..eb9fb776fdc3e50c2ecfc6b36d5472f8f65b5985 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -186,6 +186,7 @@ enum
        LINUX_MIB_TIMEWAITKILLED,               /* TimeWaitKilled */
        LINUX_MIB_PAWSACTIVEREJECTED,           /* PAWSActiveRejected */
        LINUX_MIB_PAWSESTABREJECTED,            /* PAWSEstabRejected */
+       LINUX_MIB_TSECRREJECTED,                /* TSEcrRejected */
        LINUX_MIB_PAWS_OLD_ACK,                 /* PAWSOldAck */
        LINUX_MIB_DELAYEDACKS,                  /* DelayedACKs */
        LINUX_MIB_DELAYEDACKLOCKED,             /* DelayedACKLocked */

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 03d1f22f5f480c20e99ca5d11d572475c246965b..947ba18e1f689510f0ac1f58054c88f7112cb2dd 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -136,6 +136,7 @@ enum {
 #define TCP_AO_REPAIR          42      /* Get/Set SNEs and ISNs */
 
 #define TCP_IS_MPTCP           43      /* Is MPTCP being used? */
+#define TCP_RTO_MAX_MS         44      /* max rto time in ms */
 
 #define TCP_REPAIR_ON          1
 #define TCP_REPAIR_OFF         0