From patchwork Mon Jul 18 02:06:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pei, Andy" X-Patchwork-Id: 113990 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BD0BA0547; Mon, 18 Jul 2022 04:54:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E694340A87; Mon, 18 Jul 2022 04:54:46 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 8E9C14069F for ; Mon, 18 Jul 2022 04:54:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658112884; x=1689648884; h=from:to:cc:subject:date:message-id; bh=CqsEE4T9tAZOtjUaaekDbC9cu/yf2R4HOxjdUaRBQ5A=; b=Zhto/hvYDazgIh1Hoi19UfUe902nHuBOb03vuJlz3krIgqaJEodzZTwM kQ/Una3YdTAoM1HEUYl0IbLdkV4ZBY+scrQx1BSmI8n47iDUNYNZPnS/P tTnNGUAfGfAOKxwlo0cmCB3FajI/Fr8+MNeuXVeU34zJwpChepkD6LDOK GVkI5LVa5DSx/owWPlO4PWvEgLpOMn20158CH2j+UhXSpOG2jG9VPXtWC vAAGeZl5Ps8F/27AKPEHfqyNoaXeXT0plkGlXDJKVdWl3lyNdyKEfYSFg IW7UZ3DQcLqKEzypnssRfxB3HkTtcnrCUMHdGPwApPYbzE96BKuNzSFSf g==; X-IronPort-AV: E=McAfee;i="6400,9594,10411"; a="372426707" X-IronPort-AV: E=Sophos;i="5.92,280,1650956400"; d="scan'208";a="372426707" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2022 19:54:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,280,1650956400"; d="scan'208";a="572223951" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by orsmga006.jf.intel.com with ESMTP; 17 Jul 2022 19:54:41 -0700 From: Andy Pei To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, Chenbo.Xia@intel.com, WenwuX.Ma@intel.com Subject: [PATCH] vhost: use another variable to store vhost msg result code Date: Mon, 18 Jul 2022 10:06:42 +0800 Message-Id: <1658110002-191064-1-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Currently in function vhost_user_msg_handler, variable ret is used to store both vhost msg result code and function call return value. After this patch, variable ret is used only to store function call return value, a new variable msg_result is used to store vhost msg result. This can improve readability. Signed-off-by: Andy Pei --- lib/vhost/vhost_user.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 4ad28ba..dac06c9 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2969,6 +2969,7 @@ static int is_vring_iotlb(struct virtio_net *dev, struct vhu_msg_context ctx; vhost_message_handler_t *msg_handler; struct rte_vdpa_device *vdpa_dev; + int msg_result = RTE_VHOST_MSG_RESULT_OK; int ret; int unlock_required = 0; bool handled; @@ -3061,8 +3062,8 @@ static int is_vring_iotlb(struct virtio_net *dev, handled = false; if (dev->extern_ops.pre_msg_handle) { RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0); - ret = (*dev->extern_ops.pre_msg_handle)(dev->vid, &ctx); - switch (ret) { + msg_result = (*dev->extern_ops.pre_msg_handle)(dev->vid, &ctx); + switch (msg_result) { case RTE_VHOST_MSG_RESULT_REPLY: send_vhost_reply(dev, fd, &ctx); /* Fall-through */ @@ -3080,12 +3081,12 @@ static int is_vring_iotlb(struct virtio_net *dev, goto skip_to_post_handle; if (!msg_handler->accepts_fd && validate_msg_fds(dev, &ctx, 0) != 0) { - ret = RTE_VHOST_MSG_RESULT_ERR; + msg_result = RTE_VHOST_MSG_RESULT_ERR; } else { - ret = msg_handler->callback(&dev, &ctx, fd); + msg_result = msg_handler->callback(&dev, &ctx, fd); } - switch (ret) { + switch (msg_result) { case RTE_VHOST_MSG_RESULT_ERR: VHOST_LOG_CONFIG(dev->ifname, ERR, "processing %s failed.\n", @@ -3110,11 +3111,11 @@ static int is_vring_iotlb(struct virtio_net *dev, } skip_to_post_handle: - if (ret != RTE_VHOST_MSG_RESULT_ERR && + if (msg_result != RTE_VHOST_MSG_RESULT_ERR && dev->extern_ops.post_msg_handle) { RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0); - ret = (*dev->extern_ops.post_msg_handle)(dev->vid, &ctx); - switch (ret) { + msg_result = (*dev->extern_ops.post_msg_handle)(dev->vid, &ctx); + switch (msg_result) { case RTE_VHOST_MSG_RESULT_REPLY: send_vhost_reply(dev, fd, &ctx); /* Fall-through */ @@ -3133,7 +3134,7 @@ static int is_vring_iotlb(struct virtio_net *dev, "vhost message (req: %d) was not handled.\n", request); close_msg_fds(&ctx); - ret = RTE_VHOST_MSG_RESULT_ERR; + msg_result = RTE_VHOST_MSG_RESULT_ERR; } /* @@ -3142,17 +3143,16 @@ static int is_vring_iotlb(struct virtio_net *dev, * VHOST_USER_NEED_REPLY was cleared in send_vhost_reply(). */ if (ctx.msg.flags & VHOST_USER_NEED_REPLY) { - ctx.msg.payload.u64 = ret == RTE_VHOST_MSG_RESULT_ERR; + ctx.msg.payload.u64 = msg_result == RTE_VHOST_MSG_RESULT_ERR; ctx.msg.size = sizeof(ctx.msg.payload.u64); ctx.fd_num = 0; send_vhost_reply(dev, fd, &ctx); - } else if (ret == RTE_VHOST_MSG_RESULT_ERR) { + } else if (msg_result == RTE_VHOST_MSG_RESULT_ERR) { VHOST_LOG_CONFIG(dev->ifname, ERR, "vhost message handling failed.\n"); ret = -1; goto unlock; } - ret = 0; for (i = 0; i < dev->nr_vring; i++) { struct vhost_virtqueue *vq = dev->virtqueue[i]; bool cur_ready = vq_is_ready(dev, vq);