diff mbox series

[09/11] net/netvsc: moving hotplug retry to OS dir

Message ID 20210927134231.11177-10-srikanth.k@oneconvergence.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers show
Series add FreeBSD support to VMBUS & NetVSC PMDs | expand

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Srikanth Kaka Sept. 27, 2021, 1:42 p.m. UTC
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>
---
 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(-)

Comments

Long Li Nov. 6, 2021, 8:54 p.m. UTC | #1
> 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(&eth_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(&eth_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
diff mbox series

Patch

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(&eth_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(&eth_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);
+}