From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A06DA0613 for ; Wed, 28 Aug 2019 15:44:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00E0C1BF82; Wed, 28 Aug 2019 15:44:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CCC8A1BF82 for ; Wed, 28 Aug 2019 15:43:59 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4EFE618C892A; Wed, 28 Aug 2019 13:43:59 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72E724116; Wed, 28 Aug 2019 13:43:58 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: dpdk stable Date: Wed, 28 Aug 2019 14:42:29 +0100 Message-Id: <20190828134234.20547-53-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 28 Aug 2019 13:43:59 +0000 (UTC) Subject: [dpdk-stable] patch 'net/dpaa: check multi-segment external buffers' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c4b686e0bbfff67d1b8e32fc72935194c3a37e4f Thanks. Kevin Traynor --- >From c4b686e0bbfff67d1b8e32fc72935194c3a37e4f Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 19 Jul 2019 15:36:08 +0530 Subject: [PATCH] net/dpaa: check multi-segment external buffers [ upstream commit 829904201f0a3a43c740d64e216167265bc34ffa ] This patch add check to return error as the handling for external buffer packets with SG is currently missing. Fixes: 37f9b54bd3cf ("net/dpaa: support Tx and Rx queue setup") Signed-off-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index c4471c227..ba01bd17e 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -953,4 +953,14 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) } } else { + /* TODO not supporting sg for external bufs*/ + if (unlikely(mbuf->nb_segs > 1)) { + /* Set frames_to_send & nb_bufs so + * that packets are transmitted till + * previous frame. + */ + frames_to_send = loop; + nb_bufs = loop; + goto send_pkts; + } state = tx_on_external_pool(q, mbuf, &fd_arr[loop]); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:35.021343966 +0100 +++ 0054-net-dpaa-check-multi-segment-external-buffers.patch 2019-08-28 14:32:31.730955376 +0100 @@ -1 +1 @@ -From 829904201f0a3a43c740d64e216167265bc34ffa Mon Sep 17 00:00:00 2001 +From c4b686e0bbfff67d1b8e32fc72935194c3a37e4f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 829904201f0a3a43c740d64e216167265bc34ffa ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index f16b7e0bc..30b183607 100644 +index c4471c227..ba01bd17e 100644 @@ -21 +22 @@ -@@ -958,4 +958,14 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) +@@ -953,4 +953,14 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)