Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99826/?format=api
{ "id": 99826, "url": "http://patches.dpdk.org/api/patches/99826/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210927134231.11177-10-srikanth.k@oneconvergence.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210927134231.11177-10-srikanth.k@oneconvergence.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210927134231.11177-10-srikanth.k@oneconvergence.com", "date": "2021-09-27T13:42:29", "name": "[09/11] net/netvsc: moving hotplug retry to OS dir", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ab574c82b059b9d19da3f2f2994cfc64077b5be1", "submitter": { "id": 2368, "url": "http://patches.dpdk.org/api/people/2368/?format=api", "name": "Srikanth Kaka", "email": "srikanth.k@oneconvergence.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210927134231.11177-10-srikanth.k@oneconvergence.com/mbox/", "series": [ { "id": 19194, "url": "http://patches.dpdk.org/api/series/19194/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19194", "date": "2021-09-27T13:42:20", "name": "add FreeBSD support to VMBUS & NetVSC PMDs", "version": 1, "mbox": "http://patches.dpdk.org/series/19194/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99826/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/99826/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7CDDDA0C46;\n\tMon, 27 Sep 2021 17:01:39 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 65689411B1;\n\tMon, 27 Sep 2021 16:58:40 +0200 (CEST)", "from mail-pg1-f177.google.com (mail-pg1-f177.google.com\n [209.85.215.177])\n by mails.dpdk.org (Postfix) with ESMTP id 5F7FD40E3C\n for <dev@dpdk.org>; Mon, 27 Sep 2021 15:43:24 +0200 (CEST)", "by mail-pg1-f177.google.com with SMTP id 75so1466759pga.3\n for <dev@dpdk.org>; Mon, 27 Sep 2021 06:43:24 -0700 (PDT)", "from srikanth-ThinkPad-T450.domain.name ([223.178.22.200])\n by smtp.gmail.com with ESMTPSA id b3sm16960665pfo.23.2021.09.27.06.43.20\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Sep 2021 06:43:23 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=oneconvergence.com; s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=XFHfzkQkAtV9RoDpC48spl+nGb211hhWKaRZYzd9n2g=;\n b=NNSxDsEDhi5dh4z4MCftARVKtK0fd/+/P08/hMUrBEwwsgOiGEv7aER38220LAdlZx\n jJDzJwBleMQJzdQM+sq17DkaUcXOC5GlGbTgGgNLfj9BRerWm1DG5JU28lE868+59kmW\n fhIFu/61CAqHcRmcTmRV+vrD4AABZ2taXMc8M=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=XFHfzkQkAtV9RoDpC48spl+nGb211hhWKaRZYzd9n2g=;\n b=QyU+R+Bm+JCajpJJnWSXIiiJJVkKSuEs0IjGh8SJdP3ZXnW6TK9mfcbESvMsjyYijK\n xzpXGtZvesU+N/4is5DIwmt0MAE+WZzpeuNsCtZdtLPhGuOaEAgug8gjbrVVIHXg6eAa\n WCbsDpnXcUcQza8sfDyvC2siLEsNfb2ZHCkAaDzW9HCMZyheNRtxo+EeZp825glh0PeE\n PXX15OcWmBOnMIG8KrUSyDA2gpynu1x0v1N5eqqKsG94GGBVUTXFDuYPxBFM8yo2jNk1\n ekA+2KEfAUDREy7/FGacjfcFDZI6xypxHDhjJO8SRUyMglPty1tOTLlGTrpmjk2qdM1G\n TRVw==", "X-Gm-Message-State": "AOAM531gB3h9Kem3ZVRCKzH7HUo6rk7549o3g9s9z/U3nEXWzvkoL6LX\n kLo32ELyQaX3xS8uscto7OW7jg==", "X-Google-Smtp-Source": "\n ABdhPJxKi2kphyvs/vVmayUGUw0MQcAW4jFp7vs15//yD48fswP1JTT1caY6q4f+REsDXCCMbEZ5Wg==", "X-Received": "by 2002:aa7:9682:0:b0:440:3c00:febd with SMTP id\n f2-20020aa79682000000b004403c00febdmr23857989pfk.81.1632750203535;\n Mon, 27 Sep 2021 06:43:23 -0700 (PDT)", "From": "Srikanth Kaka <srikanth.k@oneconvergence.com>", "To": "Stephen Hemminger <sthemmin@microsoft.com>, Long Li <longli@microsoft.com>", "Cc": "dev@dpdk.org, Vag Singh <vag.singh@oneconvergence.com>,\n Anand Thulasiram <avelu@juniper.net>,\n Srikanth Kaka <srikanth.k@oneconvergence.com>", "Date": "Mon, 27 Sep 2021 19:12:29 +0530", "Message-Id": "<20210927134231.11177-10-srikanth.k@oneconvergence.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210927134231.11177-1-srikanth.k@oneconvergence.com>", "References": "<20210927134231.11177-1-srikanth.k@oneconvergence.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Approved-At": "Mon, 27 Sep 2021 16:58:07 +0200", "Subject": "[dpdk-dev] [PATCH 09/11] net/netvsc: moving hotplug retry to OS dir", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Moved netvsc_hotplug_retry to respective OS dir as it contains OS\ndependent code. For Linux, it is copied as is and for FreeBSD it\nis not supported yet.\n\nSigned-off-by: Srikanth Kaka <srikanth.k@oneconvergence.com>\nSigned-off-by: Vag Singh <vag.singh@oneconvergence.com>\nSigned-off-by: Anand Thulasiram <avelu@juniper.net>\n---\n drivers/net/netvsc/freebsd/hn_os.c | 8 +++\n drivers/net/netvsc/hn_ethdev.c | 84 ---------------------------\n drivers/net/netvsc/hn_os.h | 2 +\n drivers/net/netvsc/linux/hn_os.c | 92 ++++++++++++++++++++++++++++++\n 4 files changed, 102 insertions(+), 84 deletions(-)", "diff": "diff --git a/drivers/net/netvsc/freebsd/hn_os.c b/drivers/net/netvsc/freebsd/hn_os.c\nindex 3bd67e06c8..2ba4c32a76 100644\n--- a/drivers/net/netvsc/freebsd/hn_os.c\n+++ b/drivers/net/netvsc/freebsd/hn_os.c\n@@ -4,6 +4,8 @@\n \n #include <stdio.h>\n \n+#include <rte_common.h>\n+\n #include \"hn_logs.h\"\n #include \"hn_os.h\"\n \n@@ -12,3 +14,9 @@ int eth_hn_os_dev_event(void)\n \tPMD_DRV_LOG(DEBUG, \"rte_dev_event_monitor_start not supported on FreeBSD\");\n \treturn 0;\n }\n+\n+void netvsc_hotplug_retry(void *args)\n+{\n+\tRTE_SET_USED(args);\n+\treturn;\n+}\ndiff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c\nindex 61d7d3daeb..c299b98a6c 100644\n--- a/drivers/net/netvsc/hn_ethdev.c\n+++ b/drivers/net/netvsc/hn_ethdev.c\n@@ -57,9 +57,6 @@\n #define NETVSC_ARG_TXBREAK \"tx_copybreak\"\n #define NETVSC_ARG_RX_EXTMBUF_ENABLE \"rx_extmbuf_enable\"\n \n-/* The max number of retry when hot adding a VF device */\n-#define NETVSC_MAX_HOTADD_RETRY 10\n-\n struct hn_xstats_name_off {\n \tchar name[RTE_ETH_XSTATS_NAME_SIZE];\n \tunsigned int offset;\n@@ -556,87 +553,6 @@ static int hn_subchan_configure(struct hn_data *hv,\n \treturn err;\n }\n \n-static void netvsc_hotplug_retry(void *args)\n-{\n-\tint ret;\n-\tstruct hn_data *hv = args;\n-\tstruct rte_eth_dev *dev = &rte_eth_devices[hv->port_id];\n-\tstruct rte_devargs *d = &hv->devargs;\n-\tchar buf[256];\n-\n-\tDIR *di;\n-\tstruct dirent *dir;\n-\tstruct ifreq req;\n-\tstruct rte_ether_addr eth_addr;\n-\tint s;\n-\n-\tPMD_DRV_LOG(DEBUG, \"%s: retry count %d\",\n-\t\t __func__, hv->eal_hot_plug_retry);\n-\n-\tif (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)\n-\t\treturn;\n-\n-\tsnprintf(buf, sizeof(buf), \"/sys/bus/pci/devices/%s/net\", d->name);\n-\tdi = opendir(buf);\n-\tif (!di) {\n-\t\tPMD_DRV_LOG(DEBUG, \"%s: can't open directory %s, \"\n-\t\t\t \"retrying in 1 second\", __func__, buf);\n-\t\tgoto retry;\n-\t}\n-\n-\twhile ((dir = readdir(di))) {\n-\t\t/* Skip . and .. directories */\n-\t\tif (!strcmp(dir->d_name, \".\") || !strcmp(dir->d_name, \"..\"))\n-\t\t\tcontinue;\n-\n-\t\t/* trying to get mac address if this is a network device*/\n-\t\ts = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);\n-\t\tif (s == -1) {\n-\t\t\tPMD_DRV_LOG(ERR, \"Failed to create socket errno %d\",\n-\t\t\t\t errno);\n-\t\t\tbreak;\n-\t\t}\n-\t\tstrlcpy(req.ifr_name, dir->d_name, sizeof(req.ifr_name));\n-\t\tret = ioctl(s, SIOCGIFHWADDR, &req);\n-\t\tclose(s);\n-\t\tif (ret == -1) {\n-\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t \"Failed to send SIOCGIFHWADDR for device %s\",\n-\t\t\t\t dir->d_name);\n-\t\t\tbreak;\n-\t\t}\n-\t\tif (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {\n-\t\t\tclosedir(di);\n-\t\t\treturn;\n-\t\t}\n-\t\tmemcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,\n-\t\t RTE_DIM(eth_addr.addr_bytes));\n-\n-\t\tif (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {\n-\t\t\tPMD_DRV_LOG(NOTICE,\n-\t\t\t\t \"Found matching MAC address, adding device %s network name %s\",\n-\t\t\t\t d->name, dir->d_name);\n-\t\t\tret = rte_eal_hotplug_add(d->bus->name, d->name,\n-\t\t\t\t\t\t d->args);\n-\t\t\tif (ret) {\n-\t\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t\t \"Failed to add PCI device %s\",\n-\t\t\t\t\t d->name);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\t\t/* When the code reaches here, we either have already added\n-\t\t * the device, or its MAC address did not match.\n-\t\t */\n-\t\tclosedir(di);\n-\t\treturn;\n-\t}\n-\tclosedir(di);\n-retry:\n-\t/* The device is still being initialized, retry after 1 second */\n-\trte_eal_alarm_set(1000000, netvsc_hotplug_retry, hv);\n-}\n-\n static void\n netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type type,\n \t\t void *arg)\ndiff --git a/drivers/net/netvsc/hn_os.h b/drivers/net/netvsc/hn_os.h\nindex 618c53cdcd..1fb7292b17 100644\n--- a/drivers/net/netvsc/hn_os.h\n+++ b/drivers/net/netvsc/hn_os.h\n@@ -4,3 +4,5 @@\n */\n \n int eth_hn_os_dev_event(void);\n+\n+void netvsc_hotplug_retry(void *args);\ndiff --git a/drivers/net/netvsc/linux/hn_os.c b/drivers/net/netvsc/linux/hn_os.c\nindex 862dc190c1..9c2f4cd7a8 100644\n--- a/drivers/net/netvsc/linux/hn_os.c\n+++ b/drivers/net/netvsc/linux/hn_os.c\n@@ -2,11 +2,22 @@\n * Copyright(c) 2016-2021 Microsoft Corporation\n */\n \n+#include <unistd.h>\n+#include <dirent.h>\n+#include <net/if.h>\n+#include <net/if_arp.h>\n+#include <sys/ioctl.h>\n+\n #include <rte_ethdev.h>\n+#include <rte_alarm.h>\n \n #include \"hn_logs.h\"\n+#include \"hn_var.h\"\n #include \"hn_os.h\"\n \n+/* The max number of retry when hot adding a VF device */\n+#define NETVSC_MAX_HOTADD_RETRY 10\n+\n int eth_hn_os_dev_event(void)\n {\n \tint ret;\n@@ -17,3 +28,84 @@ int eth_hn_os_dev_event(void)\n \n \treturn ret;\n }\n+\n+void netvsc_hotplug_retry(void *args)\n+{\n+\tint ret;\n+\tstruct hn_data *hv = args;\n+\tstruct rte_eth_dev *dev = &rte_eth_devices[hv->port_id];\n+\tstruct rte_devargs *d = &hv->devargs;\n+\tchar buf[256];\n+\n+\tDIR *di;\n+\tstruct dirent *dir;\n+\tstruct ifreq req;\n+\tstruct rte_ether_addr eth_addr;\n+\tint s;\n+\n+\tPMD_DRV_LOG(DEBUG, \"%s: retry count %d\",\n+\t\t __func__, hv->eal_hot_plug_retry);\n+\n+\tif (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)\n+\t\treturn;\n+\n+\tsnprintf(buf, sizeof(buf), \"/sys/bus/pci/devices/%s/net\", d->name);\n+\tdi = opendir(buf);\n+\tif (!di) {\n+\t\tPMD_DRV_LOG(DEBUG, \"%s: can't open directory %s, \"\n+\t\t\t \"retrying in 1 second\", __func__, buf);\n+\t\tgoto retry;\n+\t}\n+\n+\twhile ((dir = readdir(di))) {\n+\t\t/* Skip . and .. directories */\n+\t\tif (!strcmp(dir->d_name, \".\") || !strcmp(dir->d_name, \"..\"))\n+\t\t\tcontinue;\n+\n+\t\t/* trying to get mac address if this is a network device*/\n+\t\ts = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);\n+\t\tif (s == -1) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to create socket errno %d\",\n+\t\t\t\t errno);\n+\t\t\tbreak;\n+\t\t}\n+\t\tstrlcpy(req.ifr_name, dir->d_name, sizeof(req.ifr_name));\n+\t\tret = ioctl(s, SIOCGIFHWADDR, &req);\n+\t\tclose(s);\n+\t\tif (ret == -1) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"Failed to send SIOCGIFHWADDR for device %s\",\n+\t\t\t\t dir->d_name);\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {\n+\t\t\tclosedir(di);\n+\t\t\treturn;\n+\t\t}\n+\t\tmemcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,\n+\t\t RTE_DIM(eth_addr.addr_bytes));\n+\n+\t\tif (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {\n+\t\t\tPMD_DRV_LOG(NOTICE,\n+\t\t\t\t \"Found matching MAC address, adding device %s network name %s\",\n+\t\t\t\t d->name, dir->d_name);\n+\t\t\tret = rte_eal_hotplug_add(d->bus->name, d->name,\n+\t\t\t\t\t\t d->args);\n+\t\t\tif (ret) {\n+\t\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t\t \"Failed to add PCI device %s\",\n+\t\t\t\t\t d->name);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t\t/* When the code reaches here, we either have already added\n+\t\t * the device, or its MAC address did not match.\n+\t\t */\n+\t\tclosedir(di);\n+\t\treturn;\n+\t}\n+\tclosedir(di);\n+retry:\n+\t/* The device is still being initialized, retry after 1 second */\n+\trte_eal_alarm_set(1000000, netvsc_hotplug_retry, hv);\n+}\n", "prefixes": [ "09/11" ] }