From patchwork Mon Sep 24 20:17:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 45244 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D40731B192; Mon, 24 Sep 2018 22:17:15 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 4FF7E1B192 for ; Mon, 24 Sep 2018 22:17:14 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id q8-v6so11319949wmq.4 for ; Mon, 24 Sep 2018 13:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=KlqevEpVE/LgiA1Ie+DmN7/5IIg5yXavGQgJ7mPQScY=; b=HD4C2xZsibUk+axWXQlouqRmPSbD6GFM+VpRTkvheaAeThlYExHiCloF8MDqqAr1ru +KgrQpM2PgvAZaufmzr6pL61xQMqgogn0BOquUvOtZlyrKXKwj3HMQ53J1MAsO4sxaQV p/j0RIfc0ofLJhHt1Pf6sZVAXeEEDOqS/yBMDZ/bRihFAWLwF5Qwv81vKJqPn960jz7Q Tnrr98w5BM8SZ62JSyouKjMutx3WM6Guclsx1QXmUMTas7EaEQ75ib+oLA7n8SNNWce1 zACdW33+xvgy8sq6eNCwa7AQsYBTqoTfU4aWYcWd2Mq4DJ8/Y6D+bLfI/jK0YY9C9j0p 7qCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=KlqevEpVE/LgiA1Ie+DmN7/5IIg5yXavGQgJ7mPQScY=; b=H3sHTnke4XAEO5XJ8SmG0oZLo1vnrVkhl/nfeMhGmz77Ls5fqHkTtzibVdpSzN+RBp YRmIrfyqmA+j/ZzOAih50TZQfVT1G8rrg9OG+aaJ3iZWBeb/Q3DwWqL6naVU3/EYov4s K0fpMmUEUdJgtFWMlvfcuVDMr++mUM/0c241WRFiAYjgkxGcNMeIOu/AJwSFpyrAwMbH V5bKVuKt4cw/eK3oIe9HFt5haQeNwiEmyRorerZNOEtc4OaZLgSJhRw2Yb1tvEPh8S4p rR8+pWo4lRXvzorGj0vRUtnfu3hNK1miWmeXYTbmBEnVcPc6S6alBxiFZhUxMrMtMSgW A2og== X-Gm-Message-State: ABuFfogkO7nQkH3koIEgELWgPP2qQMKY1Ynmj8xrdBLERqa+vKbD4s9S hh3HGYqmmbvw3/+WOvSBqNBq0FcrgrYqeQ== X-Google-Smtp-Source: ACcGV60N6KB/mV56/4YfImazStSXdqQ5kI60jajmYO/tOYG38nyVWg140DLZfrl6aQm8cAAlUK6FMg== X-Received: by 2002:a1c:1609:: with SMTP id 9-v6mr54404wmw.12.1537820233425; Mon, 24 Sep 2018 13:17:13 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id z80-v6sm511924wrb.1.2018.09.24.13.17.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Sep 2018 13:17:12 -0700 (PDT) From: Nikolay Nikolaev To: maxime.coquelin@redhat.com, anatoly.burakov@intel.com, tiwei.bie@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org Date: Mon, 24 Sep 2018 23:17:11 +0300 Message-ID: <153782023114.27450.13792732999240312966.stgit@T460> In-Reply-To: <153782013094.27450.17651924330876922486.stgit@T460> References: <153782013094.27450.17651924330876922486.stgit@T460> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 2/5] vhost: make message handling functions prepare the reply X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" As VhostUserMsg structure is reused to generate the reply, move the relevant fields update into the respective message handling functions. Signed-off-by: Nikolay Nikolaev Reviewed-by: Anatoly Burakov --- lib/librte_vhost/vhost_user.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 505db3bfc..4ae7b9346 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -146,11 +146,15 @@ vhost_user_reset_owner(struct virtio_net *dev) * The features that we support are requested. */ static uint64_t -vhost_user_get_features(struct virtio_net *dev) +vhost_user_get_features(struct virtio_net *dev, struct VhostUserMsg *msg) { uint64_t features = 0; rte_vhost_driver_get_features(dev->ifname, &features); + + msg->payload.u64 = features; + msg->size = sizeof(msg->payload.u64); + return features; } @@ -158,11 +162,15 @@ vhost_user_get_features(struct virtio_net *dev) * The queue number that we support are requested. */ static uint32_t -vhost_user_get_queue_num(struct virtio_net *dev) +vhost_user_get_queue_num(struct virtio_net *dev, struct VhostUserMsg *msg) { uint32_t queue_num = 0; rte_vhost_driver_get_queue_num(dev->ifname, &queue_num); + + msg->payload.u64 = (uint64_t)queue_num; + msg->size = sizeof(msg->payload.u64); + return queue_num; } @@ -1117,6 +1125,8 @@ vhost_user_get_vring_base(struct virtio_net *dev, rte_free(vq->batch_copy_elems); vq->batch_copy_elems = NULL; + msg->size = sizeof(msg->payload.state); + return 0; } @@ -1244,6 +1254,8 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) dev->log_base = dev->log_addr + off; dev->log_size = size; + msg->size = sizeof(msg->payload.u64); + return 0; } @@ -1658,8 +1670,7 @@ vhost_user_msg_handler(int vid, int fd) switch (msg.request.master) { case VHOST_USER_GET_FEATURES: - msg.payload.u64 = vhost_user_get_features(dev); - msg.size = sizeof(msg.payload.u64); + vhost_user_get_features(dev, &msg); send_vhost_reply(fd, &msg); break; case VHOST_USER_SET_FEATURES: @@ -1690,7 +1701,6 @@ vhost_user_msg_handler(int vid, int fd) if (ret) goto skip_to_reply; /* it needs a reply */ - msg.size = sizeof(msg.payload.u64); send_vhost_reply(fd, &msg); break; case VHOST_USER_SET_LOG_FD: @@ -1712,7 +1722,6 @@ vhost_user_msg_handler(int vid, int fd) ret = vhost_user_get_vring_base(dev, &msg); if (ret) goto skip_to_reply; - msg.size = sizeof(msg.payload.state); send_vhost_reply(fd, &msg); break; @@ -1730,8 +1739,7 @@ vhost_user_msg_handler(int vid, int fd) break; case VHOST_USER_GET_QUEUE_NUM: - msg.payload.u64 = (uint64_t)vhost_user_get_queue_num(dev); - msg.size = sizeof(msg.payload.u64); + vhost_user_get_queue_num(dev, &msg); send_vhost_reply(fd, &msg); break;