From patchwork Wed Apr 3 10:49:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1075751 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="epSTUULS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Z2sG06jpz9sSM for ; Wed, 3 Apr 2019 21:49:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727015AbfDCKtw (ORCPT ); Wed, 3 Apr 2019 06:49:52 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39596 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725956AbfDCKtv (ORCPT ); Wed, 3 Apr 2019 06:49:51 -0400 Received: by mail-wm1-f66.google.com with SMTP id n25so7567415wmk.4 for ; Wed, 03 Apr 2019 03:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cviNhN8lipMp7LA1QicaaUzhIeFP5ky1Hv7DQgVZe3M=; b=epSTUULSAYR3wHhhHpipyjhNonHEEn6YZgcFeECj3CnrZqmC0xnKfHQniRaKvAQNHZ O4AXf17swl3EdkiriFDvB5PMQVvJnjqW5/PBkXcNyj6o2+43YBhtxHK0Wf9YwkoNhNQ6 kPrzxDcIvtqkGil8K3qgNkfzCeSgJKQVDUeXM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cviNhN8lipMp7LA1QicaaUzhIeFP5ky1Hv7DQgVZe3M=; b=pfLIcP90ALTn8wBv9APnJw71vbEDq+vZeMAo0S657dH+/EsVEuUyOZCIdUzO/Q8RH9 cpoSb9wndg9pk0EipCpQldxKk852mbGce1CBjDrhIMG9ELIQh4AFkqhCkEovwVjNjgH8 XFb3cmHRxhP167Ho5HHcbJ87tLCaPV+zwflwq3GqQYT06uVvkd1QZi2aK145jmbI8gjC /e49DHmf2XxfBeki9S2OT3L6EzlbjWIZObO2BLucUopCSaxhyKybMe15ZGWPPoMtgfYQ rNBpakXEuy8kKUS5Te+grMVxXvOT/ZcNvqCBWP4hKpJJYkfg3FUiYion3bWvy5C9V3gD /m5w== X-Gm-Message-State: APjAAAUubdmIN3Sz+SgP2C8xMpAGFLp/43bavqR08Iv/n507z7AAfUam hNXD6qG8dMHmjAJVtJsCg4iksrGwf0EZEg== X-Google-Smtp-Source: APXvYqzWWNqLtwlqFVcaEit4BMUYQvcYMeYhgiAEKtVXe5EI6y5XrNcjtcU8ARUj4sVWyJQEdZos/w== X-Received: by 2002:a1c:23cc:: with SMTP id j195mr2790wmj.74.1554288589462; Wed, 03 Apr 2019 03:49:49 -0700 (PDT) Received: from localhost.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o4sm32723375wmo.20.2019.04.03.03.49.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 03:49:48 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net-next] net: bridge: optimize backup_port fdb convergence Date: Wed, 3 Apr 2019 13:49:24 +0300 Message-Id: <20190403104924.32695-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We can optimize the fdb convergence when a backup_port is present by not immediately flushing the entries of the stopped port since traffic for those entries will flow towards the backup_port. There are 2 cases specifically that benefit most: - when the stopped port comes up before the entries expire by themselves - when there's an external entry refresh and they're kept while the backup_port is operating (e.g. mlag) Signed-off-by: Nikolay Aleksandrov --- We have been running with this change for over an year, it has been extensively tested. net/bridge/br_stp_if.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 808e2b914015..8d65ae5210e0 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -117,7 +117,8 @@ void br_stp_disable_port(struct net_bridge_port *p) del_timer(&p->forward_delay_timer); del_timer(&p->hold_timer); - br_fdb_delete_by_port(br, p, 0, 0); + if (!rcu_access_pointer(p->backup_port)) + br_fdb_delete_by_port(br, p, 0, 0); br_multicast_disable_port(p); br_configuration_update(br);