patch 'ethdev: check that at least one FEC mode is specified' has been queued to stable release 20.11.9

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Jun 28 16:10:30 CEST 2023


Hi,

FYI, your patch has been queued to stable release 20.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/30/23. 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/1aa63dfaebea46a6f8396a4831415acd89fdf23c

Thanks.

Luca Boccassi

---
>From 1aa63dfaebea46a6f8396a4831415acd89fdf23c Mon Sep 17 00:00:00 2001
From: Denis Pryazhennikov <denis.pryazhennikov at arknetworks.am>
Date: Mon, 8 May 2023 15:47:06 +0400
Subject: [PATCH] ethdev: check that at least one FEC mode is specified

[ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ]

The behaviour is undefined in the rte_eth_fec_set() function
when the fec_capa parameter is equal to zero.
Add a check to handle this case.

Fixes: b7ccfb09da95 ("ethdev: introduce FEC API")

Signed-off-by: Denis Pryazhennikov <denis.pryazhennikov at arknetworks.am>
Acked-by: Ivan Malov <ivan.malov at arknetworks.am>
Acked-by: Viacheslav Galaktionov <viacheslav.galaktionov at arknetworks.am>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 lib/librte_ethdev/rte_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index b5c5af3cf5..c0ffa58895 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -4032,6 +4032,12 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa)
 
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 	dev = &rte_eth_devices[port_id];
+
+	if (fec_capa == 0) {
+		RTE_ETHDEV_LOG(ERR, "At least one FEC mode should be specified\n");
+		return -EINVAL;
+	}
+
 	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP);
 	return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));
 }
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-28 11:40:08.327287406 +0100
+++ 0006-ethdev-check-that-at-least-one-FEC-mode-is-specified.patch	2023-06-28 11:40:08.036027093 +0100
@@ -1 +1 @@
-From 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a Mon Sep 17 00:00:00 2001
+From 1aa63dfaebea46a6f8396a4831415acd89fdf23c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -18,2 +19,2 @@
- lib/ethdev/rte_ethdev.c | 5 +++++
- 1 file changed, 5 insertions(+)
+ lib/librte_ethdev/rte_ethdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
@@ -21,5 +22,6 @@
-diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
-index 731423ef03..1e024802ae 100644
---- a/lib/ethdev/rte_ethdev.c
-+++ b/lib/ethdev/rte_ethdev.c
-@@ -4828,6 +4828,11 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa)
+diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
+index b5c5af3cf5..c0ffa58895 100644
+--- a/lib/librte_ethdev/rte_ethdev.c
++++ b/lib/librte_ethdev/rte_ethdev.c
+@@ -4032,6 +4032,12 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa)
+ 
@@ -28 +30 @@
- 
++
@@ -34,3 +36,3 @@
- 	if (*dev->dev_ops->fec_set == NULL)
- 		return -ENOTSUP;
- 	ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));
+ 	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP);
+ 	return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));
+ }


More information about the stable mailing list