The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b69019c14cd89a5e699bc6e69941aec5b1041b1e
commit b69019c14cd89a5e699bc6e69941aec5b1041b1e
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2021-07-06 11:13:24 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2021-07-30 09:45:28 +0000
pf: remove DIOCGETSTATESNV
While nvlists are very useful in maximising flexibility for future
extensions their performance is simply unacceptably bad for the
getstates feature, where we can easily want to export a million states
or more.
The DIOCGETSTATESNV call has been MFCd, but has not hit a release on any
branch, so we can still remove it everywhere.
Reviewed by: mjg
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D31099
---
sys/net/pfvar.h | 1 -
sys/netpfil/pf/pf_ioctl.c | 86 -----------------------------------------------
2 files changed, 87 deletions(-)
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index e13b3b61c1a3..17d1e8c1a047 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1671,7 +1671,6 @@ struct pfioc_iface {
#define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook)
#define DIOCSETDEBUG _IOWR('D', 24, u_int32_t)
#define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states)
-#define DIOCGETSTATESNV _IOWR('D', 25, struct pfioc_nv)
#define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule)
/* XXX cut 26 - 28 */
#define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index c1dd4488e67d..7c506b79295b 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -208,7 +208,6 @@ static int pf_killstates_row(struct
pf_kstate_kill *,
static int pf_killstates_nv(struct pfioc_nv *);
static int pf_clearstates_nv(struct pfioc_nv *);
static int pf_getstate(struct pfioc_nv *);
-static int pf_getstates(struct pfioc_nv *);
static int pf_clear_tables(void);
static void pf_clear_srcnodes(struct pf_ksrc_node *);
static void pf_kill_srcnodes(struct pfioc_src_node_kill *);
@@ -2185,7 +2184,6 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int
flags, struct thread *td
case DIOCSETDEBUG:
case DIOCGETSTATES:
case DIOCGETSTATESV2:
- case DIOCGETSTATESNV:
case DIOCGETTIMEOUT:
case DIOCCLRRULECTRS:
case DIOCGETLIMIT:
@@ -2240,7 +2238,6 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int
flags, struct thread *td
case DIOCGETSTATUS:
case DIOCGETSTATES:
case DIOCGETSTATESV2:
- case DIOCGETSTATESNV:
case DIOCGETTIMEOUT:
case DIOCGETLIMIT:
case DIOCGETALTQSV0:
@@ -3039,11 +3036,6 @@ DIOCGETSTATESV2_full:
break;
}
- case DIOCGETSTATESNV: {
- error = pf_getstates((struct pfioc_nv *)addr);
- break;
- }
-
case DIOCGETSTATUS: {
struct pf_status *s = (struct pf_status *)addr;
@@ -5296,84 +5288,6 @@ errout:
return (error);
}
-static int
-pf_getstates(struct pfioc_nv *nv)
-{
- nvlist_t *nvl = NULL, *nvls;
- void *nvlpacked = NULL;
- struct pf_kstate *s = NULL;
- int error = 0;
- uint64_t count = 0;
-
-#define ERROUT(x) ERROUT_FUNCTION(errout, x)
-
- nvl = nvlist_create(0);
- if (nvl == NULL)
- ERROUT(ENOMEM);
-
- nvlist_add_number(nvl, "count", uma_zone_get_cur(V_pf_state_z));
-
- for (int i = 0; i < pf_hashmask; i++) {
- struct pf_idhash *ih = &V_pf_idhash[i];
-
- /* Avoid taking the lock if there are no states in the row. */
- if (LIST_EMPTY(&ih->states))
- continue;
-
- PF_HASHROW_LOCK(ih);
- LIST_FOREACH(s, &ih->states, entry) {
- if (s->timeout == PFTM_UNLINKED)
- continue;
-
- if (SIGPENDING(curthread)) {
- PF_HASHROW_UNLOCK(ih);
- ERROUT(EINTR);
- }
-
- nvls = pf_state_to_nvstate(s);
- if (nvls == NULL) {
- PF_HASHROW_UNLOCK(ih);
- ERROUT(ENOMEM);
- }
- if ((nvlist_size(nvl) + nvlist_size(nvls)) > nv->size) {
- /* We've run out of room for more states. */
- nvlist_destroy(nvls);
- PF_HASHROW_UNLOCK(ih);
- goto DIOCGETSTATESNV_full;
- }
- nvlist_append_nvlist_array(nvl, "states", nvls);
- nvlist_destroy(nvls);
- count++;
- }
- PF_HASHROW_UNLOCK(ih);
- }
-
- /* We've managed to put them all the available space. Let's make sure
- * 'count' matches our array (that's racy, because we don't hold a lock
- * over all states, only over each row individually. */
- (void)nvlist_take_number(nvl, "count");
- nvlist_add_number(nvl, "count", count);
-
-DIOCGETSTATESNV_full:
-
- nvlpacked = nvlist_pack(nvl, &nv->len);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
- if (nv->size == 0)
- ERROUT(0);
- else if (nv->size < nv->len)
- ERROUT(ENOSPC);
-
- error = copyout(nvlpacked, nv->data, nv->len);
-
-#undef ERROUT
-errout:
- free(nvlpacked, M_NVLIST);
- nvlist_destroy(nvl);
- return (error);
-}
-
/*
* XXX - Check for version missmatch!!!
*/
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
