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 E352DA0093 for ; Tue, 19 May 2020 15:13:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D45C01D8DE; Tue, 19 May 2020 15:13:10 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id CA6E51D73C for ; Tue, 19 May 2020 15:13:09 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id h17so15829400wrc.8 for ; Tue, 19 May 2020 06:13:09 -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=I51AiKWvgZQ3h8A2E6y3SHRbhTxLtM/c6l6vXutFQfg=; b=EJRcoDScD+NBnVKH3to6Lw71sStuDBeCk92ToVIXvON4+aN+VpXf2UeXih1odn9MKG g5AUuyesR2CXWeLFXT7AEVPzfYBylp2IdCdOyCT4lOrFlHoR4/d1oSOXuG1kw4d64fn/ f5V8mOFNXq7Q+Z7k3C/5pVBvbaqOCpfaADeXABCIeSrGfrUGOCGZyz9J2BBN3RaVxYVF ChryRT3DJ1+sObFev9YMtC8eMpVWNshb3qge0mGRD+lb51MX6brqKyj+NWWS+4Tfgdaq ipDlyKWPtzza428poDZ6R51tNCzSTYm5qqfRc22CEbRe7QEihMw1nR9ze7B0SWc82uzD CdIw== 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=I51AiKWvgZQ3h8A2E6y3SHRbhTxLtM/c6l6vXutFQfg=; b=r2wqXB4ROuwwR1/EudWRLlPGg50KMhP7NTqAo0GNfwkQVFe6PmmLCAxOauFJrYLn9w MG4l7s+zabHs6HBsW11IfuTUnAglYaBdMEonvgLiwnfD2llx5ONNONmrdjElNnhgcWe5 9dmJxU9+sJ8m0F2QtkehIR47KgGZTktnEHmDEbd4oqxC8Yg8Z03Dl5yamnczcnOVIuHx WvNpDp8Dvksd7Gp0sJbsoSdpgajRKH01rd/wH9UJ5tZ0X/sZLIVKrSzJt2KxyWhSvZsC w04iDeiB7T3qJQFXKSikhD7jx6rX5iP4lRESk49tcAGgNqcDF0pYOvIoKk/XogogRpFP EyVw== X-Gm-Message-State: AOAM531zoYQz28o/rEfqQef+gTm32BudrDSnrOozZCla20i8SA4RUEtM jr8hfiTni9Y7Xni9prDi2fI= X-Google-Smtp-Source: ABdhPJxpQ5zz8DZWKy6zr364GQTXBCX5rtAquRe/LbZ8IF0cG0Y/rbXNB0ALsluGxgLrvCWxbtTe4g== X-Received: by 2002:a05:6000:4:: with SMTP id h4mr25364709wrx.36.1589893989583; Tue, 19 May 2020 06:13:09 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 32sm21328984wrg.19.2020.05.19.06.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Beilei Xing , dpdk stable Date: Tue, 19 May 2020 14:04:34 +0100 Message-Id: <20200519130549.112823-139-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 flush of flow director filter' 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 d6db84d0b1ed83c463fd29b3b9183db3b65bf9ef Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 29 Apr 2020 10:03:53 +0800 Subject: [PATCH] net/i40e: fix flush of flow director filter [ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ] When we flush FDIR filter, we can not call i40e_fdir_teardown() function as it will free vsi used for FDIR, then the vsi->base_queue will be freed from pf->qp_pool, but vsi->base_queue can only get once when do dev init in i40e_pf_setup(). If we free it, it will never be alloc again. Bugzilla ID: 404 Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Signed-off-by: Wei Zhao Acked-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 6cd39babba..ea3b223e11 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4791,7 +4791,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); i40e_fdir_rx_proc_enable(dev, 0); } break; @@ -4989,8 +4988,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) pf->fdir.inset_flag[pctype] = 0; } - i40e_fdir_teardown(pf); - return ret; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.091230009 +0100 +++ 0139-net-i40e-fix-flush-of-flow-director-filter.patch 2020-05-19 14:04:44.452652651 +0100 @@ -1,8 +1,10 @@ -From 1491f63c75596b01b95355e395dde6795fab3c8b Mon Sep 17 00:00:00 2001 +From d6db84d0b1ed83c463fd29b3b9183db3b65bf9ef Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Wed, 29 Apr 2020 10:03:53 +0800 Subject: [PATCH] net/i40e: fix flush of flow director filter +[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ] + When we flush FDIR filter, we can not call i40e_fdir_teardown() function as it will free vsi used for FDIR, then the vsi->base_queue will be freed from pf->qp_pool, but vsi->base_queue can only get @@ -11,7 +13,6 @@ Bugzilla ID: 404 Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Acked-by: Beilei Xing @@ -20,10 +21,10 @@ 1 file changed, 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c -index 1533d5abbd..65f877866d 100644 +index 6cd39babba..ea3b223e11 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c -@@ -5145,7 +5145,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, +@@ -4791,7 +4791,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)) { @@ -31,7 +32,7 @@ i40e_fdir_rx_proc_enable(dev, 0); } break; -@@ -5343,8 +5342,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) +@@ -4989,8 +4988,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) pf->fdir.inset_flag[pctype] = 0; }