From patchwork Mon Sep 24 15:21:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 147376 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp850597lji; Mon, 24 Sep 2018 08:21:58 -0700 (PDT) X-Google-Smtp-Source: ACcGV62K2O9zexynG/uYEOeGRvUxw3cJUwiG8+3GJDSZD+MgPZYdWdS6kc4Liw135+vFSu2pztlG X-Received: by 2002:a1c:eb03:: with SMTP id j3-v6mr7566284wmh.150.1537802518374; Mon, 24 Sep 2018 08:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537802518; cv=none; d=google.com; s=arc-20160816; b=VHPuRDCsw2R7ofQesCou1ENP6ewf3R3HN8+ODHfbLSx/QmVVIgMimDl0mDS0jRNYbI TL1D+7AO7AzlqRlW69q7VFPPV0E21dpGwSBqxYVfOz3C0WE/24cGd9DqnqRoZrjTRYpU lVeJpwXMTF2dwyvOiN153OG0xMuuA6IQGxCYmhVOA9t9mI5rw15jfRPu0Beiw2wcOFx5 nskCW651j81PlSOfX3F8FEu17RGBjdzu9fAnwie4umbBYqctMTxt1xjUT7/gwAW5yjRM EaYlqy6T/r7xLg/Ytmgff/CA2/dU04UFTuk7WS3J5pRCBbWmNk18j25lSy7A2og8kXdr c+VA== 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=4CrBV2UXTRbMJJ9MA7YjLrQh22wXx4c12ySNhkJxKKQ=; b=gs56pJEZoJPN4Vk4X12t4CiT1kiRM7oZ0dlmaU4IaLqG1oeRb3FqVu0SuTTp3u1J0N IAyJJrDC0CJoQHkZhWuyjMPWFGvTZ6pGJZ7T7P7OG2kius6HQO33AjfVsgNLLdp8K4LS sHDSU1wFggOD9iv8qWXa5y5RqHMWxXllg563hwSsYOwLAPe51VYa2mPSBjY9rPdxturQ 2XbJaeP7s17PJdKIg9N470Zv5H5F31B2pctn8m5gWTKFd1uV1HvrUfhgFXL0xVX/C5Qw FnzsgJdr/niHvg8W8aICwBEMsT1u55RUkP5Aapv151+T8sCMtIsSMGbWIi5oityOFPwR zmCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ACWa60ee; 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 m62-v6si1392171wmd.126.2018.09.24.08.21.58; Mon, 24 Sep 2018 08:21:58 -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=ACWa60ee; 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 4A62B5F2A; Mon, 24 Sep 2018 17:21:49 +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 789A75F29 for ; Mon, 24 Sep 2018 17:21:48 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id z3-v6so8273396wrr.13 for ; Mon, 24 Sep 2018 08:21:48 -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=4CrBV2UXTRbMJJ9MA7YjLrQh22wXx4c12ySNhkJxKKQ=; b=ACWa60ee9ZJOF5infjQRJuHqPL1ZfxsKDAuwwPmrt+4L6ncEGjMOW+NpK1oPmkK3sr tn0VBJrQvK+z1/rlVtoieNvJNF84+iZYxcfRl8nvbaMdn8LSiTwPlaDq8Py4DRGxApv6 7Il9quDeeDagxVkA3msyQYbV4lTnJZ8P2niA+l3eySippUrc/BRDs0z+xQEgy6NqzNjp sGli3l3gFiU3tkuaERDqIkq6Xvn6B7N4WHg4sUS169yQm0rhyHBGS35TVhiI8+lrlHIB EnOYcRLT4FFXNnSH6mEeMAEC+VhuUVg+DJdluzyDuriUrfXFXBHRQgUF7JrZX0HPYJ7R agXg== 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=4CrBV2UXTRbMJJ9MA7YjLrQh22wXx4c12ySNhkJxKKQ=; b=CGyDJbhwfiO2WM3EwDIq/944vBRwU5yFdCFEAEqv8R276ntr3TRyDQbECS3/B4kKfV wadL+d/LUOHFfAHfUnWDCeNhEVwWv8jlVDo5dT97DHjFU4WBUrluz8sXK2YDykgr1nkE absLdBMd/HV+NbhWHya6MN9ZVasQFRFXqRl0vwz/OUX9MD1RfEXybizIUXjFjEok4b8i o2myT3zNV7GsEofB7AOTSb1eQg3EbZAILgqJrZl0OdXBq3uPVv6e+cMlViarNoo+vUqy j6ararm1/RRFgGj74kTVkLT/ga2FI8jcrSGoeYjGBdpgXN0R4KKpNO+VtwEz+SmQDwnf jUdQ== X-Gm-Message-State: ABuFfojDsVilRYhH5PMFMHWBBkyB4RnX+rwNgI04mmJfMKJhEUKCGCJH aML9N5nfh6XHjFG/fQp08Si/derrX+ca0w== X-Received: by 2002:adf:fb0e:: with SMTP id c14-v6mr9294788wrr.117.1537802507829; Mon, 24 Sep 2018 08:21:47 -0700 (PDT) Received: from [127.0.1.1] ([82.146.27.14]) by smtp.gmail.com with ESMTPSA id s2-v6sm47214737wrn.83.2018.09.24.08.21.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Sep 2018 08:21:47 -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:46 +0300 Message-ID: <153780250604.17494.14047996367800791377.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 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 ac89f413d..faad3ba49 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: