Update kernel headers

Update kernel headers to commit:
    ad3a9ee0b623 ("ocelot: remove unused variable 'rc' in vcap_cmd()")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index d30bab8b549b4b4d95a20a6e5e61056567a21a62..12df263b0819836c95f025f8fc1897eee7937acb 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -260,6 +260,24 @@ enum bpf_attach_type {
  */
 #define BPF_F_ANY_ALIGNMENT    (1U << 1)
 
+/* BPF_F_TEST_RND_HI32 is used in BPF_PROG_LOAD command for testing purpose.
+ * Verifier does sub-register def/use analysis and identifies instructions whose
+ * def only matters for low 32-bit, high 32-bit is never referenced later
+ * through implicit zero extension. Therefore verifier notifies JIT back-ends
+ * that it is safe to ignore clearing high 32-bit for these instructions. This
+ * saves some back-ends a lot of code-gen. However such optimization is not
+ * necessary on some arches, for example x86_64, arm64 etc, whose JIT back-ends
+ * hence hasn't used verifier's analysis result. But, we really want to have a
+ * way to be able to verify the correctness of the described optimization on
+ * x86_64 on which testsuites are frequently exercised.
+ *
+ * So, this flag is introduced. Once it is set, verifier will randomize high
+ * 32-bit for those instructions who has been identified as safe to ignore them.
+ * Then, if verifier is not doing correct analysis, such randomization will
+ * regress tests to expose bugs.
+ */
+#define BPF_F_TEST_RND_HI32    (1U << 2)
+
 /* When BPF ldimm64's insn[0].src_reg != 0 then this can have
  * two extensions:
  *
@@ -2672,6 +2690,20 @@ union bpf_attr {
  *             0 on success.
  *
  *             **-ENOENT** if the bpf-local-storage cannot be found.
+ *
+ * int bpf_send_signal(u32 sig)
+ *     Description
+ *             Send signal *sig* to the current task.
+ *     Return
+ *             0 on success or successfully queued.
+ *
+ *             **-EBUSY** if work queue under nmi is full.
+ *
+ *             **-EINVAL** if *sig* is invalid.
+ *
+ *             **-EPERM** if no permission to send the *sig*.
+ *
+ *             **-EAGAIN** if bpf program can try again.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -2782,7 +2814,8 @@ union bpf_attr {
        FN(strtol),                     \
        FN(strtoul),                    \
        FN(sk_storage_get),             \
-       FN(sk_storage_delete),
+       FN(sk_storage_delete),          \
+       FN(send_signal),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 3b6a9e6be3ac9a35fe2d9b7ad86ccc7a3d20bd31..6544824a0b97b624265c74bed115746dde2349be 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -104,6 +104,8 @@ enum devlink_command {
        DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
 
        DEVLINK_CMD_FLASH_UPDATE,
+       DEVLINK_CMD_FLASH_UPDATE_END,           /* notification only */
+       DEVLINK_CMD_FLASH_UPDATE_STATUS,        /* notification only */
 
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
@@ -331,6 +333,9 @@ enum devlink_attr {
 
        DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME,    /* string */
        DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,    /* string */
+       DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG,   /* string */
+       DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE,  /* u64 */
+       DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL, /* u64 */
 
        /* add new attributes above here, update the policy in devlink.c */
 

diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index 18c5b68bddee688eeafed76c57592a01185933af..728c42dfd59c13fa8b12e5991a85440d6d084ad5 100644 (file)
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -91,6 +91,7 @@
 #define ETH_P_802_EX1  0x88B5          /* 802.1 Local Experimental 1.  */
 #define ETH_P_PREAUTH  0x88C7          /* 802.11 Preauthentication */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
+#define ETH_P_LLDP     0x88CC          /* Link Layer Discovery Protocol */
 #define ETH_P_MACSEC   0x88E5          /* 802.1ae MACsec */
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_MVRP     0x88F5          /* 802.1Q MVRP                  */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 51a0496f78eacc66a927a5f836dd1e70d2990fad..a93680fc4bfaed358a1bfb5a2c642b8e6a934959 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -105,6 +105,7 @@ enum tca_id {
        TCA_ID_IFE = TCA_ACT_IFE,
        TCA_ID_SAMPLE = TCA_ACT_SAMPLE,
        /* other actions go here */
+       TCA_ID_CTINFO,
        __TCA_ID_MAX = 255
 };
 

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 86dc24a96c90ab047d5173d625450facd6c6dd79..74904e9d1b726f5089bdfb2f6d1280fa991a27a7 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -283,6 +283,7 @@ enum
        LINUX_MIB_TCPACKCOMPRESSED,             /* TCPAckCompressed */
        LINUX_MIB_TCPZEROWINDOWDROP,            /* TCPZeroWindowDrop */
        LINUX_MIB_TCPRCVQDROP,                  /* TCPRcvQDrop */
+       LINUX_MIB_TCPFASTOPENPASSIVEALTKEY,     /* TCPFastOpenPassiveAltKey */
        __LINUX_MIB_MAX
 };