uapi: update headers from 5.15 merge

New headers from 5.15 early merge.

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index dd5475725e1e237d0e0421d807fb021a2e57618d..177cdc57c370442cd9a6974a9a86d94c42da12c9 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -84,7 +84,7 @@ struct bpf_lpm_trie_key {
 
 struct bpf_cgroup_storage_key {
        __u64   cgroup_inode_id;        /* cgroup inode id */
-       __u32   attach_type;            /* program attach type */
+       __u32   attach_type;            /* program attach type (enum bpf_attach_type) */
 };
 
 union bpf_iter_link_info {
@@ -993,6 +993,7 @@ enum bpf_attach_type {
        BPF_SK_SKB_VERDICT,
        BPF_SK_REUSEPORT_SELECT,
        BPF_SK_REUSEPORT_SELECT_OR_MIGRATE,
+       BPF_PERF_EVENT,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -1006,6 +1007,7 @@ enum bpf_link_type {
        BPF_LINK_TYPE_ITER = 4,
        BPF_LINK_TYPE_NETNS = 5,
        BPF_LINK_TYPE_XDP = 6,
+       BPF_LINK_TYPE_PERF_EVENT = 7,
 
        MAX_BPF_LINK_TYPE,
 };
@@ -1446,6 +1448,13 @@ union bpf_attr {
                                __aligned_u64   iter_info;      /* extra bpf_iter_link_info */
                                __u32           iter_info_len;  /* iter_info length */
                        };
+                       struct {
+                               /* black box user-provided value passed through
+                                * to BPF program at the execution time and
+                                * accessible through bpf_get_attach_cookie() BPF helper
+                                */
+                               __u64           bpf_cookie;
+                       } perf_event;
                };
        } link_create;
 
@@ -4847,6 +4856,27 @@ union bpf_attr {
  *             Get address of the traced function (for tracing and kprobe programs).
  *     Return
  *             Address of the traced function.
+ *
+ * u64 bpf_get_attach_cookie(void *ctx)
+ *     Description
+ *             Get bpf_cookie value provided (optionally) during the program
+ *             attachment. It might be different for each individual
+ *             attachment, even if BPF program itself is the same.
+ *             Expects BPF program context *ctx* as a first argument.
+ *
+ *             Supported for the following program types:
+ *                     - kprobe/uprobe;
+ *                     - tracepoint;
+ *                     - perf_event.
+ *     Return
+ *             Value specified by user at BPF link creation/attachment time
+ *             or 0, if it was not specified.
+ *
+ * long bpf_task_pt_regs(struct task_struct *task)
+ *     Description
+ *             Get the struct pt_regs associated with **task**.
+ *     Return
+ *             A pointer to struct pt_regs.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -5023,6 +5053,8 @@ union bpf_attr {
        FN(timer_start),                \
        FN(timer_cancel),               \
        FN(get_func_ip),                \
+       FN(get_attach_cookie),          \
+       FN(task_pt_regs),               \
        /* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index cf665bdf0a04ab2860e5876f71f644a5868e160d..d1b5fdeeb4afa4936406cfb4d02f737b12de3b7d 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -506,6 +506,7 @@ enum {
        BRIDGE_VLANDB_ENTRY_STATE,
        BRIDGE_VLANDB_ENTRY_TUNNEL_INFO,
        BRIDGE_VLANDB_ENTRY_STATS,
+       BRIDGE_VLANDB_ENTRY_MCAST_ROUTER,
        __BRIDGE_VLANDB_ENTRY_MAX,
 };
 #define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
@@ -561,8 +562,8 @@ enum {
        BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,
        BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,
        BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,
-       BRIDGE_VLANDB_GOPTS_MCAST_ROUTER,
        BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS,
+       BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE,
        __BRIDGE_VLANDB_GOPTS_MAX
 };
 #define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
@@ -770,4 +771,17 @@ struct br_boolopt_multi {
        __u32 optval;
        __u32 optmask;
 };
+
+enum {
+       BRIDGE_QUERIER_UNSPEC,
+       BRIDGE_QUERIER_IP_ADDRESS,
+       BRIDGE_QUERIER_IP_PORT,
+       BRIDGE_QUERIER_IP_OTHER_TIMER,
+       BRIDGE_QUERIER_PAD,
+       BRIDGE_QUERIER_IPV6_ADDRESS,
+       BRIDGE_QUERIER_IPV6_PORT,
+       BRIDGE_QUERIER_IPV6_OTHER_TIMER,
+       __BRIDGE_QUERIER_MAX
+};
+#define BRIDGE_QUERIER_MAX (__BRIDGE_QUERIER_MAX - 1)
 #endif /* _LINUX_IF_BRIDGE_H */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index fb2ecf403a16cf5771d6c19790186b618e3c6dea..1d4ed60bc7790c87dc8b825901fb748d55dfc48b 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -415,6 +415,7 @@ enum {
        IFLA_INET6_ICMP6STATS,  /* statistics (icmpv6)          */
        IFLA_INET6_TOKEN,       /* device token                 */
        IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
+       IFLA_INET6_RA_MTU,      /* mtu carried in the RA message */
        __IFLA_INET6_MAX
 };
 
@@ -477,6 +478,7 @@ enum {
        IFLA_BR_MCAST_MLD_VERSION,
        IFLA_BR_VLAN_STATS_PER_PORT,
        IFLA_BR_MULTI_BOOLOPT,
+       IFLA_BR_MCAST_QUERIER_STATE,
        __IFLA_BR_MAX,
 };
 

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index 68d11c6ea7f4e77aad458d0b7dc12675c2771b30..957743ce5f8a0d28cbad2d5a99f60bffb49df99f 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -73,6 +73,7 @@ enum {
 #define MPTCP_PM_ADDR_FLAG_SIGNAL                      (1 << 0)
 #define MPTCP_PM_ADDR_FLAG_SUBFLOW                     (1 << 1)
 #define MPTCP_PM_ADDR_FLAG_BACKUP                      (1 << 2)
+#define MPTCP_PM_ADDR_FLAG_FULLMESH                    (1 << 3)
 
 enum {
        MPTCP_PM_CMD_UNSPEC,

diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 70a8057ad4bbe195c3a565e2f87c6839c8b8c832..99aa27b100bc94d76894cf5de630e55040803f70 100644 (file)
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -55,6 +55,7 @@
 #define VIRTIO_ID_FS                   26 /* virtio filesystem */
 #define VIRTIO_ID_PMEM                 27 /* virtio pmem */
 #define VIRTIO_ID_MAC80211_HWSIM       29 /* virtio mac80211-hwsim */
+#define VIRTIO_ID_I2C_ADAPTER          34 /* virtio i2c adapter */
 #define VIRTIO_ID_BT                   40 /* virtio bluetooth */
 
 /*

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index eec67a2be4363bbd21d2e2b4432ab35cf3a11d72..ecd06396eb16b74aca966aecab48c08216cef7c5 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -213,6 +213,11 @@ enum {
        XFRM_MSG_GETSPDINFO,
 #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
 
+       XFRM_MSG_SETDEFAULT,
+#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT
+       XFRM_MSG_GETDEFAULT,
+#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT
+
        XFRM_MSG_MAPPING,
 #define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
        __XFRM_MSG_MAX
@@ -508,6 +513,12 @@ struct xfrm_user_offload {
 #define XFRM_OFFLOAD_IPV6      1
 #define XFRM_OFFLOAD_INBOUND   2
 
+struct xfrm_userpolicy_default {
+#define XFRM_USERPOLICY_DIRMASK_MAX    (sizeof(__u8) * 8)
+       __u8                            dirmask;
+       __u8                            action;
+};
+
 /* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE                1
 #define XFRMGRP_EXPIRE         2