allow vlan(4) interfaces to be created on a bridge(4)
ClosedPublic
Actions

Authored by ivy on May 24 2025, 12:11 AM.

Details

Reviewers

des
kevans
kp
zlei
kib

Group Reviewers

network

Commits

rG95e7d47a4bce: bridge: allow vlan(4) interfaces on a bridge

Summary

A vlan interface on top of a bridge will act as a layer 3 port for
bridge traffic on that vlan, sometimes called an "SVI". This allows
the host to send/receive traffic on that vlan without having to create
a separate epair(4) and vlan(4) to tag and untag the traffic.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 64494
Build 61378: arc lint + arc unit

Event Timeline

ivy created this revision.May 24 2025, 12:11 AM

Herald added subscribers: glebius, melifaro, ae, imp. · View Herald TranscriptMay 24 2025, 12:11 AM

ivy requested review of this revision.May 24 2025, 12:11 AM

Harbormaster completed remote builds in B64399: Diff 155961.May 24 2025, 12:11 AM

ivy added a parent revision: D50503: bridge: add vlan filtering support.May 24 2025, 12:11 AM

ivy added reviewers: zlei, kib.May 24 2025, 12:17 AM

ivy added a child revision: D50505: bridge.4: clarify vlan support status.May 24 2025, 12:25 AM

p.mousavizadeh_protonmail.com added a subscriber: p.mousavizadeh_protonmail.com.May 24 2025, 10:17 AM

kp added inline comments.May 27 2025, 9:38 AM

sys/net/if_bridge.c
431	I think if_vlan_var.h is an appropriate spot for that. It already has vlan_trunkdev_p anyway. if_ethersubr.c already includes it, so we're not going to be causing any include pollution.
2495	vlan = DOT1Q_VID_NULL ?

guest-patmaddox added a subscriber: guest-patmaddox.May 27 2025, 3:57 PM

ivy added a parent revision: D50567: if_vlan: add a prototype for vlan_input_p.May 28 2025, 3:04 AM

update for new vlan filtering behaviour

Herald added a subscriber: ziaee. · View Herald TranscriptMay 28 2025, 9:33 AM

Harbormaster completed remote builds in B64494: Diff 156158.May 28 2025, 9:33 AM

ivy marked 2 inline comments as done.May 28 2025, 9:42 AM

ivy added inline comments.

sys/net/if_bridge.c
431	done in D50567.
2495	this code was unnecessarily complicated, i've simplified it and removed the default assignment.

kp accepted this revision as: kp.May 28 2025, 7:54 PM

This revision is now accepted and ready to land.May 28 2025, 7:54 PM

des accepted this revision.Jun 25 2025, 7:20 AM

Generally looks good to me.

sys/net/if_bridge.c
850	This appears to be redundant. In `if_vlan.c` you have already tested the interface type. if (p->if_type != IFT_ETHER && p->if_type != IFT_L2VLAN && +++ p->if_type != IFT_BRIDGE && (p->if_capenable & IFCAP_VLAN_HWTAGGING) == 0)

ivy marked 2 inline comments as done.Jun 25 2025, 2:33 PM

ivy added inline comments.

sys/net/if_bridge.c
850	i think we should still set the capability here in case some other interface wants to send us tagged frames. (epair perhaps? although i haven't checked this.) in general, if_bridge does support "hardware" tagging, so the cap seems correct. perhaps the check could be removed from if_vlan though.