pf: drain Ethernet rules cleanup before starting a new transaction
ClosedPublic
Actions

Authored by kp on Apr 8 2022, 5:23 PM.

Details

Reviewers

None

Group Reviewers

network
pfsense

Commits

rG4496aecb56e6: pf: drain Ethernet rules cleanup before starting a new transaction

Summary

Inactive Ethernet rules get cleaned by a net_epoch callback. This
callback may still be pending when we try to start a new (pf rules)
transaction, causing it to fail.
This is especially likely to occur in scripted scenarios, such as the
regression tests.

Drain the epoch callbacks before starting a new transaction, ensuring
we've had the opportunity to clean up the inactive rules.

Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 45080
Build 41968: arc lint + arc unit

Event Timeline

kp created this revision.Apr 8 2022, 5:23 PM

Herald added subscribers: glebius, melifaro, farrokhi, imp. · View Herald TranscriptApr 8 2022, 5:23 PM

kp requested review of this revision.Apr 8 2022, 5:23 PM

Harbormaster completed remote builds in B45080: Diff 104781.Apr 8 2022, 5:23 PM

This revision was not accepted when it landed; it landed in state Needs Review.Apr 11 2022, 3:51 PM

Closed by commit rG4496aecb56e6: pf: drain Ethernet rules cleanup before starting a new transaction (authored by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rG4496aecb56e6: pf: drain Ethernet rules cleanup before starting a new transaction.

Spot this while doing local MFC into stable/13 of 150486f6a940 .
Is this fix a candidate for stable/13 ?

In D34846#863624, @zlei wrote:

Spot this while doing local MFC into stable/13 of 150486f6a940 .
Is this fix a candidate for stable/13 ?

I believe the pf ethernet code isn't present in stable/13, so I wouldn't think this needs to be MFC'd.

Revision Contents
Changeset List

Path

Size

sys/

netpfil/

pf/

pf_ioctl.c

2 lines

Diff 104781

View Options

pf: drain Ethernet rules cleanup before starting a new transactionClosedPublicActions