uapi: update from 6.15-rc1

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

diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index ebe21775a797809d33a5125229aabd190f810fb0..61689ae859f0ba24447dac6c080fcb471588d312 100644 (file)
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -342,7 +342,7 @@ enum batadv_nl_attrs {
        BATADV_ATTR_MCAST_FLAGS_PRIV,
 
        /**
-        * @BATADV_ATTR_VLANID: VLAN id on top of soft interface
+        * @BATADV_ATTR_VLANID: VLAN id on top of mesh interface
         */
        BATADV_ATTR_VLANID,
 
@@ -380,7 +380,7 @@ enum batadv_nl_attrs {
        /**
         * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
         *  avoidance feature is enabled. This feature detects and avoids loops
-        *  between the mesh and devices bridged with the soft interface
+        *  between the mesh and devices bridged with the mesh interface
         */
        BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
 
@@ -509,7 +509,7 @@ enum batadv_nl_commands {
        BATADV_CMD_UNSPEC,
 
        /**
-        * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
+        * @BATADV_CMD_GET_MESH: Get attributes from mesh(if)
         */
        BATADV_CMD_GET_MESH,
 
@@ -535,7 +535,7 @@ enum batadv_nl_commands {
 
        /**
         * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
-        *  current softif
+        *  current mesh(if)
         */
        BATADV_CMD_GET_HARDIF,
 
@@ -591,25 +591,25 @@ enum batadv_nl_commands {
        BATADV_CMD_GET_MCAST_FLAGS,
 
        /**
-        * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
+        * @BATADV_CMD_SET_MESH: Set attributes for mesh(if)
         */
        BATADV_CMD_SET_MESH,
 
        /**
         * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
-        *  current softif
+        *  current mesh(if)
         */
        BATADV_CMD_SET_HARDIF,
 
        /**
         * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
-        *  current softif
+        *  current mesh(if)
         */
        BATADV_CMD_GET_VLAN,
 
        /**
         * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
-        *  current softif
+        *  current mesh(if)
         */
        BATADV_CMD_SET_VLAN,
 
@@ -691,7 +691,7 @@ enum batadv_ifla_attrs {
         */
        IFLA_BATADV_ALGO_NAME,
 
-       /* add attributes above here, update the policy in soft-interface.c */
+       /* add attributes above here, update the policy in mesh-interface.c */
 
        /**
         * @__IFLA_BATADV_MAX: internal use

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 0cfb64a8b3c2bac608f9926eddbef9ff8d7e6969..00d05b86c90ca1a882462968cbfb16086473e21a 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -51,6 +51,9 @@
 #define BPF_XCHG       (0xe0 | BPF_FETCH)      /* atomic exchange */
 #define BPF_CMPXCHG    (0xf0 | BPF_FETCH)      /* atomic compare-and-write */
 
+#define BPF_LOAD_ACQ   0x100   /* load-acquire */
+#define BPF_STORE_REL  0x110   /* store-release */
+
 enum bpf_cond_pseudo_jmp {
        BPF_MAY_GOTO = 0,
 };
@@ -1207,6 +1210,7 @@ enum bpf_perf_event_type {
 #define BPF_F_BEFORE           (1U << 3)
 #define BPF_F_AFTER            (1U << 4)
 #define BPF_F_ID               (1U << 5)
+#define BPF_F_PREORDER         (1U << 6)
 #define BPF_F_LINK             BPF_F_LINK /* 1 << 13 */
 
 /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
@@ -1648,6 +1652,7 @@ union bpf_attr {
                };
                __u32           next_id;
                __u32           open_flags;
+               __s32           fd_by_id_token_fd;
        };
 
        struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
@@ -6019,7 +6024,10 @@ union bpf_attr {
        FN(user_ringbuf_drain, 209, ##ctx)              \
        FN(cgrp_storage_get, 210, ##ctx)                \
        FN(cgrp_storage_delete, 211, ##ctx)             \
-       /* */
+       /* This helper list is effectively frozen. If you are trying to \
+        * add a new helper, you should add a kfunc instead which has   \
+        * less stability guarantees. See Documentation/bpf/kfuncs.rst  \
+        */
 
 /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
  * know or care about integer value that is now passed as second argument

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
index 426daf5aa61804ec98deeca3532c20cea0adf7d0..ffba4eb1416876386eb5c110284bbf5728eeed7d 100644 (file)
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -36,7 +36,8 @@ struct btf_type {
         * bits 24-28: kind (e.g. int, ptr, array...etc)
         * bits 29-30: unused
         * bit     31: kind_flag, currently used by
-        *             struct, union, enum, fwd and enum64
+        *             struct, union, enum, fwd, enum64,
+        *             decl_tag and type_tag
         */
        __u32 info;
        /* "size" is used by INT, ENUM, STRUCT, UNION, DATASEC and ENUM64.

diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h
index e48f039ec0eca6979ad959949dd22e477361b797..ccab337dfe71058dd775f946cf5dce9cf2ccc7a1 100644 (file)
--- a/include/uapi/linux/capability.h
+++ b/include/uapi/linux/capability.h
@@ -273,6 +273,7 @@ struct vfs_ns_cap_data {
 /* Allow setting encryption key on loopback filesystem */
 /* Allow setting zone reclaim policy */
 /* Allow everything under CAP_BPF and CAP_PERFMON for backward compatibility */
+/* Allow setting hardware protection emergency action */
 
 #define CAP_SYS_ADMIN        21
 

diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h
index 2122610de7f97a8f0129bbd3e6d6f72e4b405414..95ede2334204048d49b228284e9fbc1561337a16 100644 (file)
--- a/include/uapi/linux/const.h
+++ b/include/uapi/linux/const.h
@@ -33,7 +33,7 @@
  * Missing __asm__ support
  *
  * __BIT128() would not work in the __asm__ code, as it shifts an
- * 'unsigned __init128' data type as direct representation of
+ * 'unsigned __int128' data type as direct representation of
  * 128 bit constants is not supported in the gcc compiler, as
  * they get silently truncated.
  *

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 9330d5b763e24087f0715a1a67f1755eaf4204e3..ceff2f20496f6eca70fd5dcecbfc78e06e475c49 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -378,6 +378,7 @@ enum {
        IFLA_GRO_IPV4_MAX_SIZE,
        IFLA_DPLL_PIN,
        IFLA_MAX_PACING_OFFLOAD_HORIZON,
+       IFLA_NETNS_IMMUTABLE,
        __IFLA_MAX
 };
 

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index eb9fb776fdc3e50c2ecfc6b36d5472f8f65b5985..ec47f9b68a1bfb1908f2197555c876424481ab1c 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -23,9 +23,14 @@ enum
        IPSTATS_MIB_INPKTS,                     /* InReceives */
        IPSTATS_MIB_INOCTETS,                   /* InOctets */
        IPSTATS_MIB_INDELIVERS,                 /* InDelivers */
-       IPSTATS_MIB_OUTFORWDATAGRAMS,           /* OutForwDatagrams */
+       IPSTATS_MIB_NOECTPKTS,                  /* InNoECTPkts */
+       IPSTATS_MIB_ECT1PKTS,                   /* InECT1Pkts */
+       IPSTATS_MIB_ECT0PKTS,                   /* InECT0Pkts */
+       IPSTATS_MIB_CEPKTS,                     /* InCEPkts */
        IPSTATS_MIB_OUTREQUESTS,                /* OutRequests */
+       IPSTATS_MIB_OUTPKTS,                    /* OutTransmits */
        IPSTATS_MIB_OUTOCTETS,                  /* OutOctets */
+       IPSTATS_MIB_OUTFORWDATAGRAMS,           /* OutForwDatagrams */
 /* other fields */
        IPSTATS_MIB_INHDRERRORS,                /* InHdrErrors */
        IPSTATS_MIB_INTOOBIGERRORS,             /* InTooBigErrors */
@@ -52,12 +57,7 @@ enum
        IPSTATS_MIB_INBCASTOCTETS,              /* InBcastOctets */
        IPSTATS_MIB_OUTBCASTOCTETS,             /* OutBcastOctets */
        IPSTATS_MIB_CSUMERRORS,                 /* InCsumErrors */
-       IPSTATS_MIB_NOECTPKTS,                  /* InNoECTPkts */
-       IPSTATS_MIB_ECT1PKTS,                   /* InECT1Pkts */
-       IPSTATS_MIB_ECT0PKTS,                   /* InECT0Pkts */
-       IPSTATS_MIB_CEPKTS,                     /* InCEPkts */
        IPSTATS_MIB_REASM_OVERLAPS,             /* ReasmOverlaps */
-       IPSTATS_MIB_OUTPKTS,                    /* OutTransmits */
        __IPSTATS_MIB_MAX
 };
 

diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index e1416f793738f56beb5b47447f1c422eb103da72..e1fcfcf3b33261939797d79f4e29a28fa1da6e10 100644 (file)
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -70,4 +70,6 @@
 #define __counted_by_be(m)
 #endif
 
+#define __kernel_nonstring
+
 #endif /* _LINUX_STDDEF_H */

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 947ba18e1f689510f0ac1f58054c88f7112cb2dd..cc5253a5542798c59d13815e9f3d2bb773927cdb 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -28,7 +28,8 @@ struct tcphdr {
        __be32  seq;
        __be32  ack_seq;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
-       __u16   res1:4,
+       __u16   ae:1,
+               res1:3,
                doff:4,
                fin:1,
                syn:1,
@@ -40,7 +41,8 @@ struct tcphdr {
                cwr:1;
 #elif defined(__BIG_ENDIAN_BITFIELD)
        __u16   doff:4,
-               res1:4,
+               res1:3,
+               ae:1,
                cwr:1,
                ece:1,
                urg:1,
@@ -70,6 +72,7 @@ union tcp_word_hdr {
 #define tcp_flag_word(tp) (((union tcp_word_hdr *)(tp))->words[3])
 
 enum {
+       TCP_FLAG_AE  = __constant_cpu_to_be32(0x01000000),
        TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000),
        TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000),
        TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000),
@@ -78,7 +81,7 @@ enum {
        TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000),
        TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000),
        TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000),
-       TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000),
+       TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0E000000),
        TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000)
 };
 
@@ -137,6 +140,8 @@ enum {
 
 #define TCP_IS_MPTCP           43      /* Is MPTCP being used? */
 #define TCP_RTO_MAX_MS         44      /* max rto time in ms */
+#define TCP_RTO_MIN_US         45      /* min rto time in us */
+#define TCP_DELACK_MAX_US      46      /* max delayed ack time in us */
 
 #define TCP_REPAIR_ON          1
 #define TCP_REPAIR_OFF         0

diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index 845f499538482fa60c7851dea50c7d67bc38c85c..c0a434a7195150ee45eb777aae1f8ef547d5c05d 100644 (file)
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -327,6 +327,19 @@ struct virtio_net_rss_config {
        __u8 hash_key_data[/* hash_key_length */];
 };
 
+struct virtio_net_rss_config_hdr {
+       __le32 hash_types;
+       __le16 indirection_table_mask;
+       __le16 unclassified_queue;
+       __le16 indirection_table[/* 1 + indirection_table_mask */];
+};
+
+struct virtio_net_rss_config_trailer {
+       __le16 max_tx_vq;
+       __u8 hash_key_length;
+       __u8 hash_key_data[/* hash_key_length */];
+};
+
  #define VIRTIO_NET_CTRL_MQ_RSS_CONFIG          1
 
 /*