git: c547f51943d3 - stable/12 - pf: deduplicate V_pf_state_z handling with pfsync

[Mateusz Guzik]

The branch stable/12 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=c547f51943d35555ddccddbe4237127446d9a5c3

commit c547f51943d35555ddccddbe4237127446d9a5c3
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-06-28 18:18:26 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-05 11:38:02 +0000

    pf: deduplicate V_pf_state_z handling with pfsync
    
    Reviewed by:    kp
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 803dfe3da0e30520227a791ba5c2b93da16e1cf5)
---
 sys/net/pfvar.h            |  1 +
 sys/netpfil/pf/if_pfsync.c | 20 +++-----------------
 sys/netpfil/pf/pf.c        |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 7d7e7b20ab6f..4f11ff9137d8 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1493,6 +1493,7 @@ extern int			 pf_state_insert(struct pfi_kkif *,
 				    struct pf_state_key *,
 				    struct pf_state_key *,
 				    struct pf_state *);
+extern struct pf_state		*pf_alloc_state(int);
 extern void			 pf_free_state(struct pf_state *);
 
 static __inline void
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 528195bddec1..fe50b9b270d2 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -505,16 +505,10 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
 	/*
 	 * XXXGL: consider M_WAITOK in ioctl path after.
 	 */
-	if ((st = uma_zalloc(V_pf_state_z, M_NOWAIT | M_ZERO)) == NULL)
+	st = pf_alloc_state(M_NOWAIT);
+	if (__predict_false(st == NULL))
 		goto cleanup;
 
-	for (int i = 0; i < 2; i++) {
-		st->packets[i] = counter_u64_alloc(M_NOWAIT);
-		st->bytes[i] = counter_u64_alloc(M_NOWAIT);
-		if (st->packets[i] == NULL || st->bytes[i] == NULL)
-			goto cleanup;
-	}
-
 	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
 		goto cleanup;
 
@@ -624,15 +618,7 @@ cleanup:
 
 cleanup_state:	/* pf_state_insert() frees the state keys. */
 	if (st) {
-		for (int i = 0; i < 2; i++) {
-			counter_u64_free(st->packets[i]);
-			counter_u64_free(st->bytes[i]);
-		}
-		if (st->dst.scrub)
-			uma_zfree(V_pf_state_scrub_z, st->dst.scrub);
-		if (st->src.scrub)
-			uma_zfree(V_pf_state_scrub_z, st->src.scrub);
-		uma_zfree(V_pf_state_z, st);
+		pf_free_state(st);
 	}
 	return (error);
 }
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index c131e9493ea8..4f45f5b8ea96 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -1734,7 +1734,7 @@ pf_unlink_state(struct pf_state *s, u_int flags)
 	return (pf_release_staten(s, 2));
 }
 
-static struct pf_state *
+struct pf_state *
 pf_alloc_state(int flags)
 {
 	struct pf_state *s;