From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA105C433EF for ; Tue, 18 Jan 2022 03:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357687AbiARDVU (ORCPT ); Mon, 17 Jan 2022 22:21:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350274AbiARDIc (ORCPT ); Mon, 17 Jan 2022 22:08:32 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98A82C0619C1; Mon, 17 Jan 2022 18:50:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 20EAC612E8; Tue, 18 Jan 2022 02:50:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97D62C36AEF; Tue, 18 Jan 2022 02:50:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642474222; bh=KtF8oSM/+IKrGVbzVycVUSpCGeY9eu9K95vEuK2pHRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrjX5zAjBqKaDRiIAxoAIbOcN6nJ69pd0QXxVD0phTVAc4t8oz+KcqRpr8HLfuM0W XcItdrY/H5F2Hw2/TBPkCOrSmreihelh2dzW43LxCbgRjgd8958EPoWOw865Ow9ooK TpDiQlRYDbKRQ0eC2sst5HT5VAh/PgilKPulYqCiZh47WOcLyv6xsxdKP2868om1Gy Ec9G18odSe+UsG8DT58FKBMa4bXe98p6TF9y9J6g1Po88U7yQqHUZijYXEPQVSgv36 AhDuz+s5DVcbbYtxdCPERlf34nxtn3r9Vftj4NSGASqKI4nBObLMNiSb6espLAdHiy 26s85omYKaCfQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Antoine Tenart , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, weiwan@google.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 29/56] net-sysfs: update the queue counts in the unregistration path Date: Mon, 17 Jan 2022 21:48:41 -0500 Message-Id: <20220118024908.1953673-29-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024908.1953673-1-sashal@kernel.org> References: <20220118024908.1953673-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Antoine Tenart [ Upstream commit d7dac083414eb5bb99a6d2ed53dc2c1b405224e5 ] When updating Rx and Tx queue kobjects, the queue count should always be updated to match the queue kobjects count. This was not done in the net device unregistration path, fix it. Tracking all queue count updates will allow in a following up patch to detect illegal updates. Signed-off-by: Antoine Tenart Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/net-sysfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 7d8c6ba5cbd22..3a5903f942e18 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1449,6 +1449,9 @@ static void remove_queue_kobjects(struct net_device *dev) net_rx_queue_update_kobjects(dev, real_rx, 0); netdev_queue_update_kobjects(dev, real_tx, 0); + + dev->real_num_rx_queues = 0; + dev->real_num_tx_queues = 0; #ifdef CONFIG_SYSFS kset_unregister(dev->queues_kset); #endif -- 2.34.1