From nobody Thu Jun 30 16:15:32 2022 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 8B3F78A3AAF; Thu, 30 Jun 2022 16:15:33 +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 4LYk2Y1bkdz3Qkr; Thu, 30 Jun 2022 16:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605733; 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=OnXrXaUwtU6TOKOktTqgEzT3VOr40MH+vdP5ZCJfVx0=; b=e1ZrgAoHV4S9JTovohE8NRZH8N0jNIBbRJsi8MwT6Evsqq2dRnmFPykAnDU+xRtOWlMqJ8 DB93uO2xswB3GzMDaN2mmTOAw0EcHHg+VWUvt7BNWsekLnjKzlvEahSlb7UTHiHSt6Qvv3 Fn5r0Vm1DIPKIf5OLJat4qDa4c0yhAZ4Bko5AnEnkiqbnVvAAwHl2WjAAMpSlWm1OQ/1gV qot/SAx5etKGb8lzZquj+zz9Cbj76VlMkS9e1STJFPze8y6mPW1jYTsyNytATV6S2KBE8/ E/Fd9wwrkkKTVOQCe4a+wC4IwoVeqcNgHtPhKFiRhAKFFgfbCPdtpj14lM7t9w== 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 0A2A9155E; Thu, 30 Jun 2022 16:15:33 +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 25UGFWfs014745; Thu, 30 Jun 2022 16:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGFW6q014744; Thu, 30 Jun 2022 16:15:32 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:15:32 GMT Message-Id: <202206301615.25UGFW6q014744@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: a9c39b031fe8 - main - ena: Extend debug prints for invalid req_id resets 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: a9c39b031fe89a6414174e3db82da6548d7fff0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605733; 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=OnXrXaUwtU6TOKOktTqgEzT3VOr40MH+vdP5ZCJfVx0=; b=mWdVs0SlpOYX/QpkTiQ/lSap+alhsN1AA80FV7ziWWgH1J6vdelB3b6d153PNHWOHTOGM1 FipghzIT/C+37Hw6ixaneJpP1Bn40co4x+hz+3acZu/aYSDc//Pb/87RX8z6pbTykbyREA CcOr2UnsqUvQHgMih9yhtqAyRoiQGZp3Emg1Da6GCPb2TCfWrp3tIZEAYKSrkL88HXXuaz Jsi0mVBhEWTob0PGNc2NtpeXe+YuzbNV75OUJCS4lWfNQzKWrkc50jXGImuQxoF6YXrdOe JwY9Krv3uu0DASxtgs+wma3vYI6tLSzvyH+DYzJNQmDpMKwteWmaDUAkMO5mtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656605733; a=rsa-sha256; cv=none; b=lh94xF49JNgSDRvsA3ij6DTWLGRa8nDI5T2SD1mW+WA5AM8s2oiI8FVM7mx+Vxpc/oCIYf LXvxul7LU7Q6vWWj8zqSRwGmlUaiU4jCoQI2xL7jCq3+TrB5r8D3QixIzC1/MYHF+6G0SG hZl4/t7CkOYcl/gPZdd+NNdHi1VcT0vJ67Sz8HEKUGLHGKF1wsiUzmc6SfA4naZtYLdNB3 TJo7PXe11ZFGFltahgFGfTFq+gb51Fc/zxDLQrsXi+1i9EIqA5efBbRrf5JlqkZEV4wA8V +ijSiZdfMm9NPnjGj+khV2R5MORW9GSXaazHfENpeKzNBmEbdyXFZOSG0eJm4Q== 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=a9c39b031fe89a6414174e3db82da6548d7fff0f commit a9c39b031fe89a6414174e3db82da6548d7fff0f Author: Dawid Gorecki AuthorDate: 2022-06-10 09:18:07 +0000 Commit: Marcin Wojtas CommitDate: 2022-06-30 15:31:29 +0000 ena: Extend debug prints for invalid req_id resets Print information about qid if req_id is invalid. Add information about qid and req_id if mbuf is invalid. Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena_datapath.c | 7 +++++-- sys/dev/ena/ena_netmap.c | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 8d4621947e03..6c18a4f5c1f9 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -212,7 +212,8 @@ ena_get_tx_req_id(struct ena_ring *tx_ring, struct ena_com_io_cq *io_cq, return (EAGAIN); if (unlikely(rc != 0)) { - ena_log(adapter->pdev, ERR, "Invalid req_id: %hu\n", *req_id); + ena_log(adapter->pdev, ERR, "Invalid req_id %hu in qid %hu\n", + *req_id, tx_ring->qid); counter_u64_add(tx_ring->tx_stats.bad_req_id, 1); goto err; } @@ -220,7 +221,9 @@ ena_get_tx_req_id(struct ena_ring *tx_ring, struct ena_com_io_cq *io_cq, if (tx_ring->tx_buffer_info[*req_id].mbuf != NULL) return (0); - ena_log(adapter->pdev, ERR, "tx_info doesn't have valid mbuf\n"); + ena_log(adapter->pdev, ERR, + "tx_info doesn't have valid mbuf. qid %hu req_id %hu\n", + tx_ring->qid, *req_id); err: ena_trigger_reset(adapter, ENA_REGS_RESET_INV_TX_REQ_ID); diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index 8ca6aad75abf..da9cb8fbccb2 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -882,7 +882,8 @@ validate_tx_req_id(struct ena_ring *tx_ring, uint16_t req_id) if (likely(req_id < tx_ring->ring_size)) return (0); - ena_log_nm(adapter->pdev, WARN, "Invalid req_id: %hu\n", req_id); + ena_log_nm(adapter->pdev, WARN, "Invalid req_id %hu in qid %hu\n", + req_id, tx_ring->qid); counter_u64_add(tx_ring->tx_stats.bad_req_id, 1); ena_trigger_reset(adapter, ENA_REGS_RESET_INV_TX_REQ_ID);