2016-12-13 11:22 GMT-08:00 Ciara Loftus <[email protected]>: > In order to use dpdk ports in ovs they have to be bound to a DPDK > compatible driver before ovs is started. > > This patch adds the possibility to hotplug (or hot-unplug) a device > after ovs has been started. The implementation adds two appctl commands: > netdev-dpdk/port-attach and netdev-dpdk/port-detach > > After the user attaches a new device, it has to be added to a bridge > using the add-port command, similarly, before detaching a device, > it has to be removed using the del-port command. > > Signed-off-by: Mauricio Vasquez B <[email protected]>
'response' should be freed in multiple places. How about calling the commands netdev-dpdk/attach and netdev-dpdk/detach without the 'port'? I think the 'port' part is implicit in netdev-dpdk. Minor: can you add your signoff with your coauthored-by? > --- > Changelog: > * Use xasprintf instead of snprintf when reporting attach/detach errors. > * Updated format of link in docs to comply with new format. > > Documentation/intro/install/dpdk-advanced.rst | 25 ++++++++ > NEWS | 1 + > lib/netdev-dpdk.c | 91 > +++++++++++++++++++++++++-- > 3 files changed, 111 insertions(+), 6 deletions(-) > > diff --git a/Documentation/intro/install/dpdk-advanced.rst > b/Documentation/intro/install/dpdk-advanced.rst > index 44d1cd7..42a4af6 100644 > --- a/Documentation/intro/install/dpdk-advanced.rst > +++ b/Documentation/intro/install/dpdk-advanced.rst > @@ -932,6 +932,31 @@ validate the suitability of different vSwitch > implementations in a telco > deployment environment. More information can be found on the `OPNFV wiki > <https://wiki.opnfv.org/display/vsperf/VSperf+Home>`__. > > +Port Hotplug > +------------ > + > +OvS supports port hotplugging, it allows to use ports that were not bound > +to DPDK when vswitchd was started. > +In order to attach a port, it has to be bound to DPDK using the > +dpdk_nic_bind.py script: > + > + $ $DPDK_DIR/tools/dpdk_nic_bind.py --bind=igb_uio 0000:01:00.0 > + > +Then it can be attached to OVS: > + > + $ ovs-appctl netdev-dpdk/port-attach 0000:01:00.0 > + > +At this point, the user can create a ovs port using the add-port command. > + > +It is also possible to detach a port from ovs, the user has to remove the > +port using the del-port command, then it can be detached using: > + > + $ ovs-appctl netdev-dpdk/port-detach dpdk0 > + > +This feature is not supported with VFIO and could not work with some NICs. > +For more information please refer to the `DPDK Port Hotplug Framework > +<http://dpdk.org/doc/guides/prog_guide/port_hotplug_framework.html#hotplug>`__. > + > Bug Reporting > ------------- > > diff --git a/NEWS b/NEWS > index 3a08dbc..b596cf3 100644 > --- a/NEWS > +++ b/NEWS > @@ -41,6 +41,7 @@ Post-v2.6.0 > * New option 'n_rxq_desc' and 'n_txq_desc' fields for DPDK interfaces > which set the number of rx and tx descriptors to use for the given > port. > * Support for DPDK v16.11. > + * Port Hotplug is now supported. > - Fedora packaging: > * A package upgrade does not automatically restart OVS service. > - ovs-vswitchd/ovs-vsctl: > diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c > index 625f425..677a10c 100644 > --- a/lib/netdev-dpdk.c > +++ b/lib/netdev-dpdk.c > @@ -2307,6 +2307,78 @@ netdev_dpdk_set_admin_state(struct unixctl_conn *conn, > int argc, > unixctl_command_reply(conn, "OK"); > } > > +static void > +netdev_dpdk_port_attach(struct unixctl_conn *conn, int argc OVS_UNUSED, > + const char *argv[], void *aux OVS_UNUSED) > +{ > + int ret; > + char *response; > + uint8_t port_id; > + > + ovs_mutex_lock(&dpdk_mutex); > + > + ret = rte_eth_dev_attach(argv[1], &port_id); > + if (ret < 0) { > + response = xasprintf("Error attaching device '%s'", argv[1]); > + ovs_mutex_unlock(&dpdk_mutex); > + unixctl_command_reply_error(conn, response); > + return; > + } > + > + response = xasprintf("Device '%s' has been attached as 'dpdk%d'", > + argv[1], port_id); > + > + ovs_mutex_unlock(&dpdk_mutex); > + unixctl_command_reply(conn, response); > +} > + > +static void > +netdev_dpdk_port_detach(struct unixctl_conn *conn, int argc OVS_UNUSED, > + const char *argv[], void *aux OVS_UNUSED) > +{ > + int ret; > + char *response; > + unsigned int parsed_port; > + uint8_t port_id; > + char devname[RTE_ETH_NAME_MAX_LEN]; > + > + ovs_mutex_lock(&dpdk_mutex); > + > + ret = dpdk_dev_parse_name(argv[1], "dpdk", &parsed_port); > + if (ret) { > + response = xasprintf("'%s' is not a valid port", argv[1]); > + goto error; > + } > + > + port_id = parsed_port; > + > + struct netdev *netdev = netdev_from_name(argv[1]); > + if (netdev) { > + netdev_close(netdev); > + response = xasprintf("Port '%s' is being used. Remove it before" > + "detaching", argv[1]); > + goto error; > + } > + > + rte_eth_dev_close(port_id); > + > + ret = rte_eth_dev_detach(port_id, devname); > + if (ret < 0) { > + response = xasprintf("Port '%s' can not be detached", argv[1]); > + goto error; > + } > + > + response = xasprintf("Port '%s' has been detached", argv[1]); > + > + ovs_mutex_unlock(&dpdk_mutex); > + unixctl_command_reply(conn, response); > + return; > + > +error: > + ovs_mutex_unlock(&dpdk_mutex); > + unixctl_command_reply_error(conn, response); > +} > + > /* > * Set virtqueue flags so that we do not receive interrupts. > */ > @@ -2582,6 +2654,12 @@ netdev_dpdk_class_init(void) > unixctl_command_register("netdev-dpdk/set-admin-state", > "[netdev] up|down", 1, 2, > netdev_dpdk_set_admin_state, NULL); > + unixctl_command_register("netdev-dpdk/port-attach", > + "pci address of device", 1, 1, > + netdev_dpdk_port_attach, NULL); > + unixctl_command_register("netdev-dpdk/port-detach", > + "port", 1, 1, > + netdev_dpdk_port_detach, NULL); > > ovsthread_once_done(&once); > } > @@ -2618,7 +2696,7 @@ dpdk_ring_create(const char dev_name[], unsigned int > port_no, > { > struct dpdk_ring *ivshmem; > char *ring_name; > - int err; > + int port_id; > > ivshmem = dpdk_rte_mzalloc(sizeof *ivshmem); > if (!ivshmem) { > @@ -2648,19 +2726,20 @@ dpdk_ring_create(const char dev_name[], unsigned int > port_no, > return ENOMEM; > } > > - err = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1, > - &ivshmem->cring_tx, 1, SOCKET0); > + port_id = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1, > + &ivshmem->cring_tx, 1, SOCKET0); > > - if (err < 0) { > + if (port_id < 0) { > rte_free(ivshmem); > return ENODEV; > } > > ivshmem->user_port_id = port_no; > - ivshmem->eth_port_id = rte_eth_dev_count() - 1; > + ivshmem->eth_port_id = port_id; > + *eth_port_id = port_id; > + > ovs_list_push_back(&dpdk_ring_list, &ivshmem->list_node); > > - *eth_port_id = ivshmem->eth_port_id; > return 0; > } > > -- > 2.4.3 > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
