Update kernel headers

Update kernel headers to commit:
    81adcd65b685 ("ksz884x: switch from 'pci_' to 'dma_' API")

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

diff --git a/include/uapi/linux/atmioc.h b/include/uapi/linux/atmioc.h
index cd7655e40c77a7a1efb04c4aa159e0df0639c976..a9030bcc8d56b07ed5866b42728c3acc33a25263 100644 (file)
--- a/include/uapi/linux/atmioc.h
+++ b/include/uapi/linux/atmioc.h
@@ -5,7 +5,7 @@
 
 
 /*
- * See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
+ * See https://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
  * "magic" ioctl numbers.
  */
 

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index bd1f439a17e6f5271b02934322c0fef68361d434..34d9003d01ae0da96f1ccff58dd47cedb51bf7ac 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -226,6 +226,7 @@ enum bpf_attach_type {
        BPF_CGROUP_INET4_GETSOCKNAME,
        BPF_CGROUP_INET6_GETSOCKNAME,
        BPF_XDP_DEVMAP,
+       BPF_CGROUP_INET_SOCK_RELEASE,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -3174,13 +3175,12 @@ union bpf_attr {
  * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
  *     Description
  *             Copy *size* bytes from *data* into a ring buffer *ringbuf*.
- *             If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
- *             new data availability is sent.
- *             IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
- *             new data availability is sent unconditionally.
+ *             If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ *             of new data availability is sent.
+ *             If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ *             of new data availability is sent unconditionally.
  *     Return
- *             0, on success;
- *             < 0, on error.
+ *             0 on success, or a negative error in case of failure.
  *
  * void *bpf_ringbuf_reserve(void *ringbuf, u64 size, u64 flags)
  *     Description
@@ -3192,20 +3192,20 @@ union bpf_attr {
  * void bpf_ringbuf_submit(void *data, u64 flags)
  *     Description
  *             Submit reserved ring buffer sample, pointed to by *data*.
- *             If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
- *             new data availability is sent.
- *             IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
- *             new data availability is sent unconditionally.
+ *             If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ *             of new data availability is sent.
+ *             If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ *             of new data availability is sent unconditionally.
  *     Return
  *             Nothing. Always succeeds.
  *
  * void bpf_ringbuf_discard(void *data, u64 flags)
  *     Description
  *             Discard reserved ring buffer sample, pointed to by *data*.
- *             If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
- *             new data availability is sent.
- *             IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
- *             new data availability is sent unconditionally.
+ *             If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ *             of new data availability is sent.
+ *             If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ *             of new data availability is sent unconditionally.
  *     Return
  *             Nothing. Always succeeds.
  *
@@ -3213,16 +3213,18 @@ union bpf_attr {
  *     Description
  *             Query various characteristics of provided ring buffer. What
  *             exactly is queries is determined by *flags*:
- *               - BPF_RB_AVAIL_DATA - amount of data not yet consumed;
- *               - BPF_RB_RING_SIZE - the size of ring buffer;
- *               - BPF_RB_CONS_POS - consumer position (can wrap around);
- *               - BPF_RB_PROD_POS - producer(s) position (can wrap around);
- *             Data returned is just a momentary snapshots of actual values
+ *
+ *             * **BPF_RB_AVAIL_DATA**: Amount of data not yet consumed.
+ *             * **BPF_RB_RING_SIZE**: The size of ring buffer.
+ *             * **BPF_RB_CONS_POS**: Consumer position (can wrap around).
+ *             * **BPF_RB_PROD_POS**: Producer(s) position (can wrap around).
+ *
+ *             Data returned is just a momentary snapshot of actual values
  *             and could be inaccurate, so this facility should be used to
  *             power heuristics and for reporting, not to make 100% correct
  *             calculation.
  *     Return
- *             Requested value, or 0, if flags are not recognized.
+ *             Requested value, or 0, if *flags* are not recognized.
  *
  * long bpf_csum_level(struct sk_buff *skb, u64 level)
  *     Description

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index d3ee69babab75ca3be01e44a9d69dc23468b3612..b7f23faae9015b77914d5ae5742283fa20855295 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -455,6 +455,9 @@ enum devlink_attr {
 
        DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER,  /* string */
 
+       DEVLINK_ATTR_PORT_LANES,                        /* u32 */
+       DEVLINK_ATTR_PORT_SPLITTABLE,                   /* u8 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 7ae40f233162d590018c98eb5f5478c5300d03ee..0490db9a912e813204a216050c35f786e5b8eadd 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -167,6 +167,9 @@ enum {
        IFLA_BRIDGE_MRP_RING_ROLE,
        IFLA_BRIDGE_MRP_START_TEST,
        IFLA_BRIDGE_MRP_INFO,
+       IFLA_BRIDGE_MRP_IN_ROLE,
+       IFLA_BRIDGE_MRP_IN_STATE,
+       IFLA_BRIDGE_MRP_START_IN_TEST,
        __IFLA_BRIDGE_MRP_MAX,
 };
 
@@ -240,11 +243,47 @@ enum {
        IFLA_BRIDGE_MRP_INFO_TEST_INTERVAL,
        IFLA_BRIDGE_MRP_INFO_TEST_MAX_MISS,
        IFLA_BRIDGE_MRP_INFO_TEST_MONITOR,
+       IFLA_BRIDGE_MRP_INFO_I_IFINDEX,
+       IFLA_BRIDGE_MRP_INFO_IN_STATE,
+       IFLA_BRIDGE_MRP_INFO_IN_ROLE,
+       IFLA_BRIDGE_MRP_INFO_IN_TEST_INTERVAL,
+       IFLA_BRIDGE_MRP_INFO_IN_TEST_MAX_MISS,
        __IFLA_BRIDGE_MRP_INFO_MAX,
 };
 
 #define IFLA_BRIDGE_MRP_INFO_MAX (__IFLA_BRIDGE_MRP_INFO_MAX - 1)
 
+enum {
+       IFLA_BRIDGE_MRP_IN_STATE_UNSPEC,
+       IFLA_BRIDGE_MRP_IN_STATE_IN_ID,
+       IFLA_BRIDGE_MRP_IN_STATE_STATE,
+       __IFLA_BRIDGE_MRP_IN_STATE_MAX,
+};
+
+#define IFLA_BRIDGE_MRP_IN_STATE_MAX (__IFLA_BRIDGE_MRP_IN_STATE_MAX - 1)
+
+enum {
+       IFLA_BRIDGE_MRP_IN_ROLE_UNSPEC,
+       IFLA_BRIDGE_MRP_IN_ROLE_RING_ID,
+       IFLA_BRIDGE_MRP_IN_ROLE_IN_ID,
+       IFLA_BRIDGE_MRP_IN_ROLE_ROLE,
+       IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX,
+       __IFLA_BRIDGE_MRP_IN_ROLE_MAX,
+};
+
+#define IFLA_BRIDGE_MRP_IN_ROLE_MAX (__IFLA_BRIDGE_MRP_IN_ROLE_MAX - 1)
+
+enum {
+       IFLA_BRIDGE_MRP_START_IN_TEST_UNSPEC,
+       IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID,
+       IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL,
+       IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS,
+       IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD,
+       __IFLA_BRIDGE_MRP_START_IN_TEST_MAX,
+};
+
+#define IFLA_BRIDGE_MRP_START_IN_TEST_MAX (__IFLA_BRIDGE_MRP_START_IN_TEST_MAX - 1)
+
 struct br_mrp_instance {
        __u32 ring_id;
        __u32 p_ifindex;
@@ -270,6 +309,25 @@ struct br_mrp_start_test {
        __u32 monitor;
 };
 
+struct br_mrp_in_state {
+       __u32 in_state;
+       __u16 in_id;
+};
+
+struct br_mrp_in_role {
+       __u32 ring_id;
+       __u32 in_role;
+       __u32 i_ifindex;
+       __u16 in_id;
+};
+
+struct br_mrp_start_in_test {
+       __u32 interval;
+       __u32 max_miss;
+       __u32 period;
+       __u16 in_id;
+};
+
 struct bridge_stp_xstats {
        __u64 transition_blk;
        __u64 transition_fwd;

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 4e1b6ecf79d6c6c19b16f004d47ade09a7ff607b..58c40777f6fbd63edd4993a55334a7e239e7fde6 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -342,6 +342,7 @@ enum {
        IFLA_BRPORT_ISOLATED,
        IFLA_BRPORT_BACKUP_PORT,
        IFLA_BRPORT_MRP_RING_OPEN,
+       IFLA_BRPORT_MRP_IN_OPEN,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index f009abf1e0bfd9ea008661d1ecf9f4d1c5ac41b8..cd83b4f857842541905f815dabba59cb011ec8f0 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -65,6 +65,7 @@ enum {
        INET_DIAG_REQ_NONE,
        INET_DIAG_REQ_BYTECODE,
        INET_DIAG_REQ_SK_BPF_STORAGES,
+       INET_DIAG_REQ_PROTOCOL,
        __INET_DIAG_REQ_MAX,
 };
 

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index 009b8f0b0e8bedfe7028be2512891e9327157eeb..321812307718481b983ccdfd86547bc45dad718f 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -86,4 +86,21 @@ enum {
        __MPTCP_PM_CMD_AFTER_LAST
 };
 
+#define MPTCP_INFO_FLAG_FALLBACK               _BITUL(0)
+#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED    _BITUL(1)
+
+struct mptcp_info {
+       __u8    mptcpi_subflows;
+       __u8    mptcpi_add_addr_signal;
+       __u8    mptcpi_add_addr_accepted;
+       __u8    mptcpi_subflows_max;
+       __u8    mptcpi_add_addr_signal_max;
+       __u8    mptcpi_add_addr_accepted_max;
+       __u32   mptcpi_flags;
+       __u32   mptcpi_token;
+       __u64   mptcpi_write_seq;
+       __u64   mptcpi_snd_una;
+       __u64   mptcpi_rcv_nxt;
+};
+
 #endif /* _MPTCP_H */

diff --git a/include/uapi/linux/xdp_diag.h b/include/uapi/linux/xdp_diag.h
index 78b2591a778238992a777f777bad13da81b2d6d4..66b9973b4f4ce401b7f95638cc396fcf6cd9fbc7 100644 (file)
--- a/include/uapi/linux/xdp_diag.h
+++ b/include/uapi/linux/xdp_diag.h
@@ -30,6 +30,7 @@ struct xdp_diag_msg {
 #define XDP_SHOW_RING_CFG      (1 << 1)
 #define XDP_SHOW_UMEM          (1 << 2)
 #define XDP_SHOW_MEMINFO       (1 << 3)
+#define XDP_SHOW_STATS         (1 << 4)
 
 enum {
        XDP_DIAG_NONE,
@@ -41,6 +42,7 @@ enum {
        XDP_DIAG_UMEM_FILL_RING,
        XDP_DIAG_UMEM_COMPLETION_RING,
        XDP_DIAG_MEMINFO,
+       XDP_DIAG_STATS,
        __XDP_DIAG_MAX,
 };
 
@@ -69,4 +71,13 @@ struct xdp_diag_umem {
        __u32   refs;
 };
 
+struct xdp_diag_stats {
+       __u64   n_rx_dropped;
+       __u64   n_rx_invalid;
+       __u64   n_rx_full;
+       __u64   n_fill_ring_empty;
+       __u64   n_tx_invalid;
+       __u64   n_tx_ring_empty;
+};
+
 #endif /* _LINUX_XDP_DIAG_H */