From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B766B1B48B for ; Fri, 4 Jan 2019 14:27:57 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1FEC0C058CAC; Fri, 4 Jan 2019 13:27:57 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6D445C1A1; Fri, 4 Jan 2019 13:27:55 +0000 (UTC) From: Kevin Traynor To: Rafal Kozik Cc: Michal Krawczyk , dpdk stable Date: Fri, 4 Jan 2019 13:24:32 +0000 Message-Id: <20190104132455.15170-50-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 04 Jan 2019 13:27:57 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ena: add reset reason in Rx error' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:27:58 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From d6b85eb3081aac3c681464969c6fcc76d896dd83 Mon Sep 17 00:00:00 2001 From: Rafal Kozik Date: Fri, 14 Dec 2018 14:18:29 +0100 Subject: [PATCH] net/ena: add reset reason in Rx error [ upstream commit 9b260dbf7412819f9a5fc544872b1447d6938afe ] Whenever the driver will receive too many descriptors from the device, it should trigger the device reset with reset reason set to ENA_REGS_RESET_TOO_MANY_RX_DESCS. Fixes: 241da076b1f7 ("net/ena: adjust error checking and cleaning") Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 709ad2edb..76e8d499d 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1910,4 +1910,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, if (unlikely(rc)) { RTE_LOG(ERR, PMD, "ena_com_rx_pkt error %d\n", rc); + rx_ring->adapter->reset_reason = + ENA_REGS_RESET_TOO_MANY_RX_DESCS; rx_ring->adapter->trigger_reset = true; return 0; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.661472816 +0000 +++ 0050-net-ena-add-reset-reason-in-Rx-error.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,14 +1,15 @@ -From 9b260dbf7412819f9a5fc544872b1447d6938afe Mon Sep 17 00:00:00 2001 +From d6b85eb3081aac3c681464969c6fcc76d896dd83 Mon Sep 17 00:00:00 2001 From: Rafal Kozik Date: Fri, 14 Dec 2018 14:18:29 +0100 Subject: [PATCH] net/ena: add reset reason in Rx error +[ upstream commit 9b260dbf7412819f9a5fc544872b1447d6938afe ] + Whenever the driver will receive too many descriptors from the device, it should trigger the device reset with reset reason set to ENA_REGS_RESET_TOO_MANY_RX_DESCS. Fixes: 241da076b1f7 ("net/ena: adjust error checking and cleaning") -Cc: stable@dpdk.org Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c -index 5e9666f74..a47f5f7fa 100644 +index 709ad2edb..76e8d499d 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c -@@ -1911,4 +1911,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1910,4 +1910,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, if (unlikely(rc)) { RTE_LOG(ERR, PMD, "ena_com_rx_pkt error %d\n", rc); + rx_ring->adapter->reset_reason =