From nobody Thu Oct 29 06:03:11 2026 X-Original-To: dev-commits-src-branches@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 4jFYYq5TRHz6xrcV for ; Thu, 29 Oct 2026 06:03:11 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFYYq3VT8z4sMR for ; Thu, 29 Oct 2026 06:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adtnNV3ntgjg3tZoeou56CpXRJaEI5BdH5h4Vt0Llxg=; b=sO+HdRBuyU+Ylcjb12k6+Ij/xmFa0ABKvj7P9IFJ3hTW2YBZmxmjmnFIbpzMaMM7W8HvHh 81KQNEaCthm97/XcMG/nv0BcQy1B9SKtXAJl32w4S8EU0/1WOWFAyR/XmB3Kq9SWwFEnC5 qMOoiz8aUAbvxt8xFBn6zB18ml4Ulgjnq3scoLUbgMoZ6Gj2L0+A8hzS2ouN4GH9tVFV4Y c1Qd+Wz/MRsgUCq0Jm4VV45BT9mHFJgYr9JPp3EIiix7FBtm18YHDqggNQwbdGXP20yvCs DbgcAVvZI7BFdXU82MTE4l1ylgK1awN+NHrWendrDg8gFVoKcELxqUFQIpdcnA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793253791; b=TYOochf8egkf8QvygwgZKPZ4gchKedNDilgu6tXvEi/Lw5Jczu7c2rw7uKDq4CcNbeMR/q msAZCgf9T8Z35rUhHRZ0OXeWlObQF49ODO0fTXv1cCNCqKCA4Iz+5uz2LV9HZFDvmr8eeb abifIJOAhGhrfN0mSnV8EIfuLOgVFKwxP5iyp+cFTtK3TylnWh2//gIoz234MEsUP6Yt48 zh5KBYVh5zwgAQLcxTYS3iFvVbDaMsVC6Iwv4r1C5gUW+0xECCt7aAQE90pLL1P9tt0ayr lha+NjKP2zrnuSU/hSQ0ygGFHEEK339vdva4ZuPfuLhJmKNDbFviGUOOfonXug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adtnNV3ntgjg3tZoeou56CpXRJaEI5BdH5h4Vt0Llxg=; b=jhX//YjkjGa6TSE+4ic/AF5B01xYWUlyOc+N69I71KZcLnYrr6o3uGtSTMGtJxxhXQE7jz 3Yvz7MFf1sUEumg0oz28H1TNqesrOu7zoq7DHS3cz5ZOCYG4NAJII0/qgy0hCogK0iIQWb kjpMItx9WhwntKlE4h+eIAI4JXOvIB/nVBV3xEukUv9ZDzw3S5zluDWHh9m9wgdYh56b5j TUeGfWbVC1dLsF6zAmc0sNkmpMnktJKjDPzD3tni4Nmr7+cgAzSyJjx2ABNMNk1atQlma/ Ru0rbQpUkTvdY72R80Pra4HdaJ/SHtoQ+MkKU5R144KcBtpVXzduMtmo5oIA3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFYYq384ZzR7t for ; Thu, 29 Oct 2026 06:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39cd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:03:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: 33c730ada626 - stable/15 - iflib: actually disable simple_tx when ALTQ is in use List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 33c730ada6264d2c244549f761bdf4a88ed47600 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:03:11 +0000 Message-Id: <6ae2e19f.39cd7.3680b4d6@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=33c730ada6264d2c244549f761bdf4a88ed47600 commit 33c730ada6264d2c244549f761bdf4a88ed47600 Author: Andrew Gallatin AuthorDate: 2026-08-14 22:54:21 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 05:28:17 +0000 iflib: actually disable simple_tx when ALTQ is in use When getting some baseline ALTQ numbers, I noticed that if simlple_tx is enabled in kenv, we wind up re-setting the transmit routine, but I neglected to actually clear ctx->ifc_sysctl_simple_tx. That leads to many different panics as we run a mixture of mp_ring and simple_tx. Pointy-hat to: gallatin Sponsored by: Netflix (cherry picked from commit 06aaca43fe05d22cd289af9b6fa751b9bd08b560) --- sys/net/iflib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 0b23e0ea31cb..515bde6c7e26 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5397,6 +5397,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct device_printf(dev, "using simple if_transmit\n"); #else device_printf(dev, "ALTQ prevents using simple if_transmit\n"); + ctx->ifc_sysctl_simple_tx = 0; #endif } iflib_reset_qvalues(ctx);