From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0CF6AA0C4C for ; Mon, 12 Jul 2021 15:10:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06FB04069D; Mon, 12 Jul 2021 15:10:53 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id E98EB4069D for ; Mon, 12 Jul 2021 15:10:51 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso9735144wmc.1 for ; Mon, 12 Jul 2021 06:10:51 -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=Dcwi4/e6Pza26xCrc79rFGKM7IVn3N3elceR3QrtWDw=; b=OQZQGdszZyzxMKN5PUykGa45/lEj8Gd5byMqMiXoMVI91SAyXYiVPweBQa0E7xJIkG S0wG83FPBfudwkDrcWGA+0hGly4GzXEtQQAz2FnBtG+SKUuJbqEeUdew0pfJtkNferhX saJGP3WA13PZvrHqZcstDvSI9vT3zX8C6AMyOvapOhpN3Uwjj9SL9TEDD7OzogLlFO0f RJmGdYaHTiDLdD+bAOvAq8Z8xQ85R/putlZUdDbDspC7PWexT1WgFJw8uSeTQI9I38C9 QpYukG2k688V1jXX98oo/tbYKBVVd7L8YWdP8No6xTTFahUSoY55XBFavB7TbB6yPL5L 4Tkg== 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=Dcwi4/e6Pza26xCrc79rFGKM7IVn3N3elceR3QrtWDw=; b=fvd3QdIcpvb1BjjrHJeKqpGfUixRXjN3m17FHpCJkIwFrRZwKZ1Rm1K6dKtVpUOfe1 +a/4pRx66EByhWOyWtVOgXnxLK0+Cjbn2BR1Hbx2r0OatUrbQTRzx0AptPxbCgN78yfx poctbivpceRwefRfyOrrrAbSsbkNaah/tLMeXxFzP2KdZPtaq54S5CiP0tDbZBe30nOx WxQE03FpuNyO1fqpqCWcBFTQ/NS5d13E+hF61bAsrXr7904YZ0l1TzjB/z4VMo5gbDIY sIxdjCjyEsuwgaT0MAzBdlNheSXjVCM5fOSB3P3o+skrCwe4OnwftECPcRV3/mw8HwDX wVgA== X-Gm-Message-State: AOAM531ZgFcpzGoxhnH7zxAIrq7R5ETfA8kT/78a9Z34+tz2SiZP3eAn oajjSWruMFETA0AQX9whd5Y= X-Google-Smtp-Source: ABdhPJzBi/dUEcz5CANwGjMNix6q8Qw0uFF3Vuv5V65z8JxuoDuLTdDPK0M6yYcBqT2kkg9hlt9ATQ== X-Received: by 2002:a7b:cf03:: with SMTP id l3mr31552351wmg.110.1626095451744; Mon, 12 Jul 2021 06:10:51 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id r15sm792007wrx.94.2021.07.12.06.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:10:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Steve Yang Cc: Beilei Xing , dpdk stable Date: Mon, 12 Jul 2021 14:04:15 +0100 Message-Id: <20210712130551.2462159-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix raw packet flow director' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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 07/14/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/18db4a4d845a49a8f6cef7aa71493c07cbf84746 Thanks. Luca Boccassi --- >From 18db4a4d845a49a8f6cef7aa71493c07cbf84746 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Wed, 19 May 2021 03:27:45 +0000 Subject: [PATCH] net/i40e: fix raw packet flow director [ upstream commit 920bdbf1bde39882d97118feb46892746db42078 ] When user configured the flow rule with raw packet via command "flow_director_filter", it would reset all previous fdir input set flags with "i40e_flow_set_fdir_inset()". Ignore to configure the flow input set with raw packet rule used. Fixes: ff04964ea6d5 ("net/i40e: fix flow director for common pctypes") Signed-off-by: Steve Yang Acked-by: Beilei Xing --- drivers/net/i40e/i40e_fdir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index c9cd1e4960..ab924e8538 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1767,7 +1767,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, if (add) { /* configure the input set for common PCTYPEs*/ - if (!filter->input.flow_ext.customized_pctype) { + if (!filter->input.flow_ext.customized_pctype && + !filter->input.flow_ext.pkt_template) { ret = i40e_flow_set_fdir_inset(pf, pctype, filter->input.flow_ext.input_set); if (ret < 0) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.865012899 +0100 +++ 0020-net-i40e-fix-raw-packet-flow-director.patch 2021-07-12 13:41:36.242117444 +0100 @@ -1 +1 @@ -From 920bdbf1bde39882d97118feb46892746db42078 Mon Sep 17 00:00:00 2001 +From 18db4a4d845a49a8f6cef7aa71493c07cbf84746 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 920bdbf1bde39882d97118feb46892746db42078 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index ac0e09bfdd..3c7cf1ba90 100644 +index c9cd1e4960..ab924e8538 100644 @@ -25 +26 @@ -@@ -1768,7 +1768,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, +@@ -1767,7 +1767,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,