Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50248/?format=api
{ "id": 50248, "url": "http://patches.dpdk.org/api/patches/50248/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190208034407.7865-6-stephen@networkplumber.org/", "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": "<20190208034407.7865-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190208034407.7865-6-stephen@networkplumber.org", "date": "2019-02-08T03:44:05", "name": "[5/7] bus/vmbus: map ring in secondary", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fff70ad553f76665037af83ce3962581d058076f", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "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/20190208034407.7865-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 3415, "url": "http://patches.dpdk.org/api/series/3415/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3415", "date": "2019-02-08T03:44:00", "name": "vmbus/netvsc: fix multi-process support", "version": 1, "mbox": "http://patches.dpdk.org/series/3415/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/50248/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/50248/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C6FC71B890;\n\tFri, 8 Feb 2019 04:44:25 +0100 (CET)", "from mail-pf1-f195.google.com (mail-pf1-f195.google.com\n\t[209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 2ABBA1B75D\n\tfor <dev@dpdk.org>; Fri, 8 Feb 2019 04:44:24 +0100 (CET)", "by mail-pf1-f195.google.com with SMTP id m6so1020731pfa.9\n\tfor <dev@dpdk.org>; Thu, 07 Feb 2019 19:44:24 -0800 (PST)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\ti4sm873275pfj.82.2019.02.07.19.44.21\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 07 Feb 2019 19:44:21 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=tNLmwkhhX0tuGLxvMfLDVmsc1WtKIHb65lnQnwwhhXw=;\n\tb=lIunXtjwbuIEtKfls4zm8AS4dgzsW47xkYPxtjHcpNO8ZVYWCFyK2+koWdb79XYXAd\n\tsmaLtQT1c3QsRSYEfg7djTIMQuOUrcjF+Y7p4PahZY4wzo01m93FmBEbSYC7wX+mnhHr\n\t/r2kMjeeeSFcdh5A3BrUslpGIVGTvKRFzThBACqbJEaN8kjpDWZxO51GAdOsTd8hkWxx\n\tHYSpnPG1yx7k0fbTfigu3EVlTwxBXFkMK6XMloE2YZkMEKSLW04Q5S3lSHAMnI2Q/I+3\n\tknWaMdCpAo3D5u67MbceB2ZlC4vMMglRwaYliivRJr+1zwGQ0eG5VlnxIWGKlvVqwOy1\n\t38tQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=tNLmwkhhX0tuGLxvMfLDVmsc1WtKIHb65lnQnwwhhXw=;\n\tb=UFuKjgRj18HrqPTXqXzVsD7/TSw9hbokh5J0xrbWQTBMWUytkJhOeZ+73R+Ya/V7JZ\n\tC2KEpAJykQwKEDgtuJsaGK5mkLx03VZqfADpkHrJ3/AMitdUZ60A3oD4vq7g+LsVL8jp\n\t8rgKabedQT+VZdEpiA2GXbkSjQA7RjJNM4qe9mfNHGHCjFrQob1DQQOpSOGZ6IESG5ZR\n\t/8rBR9Ge8zRmfqcWKrg+tc9ZiPGQ49CUUB/I0n1RpiQAwZQy201EXlBDYx2wiofKenf2\n\tujGQj6EPDvvx4bhNLbBl9EDqZkLqUC4XqU2fVGb8/nlqUXTC55ls2ZpvIHrUmWvZy4Co\n\tdJgw==", "X-Gm-Message-State": "AHQUAuYOeo2GM2BIKhNfAjP9tDRXUJ84ATTQCXl8P79NixC6y5ZJt/jb\n\ts0WwxzDZByAbSaTCbdqUZ3gMETPTH9A=", "X-Google-Smtp-Source": "AHgI3Ia7mjYKknoMZDRckNHY1qXU4mngawT/onYF6vUyNbw5NtXxxa1vIt/nKx/n19oOvICvesTONQ==", "X-Received": "by 2002:a62:ca9c:: with SMTP id\n\ty28mr19868181pfk.236.1549597462843; \n\tThu, 07 Feb 2019 19:44:22 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "stable@dpdk.org,\n\tStephen Hemminger <sthemmin@microsoft.com>", "Date": "Thu, 7 Feb 2019 19:44:05 -0800", "Message-Id": "<20190208034407.7865-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190208034407.7865-1-stephen@networkplumber.org>", "References": "<20190208034407.7865-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 5/7] bus/vmbus: map ring in secondary", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Stephen Hemminger <sthemmin@microsoft.com>\n\nNeed to remember primary channel in secondary process.\nThen use it to iterate over subchannels in secondary\nprocess mapping setup.\n\nFixes: 831dba47bd36 (\"bus/vmbus: add Hyper-V virtual bus support\")\nSigned-off-by: Stephen Hemminger <sthemmin@microsoft.com>\n---\n drivers/bus/vmbus/linux/vmbus_uio.c | 43 ++++++++++++++++++++++++++++\n drivers/bus/vmbus/private.h | 3 ++\n drivers/bus/vmbus/vmbus_channel.c | 20 +++++++++++--\n drivers/bus/vmbus/vmbus_common_uio.c | 15 ++++++++++\n 4 files changed, 78 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c\nindex 8c6bc52fd475..fb60ee126d9b 100644\n--- a/drivers/bus/vmbus/linux/vmbus_uio.c\n+++ b/drivers/bus/vmbus/linux/vmbus_uio.c\n@@ -247,6 +247,49 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,\n \treturn 0;\n }\n \n+int\n+vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,\n+\t\t\t\tconst struct vmbus_channel *chan)\n+{\n+\tconst struct vmbus_br *br = &chan->txbr;\n+\tchar ring_path[PATH_MAX];\n+\tvoid *mapaddr, *ring_buf;\n+\tuint32_t ring_size;\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+\n+\tring_buf = br->vbr;\n+\tring_size = br->dsize + sizeof(struct vmbus_bufring);\n+\tVMBUS_LOG(INFO, \"secondary ring_buf %p size %u\",\n+\t\t ring_buf, ring_size);\n+\n+\tfd = open(ring_path, O_RDWR);\n+\tif (fd < 0) {\n+\t\tVMBUS_LOG(ERR, \"Cannot open %s: %s\",\n+\t\t\t ring_path, strerror(errno));\n+\t\treturn -errno;\n+\t}\n+\n+\tmapaddr = vmbus_map_resource(ring_buf, fd, 0, 2 * ring_size, 0);\n+\tclose(fd);\n+\n+\tif (mapaddr == ring_buf)\n+\t\treturn 0;\n+\n+\tif (mapaddr == MAP_FAILED)\n+\t\tVMBUS_LOG(ERR,\n+\t\t\t \"mmap subchan %u in secondary failed\", chan->relid);\n+\telse\n+\t\tVMBUS_LOG(ERR,\n+\t\t\t \"mmap subchan %u in secondary address mismatch\",\n+\t\t\t chan->relid);\n+\treturn -1;\n+}\n+\n int vmbus_uio_map_rings(struct vmbus_channel *chan)\n {\n \tconst struct rte_vmbus_device *dev = chan->device;\ndiff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h\nindex 211127dd8db5..f19b14e4a657 100644\n--- a/drivers/bus/vmbus/private.h\n+++ b/drivers/bus/vmbus/private.h\n@@ -45,6 +45,7 @@ struct mapped_vmbus_resource {\n \n \trte_uuid_t id;\n \tint nb_maps;\n+\tstruct vmbus_channel *primary;\n \tstruct vmbus_map maps[VMBUS_MAX_RESOURCE];\n \tchar path[PATH_MAX];\n };\n@@ -107,6 +108,8 @@ bool vmbus_uio_subchannels_supported(const struct rte_vmbus_device *dev,\n int vmbus_uio_get_subchan(struct vmbus_channel *primary,\n \t\t\t struct vmbus_channel **subchan);\n int vmbus_uio_map_rings(struct vmbus_channel *chan);\n+int vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,\n+\t\t\t\t const struct vmbus_channel *chan);\n \n void vmbus_br_setup(struct vmbus_br *br, void *buf, unsigned int blen);\n \ndiff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c\nindex bd14c0662b46..46b3ba3f9f9e 100644\n--- a/drivers/bus/vmbus/vmbus_channel.c\n+++ b/drivers/bus/vmbus/vmbus_channel.c\n@@ -352,12 +352,21 @@ int vmbus_chan_create(const struct rte_vmbus_device *device,\n int rte_vmbus_chan_open(struct rte_vmbus_device *device,\n \t\t\tstruct vmbus_channel **new_chan)\n {\n+\tstruct mapped_vmbus_resource *uio_res;\n \tint err;\n \n+\tuio_res = vmbus_uio_find_resource(device);\n+\tif (!uio_res) {\n+\t\tVMBUS_LOG(ERR, \"can't find uio resource\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \terr = vmbus_chan_create(device, device->relid, 0,\n \t\t\t\tdevice->monitor_id, new_chan);\n-\tif (!err)\n+\tif (!err) {\n \t\tdevice->primary = *new_chan;\n+\t\tuio_res->primary = *new_chan;\n+\t}\n \n \treturn err;\n }\n@@ -396,11 +405,16 @@ void rte_vmbus_chan_close(struct vmbus_channel *chan)\n \tconst struct rte_vmbus_device *device = chan->device;\n \tstruct vmbus_channel *primary = device->primary;\n \n-\tif (chan != primary)\n+\t/*\n+\t * intentionally leak primary channel because\n+\t * secondary may still reference it\n+\t */\n+\tif (chan != primary) {\n \t\tSTAILQ_REMOVE(&primary->subchannel_list, chan,\n \t\t\t vmbus_channel, next);\n+\t\trte_free(chan);\n+\t}\n \n-\trte_free(chan);\n }\n \n static void vmbus_dump_ring(FILE *f, const char *id, const struct vmbus_br *br)\ndiff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c\nindex a6545b758e36..9947f82ab194 100644\n--- a/drivers/bus/vmbus/vmbus_common_uio.c\n+++ b/drivers/bus/vmbus/vmbus_common_uio.c\n@@ -27,6 +27,7 @@ static int\n vmbus_uio_map_secondary(struct rte_vmbus_device *dev)\n {\n \tint fd, i;\n+\tstruct vmbus_channel *chan;\n \tstruct mapped_vmbus_resource *uio_res;\n \tstruct mapped_vmbus_res_list *uio_res_list\n \t\t= RTE_TAILQ_CAST(vmbus_tailq.head, mapped_vmbus_res_list);\n@@ -76,6 +77,20 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)\n \n \t\t/* fd is not needed in slave process, close it */\n \t\tclose(fd);\n+\n+\t\tdev->primary = uio_res->primary;\n+\t\tif (!dev->primary) {\n+\t\t\tVMBUS_LOG(ERR, \"missing primary channel\");\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tSTAILQ_FOREACH(chan, &dev->primary->subchannel_list, next) {\n+\t\t\tif (vmbus_uio_map_secondary_subchan(dev, chan) != 0) {\n+\t\t\t\tVMBUS_LOG(ERR, \"cannot map secondary subchan\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\n \t\treturn 0;\n \t}\n \n", "prefixes": [ "5/7" ] }