patch 'net/cpfl: add checks for flow action types' has been queued to stable release 23.11.3
Xueming Li
xuemingl at nvidia.com
Mon Nov 11 07:27:40 CET 2024
Hi,
FYI, your patch has been queued to stable release 23.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 11/30/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=fa3204c299911a82fbcab1b3fac2adf8813e1621
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From fa3204c299911a82fbcab1b3fac2adf8813e1621 Mon Sep 17 00:00:00 2001
From: Praveen Shetty <praveen.shetty at intel.com>
Date: Tue, 30 Jul 2024 11:45:40 +0000
Subject: [PATCH] net/cpfl: add checks for flow action types
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 86126195768418da56031305cdf3636ceb6650c8 ]
In CPFL PMD, port_representor action is used for the local vport and
represented_port action is used for the remote port (remote port in this
case is either the idpf pf or the vf port that is being represented by
the cpfl pmd). Using these the other way around is an error, so add a
check for those cases.
Fixes: 441e777b85f1 ("net/cpfl: support represented port action")
Signed-off-by: Praveen Shetty <praveen.shetty at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
drivers/net/cpfl/cpfl_flow_engine_fxp.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
index f6bd1f7599..9101a0e506 100644
--- a/drivers/net/cpfl/cpfl_flow_engine_fxp.c
+++ b/drivers/net/cpfl/cpfl_flow_engine_fxp.c
@@ -292,6 +292,17 @@ cpfl_fxp_parse_action(struct cpfl_itf *itf,
is_vsi = (action_type == RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR ||
dst_itf->type == CPFL_ITF_TYPE_REPRESENTOR);
+ /* Added checks to throw an error for the invalid action types. */
+ if (action_type == RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR &&
+ dst_itf->type == CPFL_ITF_TYPE_REPRESENTOR) {
+ PMD_DRV_LOG(ERR, "Cannot use port_representor action for the represented_port");
+ goto err;
+ }
+ if (action_type == RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT &&
+ dst_itf->type == CPFL_ITF_TYPE_VPORT) {
+ PMD_DRV_LOG(ERR, "Cannot use represented_port action for the local vport");
+ goto err;
+ }
if (is_vsi)
dev_id = cpfl_get_vsi_id(dst_itf);
else
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-11-11 14:23:07.684731688 +0800
+++ 0054-net-cpfl-add-checks-for-flow-action-types.patch 2024-11-11 14:23:05.122192840 +0800
@@ -1 +1 @@
-From 86126195768418da56031305cdf3636ceb6650c8 Mon Sep 17 00:00:00 2001
+From fa3204c299911a82fbcab1b3fac2adf8813e1621 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 86126195768418da56031305cdf3636ceb6650c8 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index b9e825ef57..2c75ea6577 100644
+index f6bd1f7599..9101a0e506 100644
More information about the stable
mailing list