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 621B639447B; Fri, 27 Mar 2026 12:11:17 +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=1774613480; cv=none; b=tC8LTRvZ2oSBE79zS+0VHBS6rnahlysTBJmeLB1Cxv19u/BZfnZhVP08D/VTtlxp8hsrMgHbsu3s0MvUsQOYqYp/gVbKgSILdOzmqhhVmVh/t0ZVoYKjFexlstlW57oGiw7LyVft7adliBx+UUQvoJkgwKEUt95N7tUP1PbmK5o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774613480; c=relaxed/simple; bh=uxp79e+lvDPLB4AthBNIkcicVeaLzdj36JFHyWd+Kpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QfZUH/jx5q+CpmoazZuCzuGoliot1D25EEzwHgTGQGxhH5wxecaJi+ahhvLRmtoWXO5NmRZ13xbjxtH7PPjul4NlYnFSie7ZmNtdtBAmjJ2JcQk+n+4vHNnehPs8XNHklnv5BUoMpX+oYRGzd34/P89wAu08xKK0D/6pcAVJZVA= 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=VcovLM8T; 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="VcovLM8T" 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=kPLVrGm0yGmr2kw4VkETFsROpWLn+lwE+bj5HCsw3a8=; b=VcovLM8TuUpH+ZZNf7RgwndUJd nnA8KfbpGQdXFz/tELjNc7lUkmOddNHJ/mx+g0KZ5x0Khtf7szx/04BddjMp0Wew8/0BVIYR11jpz nS3cSLHILa4tSDWzFD3/PDP9qRTNUA0L9wZawXZ669tDQpUBpHYFpqeae6xgxGNXMy5oElJpGFTQI l9r28iVSmls8UdNtPJ/BaCegRNVOmffwPk7uRLu/oddiAgdw9XYaEeQPra+GFFCb4DHVJgSkTDK8Y RJstpRqD3nPvjb3GAgQN9NeELvsXo54/nJnUddFAHMglG5VTiLGdpH3Em1U1vgC4Js5AvV9z0mLcR NyZ6FDYw==; 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 1w661g-000AMs-2B; Fri, 27 Mar 2026 13:10:56 +0100 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 v10 04/14] net, ethtool: Disallow leased real rxqs to be resized Date: Fri, 27 Mar 2026 13:10:39 +0100 Message-ID: <20260327121049.334562-5-daniel@iogearbox.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260327121049.334562-1-daniel@iogearbox.net> References: <20260327121049.334562-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.4.3/27953/Fri Mar 27 07:24:46 2026) Similar to AF_XDP, do not allow queues in a physical netdev to be resized by ethtool -L when they are leased. Cover channel resize paths (both netlink and ioctl) to reject resizing when the queues would be affected. Signed-off-by: Daniel Borkmann Co-developed-by: David Wei Signed-off-by: David Wei --- net/ethtool/channels.c | 17 ++++++++++++----- net/ethtool/ioctl.c | 16 +++++++++++----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/net/ethtool/channels.c b/net/ethtool/channels.c index 45232cf1c144..63ed5ebf19a8 100644 --- a/net/ethtool/channels.c +++ b/net/ethtool/channels.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include "common.h" #include "netlink.h" @@ -169,14 +169,21 @@ 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++) { + bool losing_rx = i >= channels.combined_count + + channels.rx_count; + + if (netdev_queue_busy(dev, i, + losing_rx ? NETDEV_QUEUE_TYPE_RX : + NETDEV_QUEUE_TYPE_TX, NULL)) { + GENL_SET_ERR_MSG(info, + "requested channel counts are too low due to busy queues (AF_XDP or queue leasing)"); return -EINVAL; } + } ret = dev->ethtool_ops->set_channels(dev, &channels); return ret < 0 ? ret : 1; diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 3c713a91ad0d..f7288bc6cae4 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -27,12 +27,12 @@ #include #include #include +#include #include #include -#include #include #include -#include +#include #include "common.h" @@ -2284,13 +2284,19 @@ 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 leasing) */ 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)) + for (i = from_channel; i < to_channel; i++) { + bool losing_rx = i >= channels.combined_count + + channels.rx_count; + + if (netdev_queue_busy(dev, i, + losing_rx ? NETDEV_QUEUE_TYPE_RX : + NETDEV_QUEUE_TYPE_TX, NULL)) return -EINVAL; + } ret = dev->ethtool_ops->set_channels(dev, &channels); if (!ret) -- 2.43.0