From nobody Fri Jan 13 16:09:06 2023 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 4NtmZB6kxDz2r48K; Fri, 13 Jan 2023 16:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NtmZB6Dx2z4NRl; Fri, 13 Jan 2023 16:09:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673626146; 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=Q3uI/9jAyOhvjHQ7qhaEnMZPS6ici2s8c7gY55GoPpk=; b=pwqQL+5FjMhpkGJr4TNrezgXU07yIR05Xhi17QUuyoIWhsBh/py1EzCGJTzc8szDHFZeBW Fkqmf2Px9Eg8EgFn8+RrCFRhMcxqB4ct/R4Hah91d4MpZn/SN28urREtUiMTmLfTPbjVA2 YJd/fSDQuVkf4NIYiwkrWhWViFOQTNvBQ95EnlCx7zJbdb6S592s4pFL+Ndl8M/s8PLvqx PRrsPnf6kIOvzQKL04sYrqSMkoqnikgRXCL82qWK2Uw0I2/6NLYwEKtZw4cjLNkQ3vWDym j94pCOLEh8Qxbpf87src4/gTtET/uLzM90clPEpi6Fsy5byrkzfZPz2h4emRpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673626146; 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=Q3uI/9jAyOhvjHQ7qhaEnMZPS6ici2s8c7gY55GoPpk=; b=S/SL/0VOzjHsDKOh49veZqbmLYJPVC7C5nogBYnfTdqTt7DDgbMD7rk32w0uxNhZN5SfCY QJz3HJ6PZg7O5DjuS6Q1GAmydPks45IniZPSz5RkNWbukD9LHjXctkNR0+m6SqMSxKebOV TNotUaF2e4+EzwZ6dpgUedlbGQlootWnO+xN187CfFgzZPltqQIHRvzNQzjU0ZqzNII2/0 sycw0JOVCFuINjaVlYl77eNgcdkCBxdyTI0173XV2jVn4IxpyLL+EaxDHTWQqlnxV8YCqV FS1yfxiyrgQgIpJdnQIJHv2Yr5Fec2GOY3J+w5A5FkK9SJbcmut9rnsrpJLjMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673626146; a=rsa-sha256; cv=none; b=At1HGbc3AUUIEmGDeHW8Wl867zHIKJC/je7+09k4PQrqGBlMY6kE/oWKTOcV8ZkV+RpqC4 WZ8F3jW4+ZuDIDpQ0pO/3+XQyMenrx5k7L3pR05y2iAAEVuNmtENop4kLNkz9XwD5kQiEN yBnbm84kriscQs0rTDrb/C22uigIEXLRd84YApaJnPhyfpbnAM4anGhIaZqMTQayq7DfWO RjMrGNgBqkm33TLa94ch7ur1GkcLqn8zsUUmxKbN6gWzdCYJGpa31ethV4RqnujG+n99CT SsrQCLmWLQFP7/yTtYY7KQmk7XLbd9cHFyN7snY3PSIsEwrFm6DSmidnkntuUQ== 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 4NtmZB5J98z1Cwn; Fri, 13 Jan 2023 16:09:06 +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 30DG96R4082175; Fri, 13 Jan 2023 16:09:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DG96Kr082174; Fri, 13 Jan 2023 16:09:06 GMT (envelope-from git) Date: Fri, 13 Jan 2023 16:09:06 GMT Message-Id: <202301131609.30DG96Kr082174@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: f01b2cd98e93 - main - ena: Re-Enable per-packet missing tx completion print 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f01b2cd98e93ef5ac3698b97bbaa45ac9c50fe5d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=f01b2cd98e93ef5ac3698b97bbaa45ac9c50fe5d commit f01b2cd98e93ef5ac3698b97bbaa45ac9c50fe5d Author: Arthur Kiyanovski AuthorDate: 2022-12-19 13:56:44 +0000 Commit: Marcin Wojtas CommitDate: 2023-01-13 16:06:42 +0000 ena: Re-Enable per-packet missing tx completion print Commit [1] first added the ena_tx_buffer.print_once member, so that a message about a missing tx completion is printed only once per packet (and not every second when the watchdog runs). In this commit print_once is initialized to true, and is set back to false after detecting a missing tx completion and printing a warning about it to dmesg. Commit [2] incorrectly reverses the values assigned to print_once. The variable is initialized to be true but is checked to be false when a missing tx completion is detected. This is never true, and therefore the warning print for each missing tx completion is never printed since this commit. Commit [3] added time passed since last TX cleanup to the missing tx completions per-packet print. However, due to the issue in commit [2], this time is never printed. This commit reverses back the values assigned to ena_tx_buffer.print_once erroneously by commit [2], bringing back to life the missing tx completion per-packet print. Also add a space after "." in the missing tx completion print. [1] - 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC") [2] - 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver") [3] - d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup") Fixes: 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver") Fixes: d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup") MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index c091091fed20..1def02978627 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3019,19 +3019,19 @@ 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." + "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", tx_ring->qid, i, time_since_last_cleanup, missing_tx_comp_to); } - tx_buf->print_once = true; + tx_buf->print_once = false; missed_tx++; } }