From patchwork Mon Sep 24 15:21:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 147374 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp850266lji; Mon, 24 Sep 2018 08:21:38 -0700 (PDT) X-Google-Smtp-Source: ACcGV60IpHZQPHdhyvGmhL6C1GvU742PibAiPttuI0sTgta8kABnP4azmlfTJn2NGdX0koldtZh6 X-Received: by 2002:a5d:4185:: with SMTP id m5-v6mr9112336wrp.8.1537802497966; Mon, 24 Sep 2018 08:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537802497; cv=none; d=google.com; s=arc-20160816; b=sPF/pd3ejq+OChC3wrfahJXq/ahxxWkxC3h1YZnyrgGwuTodPBiDwEr3hC/l931cds LOzsz2KvIL1rdCyPJ0XaffrEY56CtZN4Oku+hFinUFr5acGu2gbufkfRn5fFi5cix3ka kGGHeJAPunUX0jz0Tewq6Oq+2KoQpBopUJ2VnlilM2nY5cni1wKez3Zz1CV1g0/zo0H5 rNtXUHQsrQsxm9eZxPPe6Ap24hzCPXMRS10E9zQXuobRMYLE7FmOYcHWmYB1K7GglmDE DBWXU7bczt+klRCW4UZ1panZWiMiJjA6Hcj6rCQcvQoXj88/5AjbGBmnC07ZEvCahV5z TcyQ== 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=02phtoPLKMhvw1pfeICuDg0OkVyxO3opBE13Pyie90Y=; b=WXgIaavaL6JmFSBURbX7sxNpexdSjIhXSo8MAo0V08umlEKfbfhlmpLVKRDQSPe7E3 Mgw7qUIgt5P9IZyQlfEd6GF8yuCUGFheBbabcMaDylSoEjWknPP56P7icYDN26wdj3dq rpk7rqL+3fedMvEHVt2plhHARI9cIUxuqZ11Q+C92EBAvowJyTK1iyYgacT5ZBqc1u/0 4D932ujEtngULkBt+rf+WVgixgaNpTwFeckYd82u8zNi/Qn+6WUcUonkUhn/iEKeAkp8 k+UhfaL0n32Pum6GOmo+0XTqJDO9htw1Rdw3QWIhKTzPaZOrER3y0TNCSQ3UssDksjeD ph6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=AxSIrpMm; 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 b69-v6si1061592wme.127.2018.09.24.08.21.37; Mon, 24 Sep 2018 08:21:37 -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=AxSIrpMm; 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 07CB65F11; Mon, 24 Sep 2018 17:21:36 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 27C4D5F11 for ; Mon, 24 Sep 2018 17:21:34 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id y25-v6so2720945wmi.1 for ; Mon, 24 Sep 2018 08:21:34 -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=02phtoPLKMhvw1pfeICuDg0OkVyxO3opBE13Pyie90Y=; b=AxSIrpMm1XvTi5LzI2kt+Dwf7JE+8AWaV4Fy05notp16Gr7tSTXlG0CvHIWBBpW5JN tASh0yDhhtPq9NMYRoBRkhN61RSNIXXAPXwdGdn9j6OjMzUWYH4FLNDhntsUFLdj3CXu 4yDc+jS5m/SSv5mde++JeI7aAG6nZUTSjFdy1yZC6Yz+0kFY0GYNwbAo3ThKAFaXoL7l 1XiljcZeBzD+mE/WdvL5cfLnczl7zyrGvZUWm5eN2pQTinNH8slbEJW0iZlsXiWXK5uZ 4itSAqVuj3D6snVVziphzBVNNpQJhAXESCO4yOXOl0+ewZgytwz9X6VQ38TYgesMOtBn xV6g== 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=02phtoPLKMhvw1pfeICuDg0OkVyxO3opBE13Pyie90Y=; b=bXLFxT0QuUHwVEq5M3e++Ov+P5Vf822xaR7Q25vCLDrpxcTmrEdPJTEZ3DlsBAPYMh yHjBwZXOEdiw7dlWcakdue0DA59Kgc9fYFn8c5i9FqeM52X+bgJ1/t3dtt9kmACa7GSH A46QtEu2Ns1R9+4qIsGVuavDx5LWDgiSc1whvNc2wqk+4PF4cpbDgC1upkcSSvMoSLND gEBKekl2XdkwYD4WZgqm2TXbxRO5XQlJrcj2XhEn/TeBtoAjxlXpQo0sl0MBXnnW5Ana 9SSqW2KKrrHyKFTVXl2xmTrTtKQeMJzwwXVYOiu9AXvDDVi9CV/PU6h/s4rTnYTyCUGq aruw== X-Gm-Message-State: ABuFfojje8sCnjdeM48hADch+QCaVU2WUnjkYCLMCItMEVzXLKpQF8V6 xuurbkX9zbTdYeLdmvrwquZlGPy+Q3Pm5w== X-Received: by 2002:a1c:a187:: with SMTP id k129-v6mr7567799wme.111.1537802493581; Mon, 24 Sep 2018 08:21:33 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id y12-v6sm27102825wrq.33.2018.09.24.08.21.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Sep 2018 08:21:32 -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:31 +0300 Message-ID: <153780249174.17494.10969398205446811104.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 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 4ae7b9346..77905dda0 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1022,6 +1022,14 @@ vhost_user_set_vring_call(struct virtio_net *dev, struct VhostUserMsg *msg) vq->callfd = file.fd; } +static void vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused, + struct VhostUserMsg *msg) +{ + if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) + close(msg->fds[0]); + RTE_LOG(INFO, VHOST_CONFIG, "not implemented\n"); +} + static int vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg) { @@ -1259,6 +1267,13 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) return 0; } +static void vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused, + struct 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 @@ -1704,8 +1719,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: @@ -1733,9 +1747,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: