b8f4fa4103
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:
a1e7c17555 ("ethdev: use device name from device structure")
But the recent commit 72e3efb149 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: 72e3efb149 ("ethdev: revert use port name from device structure")
Cc: stable@dpdk.org
Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
125 lines
3.3 KiB
C
125 lines
3.3 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright 2017 6WIND S.A.
|
|
* Copyright 2017 Mellanox.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of 6WIND S.A. nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <rte_malloc.h>
|
|
|
|
#include "failsafe_private.h"
|
|
|
|
static int
|
|
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) {
|
|
if (sdev->state != DEV_PARSED)
|
|
continue;
|
|
da = &sdev->devargs;
|
|
ret = rte_eal_hotplug_add(da->bus->name,
|
|
da->name,
|
|
da->args);
|
|
if (ret) {
|
|
ERROR("sub_device %d probe failed %s%s%s", i,
|
|
rte_errno ? "(" : "",
|
|
rte_errno ? strerror(rte_errno) : "",
|
|
rte_errno ? ")" : "");
|
|
continue;
|
|
}
|
|
RTE_ETH_FOREACH_DEV(j) {
|
|
if (strcmp(rte_eth_devices[j].device->name,
|
|
da->name) == 0) {
|
|
ETH(sdev) = &rte_eth_devices[j];
|
|
break;
|
|
}
|
|
}
|
|
if (ETH(sdev) == NULL) {
|
|
ERROR("sub_device %d init went wrong", i);
|
|
return -ENODEV;
|
|
}
|
|
SUB_ID(sdev) = i;
|
|
sdev->fs_dev = dev;
|
|
sdev->dev = ETH(sdev)->device;
|
|
ETH(sdev)->state = RTE_ETH_DEV_DEFERRED;
|
|
sdev->state = DEV_PROBED;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
failsafe_eal_init(struct rte_eth_dev *dev)
|
|
{
|
|
int ret;
|
|
|
|
ret = fs_bus_init(dev);
|
|
if (ret)
|
|
return ret;
|
|
if (PRIV(dev)->state < DEV_PROBED)
|
|
PRIV(dev)->state = DEV_PROBED;
|
|
fs_switch_dev(dev, NULL);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
fs_bus_uninit(struct rte_eth_dev *dev)
|
|
{
|
|
struct sub_device *sdev = NULL;
|
|
uint8_t i;
|
|
int sdev_ret;
|
|
int ret = 0;
|
|
|
|
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
|
|
sdev_ret = rte_eal_hotplug_remove(sdev->bus->name,
|
|
sdev->dev->name);
|
|
if (sdev_ret) {
|
|
ERROR("Failed to remove requested device %s (err: %d)",
|
|
sdev->dev->name, sdev_ret);
|
|
continue;
|
|
}
|
|
sdev->state = DEV_PROBED - 1;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
failsafe_eal_uninit(struct rte_eth_dev *dev)
|
|
{
|
|
int ret;
|
|
|
|
ret = fs_bus_uninit(dev);
|
|
PRIV(dev)->state = DEV_PROBED - 1;
|
|
return ret;
|
|
}
|