Update kernel headers

Update kernel headers to commit
63757225a933 ("Merge tag 'mlx5-updates-2022-07-28' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index d0dee2b4495f4391a168d97cffde31ae2c3af3dc..d98ed67c6964b092cc98f4079ba38bcab5008390 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2361,7 +2361,8 @@ union bpf_attr {
  *             Pull in non-linear data in case the *skb* is non-linear and not
  *             all of *len* are part of the linear section. Make *len* bytes
  *             from *skb* readable and writable. If a zero value is passed for
- *             *len*, then the whole length of the *skb* is pulled.
+ *             *len*, then all bytes in the linear part of *skb* will be made
+ *             readable and writable.
  *
  *             This helper is only needed for reading and writing with direct
  *             packet access.

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index da0f1ba8f7a03c12a2b229e85244c9f03b70aea2..0224b8bd49b2aa426f2638904809fde7c3f31107 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -136,6 +136,9 @@ enum devlink_command {
        DEVLINK_CMD_LINECARD_NEW,
        DEVLINK_CMD_LINECARD_DEL,
 
+       DEVLINK_CMD_SELFTESTS_GET,      /* can dump */
+       DEVLINK_CMD_SELFTESTS_RUN,
+
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -276,6 +279,30 @@ enum {
 #define DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS \
        (_BITUL(__DEVLINK_FLASH_OVERWRITE_MAX_BIT) - 1)
 
+enum devlink_attr_selftest_id {
+       DEVLINK_ATTR_SELFTEST_ID_UNSPEC,
+       DEVLINK_ATTR_SELFTEST_ID_FLASH, /* flag */
+
+       __DEVLINK_ATTR_SELFTEST_ID_MAX,
+       DEVLINK_ATTR_SELFTEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_ID_MAX - 1
+};
+
+enum devlink_selftest_status {
+       DEVLINK_SELFTEST_STATUS_SKIP,
+       DEVLINK_SELFTEST_STATUS_PASS,
+       DEVLINK_SELFTEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+       DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,
+       DEVLINK_ATTR_SELFTEST_RESULT,           /* nested */
+       DEVLINK_ATTR_SELFTEST_RESULT_ID,        /* u32, enum devlink_attr_selftest_id */
+       DEVLINK_ATTR_SELFTEST_RESULT_STATUS,    /* u8, enum devlink_selftest_status */
+
+       __DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+       DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1
+};
+
 /**
  * enum devlink_trap_action - Packet trap action.
  * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
@@ -576,6 +603,10 @@ enum devlink_attr {
        DEVLINK_ATTR_LINECARD_TYPE,             /* string */
        DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES,  /* nested */
 
+       DEVLINK_ATTR_NESTED_DEVLINK,            /* nested */
+
+       DEVLINK_ATTR_SELFTESTS,                 /* nested */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index a67dcd8294c91631f19a15e775dfed2138a8b2b2..c142c0f8ed8ac26516c2d62b47eeaec6454df624 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -589,7 +589,7 @@ enum {
 
        TCA_FLOWER_KEY_NUM_OF_VLANS,    /* u8 */
 
-       TCA_FLOWER_KEY_PPPOE_SID,       /* u16 */
+       TCA_FLOWER_KEY_PPPOE_SID,       /* be16 */
        TCA_FLOWER_KEY_PPP_PROTO,       /* be16 */
 
        __TCA_FLOWER_MAX,

diff --git a/include/uapi/linux/seg6_iptunnel.h b/include/uapi/linux/seg6_iptunnel.h
index ee6d1dd51088b6cbba7224feb3bd31103379ee37..f2e47aada287659084071ef0dfb06328b363d595 100644 (file)
--- a/include/uapi/linux/seg6_iptunnel.h
+++ b/include/uapi/linux/seg6_iptunnel.h
@@ -35,6 +35,8 @@ enum {
        SEG6_IPTUN_MODE_INLINE,
        SEG6_IPTUN_MODE_ENCAP,
        SEG6_IPTUN_MODE_L2ENCAP,
+       SEG6_IPTUN_MODE_ENCAP_RED,
+       SEG6_IPTUN_MODE_L2ENCAP_RED,
 };
 
 #endif

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 06ad9afb5f2987744fc4518b5af9a51349d10549..8f5f1d6e2fa52abbfa94e0c3fe22340bab94f55d 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -102,21 +102,21 @@ struct xfrm_replay_state_esn {
 struct xfrm_algo {
        char            alg_name[64];
        unsigned int    alg_key_len;    /* in bits */
-       char            alg_key[0];
+       char            alg_key[];
 };
 
 struct xfrm_algo_auth {
        char            alg_name[64];
        unsigned int    alg_key_len;    /* in bits */
        unsigned int    alg_trunc_len;  /* in bits */
-       char            alg_key[0];
+       char            alg_key[];
 };
 
 struct xfrm_algo_aead {
        char            alg_name[64];
        unsigned int    alg_key_len;    /* in bits */
        unsigned int    alg_icv_len;    /* in bits */
-       char            alg_key[0];
+       char            alg_key[];
 };
 
 struct xfrm_stats {
@@ -511,9 +511,9 @@ struct xfrm_user_offload {
        int                             ifindex;
        __u8                            flags;
 };
-/* This flag was exposed without any kernel code that supporting it.
- * Unfortunately, strongswan has the code that uses sets this flag,
- * which makes impossible to reuse this bit.
+/* This flag was exposed without any kernel code that supports it.
+ * Unfortunately, strongswan has the code that sets this flag,
+ * which makes it impossible to reuse this bit.
  *
  * So leave it here to make sure that it won't be reused by mistake.
  */