github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: bridge: fdb: pass VLAN entries to learning updates

Browse Source 
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 <idosch@nvidia.com>
Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20260930071411.2786201-6-razor@blackwall.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Nikolay Aleksandrov 2026-09-30 10:14:04 +03:00 committed by Jakub Kicinski
parent cebd6130e6
commit 8247ef7603
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/bridge/br_fdb.c
View File

@ -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;

12
net/bridge/br_input.c
View File

@ -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 */

3
net/bridge/br_private.h
View File

@ -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,