Update kernel headers

Update kernel headers to commit:
    fcb3a4653bc5 ("net/sched: act_api: use the correct TCA_ACT attributes in dump")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 4c909877592f83ff0d35ef94518161b8c41762bf..eb0588567cf81c0c112acb56ab4ecd5bc8366efb 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2801,7 +2801,7 @@ union bpf_attr {
  *
  * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size)
  *     Description
- *             For en eBPF program attached to a perf event, retrieve the
+ *             For an eBPF program attached to a perf event, retrieve the
  *             value of the event counter associated to *ctx* and store it in
  *             the structure pointed by *buf* and of size *buf_size*. Enabled
  *             and running times are also stored in the structure (see
@@ -3134,6 +3134,11 @@ union bpf_attr {
  *             **BPF_FIB_LOOKUP_OUTPUT**
  *                     Perform lookup from an egress perspective (default is
  *                     ingress).
+ *             **BPF_FIB_LOOKUP_SKIP_NEIGH**
+ *                     Skip the neighbour table lookup. *params*->dmac
+ *                     and *params*->smac will not be set as output. A common
+ *                     use case is to call **bpf_redirect_neigh**\ () after
+ *                     doing **bpf_fib_lookup**\ ().
  *
  *             *ctx* is either **struct xdp_md** for XDP programs or
  *             **struct sk_buff** tc cls_act programs.
@@ -4964,6 +4969,12 @@ union bpf_attr {
  *             different maps if key/value layout matches across maps.
  *             Every bpf_timer_set_callback() can have different callback_fn.
  *
+ *             *flags* can be one of:
+ *
+ *             **BPF_F_TIMER_ABS**
+ *                     Start the timer in absolute expire value instead of the
+ *                     default relative one.
+ *
  *     Return
  *             0 on success.
  *             **-EINVAL** if *timer* was not initialized with bpf_timer_init() earlier
@@ -5320,11 +5331,22 @@ union bpf_attr {
  *     Description
  *             Write *len* bytes from *src* into *dst*, starting from *offset*
  *             into *dst*.
- *             *flags* is currently unused.
+ *
+ *             *flags* must be 0 except for skb-type dynptrs.
+ *
+ *             For skb-type dynptrs:
+ *                 *  All data slices of the dynptr are automatically
+ *                    invalidated after **bpf_dynptr_write**\ (). This is
+ *                    because writing may pull the skb and change the
+ *                    underlying packet buffer.
+ *
+ *                 *  For *flags*, please see the flags accepted by
+ *                    **bpf_skb_store_bytes**\ ().
  *     Return
  *             0 on success, -E2BIG if *offset* + *len* exceeds the length
  *             of *dst*'s data, -EINVAL if *dst* is an invalid dynptr or if *dst*
- *             is a read-only dynptr or if *flags* is not 0.
+ *             is a read-only dynptr or if *flags* is not correct. For skb-type dynptrs,
+ *             other errors correspond to errors returned by **bpf_skb_store_bytes**\ ().
  *
  * void *bpf_dynptr_data(const struct bpf_dynptr *ptr, u32 offset, u32 len)
  *     Description
@@ -5332,6 +5354,9 @@ union bpf_attr {
  *
  *             *len* must be a statically known value. The returned data slice
  *             is invalidated whenever the dynptr is invalidated.
+ *
+ *             skb and xdp type dynptrs may not use bpf_dynptr_data. They should
+ *             instead use bpf_dynptr_slice and bpf_dynptr_slice_rdwr.
  *     Return
  *             Pointer to the underlying dynptr data, NULL if the dynptr is
  *             read-only, if the dynptr is invalid, or if the offset and length
@@ -6750,6 +6775,7 @@ struct bpf_raw_tracepoint_args {
 enum {
        BPF_FIB_LOOKUP_DIRECT  = (1U << 0),
        BPF_FIB_LOOKUP_OUTPUT  = (1U << 1),
+       BPF_FIB_LOOKUP_SKIP_NEIGH = (1U << 2),
 };
 
 enum {
@@ -6917,6 +6943,17 @@ struct bpf_list_node {
        __u64 :64;
 } __attribute__((aligned(8)));
 
+struct bpf_rb_root {
+       __u64 :64;
+       __u64 :64;
+} __attribute__((aligned(8)));
+
+struct bpf_rb_node {
+       __u64 :64;
+       __u64 :64;
+       __u64 :64;
+} __attribute__((aligned(8)));
+
 struct bpf_sysctl {
        __u32   write;          /* Sysctl is being read (= 0) or written (= 1).
                                 * Allows 1,2,4-byte read, but no write.
@@ -7066,4 +7103,13 @@ struct bpf_core_relo {
        enum bpf_core_relo_kind kind;
 };
 
+/*
+ * Flags to control bpf_timer_start() behaviour.
+ *     - BPF_F_TIMER_ABS: Timeout passed is absolute time, by default it is
+ *       relative to current time.
+ */
+enum {
+       BPF_F_TIMER_ABS = (1ULL << 0),
+};
+
 #endif /* __LINUX_BPF_H__ */

diff --git a/include/uapi/linux/fou.h b/include/uapi/linux/fou.h
index 5a7b959b637cd04cfb0700d02a7fb23a25a57ba5..1c2b680bb476336166c07e7cdb1e5f6f0142c705 100644 (file)
--- a/include/uapi/linux/fou.h
+++ b/include/uapi/linux/fou.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /* Do not edit directly, auto-generated from: */
 /*     Documentation/netlink/specs/fou.yaml */
 /* YNL-GEN uapi header */

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 921b212d9cd03976b03b57a22a1497efad6ec819..792db9800aab2320490eaa3deae5d659e07fb844 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -633,6 +633,11 @@ enum {
        MDBA_MDB_EATTR_GROUP_MODE,
        MDBA_MDB_EATTR_SOURCE,
        MDBA_MDB_EATTR_RTPROT,
+       MDBA_MDB_EATTR_DST,
+       MDBA_MDB_EATTR_DST_PORT,
+       MDBA_MDB_EATTR_VNI,
+       MDBA_MDB_EATTR_IFINDEX,
+       MDBA_MDB_EATTR_SRC_VNI,
        __MDBA_MDB_EATTR_MAX
 };
 #define MDBA_MDB_EATTR_MAX (__MDBA_MDB_EATTR_MAX - 1)
@@ -728,6 +733,11 @@ enum {
        MDBE_ATTR_SRC_LIST,
        MDBE_ATTR_GROUP_MODE,
        MDBE_ATTR_RTPROT,
+       MDBE_ATTR_DST,
+       MDBE_ATTR_DST_PORT,
+       MDBE_ATTR_VNI,
+       MDBE_ATTR_IFINDEX,
+       MDBE_ATTR_SRC_VNI,
        __MDBE_ATTR_MAX,
 };
 #define MDBE_ATTR_MAX (__MDBE_ATTR_MAX - 1)

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 217b25b963f54b20553c0c7b412649ca87e84997..2132e941b93a3660e4818bc58f9ec1c76fe4937d 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -787,6 +787,7 @@ enum {
        TCA_ROOT_FLAGS,
        TCA_ROOT_COUNT,
        TCA_ROOT_TIME_DELTA, /* in msecs */
+       TCA_ROOT_EXT_WARN_MSG,
        __TCA_ROOT_MAX,
 #define        TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
 };

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index c5f42903b22768639f413ca2358dd9e79157827a..d52e1229f8c877874265947c51c4da9fca73e649 100644 (file)
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -1205,7 +1205,9 @@ enum sctp_sched_type {
        SCTP_SS_DEFAULT = SCTP_SS_FCFS,
        SCTP_SS_PRIO,
        SCTP_SS_RR,
-       SCTP_SS_MAX = SCTP_SS_RR
+       SCTP_SS_FC,
+       SCTP_SS_WFQ,
+       SCTP_SS_MAX = SCTP_SS_WFQ
 };
 
 /* Probe Interval socket option */

diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index 61986c7e98f0357f5abb6f40daa35d9586b57843..8b9bc4fdc1551ae0c542a44e994d799579aa70ba 100644 (file)
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -61,6 +61,7 @@
 #define VIRTIO_NET_F_GUEST_USO6        55      /* Guest can handle USOv6 in. */
 #define VIRTIO_NET_F_HOST_USO  56      /* Host can handle USO in. */
 #define VIRTIO_NET_F_HASH_REPORT  57   /* Supports hash report */
+#define VIRTIO_NET_F_GUEST_HDRLEN  59  /* Guest provides the exact hdr_len value. */
 #define VIRTIO_NET_F_RSS         60    /* Supports RSS RX steering */
 #define VIRTIO_NET_F_RSC_EXT     61    /* extended coalescing info */
 #define VIRTIO_NET_F_STANDBY     62    /* Act as standby for another device