> Dpdk port representors were introduced in dpdk versions 18.xx.
> Prior to port representors there was a one-to-one relationship
> between an rte device (e.g. PCI bus) and an eth device (referenced as
> dpdk port id in OVS). With port representors the relationship becomes
> one-to-many rte device to eth devices.
> For example in [3] there are two devices (representors) using the same
> PCI physical address 0000:08:00.0: "0000:08:00.0,representor=[3]" and
> "0000:08:00.0,representor=[5]".
> This commit handles the new one-to-many relationship. For example,
> when one of the device port representors in [3] is closed - the PCI bus
> cannot be detached until the other device port representor is closed as
> well. OVS remains backward compatible by supporting dpdk legacy PCI
> ports which do not include port representors.
> Dpdk port representors related commits are listed in [1]. Dpdk port
> representors documentation appears in [2]. A sample configuration
> which uses two representors ports (the output of "ovs-vsctl show"
> command) is shown in [3].
Thanks for the v3 Ophir, a few comments inline below.
In terms of testing I've tested with a number of devices (140e, ixgbe,
igb and associated VFs). I didn't have a device that was multiple port
to single bus slot function address unfortunately, hopefully someone on
the thread could verify that case.
>
> [1]
> e0cb96204b71 ("net/i40e: add support for representor ports")
> cf80ba6e2038 ("net/ixgbe: add support for representor ports")
> 26c08b979d26 ("net/mlx5: add port representor awareness")
>
> [2]
> doc/guides/prog_guide/switch_representation.rst
>
> [3]
> Bridge "ovs_br0"
> Port "ovs_br0"
> Interface "ovs_br0"
> type: internal
> Port "port-rep3"
> Interface "port-rep3"
> type: dpdk
> options: {dpdk-devargs="0000:08:00.0,representor=[3]"}
> Port "port-rep5"
> Interface "port-rep5"
> type: dpdk
> options: {dpdk-devargs="0000:08:00.0,representor=[5]"}
> ovs_version: "2.10.90"
>
> Signed-off-by: Ophir Munk <[email protected]>
> ---
> v1 (hwol branch):
> 1. rebase on top of Kevin's patch
> dpdk: Update to use DPDK 18.11.[ovs-dev,v7,dpdk-latest,1/1] dpdk:
Update to use DPDK 18.11.
> https://patchwork.ozlabs.org/patch/1005535/
> 2. skipping count of sibling ports in case the sibling port state is
RTE_ETH_DEV_UNUSED
>
> v2 (switching to master branch):
> 1. Update based on review comments:
https://patchwork.ozlabs.org/patch/1011457/#2051417
> 2. Send patch on master branch
>
> v3:
> Add a FIXME comment regarding the direct access to DPDK
rte_eth_devices array
>
> lib/netdev-dpdk.c | 125
+++++++++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 95 insertions(+), 30 deletions(-)
>
> diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
> index 320422b..18c6e25 100644
> --- a/lib/netdev-dpdk.c
> +++ b/lib/netdev-dpdk.c
> @@ -1218,6 +1218,27 @@ dpdk_dev_parse_name(const char dev_name[],
const char prefix[],
> }
> }
>
> +/* Get the number of OVS interfaces which have the same DPDK
> + * rte device (e.g. same pci bus address).
> + * FIXME: avoid direct access to DPDK internal array rte_eth_devices
> + * and replace it with a proper API expected in upcoming DPDK
> + * releases. */
> +static int
> +netdev_dpdk_get_num_ports(struct rte_device *device)
> + OVS_REQUIRES(dpdk_mutex)
> +{
> + struct netdev_dpdk *dev;
> + int count = 0;
> +
> + LIST_FOR_EACH (dev, list_node, &dpdk_list) {
> + if (rte_eth_devices[dev->port_id].device == device
> + && rte_eth_devices[dev->port_id].state != RTE_ETH_DEV_UNUSED) {
> + count++;
> + }
> + }
> + return count;
> +}
> +
> static int
> vhost_common_construct(struct netdev *netdev)
> OVS_REQUIRES(dpdk_mutex)
> @@ -1353,20 +1374,23 @@ static void
> netdev_dpdk_destruct(struct netdev *netdev)
> {
> struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
> - struct rte_eth_dev_info dev_info;
> + struct rte_device *rte_dev;
>
> ovs_mutex_lock(&dpdk_mutex);
>
> rte_eth_dev_stop(dev->port_id);
> dev->started = false;
> -
> if (dev->attached) {
> + /* Remove the port eth device. */
> rte_eth_dev_close(dev->port_id);
> - rte_eth_dev_info_get(dev->port_id, &dev_info);
> - if (dev_info.device && !rte_dev_remove(dev_info.device)) {
> - VLOG_INFO("Device '%s' has been detached", dev->devargs);
> - } else {
> - VLOG_ERR("Device '%s' can not be detached", dev->devargs);
> + VLOG_INFO("Device '%s' has been removed", dev->devargs);
> + /* If this is the last port_id using this rte device
> + * remove this rte device and all its eth devices. */
I'd like to see a fix me comment added here also as we're accessing the
rte_eth_devices array directly.
> + rte_dev = rte_eth_devices[dev->port_id].device;
> + if (netdev_dpdk_get_num_ports(rte_dev) == 1) {
> + if (rte_dev_remove(rte_dev) < 0) {
> + VLOG_ERR("Device '%s' can not be detached",
dev->devargs);
> + }
> }
> }
>
> @@ -1632,8 +1656,28 @@ netdev_dpdk_get_port_by_mac(const char *mac_str)
> return DPDK_ETH_PORT_ID_INVALID;
> }
>
> +/* Return the first DPDK port_id matching the devargs pattern. */
> +static dpdk_port_t
> +netdev_dpdk_get_port_by_devargs(const char *devargs)
> +{
> + struct rte_dev_iterator iterator;
> + dpdk_port_t port_id;
> +
> + if (rte_dev_probe(devargs)) {
When testing this I noticed the following error being reported when a
port is added to OVS DPDK.
dpdk|ERR|EAL: Failed to attach device on primary process
Note the port was still successfully added to OVS DPDK but I was
confused when reviewing the logs.
In my case the error occurs because I had already bound the device in
question to the igb_uio before I started OVS DPDK (rather than
hotplugging the device after starting OVS DPDK).
When OVS DPDK starts the device will be probed if it is bound to a
userspace driver (e.g. igb_uio).
Later when I add the port to OVS via ovs-vsctl it will be probed again
because of the introduction of the call rte_dev_probe() above, which
returns an EEXIST error, causing the DPDK ERR message above before then
successfully adding the port to OVS DPDK.
I think this behavior will cause some confusion for a users, the error
message from DPDK is vague and unless you dive into the probe code it's
not clear whats causing the issue or if there is a real issue here at all.
Is it possible to see if a device has already been probed, and if so
skip the rte_dev_probe(devargs) above?
> + port_id = DPDK_ETH_PORT_ID_INVALID;
> + } else {
> + RTE_ETH_FOREACH_MATCHING_DEV(port_id, devargs, &iterator) {
> + /* If a break is done - must call
rte_eth_iterator_cleanup(). */
> + rte_eth_iterator_cleanup(&iterator);
> + break;
> + }
> + }
> + return port_id;
> +}
> +
> /*
> - * Normally, a PCI id is enough for identifying a specific DPDK port.
> + * Normally, a PCI id (optionally followed by a representor number)
> + * is enough for identifying a specific DPDK port.
> * However, for some NICs having multiple ports sharing the same PCI
> * id, using PCI id won't work then.
> *
> @@ -1641,34 +1685,42 @@ netdev_dpdk_get_port_by_mac(const char *mac_str)
> *
> * Note that the compatibility is fully kept: user can still use the
> * PCI id for adding ports (when it's enough for them).
> + *
> + * In order to avoid clang errors add OVS_REQUIRES(dpdk_mutex) to
this function
> + * since it is required by netdev_dpdk_lookup_by_port_id() while the
dpdk_mutex
> + * is taken outside of this function.
> */
> static dpdk_port_t
> netdev_dpdk_process_devargs(struct netdev_dpdk *dev,
> const char *devargs, char **errp)
> + OVS_REQUIRES(dpdk_mutex)
> {
> - char *name;
> dpdk_port_t new_port_id = DPDK_ETH_PORT_ID_INVALID;
>
> if (strncmp(devargs, "class=eth,mac=", 14) == 0) {
> new_port_id = netdev_dpdk_get_port_by_mac(&devargs[14]);
> } else {
> - name = xmemdup0(devargs, strcspn(devargs, ","));
> - if (rte_eth_dev_get_port_by_name(name, &new_port_id)
> - || !rte_eth_dev_is_valid_port(new_port_id)) {
> - /* Device not found in DPDK, attempt to attach it */
> - if (!rte_dev_probe(devargs)
> - && !rte_eth_dev_get_port_by_name(name, &new_port_id)) {
> - /* Attach successful */
> - dev->attached = true;
> - VLOG_INFO("Device '%s' attached to DPDK", devargs);
> - } else {
> - /* Attach unsuccessful */
> + new_port_id = netdev_dpdk_get_port_by_devargs(devargs);
> + if (!rte_eth_dev_is_valid_port(new_port_id)) {
> + new_port_id = DPDK_ETH_PORT_ID_INVALID;
> + } else {
> + struct netdev_dpdk *dup_dev;
> +
> + dup_dev = netdev_dpdk_lookup_by_port_id(new_port_id);
> + if (dup_dev) {
> + VLOG_WARN_BUF(errp, "'%s' is trying to use device '%s' "
> + "which is already in use by '%s'",
> + netdev_get_name(&dev->up), devargs,
> + netdev_get_name(&dup_dev->up));
> new_port_id = DPDK_ETH_PORT_ID_INVALID;
> + } else {
> + /* Device successfully found. */
> + dev->attached = true;
> + VLOG_INFO("Device '%s' attached to DPDK port %d",
> + devargs, new_port_id);
> }
> }
> - free(name);
> }
> -
> if (new_port_id == DPDK_ETH_PORT_ID_INVALID) {
> VLOG_WARN_BUF(errp, "Error attaching device '%s' to DPDK",
devargs);
> }
> @@ -1761,7 +1813,7 @@ netdev_dpdk_set_config(struct netdev *netdev,
const struct smap *args,
> dup_dev = netdev_dpdk_lookup_by_port_id(new_port_id);
> if (dup_dev) {
> VLOG_WARN_BUF(errp, "'%s' is trying to use
device '%s' "
> - "which is already in use by
'%s'",
> + "which is already in use by '%s'",
> netdev_get_name(netdev), new_devargs,
> netdev_get_name(&dup_dev->up));
> err = EADDRINUSE;
> @@ -3236,11 +3288,17 @@ netdev_dpdk_detach(struct unixctl_conn *conn,
int argc OVS_UNUSED,
> char *response;
> dpdk_port_t port_id;
> struct netdev_dpdk *dev;
> - struct rte_eth_dev_info dev_info;
> + struct rte_device *rte_dev;
> + struct rte_dev_iterator iterator;
>
> ovs_mutex_lock(&dpdk_mutex);
>
> - if (rte_eth_dev_get_port_by_name(argv[1], &port_id)) {
> + RTE_ETH_FOREACH_MATCHING_DEV(port_id, argv[1], &iterator) {
> + /* If a break is done - must call rte_eth_iterator_cleanup(). */
> + rte_eth_iterator_cleanup(&iterator);
> + break;
> + }
> + if (port_id == DPDK_ETH_PORT_ID_INVALID) {
> response = xasprintf("Device '%s' not found in DPDK", argv[1]);
> goto error;
> }
> @@ -3253,15 +3311,22 @@ netdev_dpdk_detach(struct unixctl_conn *conn,
int argc OVS_UNUSED,
> goto error;
> }
>
> - rte_eth_dev_close(port_id);
Same as above, Fix me comment for rte_eth_devices access.
> + rte_dev = rte_eth_devices[port_id].device;
> + if (netdev_dpdk_get_num_ports(rte_dev)) {
> + response = xasprintf("Device '%s' is being shared with other "
> + "interfaces. Remove them before
detaching.",
> + argv[1]);
> + goto error;
> + }
>
> - rte_eth_dev_info_get(port_id, &dev_info);
> - if (!dev_info.device || rte_dev_remove(dev_info.device)) {
> - response = xasprintf("Device '%s' can not be detached",
argv[1]);
> + rte_eth_dev_close(port_id);
> + if (rte_dev_remove(rte_dev) < 0) {
> + response = xasprintf("Device '%s' can not be removed", argv[1]);
> goto error;
> }
>
> - response = xasprintf("Device '%s' has been detached", argv[1]);
> + response = xasprintf("All devices shared with device '%s' "
> + "have been detached", argv[1]);
>
> ovs_mutex_unlock(&dpdk_mutex);
> unixctl_command_reply(conn, response);
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
