From nobody Sat Jun 28 15:48:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bTxfT2fxJz609K3; Sat, 28 Jun 2025 15:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bTxfS5Qfcz3FZC; Sat, 28 Jun 2025 15:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751125712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7nju5tLHUoEhgriNF2Z9rKtodQ+prlt60AScdSK054=; b=SFRtd9Ww5ATehZ/L5ZwSG0B15RYaazALNjV98XFE6fI4WoFXZ/Dmhh2wLVayGWNZBsAUq0 TApPSqUvceWXR16QFDt/7o3/vUA4RvoZdCIpG56fNsBk5f9I7/BUP38ezA1OHZJpERFm6c seC9KDNqaKWO53MDNOQCvN3Gcrol6btDuZt9yo+9lzdYDDeITlx/I5QAmXTjoyJSguP3oS QSPEtWYvCEGpXHWX3LaLyrP8MZr4CcvEQL0YhTHNYNu9z0q101VMaOFTrY5bfB6ioC7btQ 1umJGvFX8Vl3yDHN1ebk9y9BsjOlXre8E4RK2qqV1Qasu8kRHWgUxHMK5L7Fzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751125712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7nju5tLHUoEhgriNF2Z9rKtodQ+prlt60AScdSK054=; b=R7B/XxOWvbBeboq+dTzFckI6DVpwiHssd2B8CP+KE6hWYhpSDMg+ZZvNCINohFZDK3cWXQ vqA3VbskGZIWFMqC5wvTxmwr/Yvnp7R70oAuTKTaY99nYIt6HG0r6OXKepHixcp7Lfl7IT y9Jd/eWkRHXoVTbhCGvdAG2o78mokBmG0IDxKgu2fZgVG37mxMM5O7ajiALVyYAwKrKZGw jWhcPQxRDH0EeCcE61xnzXGVFBTnmaedxtDiHj3IdFh83giS04aiXsE8dk5YTSfPNjwTFj vP297n6ONt5ZS1cTzPMs4Gb4J2KxGln89dJunKtM0BOB7rzCq7xrk64QKdduWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751125712; a=rsa-sha256; cv=none; b=m5p8rjcApU7PAH7z+mhJOjHEeZespXIrCx00MrY4eTw5poVhq3CF+tdEIm0Ng7yANl3akn zTNphOpg58qjX/NAsSbszH74wS08Fs+tk4/WqL8KxYPeKwUkHU1T+DSdv+s2fgQNNoYSdZ NdPBjl+hlTvJdrgw+yQ1JHqGmU+31TW89k0sjfmAFutVsd24HJFokZGF5NtSSSam4lDTfl YLx5U1j3ksqdVMT7C8PrkCawLeejM8If/8TFELK1f37XqFZvqF5uz8yX/4mtVHSk7xgcw3 aFmlZAKRYk+nDLPW80F0AcEn+WgwdZ0+tpGnJINjhodw5vBs5ddvaP6UriQMxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bTxfS4QHfzgQw; Sat, 28 Jun 2025 15:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55SFmWt8009613; Sat, 28 Jun 2025 15:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55SFmWQl009610; Sat, 28 Jun 2025 15:48:32 GMT (envelope-from git) Date: Sat, 28 Jun 2025 15:48:32 GMT Message-Id: <202506281548.55SFmWQl009610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: edc307eca9a9 - main - pfsync: Allocate and initialize buckets before attaching the interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc307eca9a9a9b0ce7445cff513b48f6489e5c6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=edc307eca9a9a9b0ce7445cff513b48f6489e5c6 commit edc307eca9a9a9b0ce7445cff513b48f6489e5c6 Author: Zhenlei Huang AuthorDate: 2025-06-28 15:46:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-28 15:46:51 +0000 pfsync: Allocate and initialize buckets before attaching the interface This prevents a potential race that the ioctl threads see NULL or uninitialized buckets. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51064 --- sys/netpfil/pf/if_pfsync.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index d5d77fa1ae1d..fdedb9424117 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -397,23 +397,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) sc->sc_flags |= PFSYNCF_OK; sc->sc_maxupdates = 128; sc->sc_version = PFSYNC_MSG_VERSION_DEFAULT; - - ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC); - if_initname(ifp, pfsyncname, unit); - ifp->if_softc = sc; - ifp->if_ioctl = pfsyncioctl; - ifp->if_output = pfsyncoutput; - ifp->if_hdrlen = sizeof(struct pfsync_header); - ifp->if_mtu = ETHERMTU; - mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); - mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF); - callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0); - callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0); - - if_attach(ifp); - - bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); - sc->sc_buckets = mallocarray(pfsync_buckets, sizeof(*sc->sc_buckets), M_PFSYNC, M_ZERO | M_WAITOK); for (c = 0; c < pfsync_buckets; c++) { @@ -435,6 +418,22 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) b->b_snd.ifq_maxlen = ifqmaxlen; } + ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC); + if_initname(ifp, pfsyncname, unit); + ifp->if_softc = sc; + ifp->if_ioctl = pfsyncioctl; + ifp->if_output = pfsyncoutput; + ifp->if_hdrlen = sizeof(struct pfsync_header); + ifp->if_mtu = ETHERMTU; + mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); + mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF); + callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0); + callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0); + + if_attach(ifp); + + bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); + V_pfsyncif = sc; return (0);