Date: Sun, 5 Dec 2021 18:47:02 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: eb93b99d6986 - main - in_pcb: delay crfree() down into UMA dtor Message-ID: <202112051847.1B5Il2GP030287@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=eb93b99d698674e3b1cc7139fda98e2b175b8c5b commit eb93b99d698674e3b1cc7139fda98e2b175b8c5b Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2021-12-05 16:47:24 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2021-12-05 18:46:37 +0000 in_pcb: delay crfree() down into UMA dtor inpcb lookups, which check inp_cred, work with pcbs that potentially went through in_pcbfree(). So inp_cred should stay valid until SMR guarantees its invisibility to lookups. While here, put the whole inpcb destruction sequence of in_pcbfree(), inpcb_dtor() and inpcb_fini() sequentially. Submitted by: markj Differential revision: https://reviews.freebsd.org/D33273 --- sys/netinet/in_pcb.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 0a44eae0d908..ffcc93553c22 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -502,18 +502,6 @@ abort_with_hash_wlock: return (err); } -/* - * Different protocols initialize their inpcbs differently - giving - * different name to the lock. But they all are disposed the same. - */ -static void -inpcb_fini(void *mem, int size) -{ - struct inpcb *inp = mem; - - INP_LOCK_DESTROY(inp); -} - /* Make sure it is safe to use hashinit(9) on CK_LIST. */ CTASSERT(sizeof(struct inpcbhead) == sizeof(LIST_HEAD(, inpcb))); @@ -521,6 +509,8 @@ CTASSERT(sizeof(struct inpcbhead) == sizeof(LIST_HEAD(, inpcb))); * Initialize an inpcbinfo -- we should be able to reduce the number of * arguments in time. */ +static void inpcb_dtor(void *, int, void *); +static void inpcb_fini(void *, int); void in_pcbinfo_init(struct inpcbinfo *pcbinfo, const char *name, u_int hash_nelements, int porthash_nelements, char *inpcbzone_name, @@ -542,7 +532,7 @@ in_pcbinfo_init(struct inpcbinfo *pcbinfo, const char *name, pcbinfo->ipi_lbgrouphashbase = hashinit(porthash_nelements, M_PCB, &pcbinfo->ipi_lbgrouphashmask); pcbinfo->ipi_zone = uma_zcreate(inpcbzone_name, sizeof(struct inpcb), - NULL, NULL, inpcbzone_init, inpcb_fini, UMA_ALIGN_PTR, + NULL, inpcb_dtor, inpcbzone_init, inpcb_fini, UMA_ALIGN_PTR, UMA_ZONE_SMR); uma_zone_set_max(pcbinfo->ipi_zone, maxsockets); uma_zone_set_warning(pcbinfo->ipi_zone, @@ -644,7 +634,6 @@ in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo) #if defined(IPSEC) || defined(IPSEC_SUPPORT) || defined(MAC) out: - crfree(inp->inp_cred); uma_zfree_smr(pcbinfo->ipi_zone, inp); return (error); #endif @@ -1833,7 +1822,6 @@ in_pcbfree(struct inpcb *inp) inp->inp_flags &= ~INP_INHASHLIST; } - crfree(inp->inp_cred); RO_INVALIDATE_CACHE(&inp->inp_route); #ifdef MAC mac_inpcb_destroy(inp); @@ -1864,6 +1852,30 @@ in_pcbfree(struct inpcb *inp) #ifdef INET inp_freemoptions(imo); #endif + /* Destruction is finalized in inpcb_dtor(). */ +} + +static void +inpcb_dtor(void *mem, int size, void *arg) +{ + struct inpcb *inp = mem; + + crfree(inp->inp_cred); +#ifdef INVARIANTS + inp->inp_cred = NULL; +#endif +} + +/* + * Different protocols initialize their inpcbs differently - giving + * different name to the lock. But they all are disposed the same. + */ +static void +inpcb_fini(void *mem, int size) +{ + struct inpcb *inp = mem; + + INP_LOCK_DESTROY(inp); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112051847.1B5Il2GP030287>