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 D81AB1B49C for ; Fri, 4 Jan 2019 14:27:59 +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 44BD881F0F; Fri, 4 Jan 2019 13:27:59 +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 A97E45C1A1; Fri, 4 Jan 2019 13:27:57 +0000 (UTC) From: Kevin Traynor To: Rafal Kozik Cc: Michal Krawczyk , dpdk stable Date: Fri, 4 Jan 2019 13:24:33 +0000 Message-Id: <20190104132455.15170-51-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.27]); Fri, 04 Jan 2019 13:27:59 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ena: skip packet with wrong request id' 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:28:00 -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 5c54c8b11262543258e8c05ba91e358c5b2db197 Mon Sep 17 00:00:00 2001 From: Rafal Kozik Date: Fri, 14 Dec 2018 14:18:31 +0100 Subject: [PATCH] net/ena: skip packet with wrong request id [ upstream commit f00930d929151fc09914e6d61b827f9f81645324 ] When invalid req_id is received, the reset should be handled by the application, as it is indicating invalid rings state, so further Rx is not making any sense. Fixes: c2034976673d ("net/ena: add Rx out of order completion") 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 76e8d499d..e7b462859 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1947,4 +1947,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, next_to_clean++; } + if (unlikely(rc)) + break; /* fill mbuf attributes if any */ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.686581421 +0000 +++ 0051-net-ena-skip-packet-with-wrong-request-id.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,14 +1,15 @@ -From f00930d929151fc09914e6d61b827f9f81645324 Mon Sep 17 00:00:00 2001 +From 5c54c8b11262543258e8c05ba91e358c5b2db197 Mon Sep 17 00:00:00 2001 From: Rafal Kozik Date: Fri, 14 Dec 2018 14:18:31 +0100 Subject: [PATCH] net/ena: skip packet with wrong request id +[ upstream commit f00930d929151fc09914e6d61b827f9f81645324 ] + When invalid req_id is received, the reset should be handled by the application, as it is indicating invalid rings state, so further Rx is not making any sense. Fixes: c2034976673d ("net/ena: add Rx out of order completion") -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 617f85f02..505d9bf30 100644 +index 76e8d499d..e7b462859 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c -@@ -1989,4 +1989,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1947,4 +1947,6 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, next_to_clean++; } + if (unlikely(rc))