From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C1B144BC94 for ; Wed, 30 Sep 2026 07:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790752515; cv=none; b=fyA0Oksie6x6VEyzCbEKSC81kMuR8bGefqj1c/0EH1IyR0g2Nbx7ItbmYiyuRP+p3L7QYdIIGqZcQwt1OYX09cfqh5ocHGFEWzXqIoJgTFwwNEUKAGLcx/sqPLV3xSYyAe7Y4drhHYUtXnN5cN2kenbM+GBY4r6WAkPQiyIufO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790752515; c=relaxed/simple; bh=7BtmL/J/xqiZYFCYwVh4qlSlNr3nP7akGSHJE8asqxA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UA/NmYUXQAM9YN/czn4+CnsnZiAgAOuH9l5wEFROaQBvy5Bz2Sqs15SzKcP8jjTwUuqWAqNGKDC+nBEt2bYSUEi3456yfe8d6pJTwlk3te6GaWfODBdDayCf/f7LQe3RJtW2ENv3/fH1/SrPATp9jquJMRTvtF0qCuY7abxEN4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org; spf=none smtp.mailfrom=blackwall.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b=PkkJw6Fz; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=blackwall.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b="PkkJw6Fz" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e66390995so28083315e9.2 for ; Wed, 30 Sep 2026 00:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall.org; s=google; t=1790752505; x=1791357305; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TzGeIiBvK9svEo9nqmM7pKUiwQRA9WD5WaK0fC8sXGE=; b=PkkJw6FzsCzoVKpHqILV62rZNF0cuH3vosqjqr26YT7drEqeBxdMXfcXHK5Dxkl/CR pEpYpLXkKKz5K4gDFQ/95qXNgNoA8lDbucQaurnmVh3STZV5tMkDjCj9FVlyUcPrSWdL GqaRpiifTdwnicg2LA/fs7caVCuCHh9KvkY7PfbkIfsNEB36fR9Vece5N0zFQ8ykmmb4 rU2viiSx16g8KNnVjZAtUAfWbniM3x0Jcqtn/3x5EpVegQgzCetpdfMYdRXb+DJwHTL2 997qp/JXNPioxBzSa6Dhsqhz/Y1ajchKmfixwCclwXrDOcNFEKb+oSZ3sH4qUHnkFGXg IgKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790752505; x=1791357305; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=TzGeIiBvK9svEo9nqmM7pKUiwQRA9WD5WaK0fC8sXGE=; b=DO2M2sYYPOQ33GMrSQ/KX4gWEpNl7QMv1NFk5w1SQz4t1Um36waAQjIYx69Y+B9qlp 65NKbXPXOMTVCBbqYaBA+Ty8EObgSCWnDsReYVgWWb4gx2SXTBtVrcm8YTWTy33EfdvZ ige2dbfOivKBGiOcxHiAc9O/nIwRO6RuNWSB9RGW7rRRXIHLzU+AgGza2ikYDVaY2wEM +BcLGkJzmoplwGXMFLEWjZDyWeywqgHWsEkxMw6DbXTwcYWy8TmmXi7QJXnwi005VjzG wSyA/25Lb9KAOXWqIxM3yRpP/3aZWJlWBV2z4QkgT4VU/zYDKGlJTu5n1l7mjuFOAMvl 7Oug== X-Gm-Message-State: AFuF++kezgeSFfau7wmgnKH00EsDbOK48DLD8hDUrTxfYOH27RkrO+Dh PSHoe5vhZQx1X6ZysJyizRVDQU9BTkRv8yElV2CwmmSBYiQ/ioLo34E+BOswf05mMuOntvDK/LO xVrmU X-Gm-Gg: AYBFou0+jzOodGm+O/DbFFrIyUbw9R6U1mQZHH/PTqwFywlTMpz291ebDMnMCX36ekY 3eITXfWpmWY3UcKbkNfvg/Zl4Nr36mYdFDGwf9DdC/lynU1P/Qppp4Bw5ZcPWnM9bK/HrUufmMc CNMiXja4Rp4p/5M0PKl0lf2J0xX4zZTOhRlviGAFxdMSRPQZVe8GoDYs1I/yA1fSJrqgAERo9Qr f03PlO6tEBoqk12iwTrXmaZgWaZ2TUbUizWgcQL6ep0nKhcGagpIlxkirGyKMGWE7gw9mX7VAwT f73hCRQLoA3a7fmcPpzB+yVxePCYsrS7D5fjvYp3Eg63UTA4r0pDt8zd5IrXuOSTAJq40VuuDF3 wwvZP2WfZXTkis/8YPakblWp8CT1a8k1DVgsWhrBmS/1Gt34OfCd2Q8WN1lvf/TK7mL+zjP2gAI rnei1oK0jrmm/B4nfldcqwMGK7w006UTUBoL94HLKcDXOusoEzhkiIhtzbPF9adl/PnnMVftikv PtjM7ZaTKKOKKeuhOd05gs+OP1YeNI= X-Received: by 2002:a05:600c:354f:b0:49d:2536:402e with SMTP id 5b1f17b1804b1-4a01b11a05cmr5865365e9.30.1790752505252; Wed, 30 Sep 2026 00:15:05 -0700 (PDT) Received: from localhost (78-154-14-127.ip.btc-net.bg. [78.154.14.127]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-48b029be71csm1358855f8f.9.2026.09.30.00.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2026 00:15:04 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: idosch@nvidia.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, bridge@lists.linux.dev, Nikolay Aleksandrov Subject: [PATCH net-next 05/12] net: bridge: fdb: pass VLAN entries to learning updates Date: Wed, 30 Sep 2026 10:14:04 +0300 Message-ID: <20260930071411.2786201-6-razor@blackwall.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260930071411.2786201-1-razor@blackwall.org> References: <20260930071411.2786201-1-razor@blackwall.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Pass the resolved VLAN entry through fdb learning paths and derive the vid inside br_fdb_update(). The fdb destination remains a port for now, this is a preparation for caching the VLAN. Reviewed-by: Ido Schimmel Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_fdb.c | 16 ++++++++++------ net/bridge/br_input.c | 12 ++++++------ net/bridge/br_private.h | 3 ++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 0f5cf5615b56..9cd6deae8635 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -974,9 +974,11 @@ static bool __fdb_mark_active(struct net_bridge_fdb_entry *fdb) } void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, - const unsigned char *addr, u16 vid, unsigned long flags) + struct net_bridge_vlan *vlan, const unsigned char *addr, + unsigned long flags) { struct net_bridge_fdb_entry *fdb; + u16 vid = vlan ? vlan->vid : 0; /* some users want to always flood. */ if (hold_time(br) == 0) @@ -1247,9 +1249,11 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source, static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br, struct net_bridge_port *p, const unsigned char *addr, - u16 nlh_flags, u16 vid, struct nlattr *nfea_tb[], + u16 nlh_flags, struct net_bridge_vlan *vlan, + struct nlattr *nfea_tb[], bool *notified, struct netlink_ext_ack *extack) { + u16 vid = vlan ? vlan->vid : 0; int err = 0; if (ndm->ndm_flags & NTF_USE) { @@ -1263,7 +1267,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, BIT(BR_FDB_ADDED_BY_USER)); + br_fdb_update(br, p, vlan, addr, BIT(BR_FDB_ADDED_BY_USER)); rcu_read_unlock(); local_bh_enable(); } else if (ndm->ndm_flags & NTF_EXT_LEARNED) { @@ -1355,10 +1359,10 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], } /* VID was specified, so use it. */ - err = __br_fdb_add(ndm, br, p, addr, nlh_flags, vid, nfea_tb, + err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v, nfea_tb, notified, extack); } else { - err = __br_fdb_add(ndm, br, p, addr, nlh_flags, 0, nfea_tb, + err = __br_fdb_add(ndm, br, p, addr, nlh_flags, NULL, nfea_tb, notified, extack); if (err || !vg || !vg->num_vlans) goto out; @@ -1370,7 +1374,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], list_for_each_entry(v, &vg->vlan_list, vlist) { if (!br_vlan_should_use(v)) continue; - err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v->vid, + err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v, nfea_tb, notified, extack); if (err) goto out; diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index d9a0e1f65ec9..44a217d65e7f 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -121,8 +121,9 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb * and drop the packet. */ if (test_bit(BR_PORT_MAB_BIT, &p->flags)) - br_fdb_update(br, p, eth_hdr(skb)->h_source, - vid, BIT(BR_FDB_LOCKED)); + br_fdb_update(br, p, vlan, + eth_hdr(skb)->h_source, + BIT(BR_FDB_LOCKED)); goto drop; } else if (br_fdb_dst_port(fdb_src) != p || test_bit(BR_FDB_LOCAL, &fdb_src->flags)) { @@ -132,7 +133,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb /* FDB match, but entry is locked. Refresh it and drop * the packet. */ - br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, + br_fdb_update(br, p, vlan, eth_hdr(skb)->h_source, BIT(BR_FDB_LOCKED)); goto drop; } @@ -142,7 +143,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 */ if (test_bit(BR_LEARNING_BIT, &p->flags)) - br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, 0); + br_fdb_update(br, p, vlan, eth_hdr(skb)->h_source, 0); promisc = !!(br->dev->flags & IFF_PROMISC); local_rcv = promisc; @@ -253,8 +254,7 @@ static void __br_handle_local_finish(struct sk_buff *skb) nbp_state_should_learn(p) && !br_opt_get(p->br, BROPT_NO_LL_LEARN) && br_should_learn(p, skb, &vlan)) - br_fdb_update(p->br, p, eth_hdr(skb)->h_source, - vlan ? vlan->vid : 0, 0); + br_fdb_update(p->br, p, vlan, eth_hdr(skb)->h_source, 0); } /* note: already called with rcu_read_lock */ diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 34e95741b940..058cc082311a 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -993,7 +993,8 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count, int br_fdb_add_local(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, unsigned long flags); + struct net_bridge_vlan *vlan, const unsigned char *addr, + unsigned long flags); int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 vid, -- 2.47.3