From nobody Thu Jun 30 16:15:35 2022 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 81B6C8A3C13; Thu, 30 Jun 2022 16:15:36 +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 4LYk2b4nwGz3Ql1; Thu, 30 Jun 2022 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605735; 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=6TOtycY4FA52eHLTFd7cUNiiy0e1sP/7ctj5eFivPmo=; b=F9q4Dxvpd6efppSiUtGoR1mst56AI9kYhPLMlBbca7Y0KtNbpUJtK3aTmLoKYw2G5hfBIs VpC5FTz/J4/ZpyA6uofykzMkP+D112Lh86JGABOB8OyJGo3m7Ps3cBo0f+RpOHCLkfJARj gAYhnCEkkgJCLK8hmTqYwnO/suTiqelR7bFVHfVPEMbgtEGeWpSzCo4oEx/iE7TSDnAtWS 9OGctSBWDkBbyP5VKaYroQL3w95ZB+hHuifO7tP+KNliB10uLL6AkQTO5EflccXzmZtlHh c1t+aejLUmgeWmjoIAHEz/OAH21+b1RbTkSA+1nGTpVPzeUWE1V1dnkxYapL4Q== 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 5E550196C; Thu, 30 Jun 2022 16:15:35 +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 25UGFZ1l014793; Thu, 30 Jun 2022 16:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGFZeT014792; Thu, 30 Jun 2022 16:15:35 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:15:35 GMT Message-Id: <202206301615.25UGFZeT014792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: d8aba82b5ca7 - main - ena: Store ticks of last Tx cleanup 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8aba82b5ca75f1a5bff609af141844c4fc9de70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605735; 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=6TOtycY4FA52eHLTFd7cUNiiy0e1sP/7ctj5eFivPmo=; b=ybgrwdchhtkF0cbph7o8TSPb0EhrslE+E+NO2HrCrF3w/xPQdRrPBYxpQe45lpj6HlkHUM 2WIQXqQwVxmjkXA3MVQ37Z/gcVuG7VgDkFKG5MwarzX32GEyHe+BLWZTdn9aj/dll8fJoY xAI1KK57DbbFyJewYKTCPnFS3O9VUe/SV+VWYCDLRbKRMRnGcFnPUqqauMVUfCh3Sj9+Ef lA0njuHh7bWXPPkIASgP+BtSKmZBJrd9Ai3XyvniIoYy/oSJM/gbBcVYGnl04MHng4+FfB o+nihQfvCAWCUgI0asd9z8bsfdyMP/ns/5zRRuR9izdGGzgG0NunDFN/Ifla9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656605735; a=rsa-sha256; cv=none; b=fZAaPS2uwK6eI/Sin7D9imhcgXNNINLnINksQvWz9ViPRemPCW1YzQBvlRFumS389tRn/r lGOFSvry3gsxGfmIWZW+DYvA1+M7I/+GfvU4R/M2PCTA7vSgO1uOzSRPlk0zakATxFf9NA G11DEpfkezFv3FRGgjXX6cv+2/ZiYMNpE7YoL2FMvVRTA9FixQUuwXBkikKJ44VLy/w0/R WD59FjXIcOMtvJGctltXE1od48BpCPlNdC1p+IgjyZ7mJsl3N8wX4rE9XeoJGZhXzXYM1S /u9O0nT09psUWMSvFR9P8LgJXze3E3ncOiXsV4rf34tMpph++Ne8F8I3fHLmNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=d8aba82b5ca75f1a5bff609af141844c4fc9de70 commit d8aba82b5ca75f1a5bff609af141844c4fc9de70 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:18:09 +0000 Commit: Marcin Wojtas CommitDate: 2022-06-30 15:31:44 +0000 ena: Store ticks of last Tx cleanup Store timestamp of last cleanup in Tx ring structure. This does not change anything during normal operation of the driver but could be useful when the device fails for some reason. Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 17 ++++++++++++++--- sys/dev/ena/ena.h | 2 ++ sys/dev/ena/ena_datapath.c | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index b8c9efb288ea..b4b38051b035 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -439,6 +439,7 @@ ena_init_io_rings_advanced(struct ena_adapter *adapter) /* Allocate Tx statistics. */ ena_alloc_counters((counter_u64_t *)&txr->tx_stats, sizeof(txr->tx_stats)); + txr->tx_last_cleanup_ticks = ticks; /* Allocate Rx statistics. */ ena_alloc_counters((counter_u64_t *)&rxr->rx_stats, @@ -3007,6 +3008,8 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, device_t pdev = adapter->pdev; struct bintime curtime, time; struct ena_tx_buffer *tx_buf; + int time_since_last_cleanup; + int missing_tx_comp_to; sbintime_t time_offset; uint32_t missed_tx = 0; int i, rc = 0; @@ -3040,10 +3043,18 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, /* Check again if packet is still waiting */ if (unlikely(time_offset > adapter->missing_tx_timeout)) { - if (!tx_buf->print_once) + if (!tx_buf->print_once) { + time_since_last_cleanup = TICKS_2_USEC(ticks - + tx_ring->tx_last_cleanup_ticks); + missing_tx_comp_to = + sbttoms(adapter->missing_tx_timeout); ena_log(pdev, WARN, "Found a Tx that wasn't " - "completed on time, qid %d, index %d.\n", - tx_ring->qid, i); + "completed on time, qid %d, index %d." + "%d usecs have passed since last cleanup." + "Missing Tx timeout value %d msecs.\n", + tx_ring->qid, i, time_since_last_cleanup, + missing_tx_comp_to); + } tx_buf->print_once = true; missed_tx++; diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 85f353e7ab54..56e14bd800ff 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -374,6 +374,8 @@ struct ena_ring { /* Used for LLQ */ uint8_t *push_buf_intermediate_buf; + int tx_last_cleanup_ticks; + #ifdef DEV_NETMAP bool initialized; #endif /* DEV_NETMAP */ diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 6c18a4f5c1f9..85e9274eef14 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -344,6 +344,8 @@ ena_tx_cleanup(struct ena_ring *tx_ring) ENA_RING_MTX_UNLOCK(tx_ring); } + tx_ring->tx_last_cleanup_ticks = ticks; + return (work_done); }