Page MenuHomeFreeBSD
Differential D40567

pf: extend use of skip steps for Ethernet rules
ClosedPublic
Actions

Authored by kp on Jun 15 2023, 3:19 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 4:13 PM
Unknown Object (File)
Sat, Mar 22, 8:07 AM
Unknown Object (File)
Feb 24 2025, 12:25 AM
Unknown Object (File)
Jan 27 2025, 2:08 PM
Unknown Object (File)
Jan 13 2025, 8:29 AM
Unknown Object (File)
Dec 20 2024, 9:02 PM
Unknown Object (File)
Dec 1 2024, 3:57 AM
Unknown Object (File)
Nov 21 2024, 3:58 PM
View All 37 Files
Subscribers
ae
farrokhi
glebius
imp
melifaro

Details

Reviewers
None
Group Reviewers
network
pfsense
Commits
rGba94bf2880b8: pf: extend use of skip steps for Ethernet rules
Summary

Use the already populated PFE_SKIP_DST_ADDR and extend the skip
infrastructure to also skip on IP source/destination addresses.

This should make evaluating the rules slightly faster.

Reported by: R. Christian McDonald <rcm@rcm.sh>
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 52084
Build 48975: arc lint + arc unit

Event Timeline

kp created this revision.Jun 15 2023, 3:19 PM
Herald added subscribers: glebius, melifaro, farrokhi and 2 others. · View Herald TranscriptJun 15 2023, 3:19 PM
kp requested review of this revision.Jun 15 2023, 3:19 PM
Harbormaster completed remote builds in B52084: Diff 123282.Jun 15 2023, 3:19 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 19 2023, 10:05 AM
Closed by commit rGba94bf2880b8: pf: extend use of skip steps for Ethernet rules (authored by kp). · Explain Why
This revision was automatically updated to reflect the committed changes.
kp added a commit: rGba94bf2880b8: pf: extend use of skip steps for Ethernet rules.

Revision Contents
Changeset List

PathSize
sys/
net/
6 lines
netpfil/
pf/
10 lines
6 lines

Diff 123282

View Options

sys/net/pfvar.h

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
#include <sys/blockcount.h> #include <sys/blockcount.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/kdb.h> #include <sys/kdb.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/racct.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <sys/sdt.h> #include <sys/sdt.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/sleepqueue.h> #include <sys/sleepqueue.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sx.h> #include <sys/sx.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
▲ Show 20 Lines • Show All 384 Lines • ▼ Show 20 Lines
/* /*
* Compute the amount of time during which the current * Compute the amount of time during which the current
* thread was running, and add that to its total so far. * thread was running, and add that to its total so far.
*/ */
new_switchtime = cpu_ticks(); new_switchtime = cpu_ticks();
runtime = new_switchtime - PCPU_GET(switchtime); runtime = new_switchtime - PCPU_GET(switchtime);
td->td_runtime += runtime; td->td_runtime += runtime;
td->td_incruntime += runtime; td->td_incruntime += runtime;
#if defined(RACCT) && defined(RACCT_RT)
if (RACCT_ENABLED())
racct_rt_add_thread_runtime(td, runtime);
#endif
PCPU_SET(switchtime, new_switchtime); PCPU_SET(switchtime, new_switchtime);
td->td_generation++; /* bump preempt-detect counter */ td->td_generation++; /* bump preempt-detect counter */
VM_CNT_INC(v_swtch); VM_CNT_INC(v_swtch);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)", CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)",
td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name); td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
if (SDT_PROBES_ENABLED() && if (SDT_PROBES_ENABLED() &&
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines
View Options

sys/netpfil/pf/pf.c

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
#include <sys/blockcount.h> #include <sys/blockcount.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/kdb.h> #include <sys/kdb.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/racct.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <sys/sdt.h> #include <sys/sdt.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/sleepqueue.h> #include <sys/sleepqueue.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sx.h> #include <sys/sx.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
▲ Show 20 Lines • Show All 384 Lines • ▼ Show 20 Lines
/* /*
* Compute the amount of time during which the current * Compute the amount of time during which the current
* thread was running, and add that to its total so far. * thread was running, and add that to its total so far.
*/ */
new_switchtime = cpu_ticks(); new_switchtime = cpu_ticks();
runtime = new_switchtime - PCPU_GET(switchtime); runtime = new_switchtime - PCPU_GET(switchtime);
td->td_runtime += runtime; td->td_runtime += runtime;
td->td_incruntime += runtime; td->td_incruntime += runtime;
#if defined(RACCT) && defined(RACCT_RT)
if (RACCT_ENABLED())
racct_rt_add_thread_runtime(td, runtime);
#endif
PCPU_SET(switchtime, new_switchtime); PCPU_SET(switchtime, new_switchtime);
td->td_generation++; /* bump preempt-detect counter */ td->td_generation++; /* bump preempt-detect counter */
VM_CNT_INC(v_swtch); VM_CNT_INC(v_swtch);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)", CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)",
td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name); td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
if (SDT_PROBES_ENABLED() && if (SDT_PROBES_ENABLED() &&
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines
View Options

sys/netpfil/pf/pf_ioctl.c

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
#include <sys/blockcount.h> #include <sys/blockcount.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/kdb.h> #include <sys/kdb.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/racct.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <sys/sdt.h> #include <sys/sdt.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/sleepqueue.h> #include <sys/sleepqueue.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sx.h> #include <sys/sx.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
▲ Show 20 Lines • Show All 384 Lines • ▼ Show 20 Lines
/* /*
* Compute the amount of time during which the current * Compute the amount of time during which the current
* thread was running, and add that to its total so far. * thread was running, and add that to its total so far.
*/ */
new_switchtime = cpu_ticks(); new_switchtime = cpu_ticks();
runtime = new_switchtime - PCPU_GET(switchtime); runtime = new_switchtime - PCPU_GET(switchtime);
td->td_runtime += runtime; td->td_runtime += runtime;
td->td_incruntime += runtime; td->td_incruntime += runtime;
#if defined(RACCT) && defined(RACCT_RT)
if (RACCT_ENABLED())
racct_rt_add_thread_runtime(td, runtime);
#endif
PCPU_SET(switchtime, new_switchtime); PCPU_SET(switchtime, new_switchtime);
td->td_generation++; /* bump preempt-detect counter */ td->td_generation++; /* bump preempt-detect counter */
VM_CNT_INC(v_swtch); VM_CNT_INC(v_swtch);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)", CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)",
td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name); td->td_tid, td_get_sched(td), td->td_proc->p_pid, td->td_name);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
if (SDT_PROBES_ENABLED() && if (SDT_PROBES_ENABLED() &&
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines