From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AB20945BAE; Wed, 23 Oct 2024 11:41:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E66941140; Wed, 23 Oct 2024 11:41:36 +0200 (CEST) Received: from smtp-fw-6002.amazon.com (smtp-fw-6002.amazon.com [52.95.49.90]) by mails.dpdk.org (Postfix) with ESMTP id 6CD7840E72 for ; Wed, 23 Oct 2024 11:41:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1729676493; x=1761212493; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=B2TfydnnCegnZPmpPUUHdfatgRdAWbQBSs1P8/2TUcY=; b=UT3MaF2nXGzf5KYYXT0eZq1KTFIk5P92S5CLeFw7/3PvqeAqpR+idwna djz8zRHtnJjbKkRjZf23AZZkrm52S8V8qCoBMxFqjlJu+jkjUy/+xVHq3 THfPA1KVxOtoxssSPTSfwa1lwhLWkOM3ancF933ehRND7wryXV9HHbSbq 0=; X-IronPort-AV: E=Sophos;i="6.11,225,1725321600"; d="scan'208";a="443187584" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.6]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2024 09:41:30 +0000 Received: from EX19MTAEUC001.ant.amazon.com [10.0.17.79:44609] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.18.96:2525] with esmtp (Farcaster) id f1797df6-031e-482e-ba71-1456949e222d; Wed, 23 Oct 2024 09:41:28 +0000 (UTC) X-Farcaster-Flow-ID: f1797df6-031e-482e-ba71-1456949e222d Received: from EX19D007EUA003.ant.amazon.com (10.252.50.8) by EX19MTAEUC001.ant.amazon.com (10.252.51.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Wed, 23 Oct 2024 09:41:27 +0000 Received: from EX19MTAUEA001.ant.amazon.com (10.252.134.203) by EX19D007EUA003.ant.amazon.com (10.252.50.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.35; Wed, 23 Oct 2024 09:41:26 +0000 Received: from email-imr-corp-prod-iad-all-1b-85daddd1.us-east-1.amazon.com (10.43.8.2) by mail-relay.amazon.com (10.252.134.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34 via Frontend Transport; Wed, 23 Oct 2024 09:41:26 +0000 Received: from HFA15-CG15235BS.amazon.com (unknown [10.85.143.178]) by email-imr-corp-prod-iad-all-1b-85daddd1.us-east-1.amazon.com (Postfix) with ESMTP id D368740999; Wed, 23 Oct 2024 09:41:25 +0000 (UTC) From: To: CC: , Shai Brandes Subject: [PATCH 2/3] net/ena: support malformed Rx descriptor error Date: Wed, 23 Oct 2024 12:41:18 +0300 Message-ID: <20241023094119.4299-3-shaibran@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241023094119.4299-1-shaibran@amazon.com> References: <20241023094119.4299-1-shaibran@amazon.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Shai Brandes Add validation check for packet descriptor consistency and improve reset logic and stats tracking. Signed-off-by: Shai Brandes Reviewed-by: Amit Bernstein --- doc/guides/rel_notes/release_24_11.rst | 1 + drivers/net/ena/ena_ethdev.c | 29 +++++++++++++++++++------- drivers/net/ena/ena_ethdev.h | 2 ++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index fa4822d928..e94564b8b7 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -142,6 +142,7 @@ New Features * Modified the PMD API that controls the LLQ header policy. * Replaced ``enable_llq``, ``normal_llq_hdr`` and ``large_llq_hdr`` devargs with a new shared devarg ``llq_policy`` that keeps the same logic. + * Added validation check for Rx packet descriptor consistency. * **Updated Cisco enic driver.** diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 1a652b09ac..bba48ea1cc 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -162,6 +162,8 @@ static const struct ena_stats ena_stats_rx_strings[] = { ENA_STAT_RX_ENTRY(mbuf_alloc_fail), ENA_STAT_RX_ENTRY(bad_desc_num), ENA_STAT_RX_ENTRY(bad_req_id), + ENA_STAT_RX_ENTRY(bad_desc), + ENA_STAT_RX_ENTRY(unknown_error), }; #define ENA_STATS_ARRAY_GLOBAL ARRAY_SIZE(ena_stats_global_strings) @@ -1262,7 +1264,9 @@ static int ena_stats_get(struct rte_eth_dev *dev, stats->q_ibytes[i] = rx_stats->bytes; stats->q_ipackets[i] = rx_stats->cnt; stats->q_errors[i] = rx_stats->bad_desc_num + - rx_stats->bad_req_id; + rx_stats->bad_req_id + + rx_stats->bad_desc + + rx_stats->unknown_error; } max_rings_stats = RTE_MIN(dev->data->nb_tx_queues, @@ -2772,6 +2776,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, struct ena_ring *rx_ring = (struct ena_ring *)(rx_queue); unsigned int free_queue_entries; uint16_t next_to_clean = rx_ring->next_to_clean; + enum ena_regs_reset_reason_types reset_reason; uint16_t descs_in_use; struct rte_mbuf *mbuf; uint16_t completed; @@ -2804,15 +2809,25 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, PMD_RX_LOG_LINE(ERR, "Failed to get the packet from the device, rc: %d", rc); - if (rc == ENA_COM_NO_SPACE) { + switch (rc) { + case ENA_COM_NO_SPACE: ++rx_ring->rx_stats.bad_desc_num; - ena_trigger_reset(rx_ring->adapter, - ENA_REGS_RESET_TOO_MANY_RX_DESCS); - } else { + reset_reason = ENA_REGS_RESET_TOO_MANY_RX_DESCS; + break; + case ENA_COM_FAULT: + ++rx_ring->rx_stats.bad_desc; + reset_reason = ENA_REGS_RESET_RX_DESCRIPTOR_MALFORMED; + break; + case ENA_COM_EIO: ++rx_ring->rx_stats.bad_req_id; - ena_trigger_reset(rx_ring->adapter, - ENA_REGS_RESET_INV_RX_REQ_ID); + reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID; + break; + default: + ++rx_ring->rx_stats.unknown_error; + reset_reason = ENA_REGS_RESET_DRIVER_INVALID_STATE; + break; } + ena_trigger_reset(rx_ring->adapter, reset_reason); return 0; } diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index fe7d4a2d65..b8aead8f46 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -140,6 +140,8 @@ struct ena_stats_rx { u64 mbuf_alloc_fail; u64 bad_desc_num; u64 bad_req_id; + u64 bad_desc; + u64 unknown_error; }; struct __rte_cache_aligned ena_ring { -- 2.17.1