From nobody Mon Dec 13 13:50:37 2021 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 99A3E18D1751; Mon, 13 Dec 2021 13:50:38 +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 4JCNFB0ry1z3CVB; Mon, 13 Dec 2021 13:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9DE20155F8; Mon, 13 Dec 2021 13:50:37 +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 1BDDobr2036995; Mon, 13 Dec 2021 13:50:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDDob6C036994; Mon, 13 Dec 2021 13:50:37 GMT (envelope-from git) Date: Mon, 13 Dec 2021 13:50:37 GMT Message-Id: <202112131350.1BDDob6C036994@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: 87246654e350 - stable/13 - pfsync: locking fixes 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/13 X-Git-Reftype: branch X-Git-Commit: 87246654e350e502a66fa74b731b8db3748cc1e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639403438; 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=/a6qWiYNZ8RH5oUmY4lhpMZrgHQsqC2Gdw4NtUvNyto=; b=OQA8lyvkuw6SXH4s47BrVKkrf9c24sML37QRn4wVU/Rr129rPdhP3BgIqwqobjuMU0f3tT dZOXCfBdMRTlo0bPVH8o+/xVoA1AfxxgGy4u8UChkjk33wtnMIbcNUptm5VlJNjTrKafsk KP4rjy/0igqhbGQaRIPLj7gF1CPgr1LXxv1hTLRPqIoeHdK+Y4ojNiUK8Fk6+HCJbfPkuJ Ny2j5cn5kKC2+1YHJCct8UekEzPZmEHlQUNaWTgWYl0Ys0144a3934hZSdBWvM6vOetoua dKD9CGdMmCUBbSoeT58/dnubpHGB7yvsGeYVpqv7BOsM5PO5riEbBbBsPigyHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639403438; a=rsa-sha256; cv=none; b=UfO0viUWXF8bseiaPrhlOxMFC0fbdTdwXub+ERMEhZjoghRtR8oczv8t0J7LVyuYf8nfYh Vs8Dx5ZVT2/UcBWoeXO7EZsgm9NvHZ6OquVTSiEJ3XOTnICiPTgfu3UgidYScqUGRQJ3Bj qJgpMLrYkB8387VP2xCvsNFBj385Zs+QVjvQ6o2tpVzMwd+AP+rHYS+FZuBqWwi7t26jia 4h/1C2dZVAIp8B0+4uKSJdpNuBO1xgk0zSIXBsxnVoUVFcBjC4nwTrPzTHQ/11/OYesYI5 qOKgmzKbRCgkMdo5bcjwIx7xHHW6fn31O/fmYap7Ig6VQ7TU8SOhrlvzpip04g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=87246654e350e502a66fa74b731b8db3748cc1e8 commit 87246654e350e502a66fa74b731b8db3748cc1e8 Author: Kristof Provost AuthorDate: 2021-12-02 16:42:56 +0000 Commit: Kristof Provost CommitDate: 2021-12-13 13:49:27 +0000 pfsync: locking fixes * Ensure we unlock the pfsync lock in pfsync_defer() * We must hold the bucket lock when calling pfsync_push() * The pfsync_defer_tmo() callout locks the bucket lock, not the pfsync lock Reviewed by: glebius MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33243 (cherry picked from commit 41c4f1987243cefe81adcc31d5401e7a80a0428c) --- sys/netpfil/pf/if_pfsync.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a4f1d43f5ea0..455e1ad09e93 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1751,12 +1751,17 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) return (0); } + PFSYNC_BUCKET_LOCK(b); + PFSYNC_UNLOCK(sc); + if (b->b_deferred >= 128) pfsync_undefer(TAILQ_FIRST(&b->b_deferrals), 0); pd = malloc(sizeof(*pd), M_PFSYNC, M_NOWAIT); - if (pd == NULL) + if (pd == NULL) { + PFSYNC_BUCKET_UNLOCK(b); return (0); + } b->b_deferred++; m->m_flags |= M_SKIP_FIREWALL; @@ -1773,6 +1778,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) callout_reset(&pd->pd_tmo, PFSYNC_DEFER_TIMEOUT, pfsync_defer_tmo, pd); pfsync_push(b); + PFSYNC_BUCKET_UNLOCK(b); return (1); } @@ -1821,7 +1827,7 @@ pfsync_defer_tmo(void *arg) pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ if (pd->pd_refs == 0) free(pd, M_PFSYNC); - PFSYNC_UNLOCK(sc); + PFSYNC_BUCKET_UNLOCK(b); ip_output(m, NULL, NULL, 0, NULL, NULL);