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 0FE57A0093 for ; Thu, 28 May 2020 18:25:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 077701DC1D; Thu, 28 May 2020 18:25:59 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id D51C21DC19 for ; Thu, 28 May 2020 18:25:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QY+PkMd0W0Dm92z480VbEM3ctL1aCpiShYKQQTckxhg=; b=H/263cs+8Qrxy4eKMEiFUCUz3egF89LlD3lweoogQz5/LYF9ulXioF04U+NQLYdmJDiknX TOF+160dCPBL3YHOUz4dpIkKTOoNa6+4h0zTeEJGjh40/UJHoM6PdCS1XODlNgyrw6hpUt w9TvainfOqFQcNsbJWY1FBWaVV9QaTY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-Hs9RPpldMlG6E8IMb655ag-1; Thu, 28 May 2020 12:25:48 -0400 X-MC-Unique: Hs9RPpldMlG6E8IMb655ag-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F8E1800D24; Thu, 28 May 2020 16:25:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6B0760C87; Thu, 28 May 2020 16:25:46 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: dpdk stable Date: Thu, 28 May 2020 17:22:57 +0100 Message-Id: <20200528162322.7863-70-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/null: fix secondary burst function selection' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. 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/1142c2f79991f12183278ddc81c71a2ce418b01e Thanks. Kevin. --- >From 1142c2f79991f12183278ddc81c71a2ce418b01e Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 2 Mar 2020 17:36:40 +0000 Subject: [PATCH] net/null: fix secondary burst function selection [ upstream commit e2f4b25063d7d06f004d0809c30bb616f5bca61b ] Secondary process uses the primary process device and while setting the Rx/Tx functions it uses the device arguments from the secondary process instead of the primary ones. This may cause primary and secondary process use different Rx/Tx functions unintentionally. Fixes: bccc77a6a74a ("net/null: fix multi-process Rx and Tx") Signed-off-by: Ferruh Yigit --- drivers/net/null/rte_eth_null.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 1067e6e4ea..95314982c3 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -614,4 +614,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + struct pmd_internals *internals; eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { @@ -622,5 +623,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) eth_dev->dev_ops = &ops; eth_dev->device = &dev->device; - if (packet_copy) { + internals = eth_dev->data->dev_private; + if (internals->packet_copy) { eth_dev->rx_pkt_burst = eth_null_copy_rx; eth_dev->tx_pkt_burst = eth_null_copy_tx; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.716767324 +0100 +++ 0070-net-null-fix-secondary-burst-function-selection.patch 2020-05-28 17:12:59.151555269 +0100 @@ -1 +1 @@ -From e2f4b25063d7d06f004d0809c30bb616f5bca61b Mon Sep 17 00:00:00 2001 +From 1142c2f79991f12183278ddc81c71a2ce418b01e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2f4b25063d7d06f004d0809c30bb616f5bca61b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 025b73acb3..87a29b8535 100644 +index 1067e6e4ea..95314982c3 100644 @@ -25 +26 @@ -@@ -585,4 +585,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) +@@ -614,4 +614,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) @@ -31 +32 @@ -@@ -593,5 +594,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) +@@ -622,5 +623,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)