From nobody Fri Sep 06 18:35:38 2024 X-Original-To: dev-commits-src-main@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 4X0lKQ31XPz5VSGJ; Fri, 06 Sep 2024 18:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lKQ1bgbz4WY5; Fri, 6 Sep 2024 18:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725647738; 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=KT+HP03IIc7RXBzCLcXA1xCicEiF7XcQs3DTbGurAAg=; b=FBO8iJD5gnCquUnwBiuXdxg8s3RIg/c4QBGt5XlA33Rsm3Fi9jGbXSKLu3+JWAwfGZq7n+ 12jVzEVgM8EzzMMPULquJg3HJT3Yfdq1ZSN2jxmpzFZkmkKtKezkKYTOvvpmCWvNarzFz/ lwnGM23po7HS5xo0Sbb4AfhHzBymE8D6/9ridW9cfsupD7Aadqgms2Igxiw+VEzOtglOie 6WaVECW/q8Y13lFQBf/AMGgsJLoZ2cLi1/BIwKmqYAh9+w854kN8nRkJU4WdK29ZAZkkXh 8vDxQWzDKLZlpZGXzml9ph/Feu0VMkTr8yBiiHqKgbc0tXKjNH6b58/qAKcHBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647738; a=rsa-sha256; cv=none; b=voEnq6KRP3Xpz2n4p05uYnc8umLEeqywMrv+lxzmBEWWhoMWqyTocbotFG2buzwl1LAy06 OJ85Id0eoYi7MxROEHJVp751yXO6gYDz+6HmAPEuAuUPxcAlOcFRzvdu9qiAWXfTJcIbaT lIjWFyDGIPc6JDaEZYClmaYFtobSuNi85ILsi+kZ7nCD82Bf5pd8PqTkmkIqeYXPDEDIPg EDuzG12j9i1iHf762i9aRhqwIf2TnmIim3/oxpRH/PaShK/IwoBLUMdvgMMER291Bu1INv xSCz9EoqP14og7RDoczk0JMmYOFPHWpQiReNt2UffnrThj1YeF44Mv7vl8aPow== 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=1725647738; 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=KT+HP03IIc7RXBzCLcXA1xCicEiF7XcQs3DTbGurAAg=; b=gofXVymqH0c9UYG7xmUYlOMZVkKXDgIc89hbmwZgleaMyNV82YPrm2kQSRsDggZU/KCpod f2zQ3xgPe/foHWYwr88JqNH6W4ko+WMVA8m0+5+DVFuu1SVy8gMU26QZsJbDLV/v7Z2HQf /D34iFs4D3wHRDRHe1ppX8c1boILvJ2Ot3x7ggKcTSEVn9lbQbg6t7CsOSOPeNzmZSUdRT QC/eBQSXeQ69o8W/N1tSwWnMg980GlWKZGqMdv7TFrYzt8JsSEASGOMFNOtl3qwHPwQRJ+ xJ/a8IkgKB18qmxKuh4UUWr3LGVrzVMWM+gsNebMa2Yg5DZqTuWiAC5Ge1hISw== 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 4X0lKQ1DFzz135J; Fri, 6 Sep 2024 18:35:38 +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 486IZcBB011891; Fri, 6 Sep 2024 18:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZcHT011888; Fri, 6 Sep 2024 18:35:38 GMT (envelope-from git) Date: Fri, 6 Sep 2024 18:35:38 GMT Message-Id: <202409061835.486IZcHT011888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2b7f2890a812 - main - dummynet: fix pie List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b7f2890a812eb09dccaa8069483566a3b292338 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7f2890a812eb09dccaa8069483566a3b292338 commit 2b7f2890a812eb09dccaa8069483566a3b292338 Author: Franco Fichtner AuthorDate: 2024-07-29 14:38:00 +0000 Commit: Warner Losh CommitDate: 2024-09-06 18:34:33 +0000 dummynet: fix pie Since 26b9e1f07fa codel was fixed but traffic was not flowing for pie too. Apply the same fix. MFC after: 1 week Sponsored by: OPNsense Differential Revision: https://reviews.freebsd.org/D46182 Also see: https://redmine.pfsense.org/issues/13996 Also see: https://forum.opnsense.org/index.php?topic=41827.0 Reviewed by: imp, markj Pull Request: https://github.com/freebsd/freebsd-src/pull/1390 --- sys/netpfil/ipfw/dn_sched_fq_pie.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c index 632bfd4b7152..06700b0f93af 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -744,6 +744,9 @@ pie_enqueue(struct fq_pie_flow *q, struct mbuf* m, struct fq_pie_si *si) } if (t != DROP) { + if (m->m_pkthdr.rcvif != NULL) + m_rcvif_serialize(m); + mq_append(&q->mq, m); fq_update_stats(q, si, len, 0); return 0;