git: 6d51791d2832 - main - pf: remove pointless CURVNET_SET

[Kristof Provost]

The branch main has been updated by kp:

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

commit 6d51791d2832fb428b99d4c0ab22b392980bd27b
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2024-09-11 07:13:21 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2024-09-25 10:44:34 +0000

    pf: remove pointless CURVNET_SET
    
    We're already in the correct vnet when the pfil hook is called. Remove the
    pointless set/restore.
    
    Reviewed by:    glebius, zlei
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D46648
---
 sys/netpfil/pf/pf_ioctl.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index e205c5ca0c38..dcdab6029558 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -6442,6 +6442,8 @@ pf_eth_check_in(struct mbuf **m, struct ifnet *ifp, int 
flags,
 {
        int chk;
 
+       CURVNET_ASSERT_SET();
+
        chk = pf_test_eth(PF_IN, flags, ifp, m, inp);
 
        return (pf_check_return(chk, m));
@@ -6453,6 +6455,8 @@ pf_eth_check_out(struct mbuf **m, struct ifnet *ifp, int 
flags,
 {
        int chk;
 
+       CURVNET_ASSERT_SET();
+
        chk = pf_test_eth(PF_OUT, flags, ifp, m, inp);
 
        return (pf_check_return(chk, m));
@@ -6465,6 +6469,8 @@ pf_check_in(struct mbuf **m, struct ifnet *ifp, int flags,
 {
        int chk;
 
+       CURVNET_ASSERT_SET();
+
        chk = pf_test(PF_IN, flags, ifp, m, inp, NULL);
 
        return (pf_check_return(chk, m));
@@ -6476,6 +6482,8 @@ pf_check_out(struct mbuf **m, struct ifnet *ifp, int 
flags,
 {
        int chk;
 
+       CURVNET_ASSERT_SET();
+
        chk = pf_test(PF_OUT, flags, ifp, m, inp, NULL);
 
        return (pf_check_return(chk, m));
@@ -6489,15 +6497,15 @@ pf_check6_in(struct mbuf **m, struct ifnet *ifp, int 
flags,
 {
        int chk;
 
+       CURVNET_ASSERT_SET();
+
        /*
         * In case of loopback traffic IPv6 uses the real interface in
         * order to support scoped addresses. In order to support stateful
         * filtering we have change this to lo0 as it is the case in IPv4.
         */
-       CURVNET_SET(ifp->if_vnet);
        chk = pf_test6(PF_IN, flags, (*m)->m_flags & M_LOOP ? V_loif : ifp,
            m, inp, NULL);
-       CURVNET_RESTORE();
 
        return (pf_check_return(chk, m));
 }
@@ -6508,9 +6516,9 @@ pf_check6_out(struct mbuf **m, struct ifnet *ifp, int 
flags,
 {
        int chk;
 
-       CURVNET_SET(ifp->if_vnet);
+       CURVNET_ASSERT_SET();
+
        chk = pf_test6(PF_OUT, flags, ifp, m, inp, NULL);
-       CURVNET_RESTORE();
 
        return (pf_check_return(chk, m));
 }