History

Merge commit '71f0dd5a3293d75d26d405ffbaedfdda4836af32' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next into for-6.15/io_uring-rx-zc

Merge networking zerocopy receive tree, to get the prep patches for the io_uring rx zc support. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (63 commits) net: add helpers for setting a memory provider on an rx queue net: page_pool: add memory provider helpers net: prepare for non devmem TCP memory providers net: page_pool: add a mp hook to unregister_netdevice* net: page_pool: add callback for mp info printing netdev: add io_uring memory provider info net: page_pool: create hooks for custom memory providers net: generalise net_iov chunk owners net: prefix devmem specific helpers net: page_pool: don't cast mp param to devmem tools: ynl: add all headers to makefile deps eth: fbnic: set IFF_UNICAST_FLT to avoid enabling promiscuous mode when adding unicast addrs eth: fbnic: add MAC address TCAM to debugfs tools: ynl-gen: support limits using definitions tools: ynl-gen: don't output external constants net/mlx5e: Avoid WARN_ON when configuring MQPRIO with HTB offload enabled net/mlx5e: Remove unused mlx5e_tc_flow_action struct net/mlx5: Remove stray semicolon in LAG port selection table creation net/mlx5e: Support FEC settings for 200G per lane link modes net/mlx5: Add support for 200Gbps per lane link modes ...

Jens Axboe committed 1 year ago

Commit 5c496ff2 parents 94a4274 71f0dd585 files · +1566 −3355Browse files

Showing the changes to include/uapi/linux (2 of 85 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ethtool.h +18 −0
  2. include/uapi/linux/netdev.h +7 −0
include/uapi/linux/ethtool.h+18−0
@@ -2059,6 +2059,24 @@ enum ethtool_link_mode_bit_indices { · 2058 unmodified lines
2059 ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100,2059 ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100,
2060 ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101,2060 ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101,
2061 ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT = 102,2061 ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT = 102,
2062 ETHTOOL_LINK_MODE_200000baseCR_Full_BIT = 103,
2063 ETHTOOL_LINK_MODE_200000baseKR_Full_BIT = 104,
2064 ETHTOOL_LINK_MODE_200000baseDR_Full_BIT = 105,
2065 ETHTOOL_LINK_MODE_200000baseDR_2_Full_BIT = 106,
2066 ETHTOOL_LINK_MODE_200000baseSR_Full_BIT = 107,
2067 ETHTOOL_LINK_MODE_200000baseVR_Full_BIT = 108,
2068 ETHTOOL_LINK_MODE_400000baseCR2_Full_BIT = 109,
2069 ETHTOOL_LINK_MODE_400000baseKR2_Full_BIT = 110,
2070 ETHTOOL_LINK_MODE_400000baseDR2_Full_BIT = 111,
2071 ETHTOOL_LINK_MODE_400000baseDR2_2_Full_BIT = 112,
2072 ETHTOOL_LINK_MODE_400000baseSR2_Full_BIT = 113,
2073 ETHTOOL_LINK_MODE_400000baseVR2_Full_BIT = 114,
2074 ETHTOOL_LINK_MODE_800000baseCR4_Full_BIT = 115,
2075 ETHTOOL_LINK_MODE_800000baseKR4_Full_BIT = 116,
2076 ETHTOOL_LINK_MODE_800000baseDR4_Full_BIT = 117,
2077 ETHTOOL_LINK_MODE_800000baseDR4_2_Full_BIT = 118,
2078 ETHTOOL_LINK_MODE_800000baseSR4_Full_BIT = 119,
2079 ETHTOOL_LINK_MODE_800000baseVR4_Full_BIT = 120,
2062 2080
2063 /* must be last entry */2081 /* must be last entry */
2064 __ETHTOOL_LINK_MODE_MASK_NBITS2082 __ETHTOOL_LINK_MODE_MASK_NBITS
include/uapi/linux/netdev.h+7−0
@@ -86,6 +86,11 @@ enum { · 85 unmodified lines
86 NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)86 NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)
87};87};
88 88
89enum {
90 __NETDEV_A_IO_URING_PROVIDER_INFO_MAX,
91 NETDEV_A_IO_URING_PROVIDER_INFO_MAX = (__NETDEV_A_IO_URING_PROVIDER_INFO_MAX - 1)
92};
93
89enum {94enum {
90 NETDEV_A_PAGE_POOL_ID = 1,95 NETDEV_A_PAGE_POOL_ID = 1,
91 NETDEV_A_PAGE_POOL_IFINDEX,96 NETDEV_A_PAGE_POOL_IFINDEX,
@@ -94,6 +99,7 @@ enum { · 2 unmodified lines
94 NETDEV_A_PAGE_POOL_INFLIGHT_MEM,99 NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
95 NETDEV_A_PAGE_POOL_DETACH_TIME,100 NETDEV_A_PAGE_POOL_DETACH_TIME,
96 NETDEV_A_PAGE_POOL_DMABUF,101 NETDEV_A_PAGE_POOL_DMABUF,
102 NETDEV_A_PAGE_POOL_IO_URING,
97 103
98 __NETDEV_A_PAGE_POOL_MAX,104 __NETDEV_A_PAGE_POOL_MAX,
99 NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)105 NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)
@@ -136,6 +142,7 @@ enum { · 36 unmodified lines
136 NETDEV_A_QUEUE_TYPE,142 NETDEV_A_QUEUE_TYPE,
137 NETDEV_A_QUEUE_NAPI_ID,143 NETDEV_A_QUEUE_NAPI_ID,
138 NETDEV_A_QUEUE_DMABUF,144 NETDEV_A_QUEUE_DMABUF,
145 NETDEV_A_QUEUE_IO_URING,
139 146
140 __NETDEV_A_QUEUE_MAX,147 __NETDEV_A_QUEUE_MAX,
141 NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)148 NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)