From nobody Wed Dec 17 23:53:55 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 851FF30C37E for ; Mon, 13 Oct 2025 14:54:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367244; cv=none; b=npjggeIGS2CEapoWQtSCxtPEDHabxjU9P1BmmIsGA885eaXhS7H4xVCHR9cHotouTNmmHrRrCTn+JhBmQgb+lDS/DebYvHT3tcxQVPoawWI/Sn4YPP5A58l8M8KbRXDf/HRN8ivJ/15csd0Ka4xr0OBUoYMBjLh3ONJviFNS1tE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367244; c=relaxed/simple; bh=aZBe05rc0MGsCYK4sT5VGwUDz1yniV4yDrd7Hn1NTo8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mUJQ/6/WHG1OOSl4SU8LsJ14eWNmeFuXukETYu/HvQcBbb9iMfNJmZpmdzeidIcsCaDpqeaxvtHluh5ODK50ja8G+KOTAP5W/ni8YYhXlYmztS98mbjuIkhnJNc3Mv37R4VDkvev7Iiia/l/AcR83eY6BXCxvOoPA0+BLO+d2vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OFMBv60X; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OFMBv60X" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-46e6674caa5so22200765e9.0 for ; Mon, 13 Oct 2025 07:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760367240; x=1760972040; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f2Xy6qVdWrPTN0DdBWw84p2SpFLtW6dghcLsQY6aOfc=; b=OFMBv60XD65Qy2+hYXaxL8f+Uhtx0UiACS4GdPHuUsWAGYIB86MgkjIO4QbQBIzHrX CkqVhwRQhRWso0+bkuccGLbfSta0AS6eNtngPplp8Et4VczJvUJz1IHN33hCigKJ7pPC imeywDtmncHJ54byyPFgtUS3wCJhQkTnC76lr3NT1E/l8dnlkX4wV+CcpJ7fKR0+UJPt V2MdH/y324jiAgTDpCGvrfhSHdBiKLDVL/KEfxdqV3OuMnpYaty/spEjSF9VFkx4qVXZ tv7LQQv4sby9h0dIdMmr6QJq0umVlqLxmi5b362M88fpfu2deSsEtvfih10YK1B/D4NK 0FZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760367240; x=1760972040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f2Xy6qVdWrPTN0DdBWw84p2SpFLtW6dghcLsQY6aOfc=; b=UysImkX2eyg1PcSjGsm8Nz2XZKb8vqKTxBXDyuMQ13cIZ7KbcEj0Qm+GvwSUwRnLri bOQyj+M7T7Ne4a7M06tvIhn6/lb7soSCZ8S+i0iGoS+BOT3OH4vHiEx1LXWZo0SWosLc Jg0cyOimlVlGKq6GWplYgOi1h611VepJMXP5gDStsmwhXswtFQRUYYp35orQu7zHAd+z FY6hYqbeScCxjuGXNYMmWmyBzLV0/sJXy6/BiXHqU2NaT6LCi9l1WhzA+nnMS7p9prBv 6ba5EJSV2MQFnincv0m6e7WdjP5VZhKzHG4tLIZVI4NeYlF8VJsCbpvMiIvH3rxmyUXx C36A== X-Forwarded-Encrypted: i=1; AJvYcCWISDny0mAZQaIX6vU3hSpCpgjbDFzE554OFcmw06tHwTZiyq1m3ur6tc8T2YUvt7ojlQ9f5gHfLhKmrIE=@vger.kernel.org X-Gm-Message-State: AOJu0YyqlkGNYvI785TCsMZkzUsFC0TwzPoJwKVWSPJZlYAkJHgFa7Hp JFjCeU/zEj0h9p3ok7m7XYS9Mp1Nce9I2BAdkFSyFP/ACKmPPL027M0M X-Gm-Gg: ASbGnctmZwKnK9jJIegiWMcOYaThxLaGiuydVwfnZdb0jpPSvpNMuEDfz3iimxG8rpR ScEYnB8oTBmZ4WjVcLlovsaCquA8fP/KMTKpog48kFsWdv0tiz387I13+fuayIzFToXu4KawsyX 5Wl0h2rqnpqObqj0cNpeMKZuGMISb9P8XigOLnUROgWG0zYa8Wv6Rv2WH3Id8U2Hf1Ck4kOSCDt FQgH+cxkReKNfyVif8O+Grl6pmAsl0+lvABNVKqhuE/oXQceeMRYSWlxJOEiKszGAFfHSxYCpZK OxGbAm57IZ1JWBecV5bRxLXHDXRhq2FRca6gGGvR5pnoefJcJkowSfEpNDWfzyVBr/W/y2j9ISI YAeLjmmarAU9miYq3AkYSCPh4 X-Google-Smtp-Source: AGHT+IF25ZjCO04KHHq0TYmhTMidbVuQW1ShdxxUvQA1Yprokjlc765D+WOyBbnJX1oGt9SxrNvhcA== X-Received: by 2002:a05:600c:a411:b0:46e:1b9d:ac6c with SMTP id 5b1f17b1804b1-46fb1f77c2bmr85952605e9.17.1760367239377; Mon, 13 Oct 2025 07:53:59 -0700 (PDT) Received: from 127.com ([2620:10d:c092:600::1:eb09]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5e0e70sm18641085f8f.40.2025.10.13.07.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 07:53:58 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: Andrew Lunn , Jakub Kicinski , davem@davemloft.net, Eric Dumazet , Paolo Abeni , Simon Horman , Donald Hunter , Michael Chan , Pavan Chebbi , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Joshua Washington , Harshitha Ramamurthy , Jian Shen , Salil Mehta , Jijie Shao , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Saeed Mahameed , Tariq Toukan , Mark Bloch , Leon Romanovsky , Alexander Duyck , kernel-team@meta.com, Ilias Apalodimas , Joe Damato , David Wei , Willem de Bruijn , Mina Almasry , Pavel Begunkov , Breno Leitao , Dragos Tatulea , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-rdma@vger.kernel.org, Jonathan Corbet Subject: [PATCH net-next v4 20/24] net: wipe the setting of deactived queues Date: Mon, 13 Oct 2025 15:54:22 +0100 Message-ID: <65dc8bd105e2573b3bd41bd35c73913392590a87.1760364551.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jakub Kicinski Clear out all settings of deactived queues when user changes the number of channels. We already perform similar cleanup for shapers. Signed-off-by: Jakub Kicinski Reviewed-by: Mina Almasry Signed-off-by: Pavel Begunkov --- net/core/dev.c | 5 +++++ net/core/dev.h | 2 ++ net/core/netdev_config.c | 13 +++++++++++++ 3 files changed, 20 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 5f92425dfdbd..b253e7e29ffa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3188,6 +3188,8 @@ int netif_set_real_num_tx_queues(struct net_device *d= ev, unsigned int txq) if (dev->num_tc) netif_setup_tc(dev, txq); =20 + netdev_queue_config_update_cnt(dev, txq, + dev->real_num_rx_queues); net_shaper_set_real_num_tx_queues(dev, txq); =20 dev_qdisc_change_real_num_tx(dev, txq); @@ -3233,6 +3235,9 @@ int netif_set_real_num_rx_queues(struct net_device *d= ev, unsigned int rxq) rxq); if (rc) return rc; + + netdev_queue_config_update_cnt(dev, dev->real_num_tx_queues, + rxq); } =20 dev->real_num_rx_queues =3D rxq; diff --git a/net/core/dev.h b/net/core/dev.h index a203b63198e7..63192dbb1895 100644 --- a/net/core/dev.h +++ b/net/core/dev.h @@ -101,6 +101,8 @@ void __netdev_queue_config(struct net_device *dev, int = rxq, struct netdev_queue_config *qcfg, bool pending); int netdev_queue_config_revalidate(struct net_device *dev, struct netlink_ext_ack *extack); +void netdev_queue_config_update_cnt(struct net_device *dev, unsigned int t= xq, + unsigned int rxq); =20 /* netdev management, shared between various uAPI entry points */ struct netdev_name_node { diff --git a/net/core/netdev_config.c b/net/core/netdev_config.c index ede02b77470e..c5ae39e76f40 100644 --- a/net/core/netdev_config.c +++ b/net/core/netdev_config.c @@ -64,6 +64,19 @@ int netdev_reconfig_start(struct net_device *dev) return -ENOMEM; } =20 +void netdev_queue_config_update_cnt(struct net_device *dev, unsigned int t= xq, + unsigned int rxq) +{ + size_t len; + + if (rxq < dev->real_num_rx_queues) { + len =3D (dev->real_num_rx_queues - rxq) * sizeof(*dev->cfg->qcfg); + + memset(&dev->cfg->qcfg[rxq], 0, len); + memset(&dev->cfg_pending->qcfg[rxq], 0, len); + } +} + void __netdev_queue_config(struct net_device *dev, int rxq, struct netdev_queue_config *qcfg, bool pending) { --=20 2.49.0