From nobody Thu Sep 19 20:21:24 2024 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 4X8n3S6f58z5XKsP; Thu, 19 Sep 2024 20:21:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8n3S3WhDz4Wv5; Thu, 19 Sep 2024 20:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726777284; 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=ogV+2u2nA0KO049a5fzOq0eb/x2tSwA9ZIe6tvLWcVQ=; b=M2ZAs8q57H4/Gfet+33pEIq6/jSvUeiGjuxrnHFrsI7/WBFFKhi7kse02sa5TZLPb8La7J ERBDJxXlQykG0xm12hB6noe51R7WBOTfE5qy7GHCqeIi4w2Oac9r3mr330XpxirTIuN/+g xsT+6nTYcWYEjFHuUYVXQUueEA00Z8UOCVNVKmpC0mJWbMaA+M5a3Eu6Y/FB3arNFWSHDR oS9PjU9vsM9wDx9he6IMh7e+iIDf417s3OOjo1eyG77FoukGOg+L6e/LU6qMgu+UH+OwK/ sxvIOBkgtMTf06/tQ0BSaFNT5u2DPzI4VojtlFsUmT+jxXsru4D2iBGyh+U9dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726777284; a=rsa-sha256; cv=none; b=JXLxF4rIsfYjqC6jl+8SnPSbBmEEW7xtUJ4xgH/F7bw6+POGjlIjf+VQDhHVqz8jyq1xyq kw3IuaKIczQpqK44z5IUPRW/w5V8Pcrv3n0zZ4QmE0NCR+D/ohChQnv8YEZFwVwztGyOfy U0gaUSxgod90eIhPEXYaNVLYVq3PotqAD2b6nS1aWQwx/7TdXAdwTIQjx6gLaYFBdMwI0D UOJxxO5KnrNEn7BQ7dKf/P7clGV9uZim9QSs22Y5iZX4s0eI5oyNlUluxH4YDTDezpFru+ VSvnf2BcV2qvR2k0qHt9fP/NfGlqSMYF9TRJe2Sr0oScc8p7HLep9rrBRfcclQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726777284; 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=ogV+2u2nA0KO049a5fzOq0eb/x2tSwA9ZIe6tvLWcVQ=; b=Z9w5Ztuz28pGVVFOWdeOo4q/2Fsnl+/uI7yOLH3f8DFj7oNnCv+nXCSXgIcxQu3PHZWBJX gMm40JQash3j/jUSVBf6L0nUVPg3LkaQQ53iw+RX57kchtWDL5SbX5AHdqex8cQQBJAhri BuakHQ3sGtzX0Lqiww9Z9agiJ0HY55to6b9vGojLt+SOwiCNEBEzlXlj2a8cPlr0MzrlNi 118HPpuWXcnjRXM6Nf0Uu2CJuakImMSCHScTGCl8Ri6I76kKPPUIRF5L+fsqd0wFzy1jXJ PvsTpimWgv9eQ2eIv1eq9A5grKsLnYxtnXmKeOXZiujNnjLGdQAnsPS33pjTQg== 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 4X8n3S36HJzL2n; Thu, 19 Sep 2024 20:21:24 +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 48JKLOGq046642; Thu, 19 Sep 2024 20:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JKLO7j046639; Thu, 19 Sep 2024 20:21:24 GMT (envelope-from git) Date: Thu, 19 Sep 2024 20:21:24 GMT Message-Id: <202409192021.48JKLO7j046639@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: dea41633e509 - main - pf: handle ACK prioritization for v6 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dea41633e509489087b1d3e0fcb7404e4dbc5129 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dea41633e509489087b1d3e0fcb7404e4dbc5129 commit dea41633e509489087b1d3e0fcb7404e4dbc5129 Author: Kristof Provost AuthorDate: 2024-09-04 15:09:28 +0000 Commit: Kristof Provost CommitDate: 2024-09-19 20:20:14 +0000 pf: handle ACK prioritization for v6 Obtained from: OpenBSD, sthen , 1a3657e9c6 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46592 --- sys/netpfil/pf/pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b0e857e55deb..c85c2e784cd9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9525,6 +9525,9 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb break; } + if ((pd.hdr.tcp.th_flags & TH_ACK) && pd.p_len == 0) + use_2nd_queue = 1; + action = pf_normalize_tcp(kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; @@ -9701,7 +9704,7 @@ done: } else { if (s != NULL) pd.pf_mtag->qid_hash = pf_state_hash(s); - if (pd.tos & IPTOS_LOWDELAY) + if (use_2nd_queue || (pd.tos & IPTOS_LOWDELAY)) pd.pf_mtag->qid = pd.act.pqid; else pd.pf_mtag->qid = pd.act.qid;