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 A84E71F0E36; Tue, 21 Jan 2025 18:04:25 +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=1737482665; cv=none; b=JecyoQj12rUOMCY1Ad/RI5jaPVOOrrlanK2k8JqJaeHYZQzsTbNjKFfyxbsc/l8PX7lkph2LEwSnMvekQ54KyugILpz8qyS+ydqKb2X2qJFS/yAvpf+Qkpl36xbdsSHncBqDPMmm98lGtxmMRFmh8oF3VlHSGtYt5Y1G/YXSdxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737482665; c=relaxed/simple; bh=D74e8k910RYjlaSRHO7qtvngjxm73lt2kGPKm2SDtzg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CyIzB8/gv/eQYl3pvoR53KBQFYci5YRqGMYUVHz240qZE6NtGSsZxmyGSsM9Z9C9zVLJNaGcwHeXzPDRiiEK/qJ9Jt++yONa0vPfCD6NHT810oyONHP+1VbbV9h4lSIEgq0EPZnkm9SzjB9OYvgFbRA0CXGsybsxvI27tknHnEU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0v4DjqYW; 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="0v4DjqYW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C89FC4CEDF; Tue, 21 Jan 2025 18:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1737482665; bh=D74e8k910RYjlaSRHO7qtvngjxm73lt2kGPKm2SDtzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0v4DjqYWeZx4C0zRT4K9O3Wpzo+RAHiBIOcGJxBi7+EQieIm81MGN419cvMW7UavT f1tCtoIIcUgq0k4PI1sGeP+xdE3iVjSvIDmmMMyabYxHSnNuxvYgB2GDlVj83QojSa p7pULz/kTo33ZvEVuCyPGpnidU5ldqVrnmUpTIfk= 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 6.1 06/64] gtp: use exit_batch_rtnl() method Date: Tue, 21 Jan 2025 18:52:05 +0100 Message-ID: <20250121174521.811557953@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121174521.568417761@linuxfoundation.org> References: <20250121174521.568417761@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 5e0332c9d0d73..0e1dfc6157224 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1883,23 +1883,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