From nobody Thu Mar 30 03:07:45 2023 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 4Pn7dY4k6yz42JkH; Thu, 30 Mar 2023 03:07:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pn7dY1k39z3N18; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; 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=eOHCv8/vLrRyOFmo3lnUKyvpU30UncNJPPAL8A1bFxU=; b=l8MOx3WNOHtLnzHOGgAJXRuu/uwvyO0ss0w491tVVsTuw9ipQ4PG7KXOrfrAGYr+gY4h9e 0BlMcMWKcM/Rh4AwylCLXcU9n6loRKEHfcUhP0HlG47vYSdVlcutHyS0UksUkvjbRNEHKX KL4nbZAs/Hy1ZVlQUiFyhi4TAjhdwUrqdCqiyoNZFpfohaqkO3RneW2HE3gtQ8dwhO1mfY swgpQrJtc6Yp1EC0kqMh7bjO0ZnuzyZRidKAY8S2C4p9X96ZJ3AQPIEh8AA7qY8sxaXQlm FhWn2jaTBQlVgpJcKHQZT1wGCeWsSIZuuSFBc/f4GNwBjWd8REa+8u6aHgsIQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; 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=eOHCv8/vLrRyOFmo3lnUKyvpU30UncNJPPAL8A1bFxU=; b=T+SxLFxFwC77USobA1L7jrP4x2FcSQjg9PwSqgxSIYd2R7Sx9pT1vIGimVz0GXhUfU2Rth v0V6Vtny8cjMYnWJ3+Beqj7uNjbjbvLYzCpbI9XbXu5XUi/nZVTiPGVtPRGsjC/f9na+UF qmfuRsLwjHiGit+b6hp48s3eNu6C5qGS5R45SLchr1MhuTX/537G7WCiBvlfpl8+JkPsp9 SeIMYO8ZQzsqKLniJIPi4fQVrXzpV8gz6uOZbf9FH1bXKXngBoU5AB6Y+heSFlMBp3qpXC nPw+JHkmzKsc/acM+rDXtkll1n/nyxK39GQ5gdBDxXFWx0EfQ5+wwSbja6c07g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680145665; a=rsa-sha256; cv=none; b=GIOX5EIWqlyyDkaaEdWLvjNBFWXZUQlhnVBiQPnR1fP/wHcxmJI81+u6zQBunlkhY47kGs WmvtMgXGdGmJYi+rcCfs8QXns2g1RVytNGTyM+WOGDzM2zu8tMdplph+cXjrlO++n/K8Wd bnZr7DL1VGj+KBgzEtYCLJd4vHsw8btg5cV2YjpcvHi4zHBRcmZH3Yqnvpk8gGlrYglvRI 3tO5CZw5IW0uZpI/k+ZTz1NvCHWlqaKlqramr6EMk8Od0vPcqRVWJAtskjvvXWrcRAOubD qe1gxP+zkGe1IlugAyO/MfX5WJfstSZPXZUVv34EPLIvNLHyVXBx2uxpVP4SIA== 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 4Pn7dY0qrVzwJl; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U37jTx046473; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U37j7g046472; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git) Date: Thu, 30 Mar 2023 03:07:45 GMT Message-Id: <202303300307.32U37j7g046472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 5f74ed9afdb1 - stable/12 - pfsync: hold b_mtx for callout_stop(pd_tmo) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5f74ed9afdb143f3e2c5159b778685fd69f54d1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f74ed9afdb143f3e2c5159b778685fd69f54d1d commit 5f74ed9afdb143f3e2c5159b778685fd69f54d1d Author: Kristof Provost AuthorDate: 2023-03-22 13:46:25 +0000 Commit: Kristof Provost CommitDate: 2023-03-30 00:23:09 +0000 pfsync: hold b_mtx for callout_stop(pd_tmo) The pd_tmo callout has an associated mutex, which we must hold while calling callout_stop(). Reported by: markj Reviewed by: markj MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39223 (cherry picked from commit 01194da28a2123a2aa09808319f152fa115f60f1) --- sys/netpfil/pf/if_pfsync.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a73b4ff95c6a..30cac5717df5 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -395,7 +395,7 @@ pfsync_clone_destroy(struct ifnet *ifp) { struct pfsync_softc *sc = ifp->if_softc; struct pfsync_bucket *b; - int c; + int c, ret; for (c = 0; c < pfsync_buckets; c++) { b = &sc->sc_buckets[c]; @@ -404,22 +404,25 @@ pfsync_clone_destroy(struct ifnet *ifp) * cleared by pfsync_uninit(), and we have only to * drain callouts. */ + PFSYNC_BUCKET_LOCK(b); while (b->b_deferred > 0) { struct pfsync_deferral *pd = TAILQ_FIRST(&b->b_deferrals); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - if (callout_stop(&pd->pd_tmo) > 0) { - pf_release_state(pd->pd_st); - m_freem(pd->pd_m); - free(pd, M_PFSYNC); + ret = callout_stop(&pd->pd_tmo); + PFSYNC_BUCKET_UNLOCK(b); + if (ret > 0) { + pfsync_undefer(pd, 1); } else { pd->pd_refs++; callout_drain(&pd->pd_tmo); - free(pd, M_PFSYNC); } + free(pd, M_PFSYNC); + PFSYNC_BUCKET_LOCK(b); } + MPASS(b->b_deferred == 0); + MPASS(TAILQ_EMPTY(&b->b_deferrals)); + PFSYNC_BUCKET_UNLOCK(b); callout_drain(&b->b_tmo); }