From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from www62.your-server.de (www62.your-server.de [213.133.104.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21BF01DF748; Wed, 15 Oct 2025 14:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.133.104.62 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760536927; cv=none; b=dIxSCgWRGdQaVnd2YVILY0L/JySExisVrivpKH5KidSSE9mmxc45XlFU2o49eHiDMcAvTLNUTE0D62fFtEwPr7uJXN4aL9c6jBEkUtdro+F0GOunIV2AUAQpU2RAjE3wAT3TH388PJj6pKlH6Zs06UfbzUyZfSA2DxVG7JWOh7I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760536927; c=relaxed/simple; bh=l0iL0c7xCsROUyJNuSHhhzE3OOA5u6eKcL6qc+RRXDI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oRJwZlDXx9DuXxEYrUDQhtsy9v0AQB6A2wKlKK+eky8LaXZEsUYCpV5UhMAidXXmvytr/Kf5V2UPhBETDVY7SpwXy8RTwXrNSm991bmCWUcjGwj0Tg+9VH0ChImZSyfqyRFMs6PFwEqbqnXyqDuc9bBKrdEta4UB10ctZ6whkSo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iogearbox.net; spf=pass smtp.mailfrom=iogearbox.net; dkim=pass (2048-bit key) header.d=iogearbox.net header.i=@iogearbox.net header.b=ZSztB+uo; arc=none smtp.client-ip=213.133.104.62 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iogearbox.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iogearbox.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iogearbox.net header.i=@iogearbox.net header.b="ZSztB+uo" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=iogearbox.net; s=default2302; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=ZrLjr9NcnFT7keopGRh/U7qhAA1FD1cNPz/42V3LizA=; b=ZSztB+uo/CWGgtdDo62BRxQsrA 3lEIsvpej2cfJlrqOh0wLg2N+kb3o+o6EFL5JsQaXRvfBXmnFjXjdRfqDCylpd9PGlXhaZcJNaK7w jXRpXxWBJsFyPuAhRmQzsfwrJBSTX6TA/HjAIa/wCO6x+9JFdcY/mqMknSOTo1FiA4Qs3gkm0096D N4qIigMwvNIDW4JGWB3zfXIvW41fIT0xCTQt2yLHV2AOU4vcn4zOUIKq6ofWwymuwdWATdLxj5ech 36vDaYs6xAbzuJyaasatRu/Hv8Ek3NfEd2ETwHoCLjjpBUarMyFtuEYIRWPutqrUr7n+30/V4zqu5 c8EbOWeg==; Received: from localhost ([127.0.0.1]) by www62.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1v924Y-000H6r-2Q; Wed, 15 Oct 2025 16:01:46 +0200 From: Daniel Borkmann To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, kuba@kernel.org, davem@davemloft.net, razor@blackwall.org, pabeni@redhat.com, willemb@google.com, sdf@fomichev.me, john.fastabend@gmail.com, martin.lau@kernel.org, jordan@jrife.io, maciej.fijalkowski@intel.com, magnus.karlsson@intel.com, dw@davidwei.uk, toke@redhat.com, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com Subject: [PATCH net-next v2 04/15] net, ethtool: Disallow peered real rxqs to be resized Date: Wed, 15 Oct 2025 16:01:29 +0200 Message-ID: <20251015140140.62273-5-daniel@iogearbox.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251015140140.62273-1-daniel@iogearbox.net> References: <20251015140140.62273-1-daniel@iogearbox.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: Clear (ClamAV 1.0.9/27793/Wed Oct 15 11:29:40 2025) Similar to AF_XDP, do not allow queues in a physical netdev to be resized by ethtool -L when they are peered. Signed-off-by: Daniel Borkmann Co-developed-by: David Wei Signed-off-by: David Wei --- include/linux/ethtool.h | 1 + net/ethtool/channels.c | 12 ++++++------ net/ethtool/common.c | 10 +++++++++- net/ethtool/ioctl.c | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index c2d8b4ec62eb..151fc920234d 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -1481,4 +1481,5 @@ struct ethtool_forced_speed_map { void ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size); +bool ethtool_channel_busy(struct net_device *dev, u32 channel); #endif /* _LINUX_ETHTOOL_H */ diff --git a/net/ethtool/channels.c b/net/ethtool/channels.c index ca4f80282448..b3de8064275c 100644 --- a/net/ethtool/channels.c +++ b/net/ethtool/channels.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -#include - #include "netlink.h" #include "common.h" @@ -169,14 +167,16 @@ ethnl_set_channels(struct ethnl_req_info *req_info, struct genl_info *info) if (ret) return ret; - /* Disabling channels, query zero-copy AF_XDP sockets */ + /* ensure channels are not busy at the moment */ from_channel = channels.combined_count + min(channels.rx_count, channels.tx_count); - for (i = from_channel; i < old_total; i++) - if (xsk_get_pool_from_qid(dev, i)) { - GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing zerocopy AF_XDP sockets"); + for (i = from_channel; i < old_total; i++) { + if (ethtool_channel_busy(dev, i)) { + GENL_SET_ERR_MSG(info, + "requested channel counts are too low due to busy queues (AF_XDP or queue peering)"); return -EINVAL; } + } ret = dev->ethtool_ops->set_channels(dev, &channels); return ret < 0 ? ret : 1; diff --git a/net/ethtool/common.c b/net/ethtool/common.c index 55223ebc2a7e..a67382c2208b 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -6,13 +6,15 @@ #include #include #include + #include +#include +#include #include "netlink.h" #include "common.h" #include "../core/dev.h" - const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = { [NETIF_F_SG_BIT] = "tx-scatter-gather", [NETIF_F_IP_CSUM_BIT] = "tx-checksum-ipv4", @@ -1101,6 +1103,12 @@ EXPORT_SYMBOL(ethtool_get_ts_info_by_layer); const struct ethtool_phy_ops *ethtool_phy_ops; +bool ethtool_channel_busy(struct net_device *dev, u32 channel) +{ + return netdev_rx_queue_peered(dev, channel) || + xsk_get_pool_from_qid(dev, channel); +} + void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops) { ASSERT_RTNL(); diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index fa83ddade4f8..9ed87a18e48a 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2282,12 +2282,12 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev, if (ret) return ret; - /* Disabling channels, query zero-copy AF_XDP sockets */ + /* Disabling channels, query busy queues (AF_XDP, queue peering) */ from_channel = channels.combined_count + min(channels.rx_count, channels.tx_count); to_channel = curr.combined_count + max(curr.rx_count, curr.tx_count); for (i = from_channel; i < to_channel; i++) - if (xsk_get_pool_from_qid(dev, i)) + if (ethtool_channel_busy(dev, i)) return -EINVAL; ret = dev->ethtool_ops->set_channels(dev, &channels); -- 2.43.0