From nobody Sun Jan 14 21:53:52 2024 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 4TCpv50jH7z57DjB; Sun, 14 Jan 2024 21:53:53 +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 4TCpv45J1Bz4F06; Sun, 14 Jan 2024 21:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705269232; 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=zyo6QBQt6gI7qZWxrqXqHHT8OgIDEQYvRWS1LANbZA8=; b=QB/HZUZZnfpgt/th0/yvDF3ycemBq+6TpzPqUs3TU3HEFLUX2xpUCsAW5UjEwXGtTbhkVr qZuGSwNNa+lgMOnHLfkkmtE107XeNigGL9pWV7GlLShlnbqMIUCs6PFpxbURQGv8oRr+WQ ElEb4Y6cMLsrqTH3BJU9QDYdoWInQAALGrPTs1AavNdeWt+jr8RK/H6Q08c2LWEkQF0S0y souozTMFD+gNI0HMp90bwbKT1npmAhBcvKwYkyJBmKRjPDXIE7+qpBTuCWBLmU7+kljyrT h3ZEn1CyeGy1n3Fue0s5Iy/0PlLvLORGgLD8zFVZlfHIvcFaoBdWIwqxGIimug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705269232; 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=zyo6QBQt6gI7qZWxrqXqHHT8OgIDEQYvRWS1LANbZA8=; b=ORpQCOTJBAD7mT4gbjFcMVBkuK4UZmhLIqsGzQmKAxHv11TOmk4i0MW/bVZ9pGX3SAZfqn 9TRGcVLaiKxwFGkT9qidkphlGOEmubm1eQt3LWpOsF7bu8K/B0sifRCHilpLm+fjSdxURK qE0E0LXBViG12dzBOe9/oh+mNd4lhNFsThgsvLP20Q766jX8/dxc0lGPWyvry88nR4Byzh f/VXwUpKZqSDdZzUdrkiH5ZJKZC7jXV84c2ddxIJ7BoSjEQdoFZFz6v6RZvrf5kliaI8Vx KUSWuX3iAP4I76/xdLTVcwMhU9fC+kig+L+bTL1uOq9oFGRTTCt4P7g1SaE9Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705269232; a=rsa-sha256; cv=none; b=HfcVJEpL4YM+OIqjdlIMd8HthRI5ZobNczOgxw5oLLURYIKTQhCBPsD8J/ITjBk2GDSypd FvZ5Dve0m1WP6tQKnP9XaqdIeXRiSHtJclxu5eAz3LNwkVV3DEcYzsHjveOm/ibN2EFldz iCH0lPic0h8utj9EOXVv5N5Ec/dHoOuARZyvCR0NtJSITDvWZhGdLTirPgK1omPNgHGaQt P39rkTQXJZ4BmqHQLacl2Vn4jV+NSNBs03G6wHTCcV5jzJnRc+uKOU/o/PFLlCzedLCRCe vefd+IhsSUGwe6FGl2Vx08XPBvfRJSCeJf3C9+aCPmX1DqeQjdPDTMCPWdBCkA== 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 4TCpv44L22zWvh; Sun, 14 Jan 2024 21:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40ELrqBU041487; Sun, 14 Jan 2024 21:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ELrqsU041484; Sun, 14 Jan 2024 21:53:52 GMT (envelope-from git) Date: Sun, 14 Jan 2024 21:53:52 GMT Message-Id: <202401142153.40ELrqsU041484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Arthur Kiyanovski Subject: git: 4526ef3d05dd - stable/14 - ena: Change measurement unit of time since last tx cleanup to ms List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4526ef3d05dd469f5f61d22783a861d9db5c56fd Auto-Submitted: auto-generated The branch stable/14 has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=4526ef3d05dd469f5f61d22783a861d9db5c56fd commit 4526ef3d05dd469f5f61d22783a861d9db5c56fd Author: Arthur Kiyanovski AuthorDate: 2023-06-14 10:12:16 +0000 Commit: Arthur Kiyanovski CommitDate: 2024-01-14 21:18:10 +0000 ena: Change measurement unit of time since last tx cleanup to ms This commit: 1. Sets the time since last cleanup to milliseconds. 2. Fixes incorrect indentations. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit 9272e45c04c0d4fcb5d767e962783f3ab192f64e) --- sys/dev/ena/ena.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 067c8a6f3a08..ba1712093a7a 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3102,13 +3102,13 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, if (unlikely(time_offset > adapter->missing_tx_timeout)) { if (tx_buf->print_once) { - time_since_last_cleanup = TICKS_2_USEC(ticks - + time_since_last_cleanup = TICKS_2_MSEC(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. " - "%d usecs have passed since last cleanup. Missing Tx timeout value %d msecs.\n", + "%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); }