From patchwork Fri Feb 18 07:01:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12750996 X-Patchwork-Delegate: kuba@kernel.org 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 34625C433F5 for ; Fri, 18 Feb 2022 07:02:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbiBRHCO (ORCPT ); Fri, 18 Feb 2022 02:02:14 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:49608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230263AbiBRHCM (ORCPT ); Fri, 18 Feb 2022 02:02:12 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B04BA17AB3 for ; Thu, 17 Feb 2022 23:01:54 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id y11so1635815pfa.6 for ; Thu, 17 Feb 2022 23:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FGNvQsrD1bSTYYeyxoUueU7G5Ak4FXULke0q6ShFb+A=; b=mgQYho6bowg8A64b4jzl2ywlaSliZjeHp8GGuLFAs7tBDzTmvb7KQMG/nG6tzLumq5 Pssvd98mCwWxLp+HMlmhKQe95Tq+Spg5XxjtEuSAY+v0Z/MKxOgiAuQL5YWUL7P4f9+s W6/WaUeGpvzS3DHSemfdZYKSRt2DX8g1wpD6912T0av6Vyd106bJJBcT8qLirZhEddTE NzIZbq02/lN2Yo/H48EixF5iUSOCetOfb8dujuNg4odtmNltRGBZNAkcvqDttHjOt/Yl oKb5FcykuZ+tVuVNaNAScwsg76rUF286ML2h0/bM4HVmjzKJKDRK93wQmWSFXc6/6SQQ kQuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FGNvQsrD1bSTYYeyxoUueU7G5Ak4FXULke0q6ShFb+A=; b=2yMdHkWmJBjlQ0OWzgw8NrFLDQknVA7n7dKE+c0vyA68cDDuRjRjZxb7Lz+af1Eqdw upS0k/Vyqrqjzx1D3Zrwk0NGTtowSuBOeVuTOi60DVt/MOVJyX/2vsEHIv6MyglEipBp +0wALgAj8j2rQssggKUO4DKJAQro0WUzRH8RIlq5xsfsQjo1OrlivBUO8zmPm/XEd7Qn CVp+wYgngm7I8b43C1NfHtkx5iZtOy4x2GLL3JHtFl6iZUVd/jLAkCSirgkq3Y5wbPrQ 7F2CVQAWmzc0bTHph6o8nZteFXB4Gl1Bi+6kunibdmvUhpkDuQWcBPqX+V1yqozFnCWE ytJw== X-Gm-Message-State: AOAM530o6DZyl+11kv7MCEzqQY89OLfYv4yDdOx77pqVs+DaF8usK2A7 gEZ/HKWAHwwpWsjrckuo/3s= X-Google-Smtp-Source: ABdhPJz3PnsL+NWUrPAxzKJ+DQP3T5XmUhinFt/xUEbjapAwyMhfz03cqrzcSAYyNpLzkVGNVMrDPg== X-Received: by 2002:a63:3111:0:b0:373:a1fa:8998 with SMTP id x17-20020a633111000000b00373a1fa8998mr5214867pgx.415.1645167714282; Thu, 17 Feb 2022 23:01:54 -0800 (PST) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:5c60:79a8:8f41:618f]) by smtp.gmail.com with ESMTPSA id f16sm1882021pfa.147.2022.02.17.23.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Feb 2022 23:01:53 -0800 (PST) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet , Roopa Prabhu , Nikolay Aleksandrov Subject: [PATCH net-next] bridge: switch br_net_exit to batch mode Date: Thu, 17 Feb 2022 23:01:50 -0800 Message-Id: <20220218070150.2628980-1-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.35.1.265.g69c8d7142f-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet cleanup_net() is competing with other rtnl users. Instead of calling br_net_exit() for each netns, call br_net_exit_batch() once. This gives cleanup_net() ability to group more devices and call unregister_netdevice_many() only once for all bridge devices. Signed-off-by: Eric Dumazet Cc: Roopa Prabhu Cc: Nikolay Aleksandrov Acked-by: Nikolay Aleksandrov --- net/bridge/br.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/net/bridge/br.c b/net/bridge/br.c index 1fac72cc617ff7e1851b715860a95e9a1247b9b1..b1dea3febeea49f4e0882a1df64e09fc1db6b3b4 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -342,23 +342,26 @@ void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on) clear_bit(opt, &br->options); } -static void __net_exit br_net_exit(struct net *net) +static void __net_exit br_net_exit_batch(struct list_head *net_list) { struct net_device *dev; + struct net *net; LIST_HEAD(list); rtnl_lock(); - for_each_netdev(net, dev) - if (netif_is_bridge_master(dev)) - br_dev_delete(dev, &list); + + list_for_each_entry(net, net_list, exit_list) + for_each_netdev(net, dev) + if (netif_is_bridge_master(dev)) + br_dev_delete(dev, &list); unregister_netdevice_many(&list); + rtnl_unlock(); - } static struct pernet_operations br_net_ops = { - .exit = br_net_exit, + .exit_batch = br_net_exit_batch, }; static const struct stp_proto br_stp_proto = {