From patchwork Tue Jun 26 16:19:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 140007 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5441479lji; Tue, 26 Jun 2018 09:19:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeJuYgR2kAcbHaaUjurM+d201ZgjUXOutzYnMZRq5qo/vwko+ROci/KH0gn3gzBK4ZDv8eD X-Received: by 2002:adf:992d:: with SMTP id x42-v6mr2068839wrb.81.1530029975361; Tue, 26 Jun 2018 09:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530029975; cv=none; d=google.com; s=arc-20160816; b=vhAlXLQMljy2sS+cI2TNApKsqALi/pn/5urMgt35SoOxMU+y3zFFbXSx+CnoPeBYR0 eFW/G544e3rvCKGx1+/kmqhuvKuKmGE0i4Mcjbb9IHSE053R+JFtGVBjY+fLb/kq0K13 GkDvxS2TAFoAcpBcaMfg+IFiqVtvLPB6ieOZA12VT7fVfy+4Xn0aAPNY0kcP2akZ+nQ/ W6P5NNVeOZmtLazPHsku2BnK3glsTtAFHE13wo/65DG9Lxw621W9eWGeyVMx4HROxwcS VwZbUeTrtz2JYcYXhjo5ISdLJq5DWRlinb2YJuZO6Yo3bQ+mQCfDUxa0X2CnGemb6tm2 cgBw== 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 :arc-authentication-results; bh=WzeEikkS80TprZ9F+UfoT9sblGO6MIMj3Pz5V7Hryus=; b=kt3BsXe3rYiwEFJMvLMrmxR+rYjIfZSIQew7RxthuCawl5c0OZUPER3wH72XyppcEh FMKDfS1oIfvwThnHLFD8qej13+IRHD2nS2wDmoa7xUgSHk4ekCfH2d9dkUjvYbWiIloF ZAqsukvvHpQ45MAkuNxWiONNVPcw/rBJ6lUhgAfRZzHSlr1NFUpBTEgHOvKZd1JWQONN nssNLTufpEFWwWAb3BSKbq/B2rlZHYNtAP0XWm2SAhJssHJEsnH7nZdgtgSex2P6nEz1 fChVca41fZInveWL+WAYhaSPa8raPEr0EBhzCOOryME2MV5iU3xT06DXDMFKWOog7r+4 h+kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=rTf7SoH9; 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 6-v6si2158337wmv.67.2018.06.26.09.19.35; Tue, 26 Jun 2018 09:19:35 -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=rTf7SoH9; 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 7E0A21BB40; Tue, 26 Jun 2018 18:19:27 +0200 (CEST) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 9F4751BB32 for ; Tue, 26 Jun 2018 18:19:26 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id p1-v6so2269206wrs.9 for ; Tue, 26 Jun 2018 09:19:26 -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=WzeEikkS80TprZ9F+UfoT9sblGO6MIMj3Pz5V7Hryus=; b=rTf7SoH9QjMX/APEoHL7n41c//E53bcM/5W+bl5mGIg76yBmwX0HpXJrkoLT6lP7JE A4XdKxGdvfYXEeZNFTwOXpLrS3Ezaj5FXGn2c0kHAjSoekNrrdO4SpC1OY3EagGJ0sfM kCJMMjRxJDCrkT4duZxVVH08a6eJJxv3qLl+VNOJk28Jhyq53RVEjXwkHNk+BkEeNzX5 iMvVF9Nj1qEj22BiLd754dZROjDmEm8BN6A7W3UymyyuPQuF7CZVrghSXfQzHryZFYD5 WwfBeVx1q/VDrLmPMnj2HoEePKj4ZWoAZlw7Tmsj12abd0q0oTsibByP3RO+uDFfmnLQ bCZA== 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=WzeEikkS80TprZ9F+UfoT9sblGO6MIMj3Pz5V7Hryus=; b=mB+admVMrW2l/rXuINzUg/uMYl/S5pFQiqC/9dmSBdW9jeaVPK28C6NZPt9IAPz9o5 3M0qKF2MWydNFYgUoI6lXLl7oWd77goGmPVFzLOjzkf2UwkRp8Z6RCYh532/EDDo4Bsi pOE3ZBvCbxR4KM7Hcd+e+qX4UA/49J+uEqgFyW1lrpW6v7MJnSswgceQzMwEYyLg6WVY plXRhY7zfws3AyoBav8361SaQrKvYcyNg/q4DZyf+MIICSz8QA1aj5f9Wl0vqCsPADtb d+cCBqD4HyWxbIPRmoX7OdhuZXzTdfegzhew1M4S3n2H6EDFdBkyZ9OlDKGweS/pPi4y IuDQ== X-Gm-Message-State: APt69E1Uky5++rarti4GFuXHPIZnY5RjzkH3Q5nUtG8qFuVuaEAkSjMn div5f/aPxVvJskLib5k/RyvUZwNW X-Received: by 2002:adf:87f1:: with SMTP id c46-v6mr2076265wrc.246.1530029966093; Tue, 26 Jun 2018 09:19:26 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id q70-v6sm2859618wmd.45.2018.06.26.09.19.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 09:19:25 -0700 (PDT) From: Nikolay Nikolaev To: maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org Date: Tue, 26 Jun 2018 19:19:23 +0300 Message-ID: <153002996384.22089.7999103657201130704.stgit@T460> In-Reply-To: <153002988259.22089.8523468795459281187.stgit@T460> References: <153002988259.22089.8523468795459281187.stgit@T460> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1 3/5] vhost: handle unsupported message types in functions 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" Add new functions to handle the unsupported vhost message types: - vhost_user_set_vring_err - vhost_user_set_log_fd Signed-off-by: Nikolay Nikolaev --- lib/librte_vhost/vhost_user.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 1bc3d1629..d999c80ed 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -933,6 +933,14 @@ vhost_user_set_vring_call(struct virtio_net *dev, VhostUserMsg *msg) vq->callfd = file.fd; } +static void vhost_user_set_vring_err(struct virtio_net *dev __rte_unused, + VhostUserMsg *msg) +{ + if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) + close(msg->fds[0]); + RTE_LOG(INFO, VHOST_CONFIG, "not implemented\n"); +} + static void vhost_user_set_vring_kick(struct virtio_net **pdev, VhostUserMsg *msg) { @@ -1159,6 +1167,13 @@ vhost_user_set_log_base(struct virtio_net *dev, VhostUserMsg *msg) return 0; } +static void +vhost_user_set_log_fd(struct virtio_net *dev __rte_unused, VhostUserMsg *msg) +{ + close(msg->fds[0]); + RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n"); +} + /* * An rarp packet is constructed and broadcasted to notify switches about * the new location of the migrated VM, so that packets from outside will @@ -1602,8 +1617,7 @@ vhost_user_msg_handler(int vid, int fd) send_vhost_reply(fd, &msg); break; case VHOST_USER_SET_LOG_FD: - close(msg.fds[0]); - RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n"); + vhost_user_set_log_fd(dev, &msg); break; case VHOST_USER_SET_VRING_NUM: @@ -1629,9 +1643,7 @@ vhost_user_msg_handler(int vid, int fd) break; case VHOST_USER_SET_VRING_ERR: - if (!(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK)) - close(msg.fds[0]); - RTE_LOG(INFO, VHOST_CONFIG, "not implemented\n"); + vhost_user_set_vring_err(dev, &msg); break; case VHOST_USER_GET_QUEUE_NUM: