From nobody Sun Sep 22 13:53:58 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 4XBSK24sPwz5XQYK; Sun, 22 Sep 2024 13:53:58 +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 4XBSK23FFmz4RP5; Sun, 22 Sep 2024 13:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727013238; 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=5KgpjuzmMpm+3wZDkQ6R3HuCsTwswYnDbqBNqabNXAE=; b=O5ug8g6Tnt/EGbIyvu13YdArRff8Zq9kOIUcV2dOY/7W5C49P7HoM9h89SakdN5CwaxnfH 2SEcsKNUNM5fwtaEHXs5q3CjxngvTQ1XaQ7Y77RxW/mDBSn2P5/48RYJAiGx9recVtuIr5 knTcKyHXNcgzja3QCZ1fWFHJHtcz1AVYhA0zIhFfi/gWsHIy6uBhkOhwyXdolXtUk67Wz1 9vX29riZdfMIVX+LDBrRe4I0LI81Aj/to5AOLcuDb0yhREYIaOWV7A4QAxGVeoxIZLO+m6 7drrGVOaPDIYAdBWnPnZvOb9myRIDruzSfWJLcz8pFqIx2K3250uenpD2fmIyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727013238; a=rsa-sha256; cv=none; b=At5yC/WDcA1Q+MeidwpG2Rs0w3zVz1M3d7hhdzdll7+o0sQzGKuMvSBzxzPsxuklnagmE1 OpPi4XOglA970C97IB/xOUvwcML5ZbHW3N3J5hBuWlRNLkk84W27ggJ/FkUbbR4XJfmP7w bUgkkVRMmfNaRtp9D8F0qD4Cp5R/Vo7+4GjMG3TaibVgmPRBJxSCTo3y+c0UTWUnOFUvfy CBluuSJCNvnyPtadkCBL6YSkiP6AuXj2ZbZ1bQtfzRsr30vQBISlBFsI/iODHLoUBnbY2R NUPew7bisIRSq7qBmVrfu/z8DPhzH1gqvvxLKI1Pi0HCPh/I7+OYgaOkrP5vIw== 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=1727013238; 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=5KgpjuzmMpm+3wZDkQ6R3HuCsTwswYnDbqBNqabNXAE=; b=JRU69DZ8nU38q3E0OD7x3Rnc142ijPalmUopV7kZXulU0PRDgZgPtL7Sxeh6CnMY+wkTUp syStpYSJyHyCqAcVOLhlVlBz5otdRF2h9DvkmvPk2rcVldH2POsuDGzEPXdbjlMOw63mFt Q8TSQNHdMFHo4zZesNnN0b3WxDjFrqkSgSjNqJhMPBT5+sFk09h14he48swU+bDTrQ2+sU JE2GLwVd5yK2HrOWzV/aBC5j4avefiw+Cayj7QAkDuOOInJv3RpbpSHCRIIfqArrR11Uz6 HnK6vHEarpgTo5RNnpb04jlYA9LsFLH0n0XzQk1ZF1GwvsrJGV7FOzEKXY4qbQ== 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 4XBSK22sNWz1JBm; Sun, 22 Sep 2024 13:53:58 +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 48MDrw4F044502; Sun, 22 Sep 2024 13:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48MDrwlJ044499; Sun, 22 Sep 2024 13:53:58 GMT (envelope-from git) Date: Sun, 22 Sep 2024 13:53:58 GMT Message-Id: <202409221353.48MDrwlJ044499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 08a7825f05a8 - stable/14 - dummynet: fix pie 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08a7825f05a82b2c7b1e68557e288d360e59b813 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=08a7825f05a82b2c7b1e68557e288d360e59b813 commit 08a7825f05a82b2c7b1e68557e288d360e59b813 Author: Franco Fichtner AuthorDate: 2024-07-29 14:38:00 +0000 Commit: Warner Losh CommitDate: 2024-09-22 13:46:37 +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 (cherry picked from commit 2b7f2890a812eb09dccaa8069483566a3b292338) --- 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;