From patchwork Fri Nov 1 12:46:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1187988 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 (no SPF record) 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="StXp1RP1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 474MQQ0wtbz9s4Y for ; Fri, 1 Nov 2019 23:46:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729078AbfKAMqu (ORCPT ); Fri, 1 Nov 2019 08:46:50 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:37023 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726771AbfKAMqt (ORCPT ); Fri, 1 Nov 2019 08:46:49 -0400 Received: by mail-lj1-f193.google.com with SMTP id v2so10141739lji.4 for ; Fri, 01 Nov 2019 05:46:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=6VgBEPz6NfhfhSfPHra8ifnX4K85VARVvUkfysirF2g=; b=StXp1RP1E9EjNMaPRASyqskXwpI0hPgaT+uvXhG0LU+gaPhvccAxTSfUU2AbK2qaFR ghBJ2YvSEH8IzhstLqfv5CLpYf0qa0F+zaYPeJj9s4Kx1cjhLkm5Vouv1sb8IU7Z/FHz h5nagWO9sBF1cUB0fPtIs9UJDHa0887SBTbmc= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6VgBEPz6NfhfhSfPHra8ifnX4K85VARVvUkfysirF2g=; b=dfrNznPKLVjA7rrA6VmYcDOphgXJkEAytXicAUhN4ORrQrjxgQYjHhjEFaKbY3lDvm Mdgz+ZLQIQWoZrLx0tggK+gRN+vXUyOvH8VibyTtM87p8Cfkm9dX+vD9+ORo5m6VWaDS jdZfrIAqRNgYuzAcdbOGUtrdK8GD+XzzfsxJsDzzDfzsAlwmU3vfXQfAowhuRwaA2L+V DunNslci0VBvpyHz9a3g7CR+S8Yy1MkbnFMsLFx9qpL9ADuTPHvq9+rEqQY+DPeo0xJ4 EXYh5OeQgtv7fdIdErC3G7KW2z1Ro8HOaXS8NjK51bp4mE8DGTw641OQ3KWcsbkdsMtm eESA== X-Gm-Message-State: APjAAAU2AVxwtFdHkgB1ehi0JIYMxZPxzeWHuVg4mLJbnD+yeWqAVKyV G0nYL+WF+dt293JR0zFdx+2c8MIG+vw= X-Google-Smtp-Source: APXvYqxWnVg9JUm4RW8htKd9ZV+ksKJTV0bQtAkqeF0dIs/8QMw/Uy4ywdxbRGfIWgC3o4OvhB7A2A== X-Received: by 2002:a2e:870b:: with SMTP id m11mr4747149lji.249.1572612406677; Fri, 01 Nov 2019 05:46:46 -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 t4sm2297909lji.40.2019.11.01.05.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 05:46:46 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, davem@davemloft.net, Nikolay Aleksandrov Subject: [PATCH net-next v2 1/3] net: bridge: fdb: br_fdb_update can take flags directly Date: Fri, 1 Nov 2019 14:46:37 +0200 Message-Id: <20191101124639.32140-2-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191101124639.32140-1-nikolay@cumulusnetworks.com> References: <20191101124639.32140-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we modify br_fdb_update() to take flags directly we can get rid of one test and one atomic bitop in the learning path. Signed-off-by: Nikolay Aleksandrov --- include/trace/events/bridge.h | 12 ++++++------ net/bridge/br_fdb.c | 15 ++++++--------- net/bridge/br_input.c | 4 ++-- net/bridge/br_private.h | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/include/trace/events/bridge.h b/include/trace/events/bridge.h index 8ea966448b58..6b200059c2c5 100644 --- a/include/trace/events/bridge.h +++ b/include/trace/events/bridge.h @@ -95,16 +95,16 @@ TRACE_EVENT(fdb_delete, TRACE_EVENT(br_fdb_update, TP_PROTO(struct net_bridge *br, struct net_bridge_port *source, - const unsigned char *addr, u16 vid, bool added_by_user), + const unsigned char *addr, u16 vid, unsigned long flags), - TP_ARGS(br, source, addr, vid, added_by_user), + TP_ARGS(br, source, addr, vid, flags), TP_STRUCT__entry( __string(br_dev, br->dev->name) __string(dev, source->dev->name) __array(unsigned char, addr, ETH_ALEN) __field(u16, vid) - __field(bool, added_by_user) + __field(unsigned long, flags) ), TP_fast_assign( @@ -112,14 +112,14 @@ TRACE_EVENT(br_fdb_update, __assign_str(dev, source->dev->name); memcpy(__entry->addr, addr, ETH_ALEN); __entry->vid = vid; - __entry->added_by_user = added_by_user; + __entry->flags = flags; ), - TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u added_by_user %d", + TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u flags 0x%lx", __get_str(br_dev), __get_str(dev), __entry->addr[0], __entry->addr[1], __entry->addr[2], __entry->addr[3], __entry->addr[4], __entry->addr[5], __entry->vid, - __entry->added_by_user) + __entry->flags) ); diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index f244f2ac7156..b37e0f4c1b2b 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -557,7 +557,7 @@ int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, } void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, - const unsigned char *addr, u16 vid, bool added_by_user) + const unsigned char *addr, u16 vid, unsigned long flags) { struct net_bridge_fdb_entry *fdb; bool fdb_modified = false; @@ -592,21 +592,18 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, } if (now != fdb->updated) fdb->updated = now; - if (unlikely(added_by_user)) + if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &flags))) set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); if (unlikely(fdb_modified)) { - trace_br_fdb_update(br, source, addr, vid, added_by_user); + trace_br_fdb_update(br, source, addr, vid, flags); fdb_notify(br, fdb, RTM_NEWNEIGH, true); } } } else { spin_lock(&br->hash_lock); - fdb = fdb_create(br, source, addr, vid, 0); + fdb = fdb_create(br, source, addr, vid, flags); if (fdb) { - if (unlikely(added_by_user)) - set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); - trace_br_fdb_update(br, source, addr, vid, - added_by_user); + trace_br_fdb_update(br, source, addr, vid, flags); fdb_notify(br, fdb, RTM_NEWNEIGH, true); } /* else we lose race and someone else inserts @@ -889,7 +886,7 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br, } local_bh_disable(); rcu_read_lock(); - br_fdb_update(br, p, addr, vid, true); + br_fdb_update(br, p, addr, vid, BIT(BR_FDB_ADDED_BY_USER)); rcu_read_unlock(); local_bh_enable(); } else if (ndm->ndm_flags & NTF_EXT_LEARNED) { diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 7f5f646dba6e..f37b05090f45 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -88,7 +88,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb /* insert into forwarding database after filtering to avoid spoofing */ br = p->br; if (p->flags & BR_LEARNING) - br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, false); + br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, 0); local_rcv = !!(br->dev->flags & IFF_PROMISC); if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) { @@ -184,7 +184,7 @@ static void __br_handle_local_finish(struct sk_buff *skb) if ((p->flags & BR_LEARNING) && !br_opt_get(p->br, BROPT_NO_LL_LEARN) && br_should_learn(p, skb, &vid)) - br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); + br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, 0); } /* note: already called with rcu_read_lock */ diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index f4754bf7f4bd..08742bff9bf0 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -571,7 +571,7 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count, int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid); void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, - const unsigned char *addr, u16 vid, bool added_by_user); + const unsigned char *addr, u16 vid, unsigned long flags); int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 vid); From patchwork Fri Nov 1 12:46:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1187989 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 (no SPF record) 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="bzd/2xI1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 474MQR361Sz9sSX for ; Fri, 1 Nov 2019 23:46:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729852AbfKAMqu (ORCPT ); Fri, 1 Nov 2019 08:46:50 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40712 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727798AbfKAMqu (ORCPT ); Fri, 1 Nov 2019 08:46:50 -0400 Received: by mail-lj1-f195.google.com with SMTP id q2so3574030ljg.7 for ; Fri, 01 Nov 2019 05:46:48 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8hGSuiDX0siuyCstsxGZV1KLBVAGFihygZ3ZtImzPE=; b=bzd/2xI1RryF7VA9zFz0u7IFLWG16bHddSXDANDFM8IQWZfVXJiUJnaLhUqfBJLHpH VOZ1u3pRxiWiG0CF5AJYxY0K2+SDt79omLm4XOk2I9mjaBzAKdrnJ+FPsCG3Gg2tZkt6 xhNPcLx18j1clo/WBJV0PA42sDifp8loxqUjc= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8hGSuiDX0siuyCstsxGZV1KLBVAGFihygZ3ZtImzPE=; b=NQbU6JmG38HqujndWUDMZUQPTnlSKrXD+vyM+KPFVDfrRWGZ30QeMcdp2Gpo5Ttd5H 24VdYT+p1wyo8QvuO9Pwm/WktcJVhCbETvGqlf5RrvBY0s/5cx12y99xZdFrqe+3IuUP GrjCGtXBpGOs+ebxLKKcEXGs8dKFtcHfG+wk6ge8XYApcGCDEuvC6dHaP90P721r7T5g h78rOCToypFMLjYFRMyUn6Jk3y6QQnjok3hvv3P5ePgpX5yMcena/InQ/i7vUSDQcOSt YGmqiA1ygAqZt5UEzOdLSG/OmmMSNOImuvpNg9OHz27SjkehTCsVaxFWbSF4mpB0BAt3 rfbg== X-Gm-Message-State: APjAAAXim+wQMPqwzHRfpZswagGlupJUMT17YXEg9yo5jxbHbPcnY/Os IPH2Bz1ZPjlJTSE13BYQF9L0fVip1gY= X-Google-Smtp-Source: APXvYqyWwrU/5nI8+MOv5v0FKAj42popJDgXL8ZRMQMf+LlpCpvMCGVPSKedVIlxwjm5imszJnj14g== X-Received: by 2002:a2e:6817:: with SMTP id c23mr8034012lja.91.1572612407990; Fri, 01 Nov 2019 05:46:47 -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 t4sm2297909lji.40.2019.11.01.05.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 05:46:47 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, davem@davemloft.net, Nikolay Aleksandrov Subject: [PATCH net-next v2 2/3] net: bridge: fdb: avoid two atomic bitops in br_fdb_external_learn_add() Date: Fri, 1 Nov 2019 14:46:38 +0200 Message-Id: <20191101124639.32140-3-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191101124639.32140-1-nikolay@cumulusnetworks.com> References: <20191101124639.32140-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we setup the fdb flags prior to calling fdb_create() we can avoid two atomic bitops when learning a new entry. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_fdb.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index b37e0f4c1b2b..7500c84fc675 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -1113,14 +1113,15 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, fdb = br_fdb_find(br, addr, vid); if (!fdb) { - fdb = fdb_create(br, p, addr, vid, 0); + unsigned long flags = BIT(BR_FDB_ADDED_BY_EXT_LEARN); + + if (swdev_notify) + flags |= BIT(BR_FDB_ADDED_BY_USER); + fdb = fdb_create(br, p, addr, vid, flags); if (!fdb) { err = -ENOMEM; goto err_unlock; } - if (swdev_notify) - set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); - set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags); fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } else { fdb->updated = jiffies; From patchwork Fri Nov 1 12:46:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1187990 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 (no SPF record) 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="WVnfw1qw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 474MQS3cBwz9sST for ; Fri, 1 Nov 2019 23:46:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730129AbfKAMqw (ORCPT ); Fri, 1 Nov 2019 08:46:52 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:32896 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726771AbfKAMqv (ORCPT ); Fri, 1 Nov 2019 08:46:51 -0400 Received: by mail-lf1-f65.google.com with SMTP id y127so7152165lfc.0 for ; Fri, 01 Nov 2019 05:46: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=JRmAVX0LKzbwaoPbTw2s+8QG+vaakhy1/lXDson76Zo=; b=WVnfw1qw2kzwmwk+Bp9IpqrORLjhdpN8OhiSzo8Xv72VKXWy2tLbyIGD3mCh1W0Px2 qYwa3YUXQc3Ju0aOvn01M+LsQvckfc1hSkoa7sLG3s7EqFxUMPiluPy8qavqc3SlcKLk fbsPVon9M7sQ8Uk8iw0gKZERg44ug1XALBwJU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=JRmAVX0LKzbwaoPbTw2s+8QG+vaakhy1/lXDson76Zo=; b=fCrFrNUZD0j/a5DhHnRjgBo/qfMIPRxkSpUEoCB03v5Hi3UVCGVQUG3mvyoYBeyoo0 3rlsiVP0S8rbb+Iu9vVulEgItKpKjubcBuUm3Pu3navi2P2DngPdzSIPkVE7Z1tzjPt1 knzSQYWRDJylqAo2YriqW3Gb6+97mtnejk+X0xCVTV9cmRKtBSDAUnB917ye2fcqs6GH drLPRgxcVV65LcjUjVUFXOylwNCN+VJkEDIFA12KYvj6y7UADcPcXlzy3IjpiwWkkTj5 yE9dQLXY8+SnvKd9kiQX11oI407A0+4lIVWizwhIclaStOXApqcACQU8peknMlX2Hrr3 RUAg== X-Gm-Message-State: APjAAAWr+0dXygckLvV91i/hVz9uc9OQXNkjMfsV2QvxprE1OXVv+bog BT4iQFWncABOQOgTmoiqdmyGiIJvPiA= X-Google-Smtp-Source: APXvYqwCAEQcQrFVqGdlSE1891H5EOu7bWUh3BXQnRMvTS02wzyPLYP0zf9hHcuC75XLsgRsUwYgeA== X-Received: by 2002:ac2:5f0a:: with SMTP id 10mr7129371lfq.57.1572612409262; Fri, 01 Nov 2019 05:46: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 t4sm2297909lji.40.2019.11.01.05.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 05:46:48 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, davem@davemloft.net, Nikolay Aleksandrov Subject: [PATCH net-next v2 3/3] net: bridge: fdb: restore unlikely() when taking over externally added entries Date: Fri, 1 Nov 2019 14:46:39 +0200 Message-Id: <20191101124639.32140-4-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191101124639.32140-1-nikolay@cumulusnetworks.com> References: <20191101124639.32140-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Taking over hw-learned entries is not a likely scenario so restore the unlikely() use for the case of SW taking over externally learned entries. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_fdb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 7500c84fc675..284b3662d234 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -587,8 +587,10 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, fdb->dst = source; fdb_modified = true; /* Take over HW learned entry */ - test_and_clear_bit(BR_FDB_ADDED_BY_EXT_LEARN, - &fdb->flags); + if (unlikely(test_bit(BR_FDB_ADDED_BY_EXT_LEARN, + &fdb->flags))) + clear_bit(BR_FDB_ADDED_BY_EXT_LEARN, + &fdb->flags); } if (now != fdb->updated) fdb->updated = now;