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 8A954A04DD for ; Wed, 28 Oct 2020 11:47:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81C8449E0; Wed, 28 Oct 2020 11:47:20 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 8F2C64C89 for ; Wed, 28 Oct 2020 11:47:18 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id n15so5162108wrq.2 for ; Wed, 28 Oct 2020 03:47:18 -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=YGuHkbfVDHje4c3azuJtzUuOHVfdHGR7U9CadJXWTFA=; b=txBJS+sA6XDeOAjjmaFuXEp+0BFCJOVNsRVLwSUMo7YRDacX+vsdmvO1Iaf4JqsIeS Im5+ARjAgv+ny5/chDbtWXNACnO/BlWRqGmR70CUnu5DrAyji/9GJMSF6p+x0zc3vBor MeNHFfSwl+uLLgLbvaHbT51KAQZ/HfehryDqPezJTqhabv/CmHI1GXfFcxDqX13/9h0p wHk1WYaUmjk53mFEH/ZCwOdtQRq+S3ddhUtLSITNBtB5l8yKpdxEdUiu+Hmf65GHYbXu uZsVAJXKDCLb4dyDiOPKTc3tbMY9Z4Py707Or15VXtRfMmyZVGaQEikTBjNrVWwvH8kz P3Qw== 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=YGuHkbfVDHje4c3azuJtzUuOHVfdHGR7U9CadJXWTFA=; b=fJtjTZGS5LWLiKDyDE5D40KuBqJIOzGnPg/rcu+rkgSDJw07KLQrSbd4t4hYH4YzP1 sEisRbmlGfxiypw+t1xpa2yTITN/JOyq24ItjwozeXwF+MsGQm576cgjzBEDC7kvlpwU bV2IpTAMoKAJ1eOeBA7IE2byKBBTz29hdPJWuQ11duccuj4YylCSFHF9u9TMmmWKU3uC fgCB5PQ9uG1mNkfC3GTg2ldtunZwvnogzdoNNVQ99mQCx8FCPHEnb9h4BOdot5uOcjMH BQBeSBcq4FI2keRNJmiOuam38xB98r1uKX6t7Q32ZP/BcR8PdreqwANL0Qk/m79N5vls fIZA== X-Gm-Message-State: AOAM530yRI4qqebGzCuYBnVFxSEjJj/lYgzFNZ92I/vX4GP1mEXhHr/r rzHbZVln4FrF1Q9b/9fPBkQ= X-Google-Smtp-Source: ABdhPJwHMamabVq6hmIYVXYAJk/WX0HpkefffT5SMfQcq/XyEMtPCr5jRAhs8hF16ojS8JEMX5WeVg== X-Received: by 2002:adf:a345:: with SMTP id d5mr8685901wrb.55.1603882037335; Wed, 28 Oct 2020 03:47:17 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j5sm6198028wrx.88.2020.10.28.03.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:16 -0700 (PDT) From: luca.boccassi@gmail.com To: Steve Yang Cc: Beilei Xing , dpdk stable Date: Wed, 28 Oct 2020 10:43:00 +0000 Message-Id: <20201028104606.3504127-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix port start during configuration restore' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 02b72cde0b073b0fb0978ffc8b56717d547caa9c Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Fri, 4 Sep 2020 07:29:04 +0000 Subject: [PATCH] net/iavf: fix port start during configuration restore [ upstream commit dd184a454111b54b0e45a3271becc3dd19ec8616 ] If configuring VF promiscuous mode is not supported, return -ENOTSUP error code in .promiscuous_enable/disable dev_ops. This is to fix the port start during configuration restore, where if .promiscuous_enable/disable dev_ops exists and return any value other than -ENOTSUP, start will fail. Same is done for .allmulticast_enable/disable dev_ops. Fixes: ca041cd44fcc ("ethdev: change allmulticast callbacks to return status") Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status") Signed-off-by: Steve Yang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_ethdev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 1556c146ea..d65412ae94 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -658,6 +658,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev) ret = iavf_config_promisc(adapter, TRUE, vf->promisc_multicast_enabled); if (!ret) vf->promisc_unicast_enabled = TRUE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; @@ -678,6 +680,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev) ret = iavf_config_promisc(adapter, FALSE, vf->promisc_multicast_enabled); if (!ret) vf->promisc_unicast_enabled = FALSE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; @@ -698,6 +702,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev) ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, TRUE); if (!ret) vf->promisc_multicast_enabled = TRUE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; @@ -718,6 +724,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev) ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, FALSE); if (!ret) vf->promisc_multicast_enabled = FALSE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.449047049 +0000 +++ 0021-net-iavf-fix-port-start-during-configuration-restore.patch 2020-10-28 10:35:11.440829082 +0000 @@ -1,8 +1,10 @@ -From dd184a454111b54b0e45a3271becc3dd19ec8616 Mon Sep 17 00:00:00 2001 +From 02b72cde0b073b0fb0978ffc8b56717d547caa9c Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Fri, 4 Sep 2020 07:29:04 +0000 Subject: [PATCH] net/iavf: fix port start during configuration restore +[ upstream commit dd184a454111b54b0e45a3271becc3dd19ec8616 ] + If configuring VF promiscuous mode is not supported, return -ENOTSUP error code in .promiscuous_enable/disable dev_ops. This is to fix the port start during configuration restore, @@ -13,7 +15,6 @@ Fixes: ca041cd44fcc ("ethdev: change allmulticast callbacks to return status") Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status") -Cc: stable@dpdk.org Signed-off-by: Steve Yang Acked-by: Beilei Xing @@ -22,40 +23,40 @@ 1 file changed, 8 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index ec4b1a1487..5f3aea8a04 100644 +index 1556c146ea..d65412ae94 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c -@@ -690,6 +690,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev) - ret = iavf_config_promisc(adapter, true, vf->promisc_multicast_enabled); +@@ -658,6 +658,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev) + ret = iavf_config_promisc(adapter, TRUE, vf->promisc_multicast_enabled); if (!ret) - vf->promisc_unicast_enabled = true; + vf->promisc_unicast_enabled = TRUE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; -@@ -711,6 +713,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev) - vf->promisc_multicast_enabled); +@@ -678,6 +680,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev) + ret = iavf_config_promisc(adapter, FALSE, vf->promisc_multicast_enabled); if (!ret) - vf->promisc_unicast_enabled = false; + vf->promisc_unicast_enabled = FALSE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; -@@ -731,6 +735,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev) - ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, true); +@@ -698,6 +702,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev) + ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, TRUE); if (!ret) - vf->promisc_multicast_enabled = true; + vf->promisc_multicast_enabled = TRUE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else ret = -EAGAIN; -@@ -751,6 +757,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev) - ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, false); +@@ -718,6 +724,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev) + ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, FALSE); if (!ret) - vf->promisc_multicast_enabled = false; + vf->promisc_multicast_enabled = FALSE; + else if (ret == IAVF_NOT_SUPPORTED) + ret = -ENOTSUP; else