From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 5755DA0524
for <public@inbox.dpdk.org>; Fri, 5 Feb 2021 12:32:10 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 52C3E1889F8;
Fri, 5 Feb 2021 12:32:10 +0100 (CET)
Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com
[209.85.128.47])
by mails.dpdk.org (Postfix) with ESMTP id AD0CB1889F8
for <stable@dpdk.org>; Fri, 5 Feb 2021 12:32:09 +0100 (CET)
Received: by mail-wm1-f47.google.com with SMTP id m1so5646216wml.2
for <stable@dpdk.org>; Fri, 05 Feb 2021 03:32:09 -0800 (PST)
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=i+DzgsJiIeUFAZRlrXSfolzp2lOe0k9LrYqc4NkUC9Y=;
b=WAerWXPRSIcC+Mr39t6Z04WwxqotWRNc+jUnHgs/eDOtynVW7V6Xf2JLSWZ8pmN0oJ
JpYCJTvre5QaxLEWUeMmRa/Y3ocKSPigR3wE12ZkWJHbnN2BxAVjEL96X8r5tHS64CCs
/mmh0Fy06/gF/FEmuKfndoNSKVrVdaKDpmu1c1dXBd3AqKwMGi1TKBkMyw8cYe7eQ+TQ
QY8yFw9ymJc5YE2lBFbxZgS1CuidcRRMalUzbdiF5KuOiVKOI08wCdnylT/RP9KY+DMR
cn27gipsg8rpXQjVYZjr053VM2HraBRV7doemnxMPXIUTKFnOQR6T03eL3mqU3MmvaME
er6Q==
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=i+DzgsJiIeUFAZRlrXSfolzp2lOe0k9LrYqc4NkUC9Y=;
b=RvfoITv7uc4IYx5+41rvYuGDqptjlotM2vNHmWDRgLzQReSjdjd7F3HiN6ivp52bmR
zYqWDjq1HvIyRYFh7gtNnCYEH1Qs/q4MwDD9XeV8JToh+z0KIfCes1KiCMum4CTWRXRG
r9BMxGzqhNVVc3p/6eZ+Qn52unVB4+VK+aSSMybc0p2P3unUzniGHshiNY5Y6FFG0Gt5
7p1NLLunSgt9IIMRrI+Ca2IkoZtmuIwn8HNjE2LTRY171dVdzU433V+sUbSK+s+ckHeV
1x4Hd6edaewD3ufwrvxymTKkUZFcigTVzKVvh1vQpGYpR64O+nDoTwt6fxfy5D00m2ws
XElw==
X-Gm-Message-State: AOAM533wKqKu2whdOLAgGHsuHEXuM0VlV+AVJzNh8FlTh3Fr4/rChnrP
1au30N2kKvZ94MlKunvBMxs=
X-Google-Smtp-Source: ABdhPJxY9l4fk7cG5z3/fnrGmigj9pKBBb9wgLQoC41DTE9TLe13OxdXLz9RafpUTLwCT/+NIl8X8A==
X-Received: by 2002:a1c:7507:: with SMTP id o7mr3251787wmc.165.1612524729459;
Fri, 05 Feb 2021 03:32:09 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id x9sm9301759wmb.14.2021.02.05.03.32.08
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 05 Feb 2021 03:32:08 -0800 (PST)
From: luca.boccassi@gmail.com
To: Lijun Ou <oulijun@huawei.com>
Cc: dpdk stable <stable@dpdk.org>
Date: Fri, 5 Feb 2021 11:16:58 +0000
Message-Id: <20210205111920.1272063-132-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com>
References: <20210205111920.1272063-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/hns3: fix interception with flow director'
has been queued to stable release 20.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/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/3520eeda0e717f7a1b8d1162c9b2e26802bc9191
Thanks.
Luca Boccassi
---
>From 3520eeda0e717f7a1b8d1162c9b2e26802bc9191 Mon Sep 17 00:00:00 2001
From: Lijun Ou <oulijun@huawei.com>
Date: Wed, 6 Jan 2021 11:46:27 +0800
Subject: [PATCH] net/hns3: fix interception with flow director
[ upstream commit 35ec45adf7a49d8ac2091e9f06dcf74d92083510 ]
The rte_fdir_conf structure has deprecated and users need
to use the specified rule parameters of rte_flow structure
when configure a flow rule. As a result, it is incorrectly
used in the rte_flow API.
Fixes: fcba820d9b9e ("net/hns3: support flow director")
Signed-off-by: Lijun Ou <oulijun@huawei.com>
---
drivers/net/hns3/hns3_flow.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index ee6ec15498..f303df4ad8 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1208,11 +1208,6 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
"Fdir not supported in VF");
- if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT)
- return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
- "fdir_conf.mode isn't perfect");
-
step_mngr.items = first_items;
step_mngr.count = ARRAY_SIZE(first_items);
for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
--
2.29.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-02-05 11:18:35.081333187 +0000
+++ 0132-net-hns3-fix-interception-with-flow-director.patch 2021-02-05 11:18:29.010694996 +0000
@@ -1 +1 @@
-From 35ec45adf7a49d8ac2091e9f06dcf74d92083510 Mon Sep 17 00:00:00 2001
+From 3520eeda0e717f7a1b8d1162c9b2e26802bc9191 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 35ec45adf7a49d8ac2091e9f06dcf74d92083510 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org