From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com
[209.85.215.193]) by dpdk.org (Postfix) with ESMTP id B62DC1B7E7
for <stable@dpdk.org>; Fri, 8 Feb 2019 04:44:23 +0100 (CET)
Received: by mail-pg1-f193.google.com with SMTP id d72so961285pga.9
for <stable@dpdk.org>; Thu, 07 Feb 2019 19:44:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=tNLmwkhhX0tuGLxvMfLDVmsc1WtKIHb65lnQnwwhhXw=;
b=lIunXtjwbuIEtKfls4zm8AS4dgzsW47xkYPxtjHcpNO8ZVYWCFyK2+koWdb79XYXAd
smaLtQT1c3QsRSYEfg7djTIMQuOUrcjF+Y7p4PahZY4wzo01m93FmBEbSYC7wX+mnhHr
/r2kMjeeeSFcdh5A3BrUslpGIVGTvKRFzThBACqbJEaN8kjpDWZxO51GAdOsTd8hkWxx
HYSpnPG1yx7k0fbTfigu3EVlTwxBXFkMK6XMloE2YZkMEKSLW04Q5S3lSHAMnI2Q/I+3
knWaMdCpAo3D5u67MbceB2ZlC4vMMglRwaYliivRJr+1zwGQ0eG5VlnxIWGKlvVqwOy1
38tQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=tNLmwkhhX0tuGLxvMfLDVmsc1WtKIHb65lnQnwwhhXw=;
b=WrRX7Vf0Pev4bxzOlt7LfEiaGsVXxCczqsuuIEE4z3IJlJ6wLAb+BXiznclRwUt7w1
LftuKd6IrhCVe0HfcaD+/kqhIYJ36D8ZH0EgMKGjIh12g1pcRcjMhzjhuYjy6UIUiLkN
yGlJ6yTCMthjbZdFHSzvfPkGtFtTebn6rKsuQnDkbSocj0w7+fCaUOzPyTVZrYxPE4dM
r+5Qc3+2klmIwQhKELuund315IDtND0VK73sk+d1HjqJbQjgnGDyfjy1cFOa+N2fs970
LAg1FdMcyvWniGERBK+GkI7gfEysKP2XVfOQE4R9PiL9se3B/EUxC7kxwJgBsrgzi9Tw
rZxw==
X-Gm-Message-State: AHQUAuaFKvNjdWG7m5X8RTXmTlhz7qDGnK/lHKLnOCUJcqJP5BXXGFgI
dn2NzXUYI+m7KW1WGwUhz719Kw==
X-Google-Smtp-Source: AHgI3Ia7mjYKknoMZDRckNHY1qXU4mngawT/onYF6vUyNbw5NtXxxa1vIt/nKx/n19oOvICvesTONQ==
X-Received: by 2002:a62:ca9c:: with SMTP id y28mr19868181pfk.236.1549597462843;
Thu, 07 Feb 2019 19:44:22 -0800 (PST)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id i4sm873275pfj.82.2019.02.07.19.44.21
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Thu, 07 Feb 2019 19:44:21 -0800 (PST)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: stable@dpdk.org,
Stephen 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-stable] [PATCH 5/7] bus/vmbus: map ring in secondary
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Feb 2019 03:44:24 -0000
From: Stephen Hemminger <sthemmin@microsoft.com>
Need to remember primary channel in secondary process.
Then use it to iterate over subchannels in secondary
process mapping setup.
Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
drivers/bus/vmbus/linux/vmbus_uio.c | 43 ++++++++++++++++++++++++++++
drivers/bus/vmbus/private.h | 3 ++
drivers/bus/vmbus/vmbus_channel.c | 20 +++++++++++--
drivers/bus/vmbus/vmbus_common_uio.c | 15 ++++++++++
4 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 8c6bc52fd475..fb60ee126d9b 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -247,6 +247,49 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
return 0;
}
+int
+vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
+ const struct vmbus_channel *chan)
+{
+ const struct vmbus_br *br = &chan->txbr;
+ char ring_path[PATH_MAX];
+ void *mapaddr, *ring_buf;
+ uint32_t ring_size;
+ int fd;
+
+ snprintf(ring_path, sizeof(ring_path),
+ "%s/%s/channels/%u/ring",
+ SYSFS_VMBUS_DEVICES, dev->device.name,
+ chan->relid);
+
+ ring_buf = br->vbr;
+ ring_size = br->dsize + sizeof(struct vmbus_bufring);
+ VMBUS_LOG(INFO, "secondary ring_buf %p size %u",
+ ring_buf, ring_size);
+
+ fd = open(ring_path, O_RDWR);
+ if (fd < 0) {
+ VMBUS_LOG(ERR, "Cannot open %s: %s",
+ ring_path, strerror(errno));
+ return -errno;
+ }
+
+ mapaddr = vmbus_map_resource(ring_buf, fd, 0, 2 * ring_size, 0);
+ close(fd);
+
+ if (mapaddr == ring_buf)
+ return 0;
+
+ if (mapaddr == MAP_FAILED)
+ VMBUS_LOG(ERR,
+ "mmap subchan %u in secondary failed", chan->relid);
+ else
+ VMBUS_LOG(ERR,
+ "mmap subchan %u in secondary address mismatch",
+ chan->relid);
+ return -1;
+}
+
int vmbus_uio_map_rings(struct vmbus_channel *chan)
{
const struct rte_vmbus_device *dev = chan->device;
diff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h
index 211127dd8db5..f19b14e4a657 100644
--- a/drivers/bus/vmbus/private.h
+++ b/drivers/bus/vmbus/private.h
@@ -45,6 +45,7 @@ struct mapped_vmbus_resource {
rte_uuid_t id;
int nb_maps;
+ struct vmbus_channel *primary;
struct vmbus_map maps[VMBUS_MAX_RESOURCE];
char path[PATH_MAX];
};
@@ -107,6 +108,8 @@ bool vmbus_uio_subchannels_supported(const struct rte_vmbus_device *dev,
int vmbus_uio_get_subchan(struct vmbus_channel *primary,
struct vmbus_channel **subchan);
int vmbus_uio_map_rings(struct vmbus_channel *chan);
+int vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
+ const struct vmbus_channel *chan);
void vmbus_br_setup(struct vmbus_br *br, void *buf, unsigned int blen);
diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c
index bd14c0662b46..46b3ba3f9f9e 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -352,12 +352,21 @@ int vmbus_chan_create(const struct rte_vmbus_device *device,
int rte_vmbus_chan_open(struct rte_vmbus_device *device,
struct vmbus_channel **new_chan)
{
+ struct mapped_vmbus_resource *uio_res;
int err;
+ uio_res = vmbus_uio_find_resource(device);
+ if (!uio_res) {
+ VMBUS_LOG(ERR, "can't find uio resource");
+ return -EINVAL;
+ }
+
err = vmbus_chan_create(device, device->relid, 0,
device->monitor_id, new_chan);
- if (!err)
+ if (!err) {
device->primary = *new_chan;
+ uio_res->primary = *new_chan;
+ }
return err;
}
@@ -396,11 +405,16 @@ void rte_vmbus_chan_close(struct vmbus_channel *chan)
const struct rte_vmbus_device *device = chan->device;
struct vmbus_channel *primary = device->primary;
- if (chan != primary)
+ /*
+ * intentionally leak primary channel because
+ * secondary may still reference it
+ */
+ if (chan != primary) {
STAILQ_REMOVE(&primary->subchannel_list, chan,
vmbus_channel, next);
+ rte_free(chan);
+ }
- rte_free(chan);
}
static void vmbus_dump_ring(FILE *f, const char *id, const struct vmbus_br *br)
diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index a6545b758e36..9947f82ab194 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -27,6 +27,7 @@ static int
vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
{
int fd, i;
+ struct vmbus_channel *chan;
struct mapped_vmbus_resource *uio_res;
struct mapped_vmbus_res_list *uio_res_list
= RTE_TAILQ_CAST(vmbus_tailq.head, mapped_vmbus_res_list);
@@ -76,6 +77,20 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
/* fd is not needed in slave process, close it */
close(fd);
+
+ dev->primary = uio_res->primary;
+ if (!dev->primary) {
+ VMBUS_LOG(ERR, "missing primary channel");
+ return -1;
+ }
+
+ STAILQ_FOREACH(chan, &dev->primary->subchannel_list, next) {
+ if (vmbus_uio_map_secondary_subchan(dev, chan) != 0) {
+ VMBUS_LOG(ERR, "cannot map secondary subchan");
+ return -1;
+ }
+ }
+
return 0;
}
--
2.20.1