From patchwork Mon Sep 24 15:21:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 147373 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp850098lji; Mon, 24 Sep 2018 08:21:30 -0700 (PDT) X-Google-Smtp-Source: ACcGV60DXNBfI1Xujw4t/VWrKHmC+DF8OymJBDD+savNcinmUPbMstoh/26xIjgZQ1OKPljc/mab X-Received: by 2002:adf:9799:: with SMTP id s25-v6mr6196114wrb.283.1537802490242; Mon, 24 Sep 2018 08:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537802490; cv=none; d=google.com; s=arc-20160816; b=mmm/RXsWrB/4Rw7/UlPmrpoKB4M56abYQf5Rg8fRPyHKr0418iQ1G5tPmyB3wcsP47 zlWV0D4JmQNPVd6R/q/ror1QKpz5HolicxjwUxis7wgZRb8rsh+P95I2bcFzjn9MmYrZ B7uCQqT27xXWUyw/hjlY2pj6xcqZY73R5QDHpmXDfvGJRyaFHQz64HUEeYpDehgnplEr Ca8Vbxx2t1yeKC4y69VVb3oesvE5e3U9IKmP9cV2ctvQTIWAC7nqwlOdk0Yvh5msh4VN uujFROHuGuokDPOLVg6rrSrzDzErSFINkL+er6w1SHUobueT1CKovh3rvtW/aO2VYYS6 izPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=KlqevEpVE/LgiA1Ie+DmN7/5IIg5yXavGQgJ7mPQScY=; b=y2BuF1dQOfSVF5q7dE7FgA3UdOqlBAhGOag2Yg29jh9X4Z5mEFXp2yL01TWtLKg/FQ kpZLENn1+U5twuCbuYTozRC7/qG/kgagrX/F7Khjx4CL4QcsvYW+i96UKDGYXtSNeY1B GXcgFlbTzcfjZo4GW2mt31swqw4Ck8CxgqZYACjUx5MvKSBKuBAcidk6Ob0wdtw0katd +z9Zfub1kjntbkaQJxPsVVtDSR38M1iKjwR9hGL+A3ImxmowIdC6fBPcY0C2pzWWygA3 wMCFuD4ShhFt/N+k/2Sn7HEVu6aAiAn3uRE5b49UwZdL3obqwksE0OwqLMbhoWAOy/8z jRKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="Sc0/WnAs"; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id u130-v6si4870872wmf.116.2018.09.24.08.21.29; Mon, 24 Sep 2018 08:21:30 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="Sc0/WnAs"; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 435725B38; Mon, 24 Sep 2018 17:21:28 +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 62D265B34 for ; Mon, 24 Sep 2018 17:21:27 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id s12-v6so10166821wmc.0 for ; Mon, 24 Sep 2018 08:21:27 -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=Sc0/WnAskPZMqbAtThMHRqHImc6GhXMwHruyj3OpIiQiiMAH9L5DcRf0r0191TRn0u ZPJ5DU3Jz6WkUpYV1wPY5SMViEQu1bRZTPDukvi4h1x1OypxZGwLNyphtzjDc39P+otd Hzm7k3lRBLhwbG0nj8TavKmqBy0LM+Er5igwfizmIjImu3R8O5sMn2ozOE62yBNwv8Nb uf4YTSRad256stmtpizQ9Ef5Ts2e+R/G26b8Scyb6Pkm7YcSSxxi6MxSjXDNmtzRUXve 8PY3Bw4xWitoo6WJWR1fW5mTl9RXLWXP/0POly7t3b/8SOZWG/PyY/5PKjIs+Kx2bD25 MVKg== 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=i9IVcgN1Ks+WWdUMcrBLkyIAOWi1hNo7JrwDP8IA5YP5DP/XqmPtiJjWFXvGftZBOu UTz/3lSuZQS9aStAnH5uJWS6n6NQKgaFpYCu5pcWfZmXwOb4GX6QjL/fmbTgdns95srM 9EPMRcyNGfpyRyfnqykH2rLEPJ1e/TbkhufKOuwxwzORrriKrRmSPMIMea6irSpyaR28 clvjrw2syUgyKsar6NbR1Ohs9Q5nZxv0HjkM701OAqdCHgGovZ0ptgchdIo5eucwbXux 5EehZCwGIPqVqGa9EBg+SWQSKjmpkXdqeKzvXvrQwln/PZiJOXkmmSVPsefFP9Zlh9CM VSmA== X-Gm-Message-State: APzg51C2wm5s+D/1MRxIBsNkEWOZrHrUEc50d7eCnsjv39+NIGqKiYmQ pOjfLmsQGsIF37HW76QY2VxPpFiDX8SYLA== X-Received: by 2002:a1c:2dc8:: with SMTP id t191-v6mr8186587wmt.94.1537802486672; Mon, 24 Sep 2018 08:21:26 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id j66-v6sm52350296wrj.28.2018.09.24.08.21.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Sep 2018 08:21:26 -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 18:21:24 +0300 Message-ID: <153780248489.17494.5209940029313337390.stgit@T460> In-Reply-To: <153780242838.17494.4512397995243433980.stgit@T460> References: <153780242838.17494.4512397995243433980.stgit@T460> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 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 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;