Differential D31739

pf: Do not hold PF_RULES_RLOCK while processing Ethernet rules
ClosedPublic
Actions

Authored by kp on Aug 31 2021, 8:24 AM.

Tags

None

Referenced Files

	F162932589: D31739.id.diff
	Sat, Jul 18, 10:48 AM

	Unknown Object (File)
	Sun, Jul 12, 8:35 AM

	Unknown Object (File)
	Fri, Jul 10, 9:05 PM

	Unknown Object (File)
	Sat, Jul 4, 11:41 AM

	Unknown Object (File)
	Sat, Jul 4, 6:54 AM

	Unknown Object (File)
	Fri, Jul 3, 5:21 AM

	Unknown Object (File)
	Fri, Jul 3, 3:46 AM

	Unknown Object (File)
	Fri, Jul 3, 1:13 AM

Subscribers

Details

Reviewers

None

Group Reviewers

network
pfsense

Commits

rG20c4899a8eea: pf: Do not hold PF_RULES_RLOCK while processing Ethernet rules

Summary

Avoid the overhead of acquiring a (read) RULES lock when processing the
Ethernet rules.
We can get away with that because when rules are modified they're staged
in V_pf_keth_inactive. We take care to ensure the swap to V_pf_keth is
atomic, so that pf_test_eth_rule() always sees either the old rules, or
the new ruleset.

We need to take care not to delete the old ruleset until we're sure no
pf_test_eth_rule() is still running with those. We accomplish that by
using NET_EPOCH_CALL() to actually free the old 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 42107
Build 38995: arc lint + arc unit

Event Timeline

kp created this revision.Aug 31 2021, 8:24 AM

Herald added subscribers: melifaro, farrokhi, ae, imp. · View Herald TranscriptAug 31 2021, 8:24 AM

kp requested review of this revision.Aug 31 2021, 8:24 AM

kp added a parent revision: D31738: pfctl: Print Ethernet rules.

kp added a child revision: D31740: pfctl: Move pf_eth_rule definition into pfctl.

Harbormaster completed remote builds in B41278: Diff 94415.Aug 31 2021, 8:25 AM

Rebase

Harbormaster completed remote builds in B41833: Diff 95940.Sep 29 2021, 3:00 PM

Rebase & cleanup

Harbormaster completed remote builds in B42107: Diff 96814.Oct 13 2021, 3:31 PM

Why the use of ck_* instead of atomic_*?

Herald added a subscriber: glebius. · View Herald TranscriptFeb 16 2022, 7:53 AM

In D31739#776252, @mjg wrote:

Why the use of ck_* instead of atomic_*?

That'd probably work too, but we typically use the ck_* functions in combination with epoch. For example, in ifnet_byindex() or prison_ip_check().

This revision was not accepted when it landed; it landed in state Needs Review.Mar 2 2022, 4:01 PM

Closed by commit rG20c4899a8eea: pf: Do not hold PF_RULES_RLOCK while processing Ethernet rules (authored by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rG20c4899a8eea: pf: Do not hold PF_RULES_RLOCK while processing Ethernet rules.

Revision Contents
Changeset List

Path

Size

sys/

net/

3 lines

netpfil/

pf/

20 lines

36 lines

1 line

Diff 96814

sys/net/pfvar.h

Loading...

sys/netpfil/pf/pf.c

Loading...

sys/netpfil/pf/pf_ioctl.c

Loading...

sys/netpfil/pf/pf_ruleset.c

Loading...