From patchwork Sat Sep 22 21:16:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 45175 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 1D6FF4CA1; Sat, 22 Sep 2018 23:16:41 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 2D351F04 for ; Sat, 22 Sep 2018 23:16:39 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id s14-v6so16009925wrw.6 for ; Sat, 22 Sep 2018 14:16:39 -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=EXupS2tvegMuj0VxrY1zaL4e05HFpNaq0oyZBVKkEAQ=; b=sC6ZcAzp9IpT+fUvhTivbkfMt1l2Klm0kcXi+ItVdFB50U9xvVlgSYn5QYlssa/fe+ AAb4Lm+hVOvBmbqTnB8wQKkFyBzSxpy8VVP6/BTZE/R/VMr7mouqkEFLqLZ2S+omiwMK F9rT/zBHe1F3oWcoDbePnBSDivwBAzF5aGZ2h160dD7zTa6fOiG3IkcQ8fgn1R+W+rRc slyJx5TSjk634Ql8+ZaOzWVZn5uwHbngFQsbFeJ+v8+rcK/i68FJb/NCEgHVgelF5FQt Fx7IsBx1ACjEPchmm1+xGKhTTDikoqPMg7sni7hC+pCvZmnjQFu4CtmVx1dLMpnZtFRp o6kg== 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=EXupS2tvegMuj0VxrY1zaL4e05HFpNaq0oyZBVKkEAQ=; b=Ui5HZm1HGjgRQiIwBkjYLqust66Csnkc7Nd3HJHTz4NtyAlCTNwO28e8I1BHunySjO A1saag8XYoNLn5SuYLgAE0ior+bY5tDqZjh/5rmaai+AJKW3MXB2VHTEl3+cRytQfs4V U5QApjCH/DW5DGtN5EbqgypzYYPy+wV+m9IVEvfHXK6P9MOKSe8FZ8gWlqza1cTzK6/d 6EVU7bvKIogGgFq9uLImu60m/XYrukaDOIDFege0ZKyBDRWJQe3UB5gCJsBkPOdKSGzJ 294MmV8lrk5k8wmM04q+XrS3bW8Dzb3HG5ZEN/PcVrtSpsNTJOB7IlTrcfEVA+GMU8NT uQ6Q== X-Gm-Message-State: ABuFfoi0FN1w8v7Jrlu59Ow2/SjU454ZD6wvze5V7D6V6g0aCRxPQevX 6x2gtfKjOUdTyDk6HaPm3HgT2+PrwecLRA== X-Google-Smtp-Source: ACcGV62rrv6QlOFzISEgSn+P07Of9tqtWwndbl7ubgQXFSGGvKDvGBhapvy1qaApDbavczAFpkJI9g== X-Received: by 2002:adf:ee11:: with SMTP id y17-v6mr3047948wrn.63.1537650998431; Sat, 22 Sep 2018 14:16:38 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id r13-v6sm7224121wmf.34.2018.09.22.14.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 14:16:37 -0700 (PDT) From: Nikolay Nikolaev To: maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org Date: Sun, 23 Sep 2018 00:16:36 +0300 Message-ID: <153765099681.29126.593839205381221133.stgit@T460> In-Reply-To: <153765091094.29126.1031571146095035538.stgit@T460> References: <153765091094.29126.1031571146095035538.stgit@T460> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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..b20aa6adc 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, 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;