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 3AB45A0613 for ; Wed, 28 Aug 2019 15:44:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31C181C219; Wed, 28 Aug 2019 15:44:04 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B93931C21E for ; Wed, 28 Aug 2019 15:44: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 19BD03082131; Wed, 28 Aug 2019 13:44:02 +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 3A94F4129; Wed, 28 Aug 2019 13:44:00 +0000 (UTC) From: Kevin Traynor To: Ed Czeck Cc: dpdk stable Date: Wed, 28 Aug 2019 14:42:31 +0100 Message-Id: <20190828134234.20547-55-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.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 28 Aug 2019 13:44:02 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ark: fix queue packet replacement' 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/ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8 Thanks. Kevin Traynor --- >From ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8 Mon Sep 17 00:00:00 2001 From: Ed Czeck Date: Mon, 22 Jul 2019 08:35:40 -0400 Subject: [PATCH] net/ark: fix queue packet replacement [ upstream commit 7311db731863841f71be27edfad7aab9081ff4e5 ] Queue index was incorrectly incremented with port, which caused incorrect queue packet placement. This manifested when port number was != 0. Fixes: c33d45af3633 ("net/ark: add Tx initial version") Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev_rx.c | 4 +--- drivers/net/ark/ark_ethdev_tx.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 7de1a9851..6156730bb 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -128,7 +128,5 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, int status; - /* Future works: divide the Q's evenly with multi-ports */ - int port = dev->data->port_id; - int qidx = port + queue_idx; + int qidx = queue_idx; /* We may already be setup, free memory prior to re-allocation */ diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 196765570..08bcf431a 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -212,7 +212,5 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev, int status; - /* Future: divide the Q's evenly with multi-ports */ - int port = dev->data->port_id; - int qidx = port + queue_idx; + int qidx = queue_idx; if (!rte_is_power_of_2(nb_desc)) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:35.139823250 +0100 +++ 0056-net-ark-fix-queue-packet-replacement.patch 2019-08-28 14:32:31.732955332 +0100 @@ -1 +1 @@ -From 7311db731863841f71be27edfad7aab9081ff4e5 Mon Sep 17 00:00:00 2001 +From ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7311db731863841f71be27edfad7aab9081ff4e5 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org