From nobody Tue Mar 28 01:18:33 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 4PlsJT5sNBz42M3V; Tue, 28 Mar 2023 01:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlsJT59tqz4FVk; Tue, 28 Mar 2023 01:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966313; 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=V64lmMn3V9Us85FG1mp0UHXSnPbmWZ4WxT7lqs+5a5Y=; b=qA0r+lxjx7s4Dn1E0FZ8x6TtQ4Rs4eoTYdSKfC4f2XNRbKl9/9Fc0jflLtoRK2PG5lLp2b QVpPMHE/7ddDQr+z4tPAxpHlEQrAk6CWGaxh6Bd8OerzVpuNBXlb1alLZHTW/HW7DxRPQF Edg+AQ9fITXf9qzvMnT6sjZNouvCVXJB23XRBsF1jo1+RaMeGlriV77CruvrCV5qqq0mLX 2Xife+qWcyHW0x5Ce+q5TXvNKtmLhiSFWe4+U+vZZrMTzTOAsXqitO9+M0TdA2vdJhWcP3 Rho67Qjw2TwuIMlUP3Tr/1KFjDMJrq6HjOHtj+3uL5lE7Od9K6vDs8EeBFg9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966313; 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=V64lmMn3V9Us85FG1mp0UHXSnPbmWZ4WxT7lqs+5a5Y=; b=KrePG6tJOcApyMxZ1N67yOTh1uQHecB4Ed4PdnklldRH2PDV4zqSiOTrc3eBXqz1fNkuoQ SR8mlAmdMFoben++EPS4T2CcqiOZ4dJc5TyWwxlaqD5ftmbgGvv8BljtYJ1hWdADYR9KMf rjLfMRQj52pjELL26Kj55DjHJ2PGuVSvqdpsGXuKaXxv9eQXwWn3CEFPlAXZw7xWVkhqTu kwisf2lAmgtsF7FcAvYNgyBSXFKm1gQy847KTH8/1pK/qWDVx+dT80xk+Ske1NTx1VrBH7 59vECzVxiWMHACp5H4Jb/irp5jHVtlhlso8pIzIiEk0qCIQpQ1xHTQdPz4gLWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679966313; a=rsa-sha256; cv=none; b=rj0B8WIrBdNvQ31nJfHyZeROONsC8AgLCDHoIKktKDPl3NA5NsWeRFp9Wk7h/B2a3m6tfs 01cqhxNv667MGo39O1o+3w7+y+hT/DydYnRE8O3LNeeQ82OK1CNZGT2tpxegEek5ta7o+K GwesrkfJ62HaaPGkMbBB+tHGfE0rQLFdxPZdMhTpDthVYYKxL4AMX+9//rcoxnT69tSQx2 JF5QL9XYlKAgobJ0LBV+UTu5kymWUOcxXAfPBiZL1NFotfA3CU4TtNs7rOrgeekNey5JP3 y7raa5M2AbGcqn0Ri+vtLRRSDW1+kdHAP5fYDhNvlKf+H1Rq6ii8OkZ9UQIkfQ== 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 4PlsJT4H85zkgc; Tue, 28 Mar 2023 01:18:33 +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 32S1IXGN028155; Tue, 28 Mar 2023 01:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1IXdq028154; Tue, 28 Mar 2023 01:18:33 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:18:33 GMT Message-Id: <202303280118.32S1IXdq028154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 27b23cdec9d1 - main - pf: remove pd_refs from pfsync 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/main X-Git-Reftype: branch X-Git-Commit: 27b23cdec9d1255e014ea0decac42a5be8d00735 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=27b23cdec9d1255e014ea0decac42a5be8d00735 commit 27b23cdec9d1255e014ea0decac42a5be8d00735 Author: Kristof Provost AuthorDate: 2023-03-24 06:04:56 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 23:18:07 +0000 pf: remove pd_refs from pfsync It only served to complicate cleanup, and added no value. While here drop packets in pfsync_defer_tmo() if we don't have a syncif, rather than just leaving them on the queue. Reviewed by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39248 --- sys/netpfil/pf/if_pfsync.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 4e4bbc9bc8b7..c9d214d73470 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -185,7 +185,6 @@ struct pfsync_upd_req_item { struct pfsync_deferral { struct pfsync_softc *pd_sc; TAILQ_ENTRY(pfsync_deferral) pd_entry; - u_int pd_refs; struct callout pd_tmo; struct pf_kstate *pd_st; @@ -421,10 +420,8 @@ pfsync_clone_destroy(struct ifnet *ifp) if (ret > 0) { pfsync_undefer(pd, 1); } else { - pd->pd_refs++; callout_drain(&pd->pd_tmo); } - free(pd, M_PFSYNC); PFSYNC_BUCKET_LOCK(b); } MPASS(b->b_deferred == 0); @@ -1780,7 +1777,6 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) st->state_flags |= PFSTATE_ACK; pd->pd_sc = sc; - pd->pd_refs = 0; pd->pd_st = st; pf_ref_state(st); pd->pd_m = m; @@ -1831,21 +1827,21 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); + TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); + b->b_deferred--; + pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ + PFSYNC_BUCKET_UNLOCK(b); + free(pd, M_PFSYNC); + if (sc->sc_sync_if == NULL) { - PFSYNC_BUCKET_UNLOCK(b); + pf_release_state(st); + m_freem(m); return; } NET_EPOCH_ENTER(et); CURVNET_SET(sc->sc_sync_if->if_vnet); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ - if (pd->pd_refs == 0) - free(pd, M_PFSYNC); - PFSYNC_BUCKET_UNLOCK(b); - pfsync_tx(sc, m); pf_release_state(st);