From nobody Fri Nov 11 12:19:25 2022 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 4N7ySF3r56z4dLHt; Fri, 11 Nov 2022 12:19:25 +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 4N7ySF3JMXz3sY8; Fri, 11 Nov 2022 12:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668169165; 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=+uofDV+u85ZUT87evGpraA/mqAntSu/sxNmBD5AgMqU=; b=oWBNu+2Q/Hr34fZ+ZQ3DEf9e5Wq7c91WXzMUmbK9jjIJXYVNR/wGYKc6dy4pF7wGYciIPl E133UEM68rz1YcuZjBFZZ1xcsSJMlxdt1Lg/YI8eXuN09l5PkBgBz0pPOG98DgRtLCZzEb V8CSXs44xzCpSOY9nLYp52yGtb3G+mWAvp0wu4ZDvXlVdcpccQFMbCdxeeBx6hu9OBTvdD ha6yqoKEpYDk+zKgLZc27dtVriDe1+Cyl7XsUfV3+YRDED75GGXHTtI/NEsIjZWLPmmA8c 8Vq6I2MZJcNvFKi1yvLWUY55B3fyBgzFSQDy5EKBEJEMcEEH1PUoH1f3XWfmaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668169165; 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=+uofDV+u85ZUT87evGpraA/mqAntSu/sxNmBD5AgMqU=; b=qMDUN9T6UO6S4C+czoK7k55FuZMwo49bIYCdXketKAZm8xkS4DCRT7HnQTsgeTxYS2nBSe 564ESZaeR7aeOBxCGA7QjN7USAlHCHXd/kkzA/tcJY+ZkEMPTKHg9vorbp5IbfDWlPMadH kR2LLLip7mgh6hL15EjgbHCktHoTdIDuQ7EuFyz8Rdc+tHKsRhBRgJalbxd4VdObQew6hr db+08gUXLgHMiqpkKSFCr9+FkNx5DdC/wenW21qlmboE4gwHm4htwtY17Mc9GhCkbgaO8R c1jtghtIi8GGFpqX4YFX1BD5zI+hU612vTui77vYWNb2S5PDMHpuLrjWuXQe9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668169165; a=rsa-sha256; cv=none; b=kP+5JYULTSf0yytVhLIhyF4rtTVi0SHEE0xwZT7XlMfu4weWZDPDjTJ9pZ9r33uy70284x K6lAZxGmlxfFsBQugot1icswBM2br7kQYMhcw4N2GgGYNpwCdaDLC5RTF+WQ6m8Y3dadws dAgIZGSQAgjrn265uMtuYx7xGy42/KjoPLQ0H8O5w5W9VYnZq++TYej3GaOLtMpl+DLKzd nMtRINll4aFaM/u+BPJbwTgVOsdbds2yjxRKeX4HaEsAwiHnavoxd4t+UhYkruCjANnUqK 0qorwI2iOrjkNYTNMmg5JZf5K902XcBMiKDgtYFb/OdWZ3ztY+mgAW5yoIAOCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7ySF2LtQzhKN; Fri, 11 Nov 2022 12:19:25 +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 2ABCJPAZ051785; Fri, 11 Nov 2022 12:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABCJPiL051784; Fri, 11 Nov 2022 12:19:25 GMT (envelope-from git) Date: Fri, 11 Nov 2022 12:19:25 GMT Message-Id: <202211111219.2ABCJPiL051784@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: 26b9e1f07fa5 - main - dummynet: fix codel 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 26b9e1f07fa5d3e734eeb3d427a8c8a5faf735e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=26b9e1f07fa5d3e734eeb3d427a8c8a5faf735e6 commit 26b9e1f07fa5d3e734eeb3d427a8c8a5faf735e6 Author: Kristof Provost AuthorDate: 2022-11-09 16:11:26 +0000 Commit: Kristof Provost CommitDate: 2022-11-11 10:53:31 +0000 dummynet: fix codel Serialize rcvif when enqueing packets for codel. We already tried to restore the serialized rcvif in fq_codel_extract_head(), but that doesn't work when we fail to serialize it first, so we ended up dropping all packets passed through codel. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D37318 --- sys/netpfil/ipfw/dn_sched_fq_codel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/ipfw/dn_sched_fq_codel.c b/sys/netpfil/ipfw/dn_sched_fq_codel.c index 97341f5a9a60..0ac7694b6bef 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_codel.c +++ b/sys/netpfil/ipfw/dn_sched_fq_codel.c @@ -194,6 +194,9 @@ codel_enqueue(struct fq_codel_flow *q, struct mbuf *m, struct fq_codel_si *si) *(aqm_time_t *)(mtag + 1) = AQM_UNOW; m_tag_prepend(m, mtag); + if (m->m_pkthdr.rcvif != NULL) + m_rcvif_serialize(m); + mq_append(&q->mq, m); fq_update_stats(q, si, len, 0); return 0;