uapi: update to 6.11-rc1

Update from 6.11-rc1

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 858a89984ec7b303fb18c94916a6961670c50358..f4d7e495dd015b902162779ab02437b19cc7dcca 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1425,6 +1425,8 @@ enum {
 #define BPF_F_TEST_RUN_ON_CPU  (1U << 0)
 /* If set, XDP frames will be transmitted after processing */
 #define BPF_F_TEST_XDP_LIVE_FRAMES     (1U << 1)
+/* If set, apply CHECKSUM_COMPLETE to skb and validate the checksum */
+#define BPF_F_TEST_SKB_CHECKSUM_COMPLETE       (1U << 2)
 
 /* type for BPF_ENABLE_STATS */
 enum bpf_stats_type {
@@ -6207,12 +6209,17 @@ union {                                 \
        __u64 :64;                      \
 } __attribute__((aligned(8)))
 
+/* The enum used in skb->tstamp_type. It specifies the clock type
+ * of the time stored in the skb->tstamp.
+ */
 enum {
-       BPF_SKB_TSTAMP_UNSPEC,
-       BPF_SKB_TSTAMP_DELIVERY_MONO,   /* tstamp has mono delivery time */
-       /* For any BPF_SKB_TSTAMP_* that the bpf prog cannot handle,
-        * the bpf prog should handle it like BPF_SKB_TSTAMP_UNSPEC
-        * and try to deduce it by ingress, egress or skb->sk->sk_clockid.
+       BPF_SKB_TSTAMP_UNSPEC = 0,              /* DEPRECATED */
+       BPF_SKB_TSTAMP_DELIVERY_MONO = 1,       /* DEPRECATED */
+       BPF_SKB_CLOCK_REALTIME = 0,
+       BPF_SKB_CLOCK_MONOTONIC = 1,
+       BPF_SKB_CLOCK_TAI = 2,
+       /* For any future BPF_SKB_CLOCK_* that the bpf prog cannot handle,
+        * the bpf prog can try to deduce it by ingress/egress/skb->sk->sk_clockid.
         */
 };
 

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 7bdd6843c019dfba76114af6504cdbc3aba2aa77..43cfcb010ccf52ebded9891826285c4ad5ccd8cc 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -81,6 +81,8 @@ enum {
 #define IPPROTO_ETHERNET       IPPROTO_ETHERNET
   IPPROTO_RAW = 255,           /* Raw IP packets                       */
 #define IPPROTO_RAW            IPPROTO_RAW
+  IPPROTO_SMC = 256,           /* Shared Memory Communications         */
+#define IPPROTO_SMC            IPPROTO_SMC
   IPPROTO_MPTCP = 262,         /* Multipath TCP connection             */
 #define IPPROTO_MPTCP          IPPROTO_MPTCP
   IPPROTO_MAX

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 229fc925ec3a299ece747c77076feb9afe193c90..d36d9cdf0c00830d2d249d7411350b594a05bf45 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -554,6 +554,9 @@ enum {
        TCA_FLOWER_KEY_SPI,             /* be32 */
        TCA_FLOWER_KEY_SPI_MASK,        /* be32 */
 
+       TCA_FLOWER_KEY_ENC_FLAGS,       /* be32 */
+       TCA_FLOWER_KEY_ENC_FLAGS_MASK,  /* be32 */
+
        __TCA_FLOWER_MAX,
 };
 
@@ -674,8 +677,15 @@ enum {
 enum {
        TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),
        TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
+       TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM = (1 << 2),
+       TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT = (1 << 3),
+       TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM = (1 << 4),
+       TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT = (1 << 5),
+       __TCA_FLOWER_KEY_FLAGS_MAX,
 };
 
+#define TCA_FLOWER_KEY_FLAGS_MAX (__TCA_FLOWER_KEY_FLAGS_MAX - 1)
+
 enum {
        TCA_FLOWER_KEY_CFM_OPT_UNSPEC,
        TCA_FLOWER_KEY_CFM_MD_LEVEL,

diff --git a/include/uapi/linux/tcp_metrics.h b/include/uapi/linux/tcp_metrics.h
index 7cb4a172feedac9029b7bb9f4dd3abac4cb55004..d93d32f163f016b22cc062a06ee5be8602017188 100644 (file)
--- a/include/uapi/linux/tcp_metrics.h
+++ b/include/uapi/linux/tcp_metrics.h
@@ -27,6 +27,22 @@ enum tcp_metric_index {
 
 #define TCP_METRIC_MAX (__TCP_METRIC_MAX - 1)
 
+/* Re-define enum tcp_metric_index, again, using the values carried
+ * as netlink attribute types.
+ */
+enum {
+       TCP_METRICS_A_METRICS_RTT = 1,
+       TCP_METRICS_A_METRICS_RTTVAR,
+       TCP_METRICS_A_METRICS_SSTHRESH,
+       TCP_METRICS_A_METRICS_CWND,
+       TCP_METRICS_A_METRICS_REODERING,
+       TCP_METRICS_A_METRICS_RTT_US,
+       TCP_METRICS_A_METRICS_RTTVAR_US,
+
+       __TCP_METRICS_A_METRICS_MAX
+};
+#define TCP_METRICS_A_METRICS_MAX (__TCP_METRICS_A_METRICS_MAX - 1)
+
 enum {
        TCP_METRICS_ATTR_UNSPEC,
        TCP_METRICS_ATTR_ADDR_IPV4,             /* u32 */

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 75d18850f02a318ca498d4810e84677a240666cd..53f928bc5be5693f53c1e20e7aeb48d56013575d 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -321,6 +321,7 @@ enum xfrm_attr_type_t {
        XFRMA_IF_ID,            /* __u32 */
        XFRMA_MTIMER_THRESH,    /* __u32 in seconds for input SA */
        XFRMA_SA_DIR,           /* __u8 */
+       XFRMA_NAT_KEEPALIVE_INTERVAL,   /* __u32 in seconds for NAT keepalive */
        __XFRMA_MAX
 
 #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK       /* Compatibility */

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index aea1d5efe3459046a4307272afec73f6529a7db5..a6aadb1effb12f8cb04d879b738b1fef7917ce15 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_netlink.h
+++ b/rdma/include/uapi/rdma/rdma_netlink.h
@@ -572,6 +572,8 @@ enum rdma_nldev_attr {
 
        RDMA_NLDEV_ATTR_PARENT_NAME,            /* string */
 
+       RDMA_NLDEV_ATTR_NAME_ASSIGN_TYPE,       /* u8 */
+
        /*
         * Always the end
         */
@@ -615,4 +617,11 @@ enum rdma_nl_counter_mask {
 enum rdma_nl_dev_type {
        RDMA_DEVICE_TYPE_SMI = 1,
 };
+
+/* RDMA device name assignment types */
+enum rdma_nl_name_assign_type {
+       RDMA_NAME_ASSIGN_TYPE_UNKNOWN = 0,
+       RDMA_NAME_ASSIGN_TYPE_USER = 1, /* Provided by user-space */
+};
+
 #endif /* _RDMA_NETLINK_H */