Page MenuHomeFreeBSD
Differential D30242

pf: Add DIOCGETSTATENV
ClosedPublic
Actions

Authored by kp on May 13 2021, 11:48 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 2:04 AM
Unknown Object (File)
Sat, Mar 15, 2:09 PM
Unknown Object (File)
Feb 24 2025, 9:36 PM
Unknown Object (File)
Feb 11 2025, 9:27 PM
Unknown Object (File)
Feb 8 2025, 4:04 PM
Unknown Object (File)
Feb 6 2025, 7:00 PM
Unknown Object (File)
Jan 30 2025, 5:38 AM
Unknown Object (File)
Jan 18 2025, 9:44 PM
View All 74 Files
Subscribers
ae
eri
farrokhi
imp
melifaro

Details

Reviewers
None
Group Reviewers
network
manpages
Commits
rG70762ee0f20c: pf: Add DIOCGETSTATENV
rGbc6cf5a56207: pf: Add DIOCGETSTATENV
rG1732afaa0dae: pf: Add DIOCGETSTATENV
Summary

Add DIOCGETSTATENV, an nvlist-based alternative to DIOCGETSTATE.

MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kp created this revision.May 13 2021, 11:48 AM
Herald added a reviewer: manpages. · View Herald TranscriptMay 13 2021, 11:48 AM
Herald added subscribers: melifaro, farrokhi, ae, imp. · View Herald Transcript
kp requested review of this revision.May 13 2021, 11:48 AM
kp added a child revision: D30243: pf: Add DIOCGETSTATESNV.
Harbormaster completed remote builds in B39161: Diff 89121.May 13 2021, 11:49 AM
eri added a subscriber: eri.May 13 2021, 3:15 PM
eri added inline comments.
sys/netpfil/pf/pf_ioctl.c
2478

Minor: Why not just put all of these NV code in its own file.
pf_ioctl.c is quite large and would love to have more structure in the code and compartmentalisation while you doing this work.

kp added inline comments.May 13 2021, 3:32 PM
sys/netpfil/pf/pf_ioctl.c
2478

That's a reasonable suggestion, but something I'd do in a separate commit. There are a bunch of these already (as well as kernel to public struct conversions for the old style ioctls) that need to be moved then.

This revision was not accepted when it landed; it landed in state Needs Review.May 20 2021, 11:55 AM
Closed by commit rG1732afaa0dae: pf: Add DIOCGETSTATENV (authored by kp). · Explain Why
This revision was automatically updated to reflect the committed changes.
kp added a commit: rG1732afaa0dae: pf: Add DIOCGETSTATENV.
kp added a commit: rGbc6cf5a56207: pf: Add DIOCGETSTATENV.May 27 2021, 10:20 AM
kp added a commit: rG70762ee0f20c: pf: Add DIOCGETSTATENV.

Revision Contents
Changeset List

PathSize
share/
man/
man4/
4 lines
sys/
net/
1 line
netpfil/
pf/
226 lines

Diff 89521

View Options

share/man/man4/pf.4

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Lines#define ATOMIC_FCMPSET_CODE(RET, TYPE, SUF) \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[tmp], [%[ptr]] \n" \ "1: ldrex" SUF " %[tmp], [%[ptr]] \n" \
" ldr" SUF " %[ret], [%[oldv]] \n" \ " ldr" SUF " %[ret], [%[oldv]] \n" \
" teq %[tmp], %[ret] \n" \ " teq %[tmp], %[ret] \n" \
" ittee ne \n" \ " ittee ne \n" \
" str" SUF "ne %[tmp], [%[oldv]] \n" \ " str" SUF "ne %[tmp], [%[oldv]] \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_FCMPSET_CODE64(RET) \ #define ATOMIC_FCMPSET_CODE64(RET) \
{ \ { \
uint64_t cmp, tmp; \ uint64_t cmp, tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \ " ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \
" teq %Q[tmp], %Q[cmp] \n" \ " teq %Q[tmp], %Q[cmp] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[cmp] \n" \ " teqeq %R[tmp], %R[cmp] \n" \
" ittee ne \n" \ " ittee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strdne %[cmp], [%[oldv]] \n" \ " strdne %[cmp], [%[oldv]] \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[cmp] "=&r" (cmp), \ [cmp] "=&r" (cmp), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines
#define ATOMIC_CMPSET_CODE(RET, SUF) \ #define ATOMIC_CMPSET_CODE(RET, SUF) \
{ \ { \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[ret], [%[ptr]] \n" \ "1: ldrex" SUF " %[ret], [%[ptr]] \n" \
" teq %[ret], %[oldv] \n" \ " teq %[ret], %[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET) \ : [ret] "=&r" (RET) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_CMPSET_CODE64(RET) \ #define ATOMIC_CMPSET_CODE64(RET) \
{ \ { \
uint64_t tmp; \ uint64_t tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" teq %Q[tmp], %Q[oldv] \n" \ " teq %Q[tmp], %Q[oldv] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[oldv] \n" \ " teqeq %R[tmp], %R[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
▲ Show 20 Lines • Show All 629 Lines • Show Last 20 Lines
View Options

sys/net/pfvar.h

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Lines#define ATOMIC_FCMPSET_CODE(RET, TYPE, SUF) \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[tmp], [%[ptr]] \n" \ "1: ldrex" SUF " %[tmp], [%[ptr]] \n" \
" ldr" SUF " %[ret], [%[oldv]] \n" \ " ldr" SUF " %[ret], [%[oldv]] \n" \
" teq %[tmp], %[ret] \n" \ " teq %[tmp], %[ret] \n" \
" ittee ne \n" \ " ittee ne \n" \
" str" SUF "ne %[tmp], [%[oldv]] \n" \ " str" SUF "ne %[tmp], [%[oldv]] \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_FCMPSET_CODE64(RET) \ #define ATOMIC_FCMPSET_CODE64(RET) \
{ \ { \
uint64_t cmp, tmp; \ uint64_t cmp, tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \ " ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \
" teq %Q[tmp], %Q[cmp] \n" \ " teq %Q[tmp], %Q[cmp] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[cmp] \n" \ " teqeq %R[tmp], %R[cmp] \n" \
" ittee ne \n" \ " ittee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strdne %[cmp], [%[oldv]] \n" \ " strdne %[cmp], [%[oldv]] \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[cmp] "=&r" (cmp), \ [cmp] "=&r" (cmp), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines
#define ATOMIC_CMPSET_CODE(RET, SUF) \ #define ATOMIC_CMPSET_CODE(RET, SUF) \
{ \ { \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[ret], [%[ptr]] \n" \ "1: ldrex" SUF " %[ret], [%[ptr]] \n" \
" teq %[ret], %[oldv] \n" \ " teq %[ret], %[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET) \ : [ret] "=&r" (RET) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_CMPSET_CODE64(RET) \ #define ATOMIC_CMPSET_CODE64(RET) \
{ \ { \
uint64_t tmp; \ uint64_t tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" teq %Q[tmp], %Q[oldv] \n" \ " teq %Q[tmp], %Q[oldv] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[oldv] \n" \ " teqeq %R[tmp], %R[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
▲ Show 20 Lines • Show All 629 Lines • Show Last 20 Lines
View Options

sys/netpfil/pf/pf_ioctl.c

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Lines#define ATOMIC_FCMPSET_CODE(RET, TYPE, SUF) \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[tmp], [%[ptr]] \n" \ "1: ldrex" SUF " %[tmp], [%[ptr]] \n" \
" ldr" SUF " %[ret], [%[oldv]] \n" \ " ldr" SUF " %[ret], [%[oldv]] \n" \
" teq %[tmp], %[ret] \n" \ " teq %[tmp], %[ret] \n" \
" ittee ne \n" \ " ittee ne \n" \
" str" SUF "ne %[tmp], [%[oldv]] \n" \ " str" SUF "ne %[tmp], [%[oldv]] \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_FCMPSET_CODE64(RET) \ #define ATOMIC_FCMPSET_CODE64(RET) \
{ \ { \
uint64_t cmp, tmp; \ uint64_t cmp, tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \ " ldrd %Q[cmp], %R[cmp], [%[oldv]] \n" \
" teq %Q[tmp], %Q[cmp] \n" \ " teq %Q[tmp], %Q[cmp] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[cmp] \n" \ " teqeq %R[tmp], %R[cmp] \n" \
" ittee ne \n" \ " ittee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strdne %[cmp], [%[oldv]] \n" \ " strdne %[cmp], [%[oldv]] \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[cmp] "=&r" (cmp), \ [cmp] "=&r" (cmp), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines
#define ATOMIC_CMPSET_CODE(RET, SUF) \ #define ATOMIC_CMPSET_CODE(RET, SUF) \
{ \ { \
__asm __volatile( \ __asm __volatile( \
"1: ldrex" SUF " %[ret], [%[ptr]] \n" \ "1: ldrex" SUF " %[ret], [%[ptr]] \n" \
" teq %[ret], %[oldv] \n" \ " teq %[ret], %[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \ " strex" SUF "eq %[ret], %[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET) \ : [ret] "=&r" (RET) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
#define ATOMIC_CMPSET_CODE64(RET) \ #define ATOMIC_CMPSET_CODE64(RET) \
{ \ { \
uint64_t tmp; \ uint64_t tmp; \
\ \
__asm __volatile( \ __asm __volatile( \
"1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \ "1: ldrexd %Q[tmp], %R[tmp], [%[ptr]] \n" \
" teq %Q[tmp], %Q[oldv] \n" \ " teq %Q[tmp], %Q[oldv] \n" \
" it eq \n" \ " it eq \n" \
" teqeq %R[tmp], %R[oldv] \n" \ " teqeq %R[tmp], %R[oldv] \n" \
" itee ne \n" \ " itee ne \n" \
" movne %[ret], #0 \n" \ " movne %[ret], #0 \n" \
" strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \ " strexdeq %[ret], %Q[newv], %R[newv], [%[ptr]] \n" \
" eorseq %[ret], #1 \n" \ " eoreqs %[ret], #1 \n" \
" beq 1b \n" \ " beq 1b \n" \
: [ret] "=&r" (RET), \ : [ret] "=&r" (RET), \
[tmp] "=&r" (tmp) \ [tmp] "=&r" (tmp) \
: [ptr] "r" (_ptr), \ : [ptr] "r" (_ptr), \
[oldv] "r" (_old), \ [oldv] "r" (_old), \
[newv] "r" (_new) \ [newv] "r" (_new) \
: "cc", "memory"); \ : "cc", "memory"); \
} }
▲ Show 20 Lines • Show All 629 Lines • Show Last 20 Lines