diff mbox

[dpdk-dev] net/failsafe: fix PCI devices init

Message ID 1508404312-16996-1-git-send-email-rasland@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK

Commit Message

Raslan Darawsheh Oct. 19, 2017, 9:11 a.m. UTC 
  When trying to attach a port as a sub-device, the ethdev port
was compared with devargs.
In the case of a PCI device, the name in devargs is the PCI address.
And since DPDK 17.08, the devargs name of the underlying device was
used to match an ethdev port:
        a1e7c17555e8 ("ethdev: use device name from device structure")

But the recent commit 72e3efb149cc has reverted this wrong matching
to use the ethdev port name as identifier of the port.
It impacts functions like rte_eth_dev_allocated() used in failsafe
for matching ports with given devargs.
The fix is to search for matching devargs in underlying device of
all ethdev ports.
If many ports match the same PCI device, only the first one is matched.

This limitation was already present in previous implementation of
rte_eth_dev_allocated(), and must be adressed later with a better
devargs syntax.

Fixes: 72e3efb149cc ("ethdev: revert use port name from device structure")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
---
 drivers/net/failsafe/failsafe_eal.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Gaëtan Rivet Oct. 19, 2017, 10:22 a.m. UTC | #1 
Hello Raslan,

Thanks for spotting the issue and fixing it.
Small nit below.

On Thu, Oct 19, 2017 at 12:11:52PM +0300, Raslan Darawsheh wrote:
> When trying to attach a port as a sub-device, the ethdev port
> was compared with devargs.
> In the case of a PCI device, the name in devargs is the PCI address.
> And since DPDK 17.08, the devargs name of the underlying device was
> used to match an ethdev port:
>         a1e7c17555e8 ("ethdev: use device name from device structure")
> 
> But the recent commit 72e3efb149cc has reverted this wrong matching
> to use the ethdev port name as identifier of the port.
> It impacts functions like rte_eth_dev_allocated() used in failsafe
> for matching ports with given devargs.
> The fix is to search for matching devargs in underlying device of
> all ethdev ports.
> If many ports match the same PCI device, only the first one is matched.
> 
> This limitation was already present in previous implementation of
> rte_eth_dev_allocated(), and must be adressed later with a better
> devargs syntax.
> 
> Fixes: 72e3efb149cc ("ethdev: revert use port name from device structure")
> 
> Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>

With the nit below fixed:
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>

> ---
>  drivers/net/failsafe/failsafe_eal.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c
> index aeb87a0..734b25c 100644
> --- a/drivers/net/failsafe/failsafe_eal.c
> +++ b/drivers/net/failsafe/failsafe_eal.c
> @@ -41,6 +41,7 @@ fs_bus_init(struct rte_eth_dev *dev)
>  	struct sub_device *sdev;
>  	struct rte_devargs *da;
>  	uint8_t i;
> +	uint16_t j;
>  	int ret;
>  
>  	FOREACH_SUBDEV(sdev, i, dev) {
> @@ -57,7 +58,13 @@ fs_bus_init(struct rte_eth_dev *dev)
>  			      rte_errno ? ")" : "");
>  			continue;
>  		}
> -		ETH(sdev) = rte_eth_dev_allocated(da->name);
> +		RTE_ETH_FOREACH_DEV(j) {
> +			if (!strcmp(rte_eth_devices[j].device->name,
> +				    da->name)) {

The explicit comparison to 0 should be preferred, as done in
failsafe_args.c.

> +				ETH(sdev) = &rte_eth_devices[j];
> +				break;
> +			}
> +		}
>  		if (ETH(sdev) == NULL) {
>  			ERROR("sub_device %d init went wrong", i);
>  			return -ENODEV;
> -- 
> 2.7.4
>
diff mbox

Patch

diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c
index aeb87a0..734b25c 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -41,6 +41,7 @@  fs_bus_init(struct rte_eth_dev *dev)
 	struct sub_device *sdev;
 	struct rte_devargs *da;
 	uint8_t i;
+	uint16_t j;
 	int ret;
 
 	FOREACH_SUBDEV(sdev, i, dev) {
@@ -57,7 +58,13 @@  fs_bus_init(struct rte_eth_dev *dev)
 			      rte_errno ? ")" : "");
 			continue;
 		}
-		ETH(sdev) = rte_eth_dev_allocated(da->name);
+		RTE_ETH_FOREACH_DEV(j) {
+			if (!strcmp(rte_eth_devices[j].device->name,
+				    da->name)) {
+				ETH(sdev) = &rte_eth_devices[j];
+				break;
+			}
+		}
 		if (ETH(sdev) == NULL) {
 			ERROR("sub_device %d init went wrong", i);
 			return -ENODEV;