From: Long Li <longli@microsoft.com>
To: Srikanth Kaka <srikanth.k@oneconvergence.com>,
Stephen Hemminger <sthemmin@microsoft.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
Vag Singh <vag.singh@oneconvergence.com>,
Anand Thulasiram <avelu@juniper.net>
Subject: Re: [dpdk-dev] [PATCH 09/11] net/netvsc: moving hotplug retry to OS dir
Date: Sat, 6 Nov 2021 20:54:00 +0000 [thread overview]
Message-ID: <BY5PR21MB15066707CA4BF2E818168FD6CE8F9@BY5PR21MB1506.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20210927134231.11177-10-srikanth.k@oneconvergence.com>
> Subject: [PATCH 09/11] net/netvsc: moving hotplug retry to OS dir
>
> [You don't often get email from srikanth.k@oneconvergence.com. Learn why
> this is important at http://aka.ms/LearnAboutSenderIdentification.]
>
> Moved netvsc_hotplug_retry to respective OS dir as it contains OS dependent
> code. For Linux, it is copied as is and for FreeBSD it is not supported yet.
>
> Signed-off-by: Srikanth Kaka <srikanth.k@oneconvergence.com>
> Signed-off-by: Vag Singh <vag.singh@oneconvergence.com>
> Signed-off-by: Anand Thulasiram <avelu@juniper.net>
Reviewed-by: Long Li <longli@microsoft.com>
> ---
> drivers/net/netvsc/freebsd/hn_os.c | 8 +++
> drivers/net/netvsc/hn_ethdev.c | 84 ---------------------------
> drivers/net/netvsc/hn_os.h | 2 +
> drivers/net/netvsc/linux/hn_os.c | 92 ++++++++++++++++++++++++++++++
> 4 files changed, 102 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/net/netvsc/freebsd/hn_os.c
> b/drivers/net/netvsc/freebsd/hn_os.c
> index 3bd67e06c8..2ba4c32a76 100644
> --- a/drivers/net/netvsc/freebsd/hn_os.c
> +++ b/drivers/net/netvsc/freebsd/hn_os.c
> @@ -4,6 +4,8 @@
>
> #include <stdio.h>
>
> +#include <rte_common.h>
> +
> #include "hn_logs.h"
> #include "hn_os.h"
>
> @@ -12,3 +14,9 @@ int eth_hn_os_dev_event(void)
> PMD_DRV_LOG(DEBUG, "rte_dev_event_monitor_start not supported on
> FreeBSD");
> return 0;
> }
> +
> +void netvsc_hotplug_retry(void *args)
> +{
> + RTE_SET_USED(args);
> + return;
> +}
> diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
> index 61d7d3daeb..c299b98a6c 100644
> --- a/drivers/net/netvsc/hn_ethdev.c
> +++ b/drivers/net/netvsc/hn_ethdev.c
> @@ -57,9 +57,6 @@
> #define NETVSC_ARG_TXBREAK "tx_copybreak"
> #define NETVSC_ARG_RX_EXTMBUF_ENABLE "rx_extmbuf_enable"
>
> -/* The max number of retry when hot adding a VF device */ -#define
> NETVSC_MAX_HOTADD_RETRY 10
> -
> struct hn_xstats_name_off {
> char name[RTE_ETH_XSTATS_NAME_SIZE];
> unsigned int offset;
> @@ -556,87 +553,6 @@ static int hn_subchan_configure(struct hn_data *hv,
> return err;
> }
>
> -static void netvsc_hotplug_retry(void *args) -{
> - int ret;
> - struct hn_data *hv = args;
> - struct rte_eth_dev *dev = &rte_eth_devices[hv->port_id];
> - struct rte_devargs *d = &hv->devargs;
> - char buf[256];
> -
> - DIR *di;
> - struct dirent *dir;
> - struct ifreq req;
> - struct rte_ether_addr eth_addr;
> - int s;
> -
> - PMD_DRV_LOG(DEBUG, "%s: retry count %d",
> - __func__, hv->eal_hot_plug_retry);
> -
> - if (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)
> - return;
> -
> - snprintf(buf, sizeof(buf), "/sys/bus/pci/devices/%s/net", d->name);
> - di = opendir(buf);
> - if (!di) {
> - PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, "
> - "retrying in 1 second", __func__, buf);
> - goto retry;
> - }
> -
> - while ((dir = readdir(di))) {
> - /* Skip . and .. directories */
> - if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
> - continue;
> -
> - /* trying to get mac address if this is a network device*/
> - s = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
> - if (s == -1) {
> - PMD_DRV_LOG(ERR, "Failed to create socket errno %d",
> - errno);
> - break;
> - }
> - strlcpy(req.ifr_name, dir->d_name, sizeof(req.ifr_name));
> - ret = ioctl(s, SIOCGIFHWADDR, &req);
> - close(s);
> - if (ret == -1) {
> - PMD_DRV_LOG(ERR,
> - "Failed to send SIOCGIFHWADDR for device %s",
> - dir->d_name);
> - break;
> - }
> - if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
> - closedir(di);
> - return;
> - }
> - memcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,
> - RTE_DIM(eth_addr.addr_bytes));
> -
> - if (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {
> - PMD_DRV_LOG(NOTICE,
> - "Found matching MAC address, adding device %s network
> name %s",
> - d->name, dir->d_name);
> - ret = rte_eal_hotplug_add(d->bus->name, d->name,
> - d->args);
> - if (ret) {
> - PMD_DRV_LOG(ERR,
> - "Failed to add PCI device %s",
> - d->name);
> - break;
> - }
> - }
> - /* When the code reaches here, we either have already added
> - * the device, or its MAC address did not match.
> - */
> - closedir(di);
> - return;
> - }
> - closedir(di);
> -retry:
> - /* The device is still being initialized, retry after 1 second */
> - rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hv);
> -}
> -
> static void
> netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type
> type,
> void *arg)
> diff --git a/drivers/net/netvsc/hn_os.h b/drivers/net/netvsc/hn_os.h index
> 618c53cdcd..1fb7292b17 100644
> --- a/drivers/net/netvsc/hn_os.h
> +++ b/drivers/net/netvsc/hn_os.h
> @@ -4,3 +4,5 @@
> */
>
> int eth_hn_os_dev_event(void);
> +
> +void netvsc_hotplug_retry(void *args);
> diff --git a/drivers/net/netvsc/linux/hn_os.c b/drivers/net/netvsc/linux/hn_os.c
> index 862dc190c1..9c2f4cd7a8 100644
> --- a/drivers/net/netvsc/linux/hn_os.c
> +++ b/drivers/net/netvsc/linux/hn_os.c
> @@ -2,11 +2,22 @@
> * Copyright(c) 2016-2021 Microsoft Corporation
> */
>
> +#include <unistd.h>
> +#include <dirent.h>
> +#include <net/if.h>
> +#include <net/if_arp.h>
> +#include <sys/ioctl.h>
> +
> #include <rte_ethdev.h>
> +#include <rte_alarm.h>
>
> #include "hn_logs.h"
> +#include "hn_var.h"
> #include "hn_os.h"
>
> +/* The max number of retry when hot adding a VF device */ #define
> +NETVSC_MAX_HOTADD_RETRY 10
> +
> int eth_hn_os_dev_event(void)
> {
> int ret;
> @@ -17,3 +28,84 @@ int eth_hn_os_dev_event(void)
>
> return ret;
> }
> +
> +void netvsc_hotplug_retry(void *args)
> +{
> + int ret;
> + struct hn_data *hv = args;
> + struct rte_eth_dev *dev = &rte_eth_devices[hv->port_id];
> + struct rte_devargs *d = &hv->devargs;
> + char buf[256];
> +
> + DIR *di;
> + struct dirent *dir;
> + struct ifreq req;
> + struct rte_ether_addr eth_addr;
> + int s;
> +
> + PMD_DRV_LOG(DEBUG, "%s: retry count %d",
> + __func__, hv->eal_hot_plug_retry);
> +
> + if (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)
> + return;
> +
> + snprintf(buf, sizeof(buf), "/sys/bus/pci/devices/%s/net", d->name);
> + di = opendir(buf);
> + if (!di) {
> + PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, "
> + "retrying in 1 second", __func__, buf);
> + goto retry;
> + }
> +
> + while ((dir = readdir(di))) {
> + /* Skip . and .. directories */
> + if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
> + continue;
> +
> + /* trying to get mac address if this is a network device*/
> + s = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
> + if (s == -1) {
> + PMD_DRV_LOG(ERR, "Failed to create socket errno %d",
> + errno);
> + break;
> + }
> + strlcpy(req.ifr_name, dir->d_name, sizeof(req.ifr_name));
> + ret = ioctl(s, SIOCGIFHWADDR, &req);
> + close(s);
> + if (ret == -1) {
> + PMD_DRV_LOG(ERR,
> + "Failed to send SIOCGIFHWADDR for device %s",
> + dir->d_name);
> + break;
> + }
> + if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
> + closedir(di);
> + return;
> + }
> + memcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,
> + RTE_DIM(eth_addr.addr_bytes));
> +
> + if (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {
> + PMD_DRV_LOG(NOTICE,
> + "Found matching MAC address, adding device %s network
> name %s",
> + d->name, dir->d_name);
> + ret = rte_eal_hotplug_add(d->bus->name, d->name,
> + d->args);
> + if (ret) {
> + PMD_DRV_LOG(ERR,
> + "Failed to add PCI device %s",
> + d->name);
> + break;
> + }
> + }
> + /* When the code reaches here, we either have already added
> + * the device, or its MAC address did not match.
> + */
> + closedir(di);
> + return;
> + }
> + closedir(di);
> +retry:
> + /* The device is still being initialized, retry after 1 second */
> + rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hv); }
> --
> 2.30.2
next prev parent reply other threads:[~2021-11-06 20:54 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 13:42 [dpdk-dev] [PATCH 00/11] add FreeBSD support to VMBUS & NetVSC PMDs Srikanth Kaka
2021-09-27 13:42 ` [dpdk-dev] [PATCH 01/11] bus/vmbus: stub for FreeBSD support Srikanth Kaka
2021-11-06 20:44 ` Long Li
2021-09-27 13:42 ` [dpdk-dev] [PATCH 02/11] bus/vmbus: scan and get the network device Srikanth Kaka
2021-10-08 11:39 ` [dpdk-dev] [PATCH v2 " Srikanth Kaka
2021-09-27 13:42 ` [dpdk-dev] [PATCH 03/11] bus/vmbus: handle mapping of device resources Srikanth Kaka
2021-09-27 13:42 ` [dpdk-dev] [PATCH 04/11] bus/vmbus: get device resource values using sysctl Srikanth Kaka
2021-09-27 13:42 ` [dpdk-dev] [PATCH 05/11] bus/vmbus: open subchannels Srikanth Kaka
2021-09-30 23:17 ` Long Li
2021-10-08 11:41 ` [dpdk-dev] [PATCH v2 " Srikanth Kaka
2021-11-06 20:49 ` Long Li
2022-02-08 16:35 ` Thomas Monjalon
2021-09-27 13:42 ` [dpdk-dev] [PATCH 06/11] net/netvsc: request HV_UIO to open sub-channels Srikanth Kaka
2021-09-30 23:19 ` Long Li
2021-10-01 5:31 ` Srikanth K
2021-09-27 13:42 ` [dpdk-dev] [PATCH 07/11] bus/vmbus: map the subchannel resources Srikanth Kaka
2021-09-27 13:42 ` [dpdk-dev] [PATCH 08/11] net/netvsc: moving event monitoring support Srikanth Kaka
2021-11-06 20:51 ` Long Li
2021-09-27 13:42 ` [dpdk-dev] [PATCH 09/11] net/netvsc: moving hotplug retry to OS dir Srikanth Kaka
2021-11-06 20:54 ` Long Li [this message]
2021-09-27 13:42 ` [dpdk-dev] [PATCH 10/11] bus/vmbus: add meson support for FreeBSD OS Srikanth Kaka
2021-11-06 20:54 ` Long Li
2021-09-27 13:42 ` [dpdk-dev] [PATCH 11/11] net/netvsc: add meson support for FreeBSD Srikanth Kaka
2021-10-08 11:42 ` [dpdk-dev] [PATCH v2 " Srikanth Kaka
2021-11-06 20:50 ` Long Li
2021-09-30 23:25 ` [dpdk-dev] [PATCH 00/11] add FreeBSD support to VMBUS & NetVSC PMDs Long Li
2022-02-17 16:05 ` [PATCH v3 00/15] " Srikanth Kaka
2022-02-17 16:05 ` [PATCH v3 01/15] bus/vmbus: scan and get the network device Srikanth Kaka
2022-02-17 16:29 ` Stephen Hemminger
2022-02-17 16:06 ` [PATCH v3 02/15] bus/vmbus: handle mapping of device resources Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 03/15] bus/vmbus: get device resource values using sysctl Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 04/15] bus/vmbus: add resource by index Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 05/15] net/netvsc: make event monitor OS dependent Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 06/15] bus/vmbus: add ring mapping APIs Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 07/15] bus/vmbus: add stub for subchannel support API Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 08/15] bus/vmbus: open subchannels Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 09/15] net/netvsc: make IOCTL call to " Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 10/15] bus/vmbus: get subchannel info Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 11/15] net/netvsc: moving hotplug retry to OS dir Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 12/15] bus/vmbus: add meson support for FreeBSD Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 13/15] net/netvsc: " Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 14/15] bus/vmbus: add APIs to mask/unmask IRQs Srikanth Kaka
2022-02-17 16:06 ` [PATCH v3 15/15] bus/vmbus: update MAINTAINERS and docs Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 00/14] add FreeBSD support to VMBUS & NetVSC PMDs Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 01/14] bus/vmbus: move independent code from Linux Srikanth Kaka
2022-04-19 14:49 ` Stephen Hemminger
2022-04-19 14:52 ` Srikanth K
2022-04-18 4:29 ` [PATCH v4 02/14] bus/vmbus: move independent bus functions Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 03/14] bus/vmbus: move OS independent UIO functions Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 04/14] bus/vmbus: scan and get the network device on FreeBSD Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 05/14] bus/vmbus: handle mapping of device resources Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 06/14] bus/vmbus: get device resource values using sysctl Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 07/14] net/netvsc: make event monitor OS dependent Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 08/14] bus/vmbus: add sub-channel mapping support Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 09/14] bus/vmbus: open subchannels Srikanth Kaka
2022-04-19 15:00 ` Stephen Hemminger
2022-04-18 4:29 ` [PATCH v4 10/14] net/netvsc: make IOCTL call to " Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 11/14] bus/vmbus: get subchannel info Srikanth Kaka
2022-04-19 14:51 ` Stephen Hemminger
2022-04-18 4:29 ` [PATCH v4 12/14] net/netvsc: moving hotplug retry to OS dir Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 13/14] bus/vmbus: add meson support for FreeBSD Srikanth Kaka
2022-04-18 4:29 ` [PATCH v4 14/14] bus/vmbus: update MAINTAINERS and docs Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 00/14] add FreeBSD support to VMBUS & NetVSC PMDs Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 01/14] bus/vmbus: move independent code from Linux Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 02/14] bus/vmbus: move independent bus functions Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 03/14] bus/vmbus: move OS independent UIO functions Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 04/14] bus/vmbus: scan and get the network device on FreeBSD Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 05/14] bus/vmbus: handle mapping of device resources Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 06/14] bus/vmbus: get device resource values using sysctl Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 07/14] net/netvsc: make event monitor OS dependent Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 08/14] bus/vmbus: add sub-channel mapping support Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 09/14] bus/vmbus: open subchannels Srikanth Kaka
2023-08-10 15:41 ` Stephen Hemminger
2022-04-23 4:28 ` [PATCH v5 10/14] net/netvsc: make IOCTL call to " Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 11/14] bus/vmbus: get subchannel info Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 12/14] net/netvsc: moving hotplug retry to OS dir Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 13/14] bus/vmbus: add meson support for FreeBSD Srikanth Kaka
2022-04-23 4:28 ` [PATCH v5 14/14] bus/vmbus: update MAINTAINERS and docs Srikanth Kaka
2023-08-10 15:44 ` Stephen Hemminger
2022-05-18 8:18 ` [PATCH v5 00/14] add FreeBSD support to VMBUS & NetVSC PMDs Thomas Monjalon
2022-10-06 14:58 ` Thomas Monjalon
2023-07-04 0:07 ` Stephen Hemminger
2022-04-14 8:54 ` [PATCH v3 00/15] " Thomas Monjalon
2022-04-14 9:01 ` Srikanth K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BY5PR21MB15066707CA4BF2E818168FD6CE8F9@BY5PR21MB1506.namprd21.prod.outlook.com \
--to=longli@microsoft.com \
--cc=avelu@juniper.net \
--cc=dev@dpdk.org \
--cc=srikanth.k@oneconvergence.com \
--cc=sthemmin@microsoft.com \
--cc=vag.singh@oneconvergence.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).