Update kernel headers

Update kernel headers to commit:
    6c9cfb853063 ("net: ethernet: mtk_wed: minor change in wed_{tx,rx}info_show")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 007f7e538ce7fd3d2ce51b18be40f69b09f8b615..ec8dcbbaa7185ffc7aba8d2456fa7f8a39a34b79 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -19,6 +19,7 @@
 
 /* ld/ldx fields */
 #define BPF_DW         0x18    /* double word (64-bit) */
+#define BPF_MEMSX      0x80    /* load with sign extension */
 #define BPF_ATOMIC     0xc0    /* atomic memory ops - op type in immediate */
 #define BPF_XADD       0xc0    /* exclusive add - legacy name */
 
@@ -1038,6 +1039,7 @@ enum bpf_attach_type {
        BPF_NETFILTER,
        BPF_TCX_INGRESS,
        BPF_TCX_EGRESS,
+       BPF_TRACE_UPROBE_MULTI,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -1056,6 +1058,7 @@ enum bpf_link_type {
        BPF_LINK_TYPE_STRUCT_OPS = 9,
        BPF_LINK_TYPE_NETFILTER = 10,
        BPF_LINK_TYPE_TCX = 11,
+       BPF_LINK_TYPE_UPROBE_MULTI = 12,
        MAX_BPF_LINK_TYPE,
 };
 
@@ -1185,7 +1188,21 @@ enum bpf_perf_event_type {
 /* link_create.kprobe_multi.flags used in LINK_CREATE command for
  * BPF_TRACE_KPROBE_MULTI attach type to create return probe.
  */
-#define BPF_F_KPROBE_MULTI_RETURN      (1U << 0)
+enum {
+       BPF_F_KPROBE_MULTI_RETURN = (1U << 0)
+};
+
+/* link_create.uprobe_multi.flags used in LINK_CREATE command for
+ * BPF_TRACE_UPROBE_MULTI attach type to create return probe.
+ */
+enum {
+       BPF_F_UPROBE_MULTI_RETURN = (1U << 0)
+};
+
+/* link_create.netfilter.flags used in LINK_CREATE command for
+ * BPF_PROG_TYPE_NETFILTER to enable IP packet defragmentation.
+ */
+#define BPF_F_NETFILTER_IP_DEFRAG (1U << 0)
 
 /* When BPF ldimm64's insn[0].src_reg != 0 then this can have
  * the following extensions:
@@ -1618,6 +1635,15 @@ union bpf_attr {
                                };
                                __u64           expected_revision;
                        } tcx;
+                       struct {
+                               __aligned_u64   path;
+                               __aligned_u64   offsets;
+                               __aligned_u64   ref_ctr_offsets;
+                               __aligned_u64   cookies;
+                               __u32           cnt;
+                               __u32           flags;
+                               __u32           pid;
+                       } uprobe_multi;
                };
        } link_create;
 
@@ -4198,9 +4224,6 @@ union bpf_attr {
  *             **-EOPNOTSUPP** if the operation is not supported, for example
  *             a call from outside of TC ingress.
  *
- *             **-ESOCKTNOSUPPORT** if the socket type is not supported
- *             (reuseport).
- *
  * long bpf_sk_assign(struct bpf_sk_lookup *ctx, struct bpf_sock *sk, u64 flags)
  *     Description
  *             Helper is overloaded depending on BPF program type. This
@@ -5083,9 +5106,14 @@ union bpf_attr {
  * u64 bpf_get_func_ip(void *ctx)
  *     Description
  *             Get address of the traced function (for tracing and kprobe programs).
+ *
+ *             When called for kprobe program attached as uprobe it returns
+ *             probe address for both entry and return uprobe.
+ *
  *     Return
- *             Address of the traced function.
+ *             Address of the traced function for kprobe.
  *             0 for kprobes placed within the function (not at the entry).
+ *             Address of the probe for uprobe and return uprobe.
  *
  * u64 bpf_get_attach_cookie(void *ctx)
  *     Description

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 45d110254e963ceafb18e3bf05c7414bc237288a..8b9b98e7505952ee36fe4990b8f251094e9b89cc 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -661,6 +661,8 @@ enum devlink_resource_unit {
 enum devlink_port_fn_attr_cap {
        DEVLINK_PORT_FN_ATTR_CAP_ROCE_BIT,
        DEVLINK_PORT_FN_ATTR_CAP_MIGRATABLE_BIT,
+       DEVLINK_PORT_FN_ATTR_CAP_IPSEC_CRYPTO_BIT,
+       DEVLINK_PORT_FN_ATTR_CAP_IPSEC_PACKET_BIT,
 
        /* Add new caps above */
        __DEVLINK_PORT_FN_ATTR_CAPS_MAX,
@@ -669,6 +671,8 @@ enum devlink_port_fn_attr_cap {
 #define DEVLINK_PORT_FN_CAP_ROCE _BITUL(DEVLINK_PORT_FN_ATTR_CAP_ROCE_BIT)
 #define DEVLINK_PORT_FN_CAP_MIGRATABLE \
        _BITUL(DEVLINK_PORT_FN_ATTR_CAP_MIGRATABLE_BIT)
+#define DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO _BITUL(DEVLINK_PORT_FN_ATTR_CAP_IPSEC_CRYPTO_BIT)
+#define DEVLINK_PORT_FN_CAP_IPSEC_PACKET _BITUL(DEVLINK_PORT_FN_ATTR_CAP_IPSEC_PACKET_BIT)
 
 enum devlink_port_function_attr {
        DEVLINK_PORT_FUNCTION_ATTR_UNSPEC,

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 00f6ff0aff1ff6f200c6babb9eb3b5fb58110adf..3f85ae5780563cdfb42fdb3a107ca2489d0830a4 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -603,6 +603,7 @@ enum {
        TCA_NETEM_JITTER64,
        TCA_NETEM_SLOT,
        TCA_NETEM_SLOT_DIST,
+       TCA_NETEM_PRNG_SEED,
        __TCA_NETEM_MAX,
 };