From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 083EC41C2D;
Tue, 7 Feb 2023 11:46:02 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 98B1942D3C;
Tue, 7 Feb 2023 11:45:55 +0100 (CET)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.133.124])
by mails.dpdk.org (Postfix) with ESMTP id 7D34542D38
for <dev@dpdk.org>; Tue, 7 Feb 2023 11:45:54 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1675766754;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=iBNB6NpMSvvK7plI5xuz3+7gqsNHW438+IqDQ9cqIP8=;
b=b6LvlhbeZqBjTefZaBQV9SgBMkDyFHXJXNlJ2fMYevgylkoMYwVdabZ3u3G2+LFCpqYycx
8jI1X283mVbrn8Pu1iFd3uKPKbmLWoPgHyzEhcoiKuwwoxbHCmcDKZ4vvQjFUTy7389hzv
FNOdebSY5Jrj3s7STUAymbpjTQ1N5Gg=
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-94-0sEzT2PFOVWtJqxj78fnXw-1; Tue, 07 Feb 2023 05:45:49 -0500
X-MC-Unique: 0sEzT2PFOVWtJqxj78fnXw-1
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
[10.11.54.6])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 737C985A588;
Tue, 7 Feb 2023 10:45:49 +0000 (UTC)
Received: from dmarchan.redhat.com (ovpn-195-46.brq.redhat.com [10.40.195.46])
by smtp.corp.redhat.com (Postfix) with ESMTP id CAD412166B2A;
Tue, 7 Feb 2023 10:45:47 +0000 (UTC)
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: maxime.coquelin@redhat.com, stephen@networkplumber.org,
chenbo.xia@intel.com, jiayu.hu@intel.com, yuanx.wang@intel.com,
xuan.ding@intel.com, mb@smartsharesystems.com
Subject: [PATCH v6 2/9] vhost: simplify need reply handling
Date: Tue, 7 Feb 2023 11:45:25 +0100
Message-Id: <20230207104532.2370869-3-david.marchand@redhat.com>
In-Reply-To: <20230207104532.2370869-1-david.marchand@redhat.com>
References: <20220328121758.26632-1-david.marchand@redhat.com>
<20230207104532.2370869-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Dedicate send_vhost_slave_message() helper to the case when no reply is
needed.
Add a send_vhost_slave_message_process_reply() helper for the opposite.
This new helper merges both send_vhost_slave_message() and the code
previously in process_slave_message_reply().
The slave_req_lock lock is then only handled in this helper which will
make lock checks trivial.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/vhost_user.c | 119 ++++++++++++++++++-----------------------
1 file changed, 51 insertions(+), 68 deletions(-)
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 8f33d5f4d9..60ec1bf5f6 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2878,18 +2878,46 @@ send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx
}
static int
-send_vhost_slave_message(struct virtio_net *dev,
- struct vhu_msg_context *ctx)
+send_vhost_slave_message(struct virtio_net *dev, struct vhu_msg_context *ctx)
+{
+ return send_vhost_message(dev, dev->slave_req_fd, ctx);
+}
+
+static int
+send_vhost_slave_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx)
{
+ struct vhu_msg_context msg_reply;
int ret;
- if (ctx->msg.flags & VHOST_USER_NEED_REPLY)
- rte_spinlock_lock(&dev->slave_req_lock);
+ rte_spinlock_lock(&dev->slave_req_lock);
+ ret = send_vhost_slave_message(dev, ctx);
+ if (ret < 0) {
+ VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to send config change (%d)\n", ret);
+ goto out;
+ }
- ret = send_vhost_message(dev, dev->slave_req_fd, ctx);
- if (ret < 0 && (ctx->msg.flags & VHOST_USER_NEED_REPLY))
- rte_spinlock_unlock(&dev->slave_req_lock);
+ ret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);
+ if (ret <= 0) {
+ if (ret < 0)
+ VHOST_LOG_CONFIG(dev->ifname, ERR,
+ "vhost read slave message reply failed\n");
+ else
+ VHOST_LOG_CONFIG(dev->ifname, INFO, "vhost peer closed\n");
+ ret = -1;
+ goto out;
+ }
+
+ if (msg_reply.msg.request.slave != ctx->msg.request.slave) {
+ VHOST_LOG_CONFIG(dev->ifname, ERR,
+ "received unexpected msg type (%u), expected %u\n",
+ msg_reply.msg.request.slave, ctx->msg.request.slave);
+ ret = -1;
+ goto out;
+ }
+ ret = msg_reply.msg.payload.u64 ? -1 : 0;
+out:
+ rte_spinlock_unlock(&dev->slave_req_lock);
return ret;
}
@@ -3213,42 +3241,6 @@ vhost_user_msg_handler(int vid, int fd)
return ret;
}
-static int process_slave_message_reply(struct virtio_net *dev,
- const struct vhu_msg_context *ctx)
-{
- struct vhu_msg_context msg_reply;
- int ret;
-
- if ((ctx->msg.flags & VHOST_USER_NEED_REPLY) == 0)
- return 0;
-
- ret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);
- if (ret <= 0) {
- if (ret < 0)
- VHOST_LOG_CONFIG(dev->ifname, ERR,
- "vhost read slave message reply failed\n");
- else
- VHOST_LOG_CONFIG(dev->ifname, INFO, "vhost peer closed\n");
- ret = -1;
- goto out;
- }
-
- ret = 0;
- if (msg_reply.msg.request.slave != ctx->msg.request.slave) {
- VHOST_LOG_CONFIG(dev->ifname, ERR,
- "received unexpected msg type (%u), expected %u\n",
- msg_reply.msg.request.slave, ctx->msg.request.slave);
- ret = -1;
- goto out;
- }
-
- ret = msg_reply.msg.payload.u64 ? -1 : 0;
-
-out:
- rte_spinlock_unlock(&dev->slave_req_lock);
- return ret;
-}
-
int
vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
{
@@ -3277,10 +3269,9 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
return 0;
}
-static int
-vhost_user_slave_config_change(struct virtio_net *dev, bool need_reply)
+int
+rte_vhost_slave_config_change(int vid, bool need_reply)
{
- int ret;
struct vhu_msg_context ctx = {
.msg = {
.request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
@@ -3288,29 +3279,23 @@ vhost_user_slave_config_change(struct virtio_net *dev, bool need_reply)
.size = 0,
}
};
-
- if (need_reply)
- ctx.msg.flags |= VHOST_USER_NEED_REPLY;
-
- ret = send_vhost_slave_message(dev, &ctx);
- if (ret < 0) {
- VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to send config change (%d)\n", ret);
- return ret;
- }
-
- return process_slave_message_reply(dev, &ctx);
-}
-
-int
-rte_vhost_slave_config_change(int vid, bool need_reply)
-{
struct virtio_net *dev;
+ int ret;
dev = get_device(vid);
if (!dev)
return -ENODEV;
- return vhost_user_slave_config_change(dev, need_reply);
+ if (!need_reply) {
+ ret = send_vhost_slave_message(dev, &ctx);
+ } else {
+ ctx.msg.flags |= VHOST_USER_NEED_REPLY;
+ ret = send_vhost_slave_message_process_reply(dev, &ctx);
+ }
+
+ if (ret < 0)
+ VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to send config change (%d)\n", ret);
+ return ret;
}
static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
@@ -3339,13 +3324,11 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
ctx.fd_num = 1;
}
- ret = send_vhost_slave_message(dev, &ctx);
- if (ret < 0) {
+ ret = send_vhost_slave_message_process_reply(dev, &ctx);
+ if (ret < 0)
VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to set host notifier (%d)\n", ret);
- return ret;
- }
- return process_slave_message_reply(dev, &ctx);
+ return ret;
}
int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)
--
2.39.1