From nobody Thu Jun 5 21:49:05 2025 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 4bCyl61R7zz5yQTC; Thu, 05 Jun 2025 21:49:06 +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 4bCyl60f7mz3Yf1; Thu, 05 Jun 2025 21:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749160146; 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=E20fmRBwfqI9vkcGPLlpbisRxVC2C9d/LSmNsswZlp8=; b=GP8HG3zwpmKbJc2zGxq7vF4nB/TxzyStGX3lVIA+89a+DiJjxjkvWO7QUnp9pvLwv+/5eR qFtbiSwNUMMLGbjZPwkarG/vlfSfo8rAix+zV2y8UqeXZ6l8tNfmArIMDzBBFDEnmdkFKh hxkE/ARqzYTnKdXnMBT5NO+skPIRvHWHxUuiP2cSYxABMTyCumT2zsiCslPNy+dmcZ6v/K XHydxaZi6Zb6FFLEMjaSliLoJdAvZwWDWSsbxFwolBbvhbc8xzhNuLHMv3UsSkPmUd7Ap0 sNX0hjhiN096ziGRPrGqpy2y6YPV0f6uKT9VRzp9oCjZMPPVfBKVj8O20cXDHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749160146; 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=E20fmRBwfqI9vkcGPLlpbisRxVC2C9d/LSmNsswZlp8=; b=mB1v1ZPTiTHm3Aw5DmruLkEPJnjTNx4B89V+9ITOzOkYvzMUUEE7Y+7gptyTqFdzdHGzGa 5IW/H8LRY26dKAzmH9ONYsdx8DbnSapQ3BvFzFbielpO+GknXfp/gtWw2NMYd9jMQWNUOJ 6b7CX6GeObAzXnetnczf4GfgdWzUEyLfmEkde1r56eb6qqq9P4jgvzJXn+4+CurDxJCeoy Vjh/KPQuJG5qAoB+TgdTNbFAiURSMgVzNdqjMlZbox4RhtDdbCdE/ogJeI796KgzCUOxA6 d9HTSk8wK0pOqTrrJqNTzLgC/1pevAR2JrAjTNYxa419CUdQ0XZ9CwjHec6JCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749160146; a=rsa-sha256; cv=none; b=LFuQR7szFJx8rtfv38MYULtRWxBP0/W1hTKeCi6S3Xs/mHGRTC1nDdXELFDFgLepq/b5rr J4y940wlu3i0m2ed2rf7lBx+EsyyoYiRtzcOKpXHU+WBovlyCIhFuqyoTuuNkOfb6E6WAz W2iRkFUHI4Zo36KtHKJ71GhQkZfFiMsjnMEjFk5NHC9QWL7HkxpsfS0Dec6GkAXaknNEHm F7Cvz17PQ9EuDjc5ybhx4IYUsLNJVoiVQo57GJVd66txPEGefJA7tTroFe9boCYJP4g7wu wP9689O6Wve1yZK7y2IOoMsWLP/EgvBWdRb0rOa0tcercf2p1pGL8ZOHwWqryw== 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 4bCyl603y4zBQm; Thu, 05 Jun 2025 21:49:06 +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 555Ln5FH064683; Thu, 5 Jun 2025 21:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555Ln5kj064679; Thu, 5 Jun 2025 21:49:05 GMT (envelope-from git) Date: Thu, 5 Jun 2025 21:49:05 GMT Message-Id: <202506052149.555Ln5kj064679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 46fce0008432 - main - gve: Fix timestamp invalidation for DQO queue formats 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46fce000843215ff3d574d1c24fc24771975973e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=46fce000843215ff3d574d1c24fc24771975973e commit 46fce000843215ff3d574d1c24fc24771975973e Author: Jasper Tran O'Leary AuthorDate: 2025-06-05 17:21:06 +0000 Commit: Mark Johnston CommitDate: 2025-06-05 21:48:57 +0000 gve: Fix timestamp invalidation for DQO queue formats We need to invalidate timestamps when a TX queue is cleared so that the TX timeout detection callout does not mistakenly fire for cleared packets. When using DQO queue formats, timestamps are set on the pending packet array whose length is not the same as the length of the descriptor ring itself. This commit fixes logic which invalidated the wrong number of pending packets. Signed-off-by: Jasper Tran O'Leary Fixes: 3d2957336c7d ("gve: Add callout to detect and handle TX timeouts") Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50688 --- sys/dev/gve/gve_tx_dqo.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/gve/gve_tx_dqo.c b/sys/dev/gve/gve_tx_dqo.c index bbf2ee1b0324..551a7e308d19 100644 --- a/sys/dev/gve/gve_tx_dqo.c +++ b/sys/dev/gve/gve_tx_dqo.c @@ -987,11 +987,8 @@ gve_tx_clear_desc_ring_dqo(struct gve_tx_ring *tx) struct gve_ring_com *com = &tx->com; int i; - for (i = 0; i < com->priv->tx_desc_cnt; i++) { + for (i = 0; i < com->priv->tx_desc_cnt; i++) tx->dqo.desc_ring[i] = (union gve_tx_desc_dqo){}; - gve_invalidate_timestamp( - &tx->dqo.pending_pkts[i].enqueue_time_sec); - } bus_dmamap_sync(tx->desc_ring_mem.tag, tx->desc_ring_mem.map, BUS_DMASYNC_PREWRITE); @@ -1033,6 +1030,8 @@ gve_clear_tx_ring_dqo(struct gve_priv *priv, int i) for (j = 0; j < tx->dqo.num_pending_pkts; j++) { if (gve_is_qpl(tx->com.priv)) gve_clear_qpl_pending_pkt(&tx->dqo.pending_pkts[j]); + gve_invalidate_timestamp( + &tx->dqo.pending_pkts[j].enqueue_time_sec); tx->dqo.pending_pkts[j].next = (j == tx->dqo.num_pending_pkts - 1) ? -1 : j + 1; tx->dqo.pending_pkts[j].state = GVE_PACKET_STATE_FREE;