From nobody Tue Aug 4 17:15:24 2026 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 4hF0Y941Vwz6n58k for ; Tue, 04 Aug 2026 17:15: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hF0Y90tkQz3sN3 for ; Tue, 04 Aug 2026 17:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785863725; 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=iQtqwzBKLQxCuSuMF52KBLVqRJX8YRzFKV8DLYn3H1Y=; b=LAuOjP9zArA+0g27lLjUX6rFh7IM5WJTGqbFEN+D9y04/EzdE4UTPG2p4gnqLoWyw2zM9c BfGUj0yXXQvegM0aGHaXUYxNgEbWEMI/g03R+h0iFkgW/E2ERbnIyuGdbCIktJeog6EkXB z0PTn+Vivei3elNX4tUvIDvzZCzxzUeNZ/ECrFqZqjGVlVJFbm1XfQM72KsmlGexU18fPh ESo31YyyDy9/RCepWAhhhM8pRuxJkBdIQJjWNhrZukqVd8Nzjoieb5LtYzeEUD9bgKMN7q uYrvs1yMYBg6ttxVo47xA/099eA6Ftai5ybxb2dOyn8Jkdz4Qfu8Ifn4son5bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785863725; a=rsa-sha256; cv=none; b=abICQsmDBtVH8EU7+TdC2gOUSQI7idywTNiQoUuhkJiekJ6mPsYAFKaMhtKayzXnSkx67x W1oPScSQU9LvgCI1exj//OHcuqLUV4Vjsr29352KHMGYJiTcTnCb4jAKrQCm19dNhku+GE B2s1rJAft3/Zssc3vBzmixZDc/vVYqIqFstPwx+0e7Yvdw8pZiwoZK28ItxEL2V/nLV9J7 Zuqq4XfMyNsZRxpcRdYQvJRjMZ8/VG+kYHFZK+bZvkpdDHGeHbr+NSK27DwehLSKqACCY1 UYYi7oWidWCGfzWQUhGnnN6k0wdGZvrxNwp/msJBnmB1GZdM3SCXbq4TiCPWTw== 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=1785863725; 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=iQtqwzBKLQxCuSuMF52KBLVqRJX8YRzFKV8DLYn3H1Y=; b=tGK7NMMr2M4AdAXsMJhN/LlUl9KzYPAQuBLfSv5jqnGPMk1H/6G3KdCWQHNVKU/gEGb1sI /Nf6vX7TiZhDqdy9LdKBpae0AxQj4Lx+jARBvlo83m9jD0vRKCa+VOfywywFunIDSfER63 p6KlPz2U99G6fPq9IzAZPmmfRrB2HYWmh6gNRTZle9/xabdGnYeXwhFHt/tthLLLni1gJY tcsKCiv4Dfyejk7Bj4xDad3aQFq7XBPO7/JJrQdoquIGzbbSMQxAK6z+KDZ3dfVwtH5ER/ k59ggqB02iZYGrXLh2liuoJBescKowUDoAOKfWm9Q86rpEcCwDrDCBSpzB+mSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hF0Y86XRkzwP9 for ; Tue, 04 Aug 2026 17:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 213fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 17:15:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 5da9bc88936a - main - iflib: remove the unused TX queue state machine 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 List-Id: 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5da9bc88936a49cf1d3bea00dee3eb55158d5309 Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 17:15:24 +0000 Message-Id: <6a721e2c.213fb.47542da@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=5da9bc88936a49cf1d3bea00dee3eb55158d5309 commit 5da9bc88936a49cf1d3bea00dee3eb55158d5309 Author: Alexander Leidinger AuthorDate: 2026-08-04 16:44:53 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-04 17:14:31 +0000 iflib: remove the unused TX queue state machine The previous commit stopped using ift_qstatus and the IFLIB_QUEUE_* states for the TX watchdog decision, leaving only dead stores. Remove the field, the states, and all assignments. The byte the field frees stays behind as explicit padding. No functional change. Reviewed by: gallatin, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D58282 Assisted-by: Claude Code (Fable 5, Opus 5) --- sys/net/iflib.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 1b43f5833d57..f865f2414281 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -312,9 +312,6 @@ typedef struct iflib_sw_tx_desc_array { /* The minimum descriptors per second before we start coalescing */ #define IFLIB_MIN_DESC_SEC 16384 #define IFLIB_DEFAULT_TX_UPDATE_FREQ 16 -#define IFLIB_QUEUE_IDLE 0 -#define IFLIB_QUEUE_HUNG 1 -#define IFLIB_QUEUE_WORKING 2 /* maximum number of txqs that can share an rx interrupt */ #define IFLIB_MAX_TX_SHARED_INTR 4 @@ -414,10 +411,9 @@ struct iflib_txq { */ qidx_t ift_outstanding_prev; uint16_t ift_wdog_armed; - uint8_t ift_qstatus; uint8_t ift_closed; uint8_t ift_update_freq; - uint8_t ift_spare0; /* pad to the next pointer boundary */ + uint8_t ift_spare0[2]; /* pad to the next pointer boundary */ struct iflib_filter_info ift_filter_info; bus_dma_tag_t ift_buf_tag; bus_dma_tag_t ift_tso_buf_tag; @@ -1931,8 +1927,6 @@ iflib_txq_setup(iflib_txq_t txq) iflib_dma_info_t di; int i; - /* Set number of descriptors available */ - txq->ift_qstatus = IFLIB_QUEUE_IDLE; /* XXX make configurable */ txq->ift_update_freq = IFLIB_DEFAULT_TX_UPDATE_FREQ; @@ -3978,7 +3972,6 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) } if (__predict_false(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_OACTIVE)) { - txq->ift_qstatus = IFLIB_QUEUE_IDLE; CALLOUT_LOCK(txq); callout_stop(&txq->ift_timer); CALLOUT_UNLOCK(txq); @@ -3986,11 +3979,6 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) return (0); } - /* - * If we've reclaimed any packets this queue cannot be hung. - */ - if (reclaimed) - txq->ift_qstatus = IFLIB_QUEUE_IDLE; consumed = mcast_sent = bytes_sent = pkt_sent = 0; count = MIN(avail, TX_BATCH_SIZE); #ifdef INVARIANTS @@ -4066,7 +4054,6 @@ iflib_txq_drain_free(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) txq = r->cookie; - txq->ift_qstatus = IFLIB_QUEUE_IDLE; CALLOUT_LOCK(txq); callout_stop(&txq->ift_timer); CALLOUT_UNLOCK(txq); @@ -6562,7 +6549,6 @@ void iflib_link_state_change(if_ctx_t ctx, int link_state, uint64_t baudrate) { if_t ifp = ctx->ifc_ifp; - iflib_txq_t txq = ctx->ifc_txqs; if_setbaudrate(ifp, baudrate); if (baudrate >= IF_Gbps(10)) { @@ -6570,11 +6556,6 @@ iflib_link_state_change(if_ctx_t ctx, int link_state, uint64_t baudrate) ctx->ifc_flags |= IFC_PREFETCH; STATE_UNLOCK(ctx); } - /* If link down, disable watchdog */ - if ((ctx->ifc_link_state == LINK_STATE_UP) && (link_state == LINK_STATE_DOWN)) { - for (int i = 0; i < ctx->ifc_softc_ctx.isc_ntxqsets; i++, txq++) - txq->ift_qstatus = IFLIB_QUEUE_IDLE; - } ctx->ifc_link_state = link_state; if_link_state_change(ifp, link_state); }