From patchwork Sat Sep 15 05:20:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 44751 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 7DE0C4D27; Sat, 15 Sep 2018 07:20:37 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 721A44C92 for ; Sat, 15 Sep 2018 07:20:36 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o18-v6so3960256wmc.0 for ; Fri, 14 Sep 2018 22:20:36 -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=YC7apfpVWRkYONJLYzDkVxmsBll9SrTnBZv3hr3PiPo=; b=gv9AHwN9n6VDox4ESFY59zoHyJ3VJiDHzQ+Uf1UkhGb8xJOD5xRt+YN86NUPgCa5Oc jndjiPFyY+V8yTEHq6Rz8MHZEofOAGSlpxc7BDXc9ltmj0efbdlMx69Ly4TApCWYstOT 56FFRG9lkBXBZiQnWz5sumbgTRv2qH4CMNgp13euvhkL0RL9FsAgQd/mHLsjXpYVhhYo C0gENrDrAEKmoqdOTD6CQYecaCF/jLPz70Fd3NR6XBSi82yehBR4lREAxOtRnhf2gbzp 8cnpN3GuPr/8BEWCfDQZjfXWfitn220Ph682R2AjDm3YRGz3zoWaSOW6lQEI9twMOuM+ pZdQ== 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=YC7apfpVWRkYONJLYzDkVxmsBll9SrTnBZv3hr3PiPo=; b=WRmRW9RYLoYR4KN9KMyy+mGScdWPS3P9pgcyU8F8sakdMhv/bsKeHmduBwqJtRKSE+ iP7C0gWpNhfmwsNuibKJa1L2tooWi6EMXMVgBq/n4bXEcTfZW4k5/1bafJsow0AYWsai 6jVZJXRn6fpk2C5R3pKklaD8GmpRFqulmN1+Nx3MzISKoZcfPgEbRDTBo1ogsuTqR8zD r1d1VNlnm/YPUNKxJIp/O4kz8t6SnN4j1Ykq3T7EfFbns2fC/OAi1iV0gzkEqzGS2ovn B0dZyNi9ZzvgYbXM41mmTZXIxt7zkbPxW6t0v8olPqtr1khLoILn3vY8V3zDc0Yitmxx JxPw== X-Gm-Message-State: APzg51D/nyIGF7XqzxbMQOXJkHmFybiMj8jPytKwvA8HU2DjeDP6ImU9 h/8Wzuc6bW1oqOPlR0scISZmbma+nu9bAw== X-Google-Smtp-Source: ANB0VdYetgnkMjqp83i2QuBYUN3d8zpPMCXGz4Kd+KuqQfDn8nuZrwicA/+rdYkXLqKEFzrr26Wqwg== X-Received: by 2002:a1c:8587:: with SMTP id h129-v6mr4688882wmd.105.1536988835983; Fri, 14 Sep 2018 22:20:35 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id t4-v6sm9992573wrb.45.2018.09.14.22.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 22:20:35 -0700 (PDT) From: Nikolay Nikolaev To: maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org Date: Sat, 15 Sep 2018 08:20:33 +0300 Message-ID: <153698883388.23049.2819933386635765768.stgit@T460> In-Reply-To: <153698873346.23049.10966616323159180622.stgit@T460> References: <153698873346.23049.10966616323159180622.stgit@T460> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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 --- 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 b05b57670..3a00d53cf 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, 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, 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, VhostUserMsg *msg) dev->log_base = dev->log_addr + off; dev->log_size = size; + msg->size = sizeof(msg->payload.u64); + return 0; } @@ -1657,8 +1669,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: @@ -1689,7 +1700,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: @@ -1711,7 +1721,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; @@ -1729,8 +1738,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;