Introduce M_PF type for pf(4) related memory allocations. Currently used

M_TEMP and M_IFADDR types are unreasonable for that purpose. This
dedicated statistics simplify the future pf(4) unlocking work by
decreasing search area of possible memory leaks.

ok bluhm sashan

diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 7466150..046cc81 100644 (file)
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_if.c,v 1.110 2023/05/18 14:11:18 kn Exp $ */
+/*     $OpenBSD: pf_if.c,v 1.111 2023/06/30 09:58:30 mvs Exp $ */
 
 /*
  * Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -92,7 +92,7 @@ RB_PROTOTYPE(pfi_ifhead, pfi_kif, pfik_tree, pfi_if_compare);
 RB_GENERATE(pfi_ifhead, pfi_kif, pfik_tree, pfi_if_compare);
 
 #define PFI_BUFFER_MAX         0x10000
-#define PFI_MTYPE              M_IFADDR
+#define PFI_MTYPE              M_PF
 
 struct pfi_kif *
 pfi_kif_alloc(const char *kif_name, int mflags)

diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 6ec6d27..521a3d9 100644 (file)
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_ioctl.c,v 1.410 2023/06/28 21:33:35 sashan Exp $ */
+/*     $OpenBSD: pf_ioctl.c,v 1.411 2023/06/30 09:58:30 mvs Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -661,7 +661,7 @@ pf_create_queues(void)
                if (ifp == NULL)
                        continue;
 
-               qif = malloc(sizeof(*qif), M_TEMP, M_WAITOK);
+               qif = malloc(sizeof(*qif), M_PF, M_WAITOK);
                qif->ifp = ifp;
 
                if (q->flags & PFQS_ROOTCLASS) {
@@ -716,7 +716,7 @@ pf_create_queues(void)
                ifp = qif->ifp;
 
                ifq_attach(&ifp->if_snd, qif->ifqops, qif->disc);
-               free(qif, M_TEMP, sizeof(*qif));
+               free(qif, M_PF, sizeof(*qif));
        }
 
        return (0);
@@ -727,7 +727,7 @@ error:
                list = qif->next;
 
                qif->pfqops->pfq_free(qif->disc);
-               free(qif, M_TEMP, sizeof(*qif));
+               free(qif, M_PF, sizeof(*qif));
        }
 
        return (error);
@@ -2486,8 +2486,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        error = ENODEV;
                        goto fail;
                }
-               ioe = malloc(sizeof(*ioe), M_TEMP, M_WAITOK);
-               table = malloc(sizeof(*table), M_TEMP, M_WAITOK);
+               ioe = malloc(sizeof(*ioe), M_PF, M_WAITOK);
+               table = malloc(sizeof(*table), M_PF, M_WAITOK);
                NET_LOCK();
                PF_LOCK();
                pf_default_rule_new = pf_default_rule;
@@ -2496,15 +2496,15 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                memset(&pf_trans_set, 0, sizeof(pf_trans_set));
                for (i = 0; i < io->size; i++) {
                        if (copyin(io->array+i, ioe, sizeof(*ioe))) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EFAULT;
                                goto fail;
                        }
                        if (strnlen(ioe->anchor, sizeof(ioe->anchor)) ==
                            sizeof(ioe->anchor)) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = ENAMETOOLONG;
                                goto fail;
                        }
@@ -2519,8 +2519,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    &ioe->ticket, NULL, 0))) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        goto fail;
                                }
                                break;
@@ -2529,30 +2529,30 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    ioe->anchor))) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        goto fail;
                                }
                                break;
                        default:
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EINVAL;
                                goto fail;
                        }
                        PF_UNLOCK();
                        NET_UNLOCK();
                        if (copyout(ioe, io->array+i, sizeof(io->array[i]))) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EFAULT;
                                goto fail;
                        }
                }
-               free(table, M_TEMP, sizeof(*table));
-               free(ioe, M_TEMP, sizeof(*ioe));
+               free(table, M_PF, sizeof(*table));
+               free(ioe, M_PF, sizeof(*ioe));
                break;
        }
 
@@ -2566,19 +2566,19 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        error = ENODEV;
                        goto fail;
                }
-               ioe = malloc(sizeof(*ioe), M_TEMP, M_WAITOK);
-               table = malloc(sizeof(*table), M_TEMP, M_WAITOK);
+               ioe = malloc(sizeof(*ioe), M_PF, M_WAITOK);
+               table = malloc(sizeof(*table), M_PF, M_WAITOK);
                for (i = 0; i < io->size; i++) {
                        if (copyin(io->array+i, ioe, sizeof(*ioe))) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EFAULT;
                                goto fail;
                        }
                        if (strnlen(ioe->anchor, sizeof(ioe->anchor)) ==
                            sizeof(ioe->anchor)) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = ENAMETOOLONG;
                                goto fail;
                        }
@@ -2593,8 +2593,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    ioe->ticket, NULL, 0))) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        goto fail; /* really bad */
                                }
                                break;
@@ -2604,16 +2604,16 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        default:
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EINVAL;
                                goto fail; /* really bad */
                        }
                        PF_UNLOCK();
                        NET_UNLOCK();
                }
-               free(table, M_TEMP, sizeof(*table));
-               free(ioe, M_TEMP, sizeof(*ioe));
+               free(table, M_PF, sizeof(*table));
+               free(ioe, M_PF, sizeof(*ioe));
                break;
        }
 
@@ -2628,20 +2628,20 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        error = ENODEV;
                        goto fail;
                }
-               ioe = malloc(sizeof(*ioe), M_TEMP, M_WAITOK);
-               table = malloc(sizeof(*table), M_TEMP, M_WAITOK);
+               ioe = malloc(sizeof(*ioe), M_PF, M_WAITOK);
+               table = malloc(sizeof(*table), M_PF, M_WAITOK);
                /* first makes sure everything will succeed */
                for (i = 0; i < io->size; i++) {
                        if (copyin(io->array+i, ioe, sizeof(*ioe))) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EFAULT;
                                goto fail;
                        }
                        if (strnlen(ioe->anchor, sizeof(ioe->anchor)) ==
                            sizeof(ioe->anchor)) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = ENAMETOOLONG;
                                goto fail;
                        }
@@ -2654,8 +2654,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                     rs->tticket) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        error = EBUSY;
                                        goto fail;
                                }
@@ -2668,8 +2668,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    ioe->ticket) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        error = EBUSY;
                                        goto fail;
                                }
@@ -2677,8 +2677,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        default:
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EINVAL;
                                goto fail;
                        }
@@ -2697,8 +2697,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                            pf_pool_limits[i].limit_new) {
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EBUSY;
                                goto fail;
                        }
@@ -2708,15 +2708,15 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        PF_UNLOCK();
                        NET_UNLOCK();
                        if (copyin(io->array+i, ioe, sizeof(*ioe))) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EFAULT;
                                goto fail;
                        }
                        if (strnlen(ioe->anchor, sizeof(ioe->anchor)) ==
                            sizeof(ioe->anchor)) {
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = ENAMETOOLONG;
                                goto fail;
                        }
@@ -2731,8 +2731,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    NULL, NULL, 0))) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        goto fail; /* really bad */
                                }
                                break;
@@ -2741,16 +2741,16 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                                    ioe->anchor))) {
                                        PF_UNLOCK();
                                        NET_UNLOCK();
-                                       free(table, M_TEMP, sizeof(*table));
-                                       free(ioe, M_TEMP, sizeof(*ioe));
+                                       free(table, M_PF, sizeof(*table));
+                                       free(ioe, M_PF, sizeof(*ioe));
                                        goto fail; /* really bad */
                                }
                                break;
                        default:
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EINVAL;
                                goto fail; /* really bad */
                        }
@@ -2762,8 +2762,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                            pf_pool_limits[i].limit_new, NULL, 0) != 0) {
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(table, M_TEMP, sizeof(*table));
-                               free(ioe, M_TEMP, sizeof(*ioe));
+                               free(table, M_PF, sizeof(*table));
+                               free(ioe, M_PF, sizeof(*ioe));
                                error = EBUSY;
                                goto fail; /* really bad */
                        }
@@ -2782,8 +2782,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                pf_trans_set_commit();
                PF_UNLOCK();
                NET_UNLOCK();
-               free(table, M_TEMP, sizeof(*table));
-               free(ioe, M_TEMP, sizeof(*ioe));
+               free(table, M_PF, sizeof(*table));
+               free(ioe, M_PF, sizeof(*ioe));
                break;
        }
 
@@ -2793,7 +2793,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                u_int32_t                nr = 0;
                size_t                   space = psn->psn_len;
 
-               pstore = malloc(sizeof(*pstore), M_TEMP, M_WAITOK);
+               pstore = malloc(sizeof(*pstore), M_PF, M_WAITOK);
 
                NET_LOCK();
                PF_LOCK();
@@ -2803,7 +2803,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        psn->psn_len = sizeof(struct pf_src_node) * nr;
                        PF_UNLOCK();
                        NET_UNLOCK();
-                       free(pstore, M_TEMP, sizeof(*pstore));
+                       free(pstore, M_PF, sizeof(*pstore));
                        goto fail;
                }
 
@@ -2838,7 +2838,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                        if (error) {
                                PF_UNLOCK();
                                NET_UNLOCK();
-                               free(pstore, M_TEMP, sizeof(*pstore));
+                               free(pstore, M_PF, sizeof(*pstore));
                                goto fail;
                        }
                        p++;
@@ -2848,7 +2848,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 
                PF_UNLOCK();
                NET_UNLOCK();
-               free(pstore, M_TEMP, sizeof(*pstore));
+               free(pstore, M_PF, sizeof(*pstore));
                break;
        }
 
@@ -2941,7 +2941,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                }
 
                if ((kif_buf = mallocarray(sizeof(*kif_buf), apfiio_size,
-                   M_TEMP, M_WAITOK|M_CANFAIL)) == NULL) {
+                   M_PF, M_WAITOK|M_CANFAIL)) == NULL) {
                        error = EINVAL;
                        goto fail;
                }
@@ -2954,7 +2954,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                if (copyout(kif_buf, io->pfiio_buffer, sizeof(*kif_buf) *
                    io->pfiio_size))
                        error = EFAULT;
-               free(kif_buf, M_TEMP, sizeof(*kif_buf) * apfiio_size);
+               free(kif_buf, M_PF, sizeof(*kif_buf) * apfiio_size);
                break;
        }
 
@@ -3264,7 +3264,7 @@ pf_open_trans(uint32_t unit)
 
        rw_assert_wrlock(&pfioctl_rw);
 
-       t = malloc(sizeof(*t), M_TEMP, M_WAITOK|M_ZERO);
+       t = malloc(sizeof(*t), M_PF, M_WAITOK|M_ZERO);
        t->pft_unit = unit;
        t->pft_ticket = ticket++;
 
@@ -3320,7 +3320,7 @@ pf_free_trans(struct pf_trans *t)
                log(LOG_ERR, "%s unknown transaction type: %d\n",
                    __func__, t->pft_type);
        }
-       free(t, M_TEMP, sizeof(*t));
+       free(t, M_PF, sizeof(*t));
 }
 
 void

diff --git a/sys/net/pf_ruleset.c b/sys/net/pf_ruleset.c
index 01b7522..34673cf 100644 (file)
--- a/sys/net/pf_ruleset.c
+++ b/sys/net/pf_ruleset.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_ruleset.c,v 1.20 2023/04/28 14:08:38 sashan Exp $ */
+/*     $OpenBSD: pf_ruleset.c,v 1.21 2023/06/30 09:58:30 mvs Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -57,8 +57,8 @@
 
 
 #ifdef _KERNEL
-#define rs_malloc(x)           malloc(x, M_TEMP, M_WAITOK|M_CANFAIL|M_ZERO)
-#define rs_free(x, siz)                free(x, M_TEMP, siz)
+#define rs_malloc(x)           malloc(x, M_PF, M_WAITOK|M_CANFAIL|M_ZERO)
+#define rs_free(x, siz)                free(x, M_PF, siz)
 #define rs_pool_get_anchor()   pool_get(&pf_anchor_pl, \
                                    PR_WAITOK|PR_LIMITFAIL|PR_ZERO)
 #define rs_pool_put_anchor(x)  pool_put(&pf_anchor_pl, x)

diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 832fec2..14a6ff9 100644 (file)
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: malloc.h,v 1.123 2023/06/27 21:02:13 mvs Exp $        */
+/*     $OpenBSD: malloc.h,v 1.124 2023/06/30 09:58:30 mvs Exp $        */
 /*     $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $     */
 
 /*
@@ -68,7 +68,7 @@
 /* 3 - free */
 #define        M_PCB           4       /* protocol control block */
 #define        M_RTABLE        5       /* routing tables */
-/* 6 - free */
+#define M_PF           6       /* packet filter structures */
 /* 7 - free */
 /* 8 - free */
 #define        M_IFADDR        9       /* interface address */
@@ -186,7 +186,7 @@
        NULL, \
        "pcb",          /* 4 M_PCB */ \
        "rtable",       /* 5 M_RTABLE */ \
-       NULL,           /* 6 */ \
+       "pf",           /* 6 M_PF */ \
        NULL, \
        NULL, \
        "ifaddr",       /* 9 M_IFADDR */ \