From nobody Tue Jul 26 19:30:50 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 4Lsn7v0DhXz4WwFS; Tue, 26 Jul 2022 19:30:51 +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 4Lsn7t6vBJz42RL; Tue, 26 Jul 2022 19:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863851; 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=70ua36jvfU82vTL2+aViWN28XCOq+iineMDBlfdA1VE=; b=LZMwiJ/25Ohz+KOaHUXU4PJemIqdYvDiTFUJ7MMUfh9kLKmwY9EySH9mUyKOoNiaFr8HL9 CEkz0KzeFZ0LJs+0Zm/S9EmS1EXMg3EE1cA/MKJ7k2rOvzDXh1FWVE7z41ko5sEF4hOEOu XnEV8JH9QJGPKWerpexJkFYou0e+1zjg1VfXi3pNAsAlSkdfqEfIZbLraNc0Tv5zDNdDAa hk9z75XL+MRT+zf8poj125q7IOVE6TRhyNulDaOmYlrHx+5JLZ758dl/WcDpJW/KpwWBtp WuiNwNBVHUg72lZly+twzE3sVKWUsrgKQudHaqZlCS1wJab5MLVFlOIlV5k+aA== 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 4Lsn7t5kF6zp3X; Tue, 26 Jul 2022 19:30:50 +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 26QJUoiO029583; Tue, 26 Jul 2022 19:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJUogN029582; Tue, 26 Jul 2022 19:30:50 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:30:50 GMT Message-Id: <202207261930.26QJUogN029582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 274af2948a31 - stable/13 - ena: Extend debug prints for invalid req_id resets 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 274af2948a31cc7564447b13a26f1f41ce6f7e06 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863851; 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=70ua36jvfU82vTL2+aViWN28XCOq+iineMDBlfdA1VE=; b=BejEHZnL6Ym+yl7YVdfiTywYxtWvOnN9ZS0nT+ZlJ5ye7H3XtQtJ8XNmSQIieZrJTJ3LVE S5opqh2FGG1i/egl2KKuunVWHbh0qDlXY1TbMLZaC9d0HuaXOu/0Vn6Y0ndqROrao+vIZv RfRclIy4dcN4ftVJ7qPfzd2DKMnu/a2KWydpEQdZyGRRMaExqRO7C8rQaYVQckDnDI1G9i YnWtWIPqzzhBU5lmX4Xcn3ZN3rVGsmY0CK6skOae7VCqsuzuTU1gHFFSYTeGmcZRAL0aA7 EJFT7CXmmx5uea5GUx57mKceSvjwjZVfm275HW9WLkPwrq5m95kubuh1zQPRSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863851; a=rsa-sha256; cv=none; b=G5YKU1/UXKDnYs+kJdTQ91TbCqSaTpwI2+Hon9K6UvpI/DHws63VSEO74FhuzsT3JPwqea I1KlYmlqjpadE471GA+KEpfiIbZ3dqm29rqCMDtL/PRmyjXib1vdnf7eo4zH4GlbU6Op4i yCbBapWfUoLGRXAO2G2BWhnCd2jAf4RCXgflHrL9eaU70vn0wedQRc6OGvMiOzH8KgEZ+E Xq2gZpwuOLG+73GXicucUR1VuNwMjTDgZmEv+iJHjvOJ/ukEJzYrvbqT/mcxH3UthACXv0 UBFyBwycTrOsP4KOuleDkihEi2YWVrub/vMdd4hJid5/gSt5sMZ4gtlNtK+DIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=274af2948a31cc7564447b13a26f1f41ce6f7e06 commit 274af2948a31cc7564447b13a26f1f41ce6f7e06 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:18:07 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:30:14 +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. (cherry picked from commit a9c39b031fe89a6414174e3db82da6548d7fff0f) --- 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 e9511b033fd3..476926da373d 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -884,7 +884,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);