From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B2A73A0096 for ; Wed, 8 May 2019 12:16:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A8DE32862; Wed, 8 May 2019 12:16:05 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4A4992862 for ; Wed, 8 May 2019 12:16:02 +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 AE0AA3082E69; Wed, 8 May 2019 10:16:01 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68E261A267; Wed, 8 May 2019 10:16:00 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Thomas Monjalon , dpdk stable Date: Wed, 8 May 2019 11:14:51 +0100 Message-Id: <20190508101534.8984-9-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-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.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 08 May 2019 10:16:01 +0000 (UTC) Subject: [dpdk-stable] patch 'net/enetc: fix big endian build and buffer allocation' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/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/3b306f2b1216d48f7568cf99acdee8214ec869d7 Thanks. Kevin Traynor --- >From 3b306f2b1216d48f7568cf99acdee8214ec869d7 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Fri, 12 Apr 2019 12:28:56 +0000 Subject: [PATCH] net/enetc: fix big endian build and buffer allocation [ upstream commit 389a450f377b6c5aed016f437eb6a6f78adb4cf1 ] There was an error at rte_constant_bswap64 while compiling with big endian toolchain. so fixing it by adding type cast. Also, rte_pktmbuf_alloc API should be used to allocate mbuf instead of rte_pktmbuf_raw_alloc to avoid use of stale mbuf information. Fixes: 469c6111a799 ("net/enetc: enable Rx and Tx") Suggested-by: Thomas Monjalon Signed-off-by: Gagandeep Singh --- drivers/net/enetc/enetc_rxtx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c index 631e2430d..ce43a9efe 100644 --- a/drivers/net/enetc/enetc_rxtx.c +++ b/drivers/net/enetc/enetc_rxtx.c @@ -89,6 +89,7 @@ enetc_refill_rx_ring(struct enetc_bdr *rx_ring, const int buff_cnt) rxbd = ENETC_RXBD(*rx_ring, i); for (j = 0; j < buff_cnt; j++) { - rx_swbd->buffer_addr = - rte_cpu_to_le_64(rte_mbuf_raw_alloc(rx_ring->mb_pool)); + rx_swbd->buffer_addr = (void *)(uintptr_t) + rte_cpu_to_le_64((uint64_t)(uintptr_t) + rte_pktmbuf_alloc(rx_ring->mb_pool)); rxbd->w.addr = (uint64_t)(uintptr_t) rx_swbd->buffer_addr->buf_addr + -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.320549650 +0100 +++ 0009-net-enetc-fix-big-endian-build-and-buffer-allocation.patch 2019-05-08 11:05:05.768934038 +0100 @@ -1 +1 @@ -From 389a450f377b6c5aed016f437eb6a6f78adb4cf1 Mon Sep 17 00:00:00 2001 +From 3b306f2b1216d48f7568cf99acdee8214ec869d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 389a450f377b6c5aed016f437eb6a6f78adb4cf1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a31a38725..42f16cab1 100644 +index 631e2430d..ce43a9efe 100644 @@ -35 +36 @@ - rx_swbd->buffer_addr->buf_iova + + rx_swbd->buffer_addr->buf_addr +