uapi: update headers to 6.13-rc1

Update of headers after 6.13-rc1

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index aa381a3d982da5f193c278479f16550647616bd3..5abdd4fb9522bdf3fa7da964d2b1952405cd68c8 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1116,6 +1116,7 @@ enum bpf_attach_type {
        BPF_NETKIT_PRIMARY,
        BPF_NETKIT_PEER,
        BPF_TRACE_KPROBE_SESSION,
+       BPF_TRACE_UPROBE_SESSION,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -1973,6 +1974,8 @@ union bpf_attr {
  *             program.
  *     Return
  *             The SMP id of the processor running the program.
+ *     Attributes
+ *             __bpf_fastcall
  *
  * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
  *     Description
@@ -3104,10 +3107,6 @@ union bpf_attr {
  *             with the **CONFIG_BPF_KPROBE_OVERRIDE** configuration
  *             option, and in this case it only works on functions tagged with
  *             **ALLOW_ERROR_INJECTION** in the kernel code.
- *
- *             Also, the helper is only available for the architectures having
- *             the CONFIG_FUNCTION_ERROR_INJECTION option. As of this writing,
- *             x86 architecture is the only one to support this feature.
  *     Return
  *             0
  *
@@ -5372,7 +5371,7 @@ union bpf_attr {
  *             Currently, the **flags** must be 0. Currently, nr_loops is
  *             limited to 1 << 23 (~8 million) loops.
  *
- *             long (\*callback_fn)(u32 index, void \*ctx);
+ *             long (\*callback_fn)(u64 index, void \*ctx);
  *
  *             where **index** is the current index in the loop. The index
  *             is zero-indexed.

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 987efeddc30e987e1fd1b2d39dfc2024c644645f..be6cd764adf7447045f9cdd542a59f7681299409 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -377,6 +377,7 @@ enum {
        IFLA_GSO_IPV4_MAX_SIZE,
        IFLA_GRO_IPV4_MAX_SIZE,
        IFLA_DPLL_PIN,
+       IFLA_MAX_PACING_OFFLOAD_HORIZON,
        __IFLA_MAX
 };
 
@@ -1290,6 +1291,19 @@ enum netkit_mode {
        NETKIT_L3,
 };
 
+/* NETKIT_SCRUB_NONE leaves clearing skb->{mark,priority} up to
+ * the BPF program if attached. This also means the latter can
+ * consume the two fields if they were populated earlier.
+ *
+ * NETKIT_SCRUB_DEFAULT zeroes skb->{mark,priority} fields before
+ * invoking the attached BPF program when the peer device resides
+ * in a different network namespace. This is the default behavior.
+ */
+enum netkit_scrub {
+       NETKIT_SCRUB_NONE,
+       NETKIT_SCRUB_DEFAULT,
+};
+
 enum {
        IFLA_NETKIT_UNSPEC,
        IFLA_NETKIT_PEER_INFO,
@@ -1297,6 +1311,8 @@ enum {
        IFLA_NETKIT_POLICY,
        IFLA_NETKIT_PEER_POLICY,
        IFLA_NETKIT_MODE,
+       IFLA_NETKIT_SCRUB,
+       IFLA_NETKIT_PEER_SCRUB,
        __IFLA_NETKIT_MAX,
 };
 #define IFLA_NETKIT_MAX        (__IFLA_NETKIT_MAX - 1)
@@ -1940,6 +1956,7 @@ struct ifla_rmnet_flags {
 enum {
        IFLA_MCTP_UNSPEC,
        IFLA_MCTP_NET,
+       IFLA_MCTP_PHYS_BINDING,
        __IFLA_MCTP_MAX,
 };
 

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index a3cd0c2dc9956f8c873f35c7b33b2bcf93feb2f1..25a9a47001cdde59cf052ea658ba1ac26f4c34e8 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -836,6 +836,8 @@ enum {
 
        TCA_FQ_WEIGHTS,         /* Weights for each band */
 
+       TCA_FQ_OFFLOAD_HORIZON, /* dequeue paced packets within this horizon immediately (us units) */
+
        __TCA_FQ_MAX
 };
 

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 4e6c8e14cc300a5e14bfe06481bc349de0f9bb6e..1cb71e76208fcfe3a3a90a57c6f3a5af08a95e69 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -174,7 +174,7 @@ enum {
 #define RTM_GETLINKPROP        RTM_GETLINKPROP
 
        RTM_NEWVLAN = 112,
-#define RTM_NEWNVLAN   RTM_NEWVLAN
+#define RTM_NEWVLAN    RTM_NEWVLAN
        RTM_DELVLAN,
 #define RTM_DELVLAN    RTM_DELVLAN
        RTM_GETVLAN,

diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h
index e6700138c2096dc31452ba87d12c19a905101cae..251874108e6a37cdb7d421f7c9fe8f0d2a780fc1 100644 (file)
--- a/include/uapi/linux/types.h
+++ b/include/uapi/linux/types.h
@@ -48,6 +48,7 @@ typedef __u32 __bitwise __wsum;
  * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
  */
 #define __aligned_u64 __u64 __attribute__((aligned(8)))
+#define __aligned_s64 __s64 __attribute__((aligned(8)))
 #define __aligned_be64 __be64 __attribute__((aligned(8)))
 #define __aligned_le64 __le64 __attribute__((aligned(8)))
 

diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
index 241936346da80b115b8050deb667533591ed7f53..13b485fba4df1e480a4bacd235b74eb034dee2ce 100644 (file)
--- a/include/uapi/linux/udp.h
+++ b/include/uapi/linux/udp.h
@@ -31,7 +31,7 @@ struct udphdr {
 #define UDP_CORK       1       /* Never send partially complete segments */
 #define UDP_ENCAP      100     /* Set the socket to accept encapsulated packets */
 #define UDP_NO_CHECK6_TX 101   /* Disable sending checksum for UDP6X */
-#define UDP_NO_CHECK6_RX 102   /* Disable accpeting checksum for UDP6 */
+#define UDP_NO_CHECK6_RX 102   /* Disable accepting checksum for UDP6 */
 #define UDP_SEGMENT    103     /* Set GSO segmentation size */
 #define UDP_GRO                104     /* This socket can receive UDP GRO packets */
 

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 53f928bc5be5693f53c1e20e7aeb48d56013575d..f4d5c151786f36abd76cf2d510da61cc4b933d4a 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -322,6 +322,7 @@ enum xfrm_attr_type_t {
        XFRMA_MTIMER_THRESH,    /* __u32 in seconds for input SA */
        XFRMA_SA_DIR,           /* __u8 */
        XFRMA_NAT_KEEPALIVE_INTERVAL,   /* __u32 in seconds for NAT keepalive */
+       XFRMA_SA_PCPU,          /* __u32 */
        __XFRMA_MAX
 
 #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK       /* Compatibility */
@@ -437,6 +438,7 @@ struct xfrm_userpolicy_info {
 #define XFRM_POLICY_LOCALOK    1       /* Allow user to override global policy */
        /* Automatically expand selector to include matching ICMP payloads. */
 #define XFRM_POLICY_ICMP       2
+#define XFRM_POLICY_CPU_ACQUIRE        4
        __u8                            share;
 };