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 CE410A0093 for ; Tue, 19 May 2020 15:09:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C498D1D689; Tue, 19 May 2020 15:09:12 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7F4951D6B1 for ; Tue, 19 May 2020 15:09:11 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id e16so15831105wra.7 for ; Tue, 19 May 2020 06:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mKBbLV/DCjjSpUu1EP2Bltcw6+4IKNIaZhKzsJtbwtU=; b=h5niXG/PNMWeklULAAxq/A/1Xf+ETiueH5sKyplHZR1iy9JLl74VMT0SNZZPMBLZdA E8ULoqDw3u9wXsO4FgXINNT79wn8Vb6lxV8i5jdeVFZ4nEiIsAkCnNgAZuaGKW3X/0Sw 4Wc65Zsue2V4yhhU9WSLZn4wwsCJCv/KYb/VkHDguXcN7QXTrSRtkfgPG/EeAumjijja XYACfaZtSHBoGtsmxgAX5ua3gkHga0iMGfC/09f5U5gTyjvzuPblfsNK06BIed8SE8Gq mXO3JBtq4TybL7s46wTCKujYNoN4flQEA4KAvB+ITtGbcu0n2uMOcIkwrdR3kiHbVyFs rWbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mKBbLV/DCjjSpUu1EP2Bltcw6+4IKNIaZhKzsJtbwtU=; b=GEBF+2WYY2638HlIGTQLV2VIkp0sZXr8MwEM3RbDmy90AzQxhALXB0YGgcOeJfy+xf VMc9k0Qkgvy3gSEE7jn3iJLBThOPNWbGFKefHsUQ7UoyDpyy3vD1CoORwppRowe2GPsq Yo9+EPlJNvKhO5nMkJet7PoBki2HARwhr9gY/FGUiZJs/YbVAy0tGA8NhIh3J32lwBLe CX+tgHWXWKWJCI8gDJVibYNRgvJaJbnorbCyS+emrf3Ro3MULkiSWIuwVh41tfhLXS0a I0G/rXrG2Yu/O1D5rVC+Odp/eIP4Grl4TFJuKxCzkmNX1AMIzgR7mXpIMOXzHrzkNYan jJ9Q== X-Gm-Message-State: AOAM530CxshLxVMNmfXQMqeOeOteK6JoFUGf5edYYt3m7Z0sf0Xa0VPy YQYDOJtf/w9WA55pqYKSsAeTwP0H9uPKPvdT X-Google-Smtp-Source: ABdhPJyYSGpefH4hzLi+O3DkqdgVzUEZ0pzZBzqu4rNGiJVLhLIW5EbFRcVVe2SykqWVo8Uk/ZcefA== X-Received: by 2002:adf:82c1:: with SMTP id 59mr24708881wrc.377.1589893751252; Tue, 19 May 2020 06:09:11 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c17sm21228952wrn.59.2020.05.19.06.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: dpdk stable Date: Tue, 19 May 2020 14:03:20 +0100 Message-Id: <20200519130549.112823-65-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/null: fix secondary burst function selection' has been queued to stable release 19.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 stable release 19.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 05/21/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. Thanks. Luca Boccassi --- >From bfc5290bc8e1cb8afab2b8858c28f303e9c9a6ff 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 025b73acb3..87a29b8535 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -584,6 +584,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) PMD_LOG(INFO, "Initializing pmd_null for %s", name); if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + struct pmd_internals *internals; eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { PMD_LOG(ERR, "Failed to probe %s", name); @@ -592,7 +593,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) /* TODO: request info from primary to set up Rx and Tx */ 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; } else { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.140388686 +0100 +++ 0065-net-null-fix-secondary-burst-function-selection.patch 2020-05-19 14:04:44.224648517 +0100 @@ -1,8 +1,10 @@ -From e2f4b25063d7d06f004d0809c30bb616f5bca61b Mon Sep 17 00:00:00 2001 +From bfc5290bc8e1cb8afab2b8858c28f303e9c9a6ff 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. @@ -11,7 +13,6 @@ functions unintentionally. Fixes: bccc77a6a74a ("net/null: fix multi-process Rx and Tx") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit ---