From nobody Mon Jul 7 10:07:07 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 4bbKfM6dDGz61Jbt; Mon, 07 Jul 2025 10:07:07 +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 4bbKfM1Zkdz3dyW; Mon, 07 Jul 2025 10:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882827; 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=ABLqcM3FxkvnXyKFtfa6vDndtp19Lj9eEH9+T3mjWig=; b=p45zFVoUgSMdcdziEQPysDR7BCV+GzXiBumCoNT7Z4li8SKvsMo3wqSUJzCGWGtRYuSAie 2gYgX3uroiWIKL6kC+aNa0Wp0Q8DwzwRVIKlalIw9/4UM+nwOey69sf8gQyPMjFwdsz93f e8iU1H7fKKXZMtEj3R6+84kkqi5C8OStrWP/2BRbsh21SRMrA8avFb7JxFZc6SI1V0Z8TN ZXFeAeMJrH366Ta87H3/ZSjDIMQ9yPQjVT9u4QMxQSYK3y2U192Bq3FzrNdd3a5CUaYTZx HIs1BxPwb+ykloQvNzn2xwA5D+pAY2pXKawIuQv1DMzCPVsJ2idqhDrLVFCPeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882827; 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=ABLqcM3FxkvnXyKFtfa6vDndtp19Lj9eEH9+T3mjWig=; b=jmi3ro9mWdRpmwWEsLzNY3nmH4FHHoAIMDN3sX4KoyOQe5F52YIwU6DB5uhr32M25iqTWs WdsQjDDRQQDegKS2Eblqm3rvLbLD3K2v25QCwnAnl2/6MF+yA9++lMzjM8v77JUIyF2wGH J+zwjRUUDRGoylCTwhqPP4RfHr8HhGFUbKFP/a5UmIYDP73YNXk4iALgF7aJkPaLzAF+5X GvMKJB4RoG80ZpeVVXAEkD2ARdqKdm2WWrCgnSqXSpL+TatDcFsJoc5pjGg7qyFxwdFmla soQ1dbdgRQ30QO0As8jGPKH0XZmzwlODzke0wa9aRYTaeKJjDzwVh1gt5E14OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882827; a=rsa-sha256; cv=none; b=Mb4Q6JONWTAyEwGB2g2YLQJytAwjUQVbJONHyslRnx8ydZ4d/I3czpbQr6oDThoJIW8pG8 LtpqqFcNWfRAE01dtbuVkyoDDj/3WsSCnwgYrAhQTkuqgtcujZTAjGTBP1i6llTgtSmuTC p8PjrcsarDV9r2cePvObTJG149zJ830XJXIiMD06pRxh+ZPRtGOYopWJ71Tp71VrmxcyoD X/iH/5GRTOtlZGCM0m5n1/QnYoh8sTZZ428KeFmhai8knDRtVei/rm7hOroGpTUGw61U20 FIeA8tqC1bxSmM+nNq2mtyEmrjPgrlo8uPn4EKkqWuktR8qJWyRnmRoq/87VCA== 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 4bbKfM0yTbzmcx; Mon, 07 Jul 2025 10:07:07 +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 567A7776053711; Mon, 7 Jul 2025 10:07:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A77fW053706; Mon, 7 Jul 2025 10:07:07 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:07 GMT Message-Id: <202507071007.567A77fW053706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8cc376735c65 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cc376735c65a18c53a70c30957a5f56dd066b79 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc376735c65a18c53a70c30957a5f56dd066b79 commit 8cc376735c65a18c53a70c30957a5f56dd066b79 Author: Zhenlei Huang AuthorDate: 2025-06-28 15:46:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +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 (cherry picked from commit edc307eca9a9a9b0ce7445cff513b48f6489e5c6) --- 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 b75cc4e08029..64c938ee52ee 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -395,23 +395,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++) { @@ -433,6 +416,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);