From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7D4231E7C25; Thu, 30 Jan 2025 14:19:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738246756; cv=none; b=sfNo8lwMGIoo1LGQdjCvvXvaB0N3JNSDQ0dDgqK5NdOQ1miAuQ0DowytH48Ol+u47wSlTPEQd8/TDkUl7zscTnNC5bdiDnpkyZEAcMn+O+GSozKd83/nC/I9TzBO6tF1N1wU5Ywzp5j8YNcyVSXPv1EbH1R2pOQifYeQIvEo7Ek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738246756; c=relaxed/simple; bh=S6QOIM+bH9PJiQoXEO/LLz8xFomQrSojTWVlNB1SZTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E8tir/Dbu//1Fdzkpl5RdASlfHKHaSrA89M9mQTsfr3bCmshEpf7+UoqnVcZOdoY77v+DHQXoziqwiGsrwzUliDMYhcSCSrdwqU9K7iy3v7nqNwAPFs/lkM8OBNmyK9pSyF9cw5KLdhlBVXgc7z1IauVL7wQWhKA1+1SoiNUovE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BLM+yvID; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BLM+yvID" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0387C4CED2; Thu, 30 Jan 2025 14:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738246756; bh=S6QOIM+bH9PJiQoXEO/LLz8xFomQrSojTWVlNB1SZTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLM+yvID2tuc6dDXdqawp8btA0C9JTH4PXX37XyQrdTNIH1aDbXBUuvkh3swPQyUV fZm//vZj4IAZEHKGIxnqsDsgvVZLOi/M7CE8bT/dDK5bzB27f3ktzMUHcfTdJ52Gdd 14lA3qSRfveFRj/z76yjsHpj7UX9NA0vv6YbjyUE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Antoine Tenart , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 57/91] gtp: use exit_batch_rtnl() method Date: Thu, 30 Jan 2025 15:01:16 +0100 Message-ID: <20250130140135.956804088@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250130140133.662535583@linuxfoundation.org> References: <20250130140133.662535583@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 6eedda01b2bfdcf427b37759e053dc27232f3af1 ] exit_batch_rtnl() is called while RTNL is held, and devices to be unregistered can be queued in the dev_kill_list. This saves one rtnl_lock()/rtnl_unlock() pair per netns and one unregister_netdevice_many() call per netns. Signed-off-by: Eric Dumazet Reviewed-by: Antoine Tenart Link: https://lore.kernel.org/r/20240206144313.2050392-8-edumazet@google.com Signed-off-by: Jakub Kicinski Stable-dep-of: 46841c7053e6 ("gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp().") Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index f85f4e3d28215..fd5d3f58b5c10 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1355,23 +1355,23 @@ static int __net_init gtp_net_init(struct net *net) return 0; } -static void __net_exit gtp_net_exit(struct net *net) +static void __net_exit gtp_net_exit_batch_rtnl(struct list_head *net_list, + struct list_head *dev_to_kill) { - struct gtp_net *gn = net_generic(net, gtp_net_id); - struct gtp_dev *gtp; - LIST_HEAD(list); + struct net *net; - rtnl_lock(); - list_for_each_entry(gtp, &gn->gtp_dev_list, list) - gtp_dellink(gtp->dev, &list); + list_for_each_entry(net, net_list, exit_list) { + struct gtp_net *gn = net_generic(net, gtp_net_id); + struct gtp_dev *gtp; - unregister_netdevice_many(&list); - rtnl_unlock(); + list_for_each_entry(gtp, &gn->gtp_dev_list, list) + gtp_dellink(gtp->dev, dev_to_kill); + } } static struct pernet_operations gtp_net_ops = { .init = gtp_net_init, - .exit = gtp_net_exit, + .exit_batch_rtnl = gtp_net_exit_batch_rtnl, .id = >p_net_id, .size = sizeof(struct gtp_net), }; -- 2.39.5