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 AEDF1A0093 for ; Fri, 22 May 2020 11:40:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A533C1D966; Fri, 22 May 2020 11:40:53 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id B5A661D966 for ; Fri, 22 May 2020 11:40:50 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id e16so9497835wra.7 for ; Fri, 22 May 2020 02:40:50 -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=+CQ8mTpaFLHJFlDaEccLMjaCSsjnzysPJsuR1/OAYLU=; b=ilsgLLDPCCaJ8WAyGpnyvsZ9cChWEdF27ZeElNA4Z2tZ0IFMM+GMG+sBRBoZODtBP9 ftJVcKQpgfJiRWZVqe0EFQxDCQXHT+ORejBuQCwuWa1d3X69SgNg+zwuNiNmCPy2vUlQ WV4okegu+CW1J+Zy14hYH529RsPVHVtrVZ7zNGbwXLzpjiO5VPsk+MeSqay1v3iEAM/j vVA3ysbldlnIt0Ei4EtGNrFOLNLaxISEJnMlrfXcgY/rFIZxOLb9nea9Gv4Yv17f3jr5 EqD6yJA0lq+7SHtrATcBhbTimRxZ8+oNLLkb7voMQyFKJlXWmGI6as+Hn/ZxiQ6BX2KF x+Hg== 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=+CQ8mTpaFLHJFlDaEccLMjaCSsjnzysPJsuR1/OAYLU=; b=jMKIGnD0tMAkAg5wUXo9KBbJINy4fkwpD9HJHhhekXfB7BGo0M6IhDxhw+Jl9gKUrY 92Ds5wPpDvQKDFqqTiLQXTG+uVhqb4DRhh4NCSyv5ZQDzeC8C+/1PcGJoOLTep5a+EZJ ajnjVIgu7/EG4/7OTDV9f+4MIiJrMg/6hHOs/hbGrUKwZkmUcOGNlYw+Q/cWU481XPPz YOyFuXII9S95HJfrR2gxKPzxhJkuwfHgYHEhH038BxI17FSJbfYr37ytucjPdNOjHnyh w8jPsDRV/1nUtOGZteXzvYBoHSREJDgyuwEf0OwfICSWFNZiQa4bIthMTdlYr9fdpCxG zuFA== X-Gm-Message-State: AOAM530TFwdrtRAqpyTghBfwIumV7KAWnyNDXLNO3CjuDqZ4WkG9ZXFZ mDwb14Ds8zqddwYkTssFvHw= X-Google-Smtp-Source: ABdhPJwJFJ7DPC2W75K5i8tQKmrKIx4rilXFIcg/ze8pall9Lxls6MG5k6odDgwecK95C9KY7lBldQ== X-Received: by 2002:a5d:4907:: with SMTP id x7mr2617271wrq.49.1590140450450; Fri, 22 May 2020 02:40:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w9sm9683103wrc.27.2020.05.22.02.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:40:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Alvin Zhang Cc: Jianwei Mei , Jeff Guo , dpdk stable Date: Fri, 22 May 2020 10:39:49 +0100 Message-Id: <20200522094022.1025696-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' 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/24/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 fc962b01c7428ec199de39f6cae25a737ffc7ded 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 080cbe2df5..fc47993c83 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -321,7 +321,7 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; eth_em_close(eth_dev); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index a3e30dbe5a..e061615b88 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -922,7 +922,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; eth_igb_close(eth_dev); @@ -1043,7 +1043,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -EPERM; + return 0; igbvf_dev_close(eth_dev); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.606036528 +0100 +++ 0010-net-e1000-fix-port-hotplug-for-multi-process.patch 2020-05-22 10:37:39.072411710 +0100 @@ -1,12 +1,13 @@ -From 3a19eeb0c3329905fbb927fdbac90e548061130d Mon Sep 17 00:00:00 2001 +From fc962b01c7428ec199de39f6cae25a737ffc7ded 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") -Cc: stable@dpdk.org Signed-off-by: Alvin Zhang Tested-by: Jianwei Mei @@ -17,7 +18,7 @@ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c -index 188cda3508..902b1cdca0 100644 +index 080cbe2df5..fc47993c83 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -321,7 +321,7 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev) @@ -30,10 +31,10 @@ eth_em_close(eth_dev); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c -index 520fba8fab..a5551e8175 100644 +index a3e30dbe5a..e061615b88 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c -@@ -923,7 +923,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev) +@@ -922,7 +922,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) @@ -42,7 +43,7 @@ eth_igb_close(eth_dev); -@@ -1044,7 +1044,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) +@@ -1043,7 +1043,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY)