uapi: update headers

Update headers from 6.16 pre rc1.

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 2574ea7a04404a95840621fa9073aa7b4e633631..3732e5e02d511c569f8cd001d7cdbfd1581c634c 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1506,7 +1506,7 @@ union bpf_attr {
                __s32   map_token_fd;
        };
 
-       struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
+       struct { /* anonymous struct used by BPF_MAP_*_ELEM and BPF_MAP_FREEZE commands */
                __u32           map_fd;
                __aligned_u64   key;
                union {
@@ -1995,11 +1995,15 @@ union bpf_attr {
  * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
  *     Description
  *             Store *len* bytes from address *from* into the packet
- *             associated to *skb*, at *offset*. *flags* are a combination of
- *             **BPF_F_RECOMPUTE_CSUM** (automatically recompute the
- *             checksum for the packet after storing the bytes) and
- *             **BPF_F_INVALIDATE_HASH** (set *skb*\ **->hash**, *skb*\
- *             **->swhash** and *skb*\ **->l4hash** to 0).
+ *             associated to *skb*, at *offset*. The *flags* are a combination
+ *             of the following values:
+ *
+ *             **BPF_F_RECOMPUTE_CSUM**
+ *                     Automatically update *skb*\ **->csum** after storing the
+ *                     bytes.
+ *             **BPF_F_INVALIDATE_HASH**
+ *                     Set *skb*\ **->hash**, *skb*\ **->swhash** and *skb*\
+ *                     **->l4hash** to 0.
  *
  *             A call to this helper is susceptible to change the underlying
  *             packet buffer. Therefore, at load time, all checks on pointers
@@ -2051,7 +2055,7 @@ union bpf_attr {
  *             untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and
  *             for updates resulting in a null checksum the value is set to
  *             **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates
- *             the checksum is to be computed against a pseudo-header.
+ *             that the modified header field is part of the pseudo-header.
  *
  *             This helper works in combination with **bpf_csum_diff**\ (),
  *             which does not update the checksum in-place, but offers more
@@ -6723,6 +6727,7 @@ struct bpf_link_info {
                                        __u32 name_len;
                                        __u32 offset; /* offset from file_name */
                                        __u64 cookie;
+                                       __u64 ref_ctr_offset;
                                } uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
                                struct {
                                        __aligned_u64 func_name; /* in/out */

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 80051b8c35207c3a1265d26d6a492f0fd5117175..9a1bdc946be78deaf50d55020c336d1fdcab5d4e 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -385,6 +385,21 @@ enum devlink_linecard_state {
        DEVLINK_LINECARD_STATE_MAX = __DEVLINK_LINECARD_STATE_MAX - 1
 };
 
+/* Variable attribute type. */
+enum devlink_var_attr_type {
+       /* Following values relate to the internal NLA_* values */
+       DEVLINK_VAR_ATTR_TYPE_U8 = 1,
+       DEVLINK_VAR_ATTR_TYPE_U16,
+       DEVLINK_VAR_ATTR_TYPE_U32,
+       DEVLINK_VAR_ATTR_TYPE_U64,
+       DEVLINK_VAR_ATTR_TYPE_STRING,
+       DEVLINK_VAR_ATTR_TYPE_FLAG,
+       DEVLINK_VAR_ATTR_TYPE_NUL_STRING = 10,
+       DEVLINK_VAR_ATTR_TYPE_BINARY,
+       __DEVLINK_VAR_ATTR_TYPE_CUSTOM_BASE = 0x80,
+       /* Any possible custom types, unrelated to NLA_* values go below */
+};
+
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index c206cf6d9a1edffa5df211d69f8ef4ff772c6078..bed5e0c11218d6cee7e7db441088fa7b9cdf302a 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -699,10 +699,11 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
        __u8 state;
-#define MDB_FLAGS_OFFLOAD      (1 << 0)
-#define MDB_FLAGS_FAST_LEAVE   (1 << 1)
-#define MDB_FLAGS_STAR_EXCL    (1 << 2)
-#define MDB_FLAGS_BLOCKED      (1 << 3)
+#define MDB_FLAGS_OFFLOAD              (1 << 0)
+#define MDB_FLAGS_FAST_LEAVE           (1 << 1)
+#define MDB_FLAGS_STAR_EXCL            (1 << 2)
+#define MDB_FLAGS_BLOCKED              (1 << 3)
+#define MDB_FLAGS_OFFLOAD_FAILED       (1 << 4)
        __u8 flags;
        __u16 vid;
        struct {
@@ -830,6 +831,7 @@ enum br_boolopt_id {
        BR_BOOLOPT_NO_LL_LEARN,
        BR_BOOLOPT_MCAST_VLAN_SNOOPING,
        BR_BOOLOPT_MST_ENABLE,
+       BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
        BR_BOOLOPT_MAX
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index ceff2f20496f6eca70fd5dcecbfc78e06e475c49..bb94d881b49f97e91c96ac7c0e3ff5a94f112c7c 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1984,4 +1984,19 @@ enum {
 
 #define IFLA_DSA_MAX   (__IFLA_DSA_MAX - 1)
 
+/* OVPN section */
+
+enum ovpn_mode {
+       OVPN_MODE_P2P,
+       OVPN_MODE_MP,
+};
+
+enum {
+       IFLA_OVPN_UNSPEC,
+       IFLA_OVPN_MODE,
+       __IFLA_OVPN_MAX,
+};
+
+#define IFLA_OVPN_MAX  (__IFLA_OVPN_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 2c32080416b5a3cc0472a7d368fe34e386fa8cc0..3c24e8e2880b3c3fcef7c91224418fdbde34b56f 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -697,6 +697,7 @@ enum {
 };
 
 #define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)
+#define TCA_FLOWER_KEY_CFM_MAX    (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)
 
 #define TCA_FLOWER_MASK_FLAGS_RANGE    (1 << 0) /* Range-based match */
 

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 25a9a47001cdde59cf052ea658ba1ac26f4c34e8..958d94072e55f517b34bee434938bcbc2b037ffc 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1182,6 +1182,7 @@ enum {
        TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */
        TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */
        TCA_TAPRIO_PAD,
+       TCA_TAPRIO_ATTR_PAD = TCA_TAPRIO_PAD,
        TCA_TAPRIO_ATTR_ADMIN_SCHED, /* The admin sched, only used in dump */
        TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */
        TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index ec47f9b68a1bfb1908f2197555c876424481ab1c..1d234d7e1892778c5ff04c240f8360608f391401 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -188,6 +188,7 @@ enum
        LINUX_MIB_PAWSESTABREJECTED,            /* PAWSEstabRejected */
        LINUX_MIB_TSECRREJECTED,                /* TSEcrRejected */
        LINUX_MIB_PAWS_OLD_ACK,                 /* PAWSOldAck */
+       LINUX_MIB_PAWS_TW_REJECTED,             /* PAWSTimewait */
        LINUX_MIB_DELAYEDACKS,                  /* DelayedACKs */
        LINUX_MIB_DELAYEDACKLOCKED,             /* DelayedACKLocked */
        LINUX_MIB_DELAYEDACKLOST,               /* DelayedACKLost */

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index cc5253a5542798c59d13815e9f3d2bb773927cdb..85b51e4c80ea42959ebbb013164a5e4e77863fea 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -184,6 +184,7 @@ enum tcp_fastopen_client_fail {
 #define TCPI_OPT_ECN_SEEN      16 /* we received at least one packet with ECT */
 #define TCPI_OPT_SYN_DATA      32 /* SYN-ACK acked data in SYN sent or rcvd */
 #define TCPI_OPT_USEC_TS       64 /* usec timestamps */
+#define TCPI_OPT_TFO_CHILD     128 /* child from a Fast Open option on SYN */
 
 /*
  * Sender's congestion state indicating normal or abnormal situations

diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
index 13b485fba4df1e480a4bacd235b74eb034dee2ce..cd6a8b17e2ebd245ebced592ce51b5f04cf2cd15 100644 (file)
--- a/include/uapi/linux/udp.h
+++ b/include/uapi/linux/udp.h
@@ -43,5 +43,6 @@ struct udphdr {
 #define UDP_ENCAP_GTP1U                5 /* 3GPP TS 29.060 */
 #define UDP_ENCAP_RXRPC                6
 #define TCP_ENCAP_ESPINTCP     7 /* Yikes, this is really xfrm encap types. */
+#define UDP_ENCAP_OVPNINUDP    8 /* OpenVPN traffic */
 
 #endif /* _LINUX_UDP_H */

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index e16650f0c85dd6223222afc027e9107067b500fc..3b7bd99813e9526ead3f9fb124835a0b17e4d2a6 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -233,6 +233,22 @@ struct ib_uverbs_ex_query_device {
        __u32 reserved;
 };
 
+enum ib_uverbs_odp_general_cap_bits {
+       IB_UVERBS_ODP_SUPPORT          = 1 << 0,
+       IB_UVERBS_ODP_SUPPORT_IMPLICIT = 1 << 1,
+};
+
+enum ib_uverbs_odp_transport_cap_bits {
+       IB_UVERBS_ODP_SUPPORT_SEND     = 1 << 0,
+       IB_UVERBS_ODP_SUPPORT_RECV     = 1 << 1,
+       IB_UVERBS_ODP_SUPPORT_WRITE    = 1 << 2,
+       IB_UVERBS_ODP_SUPPORT_READ     = 1 << 3,
+       IB_UVERBS_ODP_SUPPORT_ATOMIC   = 1 << 4,
+       IB_UVERBS_ODP_SUPPORT_SRQ_RECV = 1 << 5,
+       IB_UVERBS_ODP_SUPPORT_FLUSH    = 1 << 6,
+       IB_UVERBS_ODP_SUPPORT_ATOMIC_WRITE     = 1 << 7,
+};
+
 struct ib_uverbs_odp_caps {
        __aligned_u64 general_caps;
        struct {