From nobody Thu Oct 31 16:01:22 2024 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 4XfTJ270fwz5bx26; Thu, 31 Oct 2024 16:01:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfTJ23Qkqz4ShW; Thu, 31 Oct 2024 16:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730390482; 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=gJ42nr9WkkkhF56aIXSDownkilKZ7wuej3nMSXOkHVM=; b=UFRY2wY0JySoUr4iHi7YO8JJpo65NtzwWKGzzl6lKaMZ1AxO8StVstE4IwWxn0ce7IzPBH rHOZqRaOrSUyLp8FMYiiObXYcybbbeR4gsKs8Zy4vbZRmOJtE/nQFRNrLH1o90KoDajfLW M9oc5/ZL5ch99p1rSdhWw2pbKk5jmB2oGbNqCFGUnKubOc15W4CEDJBNLt82bT7mxk7g60 hadVsYZbE4FIqgXzojZ+BY+5A4BCD++SBqL/x6pRuGpD/I0jqz05kdqF1AAPASd+kHtVHi 2GP5XNVoDExYuM5H6MTu/hLG+wn/90GkHCgR2IWMzIowtWmeOetIvdVSIugEDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730390482; 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=gJ42nr9WkkkhF56aIXSDownkilKZ7wuej3nMSXOkHVM=; b=Ma+/mQKjjq4nUe1xlNn+LwThudFi4XGFhBbg2krKNdhlecKaOmIC1M2mtRiTdjUINgRPe9 yU5J0MxnzSfz0l0X2+be40lyIOZ1d9xiHKGjGC2dSy+WTZK8JBr4Itx4DVRuzPsXJHtYqz Ipf87YSMBTXcsSkaH/qysNP38hZPQodQRWaL1dOs7HsJYw5T35juKuHvE3y9QshrJwsTsq odBmU9/FHld8L4rmsLKyfXpCwPZRT0JST9Sxq2M4S/4fWY9Nu8jDte29P9BdJ5+ypekwOt r9C5RAaTx1bT3V505j0TVzp62H97wsnzC95bTSzendSWfNN7+0oxlv1iim8rfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730390482; a=rsa-sha256; cv=none; b=dnwTccobJYaJlrbZ76cd9hxrxGBSKd3S32wGzvXxa7FguuuxwfStfBC72gntL0zFdDLZcA BT449bx82ygXt2p2PvUte9v/AeqNyMB4Hsyu3MDJGe0nUgrcw4yiSCudbMhQx2oY+QAP9r A4sSbxgNQHQUau+/Lq+Q0nFrFCerwTWy31qjacQ1OXTvgyeghbfWW3wMEcdYPBmByilGoe +61hdjhtQEuTiANExSHnuQLVPug0ywQeLrhV9VRM9cbFaUqupWlhh82IH6WP/X2hegK0ki yaeTLJt3HTpzRhqTi6LKJb8wcY6DSnCf6Z5IPt0obYyJCKKyVUZ3kKXImx98CA== 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 4XfTJ22lgrzjd6; Thu, 31 Oct 2024 16:01:22 +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 49VG1M4J069909; Thu, 31 Oct 2024 16:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VG1MwT069906; Thu, 31 Oct 2024 16:01:22 GMT (envelope-from git) Date: Thu, 31 Oct 2024 16:01:22 GMT Message-Id: <202410311601.49VG1MwT069906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Osama Abboud Subject: git: e31fe28929a7 - stable/14 - ena: Count all currently missing TX completions in check 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osamaabb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e31fe28929a76ca552189ddc907345cd4e32d62b Auto-Submitted: auto-generated The branch stable/14 has been updated by osamaabb: URL: https://cgit.FreeBSD.org/src/commit/?id=e31fe28929a76ca552189ddc907345cd4e32d62b commit e31fe28929a76ca552189ddc907345cd4e32d62b Author: Osama Abboud AuthorDate: 2024-08-07 06:24:18 +0000 Commit: Osama Abboud CommitDate: 2024-10-31 14:54:10 +0000 ena: Count all currently missing TX completions in check Currently we count all of the newly added and already existing missing tx completions in each iteration of check_missing_comp_in_tx_queue() causing duplicate counts to missing_tx_comp stat. This commit adds a new counter new_missed_tx within the relevant function which only counts the newly added missing tx completions in each iteration of check_missing_comp_in_tx_queue(). This will allow us to update missing_tx_comp stat accurately without counting duplicates. Approved by: cperciva (mentor) Sponsored by: Amazon, Inc. (cherry picked from commit 1f67704e2cd85a507776312b52dc63d8690b9260) --- sys/dev/ena/ena.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 9d047cc89b30..6c1cbb6701de 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3058,13 +3058,13 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter, struct ena_ring *tx_ring) { + uint32_t missed_tx = 0, new_missed_tx = 0; 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; getbinuptime(&curtime); @@ -3107,13 +3107,15 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, "%d msecs have passed since last cleanup. Missing Tx timeout value %d msecs.\n", tx_ring->qid, i, time_since_last_cleanup, missing_tx_comp_to); + /* Add new TX completions which are missed */ + new_missed_tx++; } tx_buf->print_once = false; missed_tx++; } } - + /* Checking if this TX ring missing TX completions have passed the threshold */ if (unlikely(missed_tx > adapter->missing_tx_threshold)) { ena_log(pdev, ERR, "The number of lost tx completion is above the threshold " @@ -3122,8 +3124,8 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, ena_trigger_reset(adapter, ENA_REGS_RESET_MISS_TX_CMPL); rc = EIO; } - - counter_u64_add(tx_ring->tx_stats.missing_tx_comp, missed_tx); + /* Add the newly discovered missing TX completions */ + counter_u64_add(tx_ring->tx_stats.missing_tx_comp, new_missed_tx); return (rc); }