Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99824/?format=api
{ "id": 99824, "url": "http://patches.dpdk.org/api/patches/99824/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210927134231.11177-8-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-8-srikanth.k@oneconvergence.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210927134231.11177-8-srikanth.k@oneconvergence.com", "date": "2021-09-27T13:42:27", "name": "[07/11] bus/vmbus: map the subchannel resources", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "af608cf2edee7f17da7325e1f6fc22753625e387", "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-8-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/99824/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/99824/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 04AFAA0C46;\n\tMon, 27 Sep 2021 17:01:23 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2AD01411A7;\n\tMon, 27 Sep 2021 16:58:38 +0200 (CEST)", "from mail-pl1-f174.google.com (mail-pl1-f174.google.com\n [209.85.214.174])\n by mails.dpdk.org (Postfix) with ESMTP id 7623A410DD\n for <dev@dpdk.org>; Mon, 27 Sep 2021 15:43:18 +0200 (CEST)", "by mail-pl1-f174.google.com with SMTP id t11so11798905plq.11\n for <dev@dpdk.org>; Mon, 27 Sep 2021 06:43:18 -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.15\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Sep 2021 06:43:17 -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=ypsdkfEQUqstAzTHwOVtK+4V2nRVI41QIW0OB1Uo4Ak=;\n b=A4qozoIrB6hNq6Pesxr6RBAs7odlKiq2dKHL6LW0EGSR92JrNktCI43nI5ejgJW7wR\n 1rUPoVLT0MpoKXhAXNVA5QZ287WMXeieoc5IqlPnTmrhXA9Hpfw7EAWuViCShLXig8PX\n RAJQfkp21cJM2nKBwwW/3mTGoE0xi4/SFkzIw=", "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=ypsdkfEQUqstAzTHwOVtK+4V2nRVI41QIW0OB1Uo4Ak=;\n b=609fopmioxceEx0lM3m0YB+27FFqTUPCXUcrNC+Av+FBnhvDMEAFIWTnHi3BIZy06z\n KUt7RZuLxTPVvfDuaFrMX2M8wlnRDsAfZBVNExxZkpjrADoa+cTxuJ/Bzal0d92ls7Vw\n 4f3NGTkmUitQVspk4IEVsD9jndI+Pm2CU7ycQFUd801b3Uj7GGlC9tt6M8nenBANxE/u\n ZQRHMWpndS7amqERjWaU7nbxJBNahfmgma5Zu/eIuWGaGJqEvxIKy4oaT+vAd+Vz2hBM\n S0w5qM5gfqb3scoIdEq4XeLo21Q/byqWjtfYX/y2INk3NcM3l/38MDQ8m4X5a41h6AMt\n yVmA==", "X-Gm-Message-State": "AOAM530nOADG5mcUtkX6W4a+cottjQNk8j+8gR2Ql1WbBAqNl/m1+n6y\n zTNxPD7NNF0JrSRUsh/PITHvng==", "X-Google-Smtp-Source": "\n ABdhPJxkHlUofbS3xFYjj4lDxKkI9BDwHctPpQRloYbY1ZWeHCLwsa1myY+/QohEkNo8p88YtKiCUw==", "X-Received": "by 2002:a17:90a:2944:: with SMTP id\n x4mr2079970pjf.131.1632750197671;\n Mon, 27 Sep 2021 06:43:17 -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:27 +0530", "Message-Id": "<20210927134231.11177-8-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 07/11] bus/vmbus: map the subchannel resources", "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": "Using sysctl, the resource values of subchannels are obtained and\nan mmap request to made to their buffers.\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/bus/vmbus/freebsd/vmbus_uio.c | 181 ++++++++++----------------\n 1 file changed, 66 insertions(+), 115 deletions(-)", "diff": "diff --git a/drivers/bus/vmbus/freebsd/vmbus_uio.c b/drivers/bus/vmbus/freebsd/vmbus_uio.c\nindex 022ac85302..14b858f39d 100644\n--- a/drivers/bus/vmbus/freebsd/vmbus_uio.c\n+++ b/drivers/bus/vmbus/freebsd/vmbus_uio.c\n@@ -24,8 +24,11 @@\n \n #include \"private.h\"\n \n-/** Pathname of VMBUS devices directory. */\n-#define SYSFS_VMBUS_DEVICES \"/sys/bus/vmbus/devices\"\n+/* Macros to distinguish mmap request\n+ * [7-0] - Device memory region\n+ * [15-8]- Sub-channel id\n+ */\n+#define UH_SUBCHAN_MASK_SHIFT 8\n \n /* ioctl */\n #define HVIOOPENSUBCHAN _IOW('h', 14, uint32_t)\n@@ -274,19 +277,17 @@ static int vmbus_uio_map_primary(struct vmbus_channel *chan,\n }\n \n static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,\n-\t\t\t\t const struct vmbus_channel *chan,\n+\t\t\t\t struct vmbus_channel *chan,\n \t\t\t\t void **ring_buf, uint32_t *ring_size)\n {\n \tchar ring_path[PATH_MAX];\n-\tsize_t file_size;\n-\tstruct stat sb;\n+\tsize_t size;\n \tvoid *mapaddr;\n+\toff_t offset;\n \tint fd;\n \n \tsnprintf(ring_path, sizeof(ring_path),\n-\t\t \"%s/%s/channels/%u/ring\",\n-\t\t SYSFS_VMBUS_DEVICES, dev->device.name,\n-\t\t chan->relid);\n+\t\t \"/dev/hv_uio%d\", dev->uio_num);\n \n \tfd = open(ring_path, O_RDWR);\n \tif (fd < 0) {\n@@ -295,33 +296,21 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,\n \t\treturn -errno;\n \t}\n \n-\tif (fstat(fd, &sb) < 0) {\n-\t\tVMBUS_LOG(ERR, \"Cannot state %s: %s\",\n-\t\t\t ring_path, strerror(errno));\n-\t\tclose(fd);\n-\t\treturn -errno;\n-\t}\n-\tfile_size = sb.st_size;\n-\n-\tif (file_size == 0 || (file_size & (rte_mem_page_size() - 1))) {\n-\t\tVMBUS_LOG(ERR, \"incorrect size %s: %zu\",\n-\t\t\t ring_path, file_size);\n-\n-\t\tclose(fd);\n-\t\treturn -EINVAL;\n-\t}\n+\t/* subchannel rings are of the same size as primary */\n+\tsize = dev->resource[HV_TXRX_RING_MAP].len;\n+\toffset = (chan->relid << UH_SUBCHAN_MASK_SHIFT) * PAGE_SIZE;\n \n \tmapaddr = vmbus_map_resource(vmbus_map_addr, fd,\n-\t\t\t\t 0, file_size, 0);\n+\t\t\t\t offset, size, 0);\n \tclose(fd);\n \n \tif (mapaddr == MAP_FAILED)\n \t\treturn -EIO;\n \n-\t*ring_size = file_size / 2;\n+\t*ring_size = size / 2;\n \t*ring_buf = mapaddr;\n \n-\tvmbus_map_addr = RTE_PTR_ADD(mapaddr, file_size);\n+\tvmbus_map_addr = RTE_PTR_ADD(mapaddr, size);\n \treturn 0;\n }\n \n@@ -336,9 +325,7 @@ vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,\n \tint fd;\n \n \tsnprintf(ring_path, sizeof(ring_path),\n-\t\t \"%s/%s/channels/%u/ring\",\n-\t\t SYSFS_VMBUS_DEVICES, dev->device.name,\n-\t\t chan->relid);\n+\t\t \"/dev/ring%d\", dev->uio_num);\n \n \tring_buf = br->vbr;\n \tring_size = br->dsize + sizeof(struct vmbus_bufring);\n@@ -391,32 +378,6 @@ int vmbus_uio_map_rings(struct vmbus_channel *chan)\n \treturn 0;\n }\n \n-static int vmbus_uio_sysfs_read(const char *dir, const char *name,\n-\t\t\t\tunsigned long *val, unsigned long max_range)\n-{\n-\tchar path[PATH_MAX];\n-\tFILE *f;\n-\tint ret;\n-\n-\tsnprintf(path, sizeof(path), \"%s/%s\", dir, name);\n-\tf = fopen(path, \"r\");\n-\tif (!f) {\n-\t\tVMBUS_LOG(ERR, \"can't open %s:%s\",\n-\t\t\t path, strerror(errno));\n-\t\treturn -errno;\n-\t}\n-\n-\tif (fscanf(f, \"%lu\", val) != 1)\n-\t\tret = -EIO;\n-\telse if (*val > max_range)\n-\t\tret = -ERANGE;\n-\telse\n-\t\tret = 0;\n-\tfclose(f);\n-\n-\treturn ret;\n-}\n-\n bool vmbus_uio_subchannels_supported(const struct rte_vmbus_device *dev,\n \t\t\t\t const struct vmbus_channel *chan)\n {\n@@ -426,7 +387,7 @@ bool vmbus_uio_subchannels_supported(const struct rte_vmbus_device *dev,\n }\n \n static bool vmbus_isnew_subchannel(struct vmbus_channel *primary,\n-\t\t\t\t unsigned long id)\n+\t\t\t\t uint16_t id)\n {\n \tconst struct vmbus_channel *c;\n \n@@ -441,83 +402,73 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,\n \t\t\t struct vmbus_channel **subchan)\n {\n \tconst struct rte_vmbus_device *dev = primary->device;\n-\tchar chan_path[PATH_MAX], subchan_path[PATH_MAX];\n-\tstruct dirent *ent;\n-\tDIR *chan_dir;\n+\tchar sysctlBuffer[PATH_MAX], sysctlVar[PATH_MAX];\n+\tsize_t len = PATH_MAX, sysctl_len;\n+\t/* nr_schan, relid, subid & monid datatype must match kernel's for sysctl */\n+\tuint32_t relid, subid, nr_schan, i;\n+\tuint8_t monid;\n \tint err;\n \n-\tsnprintf(chan_path, sizeof(chan_path),\n-\t\t \"%s/%s/channels\",\n-\t\t SYSFS_VMBUS_DEVICES, dev->device.name);\n-\n-\tchan_dir = opendir(chan_path);\n-\tif (!chan_dir) {\n-\t\tVMBUS_LOG(ERR, \"cannot open %s: %s\",\n-\t\t\t chan_path, strerror(errno));\n-\t\treturn -errno;\n+\t/* get no. of sub-channels opened by hv_uio\n+\t * dev.hv_uio.0.subchan_cnt\n+\t */\n+\tsnprintf(sysctlVar, len, \"dev.%s.%d.subchan_cnt\", driver_name,\n+\t\t dev->uio_num);\n+\tsysctl_len = sizeof(nr_schan);\n+\tif (sysctlbyname(sysctlVar, &nr_schan, &sysctl_len, NULL, 0) < 0) {\n+\t\tVMBUS_LOG(ERR, \"could not read %s : %s\", sysctlVar,\n+\t\t\t\tstrerror(errno));\n+\t\treturn -1;\n \t}\n \n-\twhile ((ent = readdir(chan_dir))) {\n-\t\tunsigned long relid, subid, monid;\n-\t\tchar *endp;\n-\n-\t\tif (ent->d_name[0] == '.')\n-\t\t\tcontinue;\n-\n-\t\terrno = 0;\n-\t\trelid = strtoul(ent->d_name, &endp, 0);\n-\t\tif (*endp || errno != 0 || relid > UINT16_MAX) {\n-\t\t\tVMBUS_LOG(NOTICE, \"not a valid channel relid: %s\",\n-\t\t\t\t ent->d_name);\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tif (!vmbus_isnew_subchannel(primary, relid)) {\n-\t\t\tVMBUS_LOG(DEBUG, \"skip already found channel: %lu\",\n-\t\t\t\t relid);\n-\t\t\tcontinue;\n+\t/* dev.hv_uio.0.channel.14.sub */\n+\tsnprintf(sysctlBuffer, len, \"dev.%s.%d.channel.%u.sub\", driver_name,\n+\t\t dev->uio_num, primary->relid);\n+\tfor (i = 1; i <= nr_schan; i++) {\n+\t\t/* get relid */\n+\t\tsnprintf(sysctlVar, len, \"%s.%u.chanid\", sysctlBuffer, i);\n+\t\tsysctl_len = sizeof(relid);\n+\t\tif (sysctlbyname(sysctlVar, &relid, &sysctl_len, NULL, 0) < 0) {\n+\t\t\tVMBUS_LOG(ERR, \"could not read %s : %s\", sysctlVar,\n+\t\t\t\t\tstrerror(errno));\n+\t\t\tgoto error;\n \t\t}\n \n-\t\tif (!vmbus_uio_ring_present(dev, relid)) {\n-\t\t\tVMBUS_LOG(DEBUG, \"ring mmap not found (yet) for: %lu\",\n-\t\t\t\t relid);\n+\t\tif (!vmbus_isnew_subchannel(primary, (uint16_t)relid)) {\n+\t\t\tVMBUS_LOG(DEBUG, \"skip already found channel: %u\",\n+\t\t\t\t\trelid);\n \t\t\tcontinue;\n \t\t}\n \n-\t\tsnprintf(subchan_path, sizeof(subchan_path), \"%s/%lu\",\n-\t\t\t chan_path, relid);\n-\t\terr = vmbus_uio_sysfs_read(subchan_path, \"subchannel_id\",\n-\t\t\t\t\t &subid, UINT16_MAX);\n-\t\tif (err) {\n-\t\t\tVMBUS_LOG(NOTICE, \"no subchannel_id in %s:%s\",\n-\t\t\t\t subchan_path, strerror(-err));\n-\t\t\tgoto fail;\n+\t\t/* get sub-channel id */\n+\t\tsnprintf(sysctlVar, len, \"%s.%u.ch_subidx\", sysctlBuffer, i);\n+\t\tsysctl_len = sizeof(subid);\n+\t\tif (sysctlbyname(sysctlVar, &subid, &sysctl_len, NULL, 0) < 0) {\n+\t\t\tVMBUS_LOG(ERR, \"could not read %s : %s\", sysctlVar,\n+\t\t\t\t\tstrerror(errno));\n+\t\t\tgoto error;\n \t\t}\n \n-\t\tif (subid == 0)\n-\t\t\tcontinue;\t/* skip primary channel */\n-\n-\t\terr = vmbus_uio_sysfs_read(subchan_path, \"monitor_id\",\n-\t\t\t\t\t &monid, UINT8_MAX);\n-\t\tif (err) {\n-\t\t\tVMBUS_LOG(NOTICE, \"no monitor_id in %s:%s\",\n-\t\t\t\t subchan_path, strerror(-err));\n-\t\t\tgoto fail;\n+\t\t/* get monitor id */\n+\t\tsnprintf(sysctlVar, len, \"%s.%u.monitor_id\", sysctlBuffer, i);\n+\t\tsysctl_len = sizeof(monid);\n+\t\tif (sysctlbyname(sysctlVar, &monid, &sysctl_len, NULL, 0) < 0) {\n+\t\t\tVMBUS_LOG(ERR, \"could not read %s : %s\", sysctlVar,\n+\t\t\t\t\tstrerror(errno));\n+\t\t\tgoto error;\n \t\t}\n \n-\t\terr = vmbus_chan_create(dev, relid, subid, monid, subchan);\n+\t\terr = vmbus_chan_create(dev, (uint16_t)relid, (uint16_t)subid,\n+\t\t\t\t\tmonid, subchan);\n \t\tif (err) {\n \t\t\tVMBUS_LOG(ERR, \"subchannel setup failed\");\n-\t\t\tgoto fail;\n+\t\t\treturn err;\n \t\t}\n \t\tbreak;\n \t}\n-\tclosedir(chan_dir);\n-\n-\treturn (ent == NULL) ? -ENOENT : 0;\n-fail:\n-\tclosedir(chan_dir);\n-\treturn err;\n+\treturn 0;\n+error:\n+\treturn -1;\n }\n \n int vmbus_uio_subchan_open(struct rte_vmbus_device *dev, uint32_t subchan)\n", "prefixes": [ "07/11" ] }