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 B6ED0A0093 for ; Tue, 19 May 2020 15:11:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AE4631D6F8; Tue, 19 May 2020 15:11:20 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 7084E1D702 for ; Tue, 19 May 2020 15:11:19 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id z72so3512700wmc.2 for ; Tue, 19 May 2020 06:11:19 -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=5JAJiu1DuWz80BQOrnfii6SWR+TOFoEULpb0QDef8xg=; b=MGYdHGlksd4TpuLA5Y9iqKpn5rFJCNnQ907tre0KsUPYoRZ7jKJ4958esbQimTMWLp /3kMJbt1/iv2i/+jt8hjW3BcGg2nGRsFY0Yjcf2/u9KUdEA9dj6KvI4TeZL45DLgM8aX /as7g4zndMBO0EVcs78BKm8CAoAZvMvvR4SbEwRaSnplAgHNq9+uf8iEzqkOF3CDv2Af FP3V3ya+u2PQyRMJWqJ4KO5fPvWsphDoIwU7ubX+ui9HD2NsHLuvsvqqaVaLJVy8La2o NdW+TmvRMhamXBbv2OsN95VLTHJdnZN2co16b3HLO+nJjMpS//pBj544o78Bf71vRmrx 4Vrg== 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=5JAJiu1DuWz80BQOrnfii6SWR+TOFoEULpb0QDef8xg=; b=CF/+jzbG5xr0eNbhYfEzglDD89DUIUwG6rbs1dPSl76lNY8kbkvoXtAtHBvKf+ZKeT OL89wAUfqAjgd883fFtHJPQX1DMFcXJp/rOLs/uPjGoBI0BMWy6x6LnpKufvPXPqzB9v UKbWOJ+pBIQXtd9gViqAptbgfcgIP4CEOnon+tR10oQeProIpp+JpKzUf7MK1aKPX8ut iBh59lackBAikMWKxc7HzWvM1dWXnUD3ucG3nA1Vtm9buEyZhfSgTYNN6n3qj5KStPOk VmGUxEwy0czE9O+vOVbua6Wz0l+bEQttprAciiYQVa623OmegWQpMhlEYJPzjdTCSlAo C7Fg== X-Gm-Message-State: AOAM533wwZ6D45wRsxsWA7CQqnjN2xOidlH33P6qqyecQ+vn0Y0fcvjP ZW88d7C38StwnXqdgHyNW6w= X-Google-Smtp-Source: ABdhPJyKU3UJeK4g8X81FxM0A/38cttiM1nPWCmWKQsVlAwMjWJq9mYQ0TPH+aAP78ag3n40v96Cpw== X-Received: by 2002:a1c:7e03:: with SMTP id z3mr5368190wmc.88.1589893878826; Tue, 19 May 2020 06:11:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 5sm3979064wmz.16.2020.05.19.06.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Bernard Iremonger Cc: Beilei Xing , dpdk stable Date: Tue, 19 May 2020 14:03:58 +0100 Message-Id: <20200519130549.112823-103-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/i40e: fix flow director initialisation' 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 461a2ba67a7e9836cd99aab3d0d585eed317c5bd Mon Sep 17 00:00:00 2001 From: Bernard Iremonger Date: Tue, 7 Apr 2020 16:26:41 +0100 Subject: [PATCH] net/i40e: fix flow director initialisation [ upstream commit ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc ] Remove references to struct rte_fdir_conf which is deprecated, in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and i40e_flow_add_del_fdir_filter(). Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup") Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API") Signed-off-by: Bernard Iremonger Acked-by: Beilei Xing --- drivers/net/i40e/i40e_fdir.c | 4 ++-- drivers/net/i40e/i40e_flow.c | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index dee007daae..239cdbf522 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1559,8 +1559,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, struct i40e_fdir_filter check_filter; /* Check if the filter exists */ int ret = 0; - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DRV_LOG(ERR, "FDIR is not enabled, please check the mode in fdir_conf."); + if (pf->fdir.fdir_vsi == NULL) { + PMD_DRV_LOG(ERR, "FDIR is not enabled"); return -ENOTSUP; } diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 61021037c8..a5bd1c7783 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3208,8 +3208,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, cons_filter_type = RTE_ETH_FILTER_FDIR; - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT || - pf->fdir.fdir_vsi == NULL) { + if (pf->fdir.fdir_vsi == NULL) { /* Enable fdir when fdir flow is added at first time. */ ret = i40e_fdir_setup(pf); if (ret != I40E_SUCCESS) { @@ -3225,8 +3224,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, NULL, "Failed to configure fdir."); goto err; } - - dev->data->dev_conf.fdir_conf.mode = RTE_FDIR_MODE_PERFECT; } return 0; @@ -4797,8 +4794,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, /* If the last flow is destroyed, disable fdir. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { i40e_fdir_teardown(pf); - dev->data->dev_conf.fdir_conf.mode = - RTE_FDIR_MODE_NONE; i40e_fdir_rx_proc_enable(dev, 0); } break; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.646677538 +0100 +++ 0103-net-i40e-fix-flow-director-initialisation.patch 2020-05-19 14:04:44.320650258 +0100 @@ -1,8 +1,10 @@ -From ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc Mon Sep 17 00:00:00 2001 +From 461a2ba67a7e9836cd99aab3d0d585eed317c5bd Mon Sep 17 00:00:00 2001 From: Bernard Iremonger Date: Tue, 7 Apr 2020 16:26:41 +0100 Subject: [PATCH] net/i40e: fix flow director initialisation +[ upstream commit ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc ] + Remove references to struct rte_fdir_conf which is deprecated, in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and i40e_flow_add_del_fdir_filter(). @@ -10,7 +12,6 @@ Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup") Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API") -Cc: stable@dpdk.org Signed-off-by: Bernard Iremonger Acked-by: Beilei Xing @@ -20,10 +21,10 @@ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c -index 2f24615b65..d59399afea 100644 +index dee007daae..239cdbf522 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c -@@ -1695,8 +1695,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, +@@ -1559,8 +1559,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, struct i40e_fdir_filter check_filter; /* Check if the filter exists */ int ret = 0; @@ -35,10 +36,10 @@ } diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c -index d1bc960843..7e64ae53a3 100644 +index 61021037c8..a5bd1c7783 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c -@@ -3445,8 +3445,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, +@@ -3208,8 +3208,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, cons_filter_type = RTE_ETH_FILTER_FDIR; @@ -48,7 +49,7 @@ /* Enable fdir when fdir flow is added at first time. */ ret = i40e_fdir_setup(pf); if (ret != I40E_SUCCESS) { -@@ -3462,8 +3461,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, +@@ -3225,8 +3224,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, NULL, "Failed to configure fdir."); goto err; } @@ -57,7 +58,7 @@ } return 0; -@@ -5151,8 +5148,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, +@@ -4797,8 +4794,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, /* If the last flow is destroyed, disable fdir. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { i40e_fdir_teardown(pf);