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 2B8EEA04A3 for ; Fri, 5 Jun 2020 20:27:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 22CB01D510; Fri, 5 Jun 2020 20:27:27 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id BC4331D515 for ; Fri, 5 Jun 2020 20:27:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381645; 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=NypaoIWLoguSm17TNl5wW7LkeG+X+1bD6BVgyIPrxfk=; b=MOuTDbCAzVT3kB31sIt7qjztDYxN5PXDW5Pgx7q+EgmoKy7gaoO9XNF8wFw1+ut5eRo9L/ xMV6za0dCbOxvjAPhvuDAW9RSzw9cKsGGZbesLwGfS9lT6hgGBtfbuyeiSrqOg60k7WOm4 gmVVqLuy3JwK3FqPKhTQZnlLPErYi1A= 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-411-Dehe3-QdO1-0HknasHX6Gg-1; Fri, 05 Jun 2020 14:27:22 -0400 X-MC-Unique: Dehe3-QdO1-0HknasHX6Gg-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 6CE21800685; Fri, 5 Jun 2020 18:27:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F82E60C47; Fri, 5 Jun 2020 18:27:20 +0000 (UTC) From: Kevin Traynor To: Alvin Zhang Cc: Jianwei Mei , Jeff Guo , dpdk stable Date: Fri, 5 Jun 2020 19:24:52 +0100 Message-Id: <20200605182525.22483-55-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-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/e1000: fix port hotplug for multi-process' 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/10/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/5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Thanks. Kevin. --- >From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Wed, 29 Apr 2020 14:37:24 +0800 Subject: [PATCH] net/e1000: fix port hotplug for multi-process [ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ] Enable detach device on secondary process. Fixes: b9eee2cb8c29 ("e1000: support port hotplug") Signed-off-by: Alvin Zhang Tested-by: Jianwei Mei Reviewed-by: Jeff Guo --- drivers/net/e1000/em_ethdev.c | 2 +- drivers/net/e1000/igb_ethdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 28637c4945..3f061e8a92 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; if (adapter->stopped == 0) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 2c1f2314e8..dfd16d4049 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -924,5 +924,5 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); @@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; if (adapter->stopped == 0) -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.832297345 +0100 +++ 0055-net-e1000-fix-port-hotplug-for-multi-process.patch 2020-06-05 19:20:50.868039495 +0100 @@ -1 +1 @@ -From 3a19eeb0c3329905fbb927fdbac90e548061130d Mon Sep 17 00:00:00 2001 +From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 188cda3508..902b1cdca0 100644 +index 28637c4945..3f061e8a92 100644 @@ -23 +24 @@ -@@ -322,5 +322,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev) +@@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev) @@ -29 +30 @@ - eth_em_close(eth_dev); + if (adapter->stopped == 0) @@ -31 +32 @@ -index 520fba8fab..a5551e8175 100644 +index 2c1f2314e8..dfd16d4049 100644 @@ -40,2 +41,2 @@ - eth_igb_close(eth_dev); -@@ -1045,5 +1045,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) + hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); +@@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) @@ -47 +48 @@ - igbvf_dev_close(eth_dev); + if (adapter->stopped == 0)