From nobody Thu Oct 29 06:03:08 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 4jFYYm2HPtz6xr1J for ; Thu, 29 Oct 2026 06:03:08 +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 4jFYYm0zm5z4sXT for ; Thu, 29 Oct 2026 06:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253788; 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=diFrv8C57/1u69pVGncrvFl6lZlyHkM8cpx7ScjSoRc=; b=U04waGYtB+rhlsXqGvITfuVzxpkSMwX/pEBRtcSfknxJkfJoSkQR/7Clk5s3bJZcixU9AN MZAIsXLUcxClaS7KFYw2/mevCxF4mDMZiI6xllHzNX5S3kTDMnDAnwtG3RSL6SisSdX650 t0hdflwz0gsLpRAXxl2OM80uw9YmbvdjBSzIBz26++FzLA4KlNFbdJKvZjDmgZaEZDLfG5 uJgM0XS5tVyN2G8eJdkIReAMOfbhe9f8jHXaXKwlKIIa78Uhzgef7CoAIXmnw5mk0TO/mj 9Anycfp7FlDZBP7a3RRX/ZnGNaB73dJbLtuf8QK0V+97o7XZtvF4fRm6c8Mi9A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793253788; b=Q0pbTpPHEToUZ4Yio5Q+q4FjZLK+kyjxXtfmL7iC7oVehf33ojIlF1quki8BKXiWCBlFmD RCT3YDSj2NQl/nz6rsMcLresQqAM9vTV3z07hPXMHSwJsIwe+X6+6zUS3m4rBwd7MHCzcU rM6BeA+tmD886j2lwygGcoBJ4cZLqogs2MeLd+O8W1WL1hgjl1iHiDYuS5EtJqO4j0Pv+X oVZoHDEqIT4ZEr5jjWOL0lDSDt0o7pc9G/VMZIu/ch1MlveShrYlkmbZYCJO73kCYuut+U wWq/Zi/Wp3EZBGrSifchPG2WzptNSDDk1n5/qFXIswvXsTJC7QUtwvL2gSTT9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253788; 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=diFrv8C57/1u69pVGncrvFl6lZlyHkM8cpx7ScjSoRc=; b=sAGM7lTRMez7PsC4meeggwCnSjCFoWa/+IYZPYKEDaVeojy0R/a7Pz/sk19sxvadWvD2qV bfzd9wvkwNTPKe55dyXEQCGfghpqt6qhZIii0Yd1ZOBC/ULlHXNJYRV9WPdEqx3gI+M89l iZG+4uyy77pQrthfgWw/TfJlT7wjZFsHVyTPepcG1uRKqvnuqovAtGX9aLlCSWt8qgnRFP iNPe/6QIfxSf9LsH8ftC6cZdM5pLJtYAXUC0Mp2cHwKjRH6Ef5dE4BOhfaEKC+89JV8mdq IxrPeDzIxBBC2sfmW6YBQHJL92RZkPC6ssttI9AQQAZKRPavwxMQGpZOkDfbVw== 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 4jFYYm0fjvzR9V for ; Thu, 29 Oct 2026 06:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39466 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:03:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Leidinger From: Kevin Bowling Subject: git: d8023ec68d42 - stable/15 - iflib: remove the unused TX queue state machine 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: d8023ec68d4230008fdccdfba7aed34cc3279a80 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:03:08 +0000 Message-Id: <6ae2e19c.39466.52565f03@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d8023ec68d4230008fdccdfba7aed34cc3279a80 commit d8023ec68d4230008fdccdfba7aed34cc3279a80 Author: Alexander Leidinger AuthorDate: 2026-08-04 16:44:53 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 05:28:17 +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 Differential Revision: https://reviews.freebsd.org/D58282 Assisted-by: Claude Code (Fable 5, Opus 5) (cherry picked from commit 5da9bc88936a49cf1d3bea00dee3eb55158d5309) --- 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 439894d7a198..9e02cfa80325 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -350,9 +350,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 @@ -452,10 +449,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; @@ -1997,8 +1993,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; @@ -4116,7 +4110,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); @@ -4124,11 +4117,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 @@ -4204,7 +4192,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); @@ -6958,7 +6945,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)) { @@ -6966,11 +6952,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); }