diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-07-05 11:40:18 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-07-05 11:40:18 +0000 |
| commit | 0031bd7b7cfcc6c1a40403bcf3a49fe1927a4176 (patch) | |
| tree | f36470d82a14594ede817bb93cc317240fd291d0 /sys | |
| parent | 475cde7adc32e7be63bf1d7e64e7415a675f0b28 (diff) | |
Convert pf tagname malloc(9) into pool_get(9) to make it MP safe.
While there use TAILQ_FOREACH macro for traversing tags.
OK mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf_ioctl.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 70fed2c609f..7c9df05a53b 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.317 2017/06/28 19:30:24 mikeb Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.318 2017/07/05 11:40:17 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -84,6 +84,8 @@ #include <net/if_pfsync.h> #endif /* NPFSYNC > 0 */ +struct pool pf_tag_pl; + void pfattach(int); void pf_thread_create(void *); int pfopen(dev_t, int, int, struct proc *); @@ -165,6 +167,8 @@ pfattach(int num) IPL_SOFTNET, 0, "pfruleitem", NULL); pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, IPL_SOFTNET, 0, "pfqueue", NULL); + pool_init(&pf_tag_pl, sizeof(struct pf_tagname), 0, + IPL_SOFTNET, 0, "pftag", NULL); hfsc_initialize(); pfr_initialize(); pfi_initialize(); @@ -348,16 +352,17 @@ tagname2tag(struct pf_tags *head, char *tagname, int create) */ /* new entry */ - if (!TAILQ_EMPTY(head)) - for (p = TAILQ_FIRST(head); p != NULL && - p->tag == new_tagid; p = TAILQ_NEXT(p, entries)) - new_tagid = p->tag + 1; + TAILQ_FOREACH(p, head, entries) { + if (p->tag != new_tagid) + break; + new_tagid = p->tag + 1; + } if (new_tagid > TAGID_MAX) return (0); /* allocate and fill new struct pf_tagname */ - tag = malloc(sizeof(*tag), M_RTABLE, M_NOWAIT|M_ZERO); + tag = pool_get(&pf_tag_pl, PR_NOWAIT | PR_ZERO); if (tag == NULL) return (0); strlcpy(tag->name, tagname, sizeof(tag->name)); @@ -392,12 +397,11 @@ tag_unref(struct pf_tags *head, u_int16_t tag) if (tag == 0) return; - for (p = TAILQ_FIRST(head); p != NULL; p = next) { - next = TAILQ_NEXT(p, entries); + TAILQ_FOREACH_SAFE(p, head, entries, next) { if (tag == p->tag) { if (--p->ref == 0) { TAILQ_REMOVE(head, p, entries); - free(p, M_RTABLE, sizeof(*p)); + pool_put(&pf_tag_pl, p); } break; } |