bridge: refactor local packet handling
Needs RevisionPublic
Actions

Authored by ivy on Jul 11 2025, 12:15 PM.

Details

Reviewers

des
kevans
pouria

Group Reviewers

network

Summary

Remove the GRAB_OUR_PACKETS() macro and sprinkle its remains over
bridge_input():

check much earlier if we should punt the packet to vlan(4), or if it's filtered by pfil, or if we need to learn the address.

actual local packet handling is moved to a new function, bridge_try_local().

While here, change handling of frames received from discarding (STP)
ports to drop the frames instead of passing them to the host IP stack.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 65357
Build 62240: arc lint + arc unit

Event Timeline

ivy created this revision.Jul 11 2025, 12:15 PM

Herald added subscribers: glebius, melifaro, ae, imp. · View Herald TranscriptJul 11 2025, 12:15 PM

ivy requested review of this revision.Jul 11 2025, 12:15 PM

Harbormaster completed remote builds in B65355: Diff 158328.Jul 11 2025, 12:15 PM

ivy added a parent revision: D51252: ifconfig: don't print bridge member ifmaxaddr if it's 0.Jul 11 2025, 12:16 PM

no need to call bridge_rtupdate() in bridge_forward() now

Harbormaster completed remote builds in B65357: Diff 158331.Jul 11 2025, 12:46 PM

improve code a little; add more comments; ensure the bif is set correctly for netmap-injected frames

Harbormaster completed remote builds in B65368: Diff 158347.Jul 12 2025, 2:37 AM

change the order of input processing: do filtering, then monitoring, then span,
so monitor and span see the same frames and don't see filtered frames.

improve some comments.

fix the member_ifaddrs_enabled test (the bridge needs to be up to pass frames now).

Harbormaster completed remote builds in B65369: Diff 158348.Jul 12 2025, 3:18 AM

ivy added a child revision: D51310: bridge: do not allow a bridge SVI in a bridge.Jul 14 2025, 4:42 PM

ivy removed a child revision: D51310: bridge: do not allow a bridge SVI in a bridge.Jul 28 2025, 2:31 PM

ivy mentioned this in D51677: bridge: Make the vlan(4) shunt more robust.Aug 1 2025, 4:02 PM

Could you please update this revision according to D51677.
This change looks good.
I'll review it if you update it again.

sys/net/if_bridge.c
2942–2944

This revision now requires changes to proceed.Wed, Feb 25, 2:20 PM

this diff is basically dead, in the sense it won't be committed as it, but i was planning to factor out some smaller changes from it into their own diffs. did not have time yet...

Revision Contents
Changeset List

Path

Size

sys/

net/

if_bridge.c

320 lines

Diff 158331

View Options

bridge: refactor local packet handlingNeeds RevisionPublicActions