From patchwork Sat Sep 22 21:16:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 147327 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1157391ljw; Sat, 22 Sep 2018 14:17:14 -0700 (PDT) X-Google-Smtp-Source: ANB0VdamW0ZOcYMbyFIBYg5wJXGT5iXJqZvAtJKVt9w92walTuYriBYA3M6YbRbAyKsdFvxu51/A X-Received: by 2002:a1c:7411:: with SMTP id p17-v6mr2340931wmc.77.1537651034501; Sat, 22 Sep 2018 14:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537651034; cv=none; d=google.com; s=arc-20160816; b=Eg1iTc6dlvpMehXeAgLPMdbZ+5hjjdVAuqTZP5bqX96vUOuyvil74dv9mmgOIYKuKW jK8lhOTCmcXTPZUAvhnOPpxpaYCGM3/3926YNwNMPgdkvV8Pji8iobYTU7v+OuEATuOs nbAmRoD9eLtx5jWgjwOJS/RHnBVGGkFOXq/hqbF9wOL3HtZxJW0160ZdUZBHE8Vx2iF0 rPmDiH2lhhSNKFw6lneiuxVhYCJ49ccgl/glNH76UwDJjWtIA05IMSEnK/WMZ4QiHFiK u97Ckqo38ECJZbf99mQdCTxndCXBWSID/lU8RLawxj29t/atzQQTuchyb9Ky46Zc9fRu ZqLw== 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=AZ9DUhrOmKCd/cvdUEPq0e8pvG+izaG3eM8h4+BfO3U=; b=S92cTsYNThpyGPlhcEaITiwsOP/fNBi+s/sGqH8gxFmtSGPy24HEiOk83+Go7LTlYK NuTGJ0RssZ0rUOjQ4qQYYMWcsZkAUS4rfd/drgyLjjBxvYCH3PmkWFb2gFtp+jLd0qbb 7b1OOSInkf79nsc51+vIVNuUQDMR8unxC54rIdIIW+n4qOrN3fB0uF8Fgrqs0+SBGqaV dwyqYuI6Tr+NA6rHcc7/OREJ1WIcej44BAf4S9ibKmhEO4oO0HpxN714IuJZbdBXpWyv o/a8OFi+lI104GMpbY4pXNS2SNQecOLQBR9KqBRPgRkC3PVqsPUpAWja8/031IrnZUbW aftw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=fAGR4hEY; 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 ([92.243.14.124]) by mx.google.com with ESMTP id e67-v6si3426379wmg.44.2018.09.22.14.17.14; Sat, 22 Sep 2018 14:17:14 -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=fAGR4hEY; 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 A9688532C; Sat, 22 Sep 2018 23:17:00 +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 8C3B25323 for ; Sat, 22 Sep 2018 23:16:59 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id o18-v6so6535869wmc.0 for ; Sat, 22 Sep 2018 14:16:59 -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=AZ9DUhrOmKCd/cvdUEPq0e8pvG+izaG3eM8h4+BfO3U=; b=fAGR4hEYSSsdMGFKKsbwYC5TzrdZ8oLjG/t5K5SgI8aiwxuI2C8pGjUEx2+0bAycde hpfirm0Xneh+h7rvuwOkos74J/OAvj5PwDP+F7yD01tuID71zkZQ3ys36QEg+28fbW7i Xur56nkMR2HvwMrDL8n4DcS/mX1v80ioLSqrI9OeZ467J1lqtj5QDk09MPLU6unpXfA9 BLmmEzEQsSGNJsOV0GolbpCIubInqjhDtp2OBZYhajRBmZmEyPVaflIYqou53IiOwqlk 7CWIRgVaqOmmA7Pc8eDIx4fGPnVd8iQPTaQSjnNzneY6d97E14YS3nJ6tI5H+ZlBF18m Vmkw== 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=AZ9DUhrOmKCd/cvdUEPq0e8pvG+izaG3eM8h4+BfO3U=; b=LfF0HFkj7gC62HI/V81nNfAT5mScGgxvEllC6qbrONh6xCZjoN8pz3FTAJRT5mp6lB KasWlGkZcTj7BOU/i6hR1xgPfYxQu6h7LheNYf2rz3M6bVIyU7jk3IL4O6XBMZ8Zm0JX fMJDhdLVotKyORAZaVlNXOGoGgoyvg0/KRiys/rO/l17DBbJfMtEgwllmyJF6Iu7iZkR H0iQ0QoWvC7esyr+Wvhq53yxlkHOoyfLIk4LtNSGfpyBmXTnXe8476eom+4y7NnbUJIf qoMZlAHVdEGkoG4aRv3rmjepnh+Rd2PVbGVV4NPtK51uhyl5Ceck4SzkJOUnH65ZKWTg RnCA== X-Gm-Message-State: APzg51BmjEWEYATcBMofZChAuron+23n+P3oldhqP0xi+vmlUXWY/ANn hAeIFsyMdYjW+6WR20eLgQol26ZIq0s47g== X-Received: by 2002:a1c:b5d3:: with SMTP id e202-v6mr2425633wmf.23.1537651018959; Sat, 22 Sep 2018 14:16:58 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id v21-v6sm62818914wrd.4.2018.09.22.14.16.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 14:16:58 -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:57 +0300 Message-ID: <153765101718.29126.8572479467169372862.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 5/5] vhost: message handling implemented as a callback array 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" Introduce vhost_message_handlers, which maps the message request type to the message handler. Then replace the switch construct with a map and call. Failing vhost_user_set_features is fatal and all processing should stop immediately and propagate the error to the upper layers. Change the code accordingly to reflect that. Signed-off-by: Nikolay Nikolaev --- lib/librte_vhost/vhost_user.c | 149 +++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 93 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 051740477..0c2faa6af 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1477,6 +1477,34 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg) return VH_RESULT_OK; } +typedef int (*vhost_message_handler_t)(struct virtio_net **pdev, VhostUserMsg * msg); +static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = { + [VHOST_USER_NONE] = NULL, + [VHOST_USER_GET_FEATURES] = vhost_user_get_features, + [VHOST_USER_SET_FEATURES] = vhost_user_set_features, + [VHOST_USER_SET_OWNER] = vhost_user_set_owner, + [VHOST_USER_RESET_OWNER] = vhost_user_reset_owner, + [VHOST_USER_SET_MEM_TABLE] = vhost_user_set_mem_table, + [VHOST_USER_SET_LOG_BASE] = vhost_user_set_log_base, + [VHOST_USER_SET_LOG_FD] = vhost_user_set_log_fd, + [VHOST_USER_SET_VRING_NUM] = vhost_user_set_vring_num, + [VHOST_USER_SET_VRING_ADDR] = vhost_user_set_vring_addr, + [VHOST_USER_SET_VRING_BASE] = vhost_user_set_vring_base, + [VHOST_USER_GET_VRING_BASE] = vhost_user_get_vring_base, + [VHOST_USER_SET_VRING_KICK] = vhost_user_set_vring_kick, + [VHOST_USER_SET_VRING_CALL] = vhost_user_set_vring_call, + [VHOST_USER_SET_VRING_ERR] = vhost_user_set_vring_err, + [VHOST_USER_GET_PROTOCOL_FEATURES] = vhost_user_get_protocol_features, + [VHOST_USER_SET_PROTOCOL_FEATURES] = vhost_user_set_protocol_features, + [VHOST_USER_GET_QUEUE_NUM] = vhost_user_get_queue_num, + [VHOST_USER_SET_VRING_ENABLE] = vhost_user_set_vring_enable, + [VHOST_USER_SEND_RARP] = vhost_user_send_rarp, + [VHOST_USER_NET_SET_MTU] = vhost_user_net_set_mtu, + [VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd, + [VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg, +}; + + /* return bytes# of read on success or negative val on failure. */ static int read_vhost_message(int sockfd, struct VhostUserMsg *msg) @@ -1630,6 +1658,7 @@ vhost_user_msg_handler(int vid, int fd) int ret; int unlock_required = 0; uint32_t skip_master = 0; + int request; dev = get_device(vid); if (dev == NULL) @@ -1722,100 +1751,34 @@ vhost_user_msg_handler(int vid, int fd) goto skip_to_post_handle; } - switch (msg.request.master) { - case VHOST_USER_GET_FEATURES: - ret = vhost_user_get_features(&dev, &msg); - send_vhost_reply(fd, &msg); - break; - case VHOST_USER_SET_FEATURES: - ret = vhost_user_set_features(&dev, &msg); - break; - - case VHOST_USER_GET_PROTOCOL_FEATURES: - ret = vhost_user_get_protocol_features(&dev, &msg); - send_vhost_reply(fd, &msg); - break; - case VHOST_USER_SET_PROTOCOL_FEATURES: - ret = vhost_user_set_protocol_features(&dev, &msg); - break; - - case VHOST_USER_SET_OWNER: - ret = vhost_user_set_owner(&dev, &msg); - break; - case VHOST_USER_RESET_OWNER: - ret = vhost_user_reset_owner(&dev, &msg); - break; - - case VHOST_USER_SET_MEM_TABLE: - ret = vhost_user_set_mem_table(&dev, &msg); - break; - - case VHOST_USER_SET_LOG_BASE: - ret = vhost_user_set_log_base(&dev, &msg); - if (ret) - goto skip_to_reply; - /* it needs a reply */ - send_vhost_reply(fd, &msg); - break; - case VHOST_USER_SET_LOG_FD: - ret = vhost_user_set_log_fd(&dev, &msg); - break; - - case VHOST_USER_SET_VRING_NUM: - ret = vhost_user_set_vring_num(&dev, &msg); - break; - case VHOST_USER_SET_VRING_ADDR: - ret = vhost_user_set_vring_addr(&dev, &msg); - break; - case VHOST_USER_SET_VRING_BASE: - ret = vhost_user_set_vring_base(&dev, &msg); - break; - - case VHOST_USER_GET_VRING_BASE: - ret = vhost_user_get_vring_base(&dev, &msg); - if (ret) - goto skip_to_reply; - send_vhost_reply(fd, &msg); - break; - - case VHOST_USER_SET_VRING_KICK: - ret = vhost_user_set_vring_kick(&dev, &msg); - break; - case VHOST_USER_SET_VRING_CALL: - ret = vhost_user_set_vring_call(&dev, &msg); - break; - - case VHOST_USER_SET_VRING_ERR: - ret = vhost_user_set_vring_err(&dev, &msg); - break; - - case VHOST_USER_GET_QUEUE_NUM: - ret = vhost_user_get_queue_num(&dev, &msg); - send_vhost_reply(fd, &msg); - break; - - case VHOST_USER_SET_VRING_ENABLE: - ret = vhost_user_set_vring_enable(&dev, &msg); - break; - case VHOST_USER_SEND_RARP: - ret = vhost_user_send_rarp(&dev, &msg); - break; - - case VHOST_USER_NET_SET_MTU: - ret = vhost_user_net_set_mtu(&dev, &msg); - break; - - case VHOST_USER_SET_SLAVE_REQ_FD: - ret = vhost_user_set_req_fd(&dev, &msg); - break; - - case VHOST_USER_IOTLB_MSG: - ret = vhost_user_iotlb_msg(&dev, &msg); - break; + request = msg.request.master; + if (request > VHOST_USER_NONE && request < VHOST_USER_MAX) { + if (!vhost_message_handlers[request]) + goto skip_to_post_handle; + ret = vhost_message_handlers[request](&dev, &msg); - default: - ret = -1; - break; + switch (ret) { + case VH_RESULT_ERR: + RTE_LOG(ERR, VHOST_CONFIG, + "Processing %s failed.\n", + vhost_message_str[request]); + break; + case VH_RESULT_OK: + RTE_LOG(DEBUG, VHOST_CONFIG, + "Processing %s succeeded.\n", + vhost_message_str[request]); + break; + case VH_RESULT_REPLY: + RTE_LOG(INFO, VHOST_CONFIG, + "Processing %s succeeded and needs reply.\n", + vhost_message_str[request]); + send_vhost_reply(fd, &msg); + break; + } + } else { + RTE_LOG(ERR, VHOST_CONFIG, + "Requested invalid message type %d.\n", request); + ret = VH_RESULT_ERR; } skip_to_post_handle: