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 88D5BA04A3 for ; Fri, 5 Jun 2020 20:25:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80C481D510; Fri, 5 Jun 2020 20:25:56 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id B1A221D51B for ; Fri, 5 Jun 2020 20:25:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381555; 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=gCfVX2DI58XwXcnXdNhaLcL3zoOH7LzQTA2dpunRvTw=; b=PFw2x4PYkU0eilb4etlWmpZwUzdJZ8EPZIPCvpH9iR9ZBSydGCZu29U8PBTxdkm5RJ1OdK QBfzxEYHAwVSwbwbLkACCa4AgoDH1vPxR8LXO6f077WdUF2H0+695wzGOvokcBebFjIlbg 29pqO+c1/I1K2ABOZYdSd+W9DFun1Po= 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-309-w1yV5o5wPjGRQixmer24JA-1; Fri, 05 Jun 2020 14:25:49 -0400 X-MC-Unique: w1yV5o5wPjGRQixmer24JA-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 C399080572E; Fri, 5 Jun 2020 18:25:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id E15C161983; Fri, 5 Jun 2020 18:25:47 +0000 (UTC) From: Kevin Traynor To: Wei Zhao Cc: Beilei Xing , dpdk stable Date: Fri, 5 Jun 2020 19:24:07 +0100 Message-Id: <20200605182525.22483-10-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/i40e: fix flush of flow director filter' 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/25b486624491329927a2d00c96fb2782ef2eeca0 Thanks. Kevin. --- >From 25b486624491329927a2d00c96fb2782ef2eeca0 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 98588d0113..088b92fdd1 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4767,5 +4767,4 @@ 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; @@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) } - i40e_fdir_teardown(pf); - return ret; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:51.497159597 +0100 +++ 0010-net-i40e-fix-flush-of-flow-director-filter.patch 2020-06-05 19:20:50.720042858 +0100 @@ -1 +1 @@ -From 1491f63c75596b01b95355e395dde6795fab3c8b Mon Sep 17 00:00:00 2001 +From 25b486624491329927a2d00c96fb2782ef2eeca0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 1533d5abbd..65f877866d 100644 +index 98588d0113..088b92fdd1 100644 @@ -26 +27 @@ -@@ -5146,5 +5146,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev, +@@ -4767,5 +4767,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev, @@ -30,3 +31,3 @@ - i40e_fdir_rx_proc_enable(dev, 0); - } -@@ -5344,6 +5343,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) + dev->data->dev_conf.fdir_conf.mode = + RTE_FDIR_MODE_NONE; +@@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)