From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F81DA034C; Thu, 29 Sep 2022 15:49:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 506D440694; Thu, 29 Sep 2022 15:49:30 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id CDFB740395 for ; Thu, 29 Sep 2022 15:49:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664459368; x=1695995368; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=aQfpNjR22Y1A/by3hX4ZVZDkkygyAlkO1FaJ6ArcyMQ=; b=C4Z/s4RJtqYTpn0Addq5SSYSybpzm2DURzRxsuA8ECbIe6hZpwacBnuq 9mZTfmm8jrDxCsfPy3zoH5ck4M4WkweypmfketpYQVOFe1SN1vkN9ky2J 9IFi9xP7SJW5SDwIpi+4g3x5bD52ufcrFdA+kfJTHLo3UwN8mu6jGxBLY IoaGj7CZAvV7BtfJN2iZwcEzb8qP/a5JKPVWT81gVQnhnyIw/fk4tdqf9 pzQ2HNPvDIoD2n/ZLVC82RV4duEBQVPkkauL45nugUb6V7Kzf62W97RKP gYzBdekYyabZmXY/QKbs1J6Dn2lSExI3I+v3iyDPrI0F/+7KVB76N0rJy g==; X-IronPort-AV: E=McAfee;i="6500,9779,10485"; a="281611182" X-IronPort-AV: E=Sophos;i="5.93,355,1654585200"; d="scan'208";a="281611182" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 06:49:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10485"; a="747840233" X-IronPort-AV: E=Sophos;i="5.93,355,1654585200"; d="scan'208";a="747840233" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga004.jf.intel.com with ESMTP; 29 Sep 2022 06:49:27 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 29 Sep 2022 06:49:27 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 29 Sep 2022 06:49:26 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Thu, 29 Sep 2022 06:49:26 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 29 Sep 2022 06:49:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+IFFJ4pbJQK3XCpbno7XCrIINg+Pm4P0m7DtY2nSLv+nrjqJ/NlBU4GjxRZ3qlp23iWwJp0eJoDDmKi/Zv1tP9qK9JjCqrbNuvhCbFsu1cRB3ho03Iq0ZPUgGkKJp9vI7l6AXSm//HVnb9Y5zjxFKiEO3OKVSFqFkQBzoORYDyrtV2IKOGFU+6fLDTA59NAA0qtt7quiiWiSUKGxx8YADIK7TjaKqXxPcPUyR5x5F8Oq2tsIEAS4yrYtxWqS8lasQQWpYPtO9RqATOXjcrDBRFnXK3AU8YZb/tcyfVEvN5V/YcLjouDQiW8/qTZ6//bPi0TnQfD+gur7pBt5+0PZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0JBlD6p5l++RrBWHY/Vb829KiYdq3+uPWiCNjsfBd3Q=; b=GyvLMQIQPRctQNWjISVCeFn5y4CtTlSMCAdcincbM/3Ah0dJKnU466t3nhpeEu2XoxWA89ukB74o4tZICRPvR4NCuG9hdFqLmBTSdVFz7oMGuGRq0Xd4sDD6zZYh5o7gdFp9Evj7mUJIR1CQB7jOUbpQFDBqK7ULrvElv9y2Cxc5pob/FeEKShewcvaiCZWDx3Y8sYHZl5G8PDz7vhdo3GzKf7ZSV/wmLI1JfpXd+tY+7ktxsIk+Co5c+BsmA6+M5m1amQXt3AG+bONp7Qp9b1PI6HCzpkmTKdmtpsi5R0Dps/W6XXa3UyqtO/zNtFbWr3ahNWVMjrhzxAV15ugtWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM5PR11MB1739.namprd11.prod.outlook.com (2603:10b6:3:111::22) by MN0PR11MB6036.namprd11.prod.outlook.com (2603:10b6:208:377::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Thu, 29 Sep 2022 13:49:19 +0000 Received: from DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::b8d7:6a95:bf26:e4ef]) by DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::b8d7:6a95:bf26:e4ef%12]) with mapi id 15.20.5676.017; Thu, 29 Sep 2022 13:49:19 +0000 From: "Pei, Andy" To: "Xia, Chenbo" , "dev@dpdk.org" CC: "maxime.coquelin@redhat.com" Subject: RE: [PATCH v2] vhost: use dedicated variable for vhost message result code Thread-Topic: [PATCH v2] vhost: use dedicated variable for vhost message result code Thread-Index: AQHYzvTiz9C6YpNDdkuzmHqgcM1vrq3xTIVAgATTJeCAAFbgUA== Date: Thu, 29 Sep 2022 13:49:19 +0000 Message-ID: References: <1658110002-191064-1-git-send-email-andy.pei@intel.com> <1663900369-294749-1-git-send-email-andy.pei@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.500.17 dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM5PR11MB1739:EE_|MN0PR11MB6036:EE_ x-ms-office365-filtering-correlation-id: 8a8d33bc-e456-4770-650d-08daa2216872 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QTL6H3uCmifhwbPhZSXdEQXDglppXVTt0Bqr9+nMpVeR/JZQpeVlPruvJICZc7N70jNdYWmhIxmNLuodJFNdbOr6X/hK7C/6oRhxIhseG1jHJbTT5Y6dl3FruyfhDBGgYo0+FY+uZetAgDE6w7wCbyAiU3I0JDynNThT9s2A0Bb0UQdACLKCopckadLAODyuUWzl5MS2/SRV17kVTAtEZfvxQSBZ2AKgzwoW0BAt5Eh7eLYF8hHTISnEAN8TwPc3SbnieDdUaAtQEZlrNen2IFDldy3K1/aRhvqq0llRG3UVxsUhHSHDMdqZR7FqKH6AWrQvnclqlXWtYIz4KVZOP4wUzItK+/HhqwiJmVoPTL2enGUU7s1DV2mOjJ2kp1vN6iE3eICUedU7ZMuW8iSbGuRaqbGACBucVxfJnGA23H2OXan4x1Jy7RYt8bdTCjlqK0E0dWoacP1gCuKTbKLifdfyE8tibGtlLH9cPMts/1GveoDq2a+7VJQFlcxQKYPXnJsGc62pIsMj2KT6HtolwuMBqfEmtMzP6x0us4GocpuHQVO/PFOwFmckrRArs7u9NV/jYhDLfXT3qSaOXQe/bUl7WbFXvEwFXty/+rpNVQnBeVmAoAV78dMa27O96//nb1jYeUKdttVymVr00qiQGT0Ku6WkAWB4oTYuDFGbPlVJ+BVEe3cd3qJmQwvS33InKfmvTv3UhKtBezzruExZCt644um2LW9dRJ4N+McwNcvD8pgPbWsqhthxM3UO9L0kSou0v+u0FeT5mQ4lnqVhcA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1739.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(136003)(39860400002)(366004)(346002)(376002)(396003)(451199015)(2906002)(86362001)(122000001)(15650500001)(66946007)(83380400001)(6506007)(76116006)(7696005)(82960400001)(478600001)(52536014)(41300700001)(9686003)(5660300002)(8936002)(38100700002)(71200400001)(26005)(38070700005)(4326008)(186003)(110136005)(64756008)(33656002)(55016003)(8676002)(66556008)(66446008)(53546011)(66476007)(316002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?QHJlx45c77sP6w9HC6np4wf7zSrY2wFElfBNlr4BEw3JNKiCJ98XoJfm4+Nm?= =?us-ascii?Q?b5upAX9Ye43/mdLo/iXEbsF5octCViaCJ9293ftyV2jEfqLBv0lwkPcJZPY1?= =?us-ascii?Q?JLYLKe1kfGHF9c8Y2jKVEgL1lxKw3QwFt4de05GLLxt1EPMYRnD0Rwrf0lIR?= =?us-ascii?Q?wbJYvcNZn7MDM5wdZBDQ5BPWvUpwmyGUh5o6psFG8cw4sIWf+tPmPMJDw+mU?= =?us-ascii?Q?uoTgJUTJ2wbFG5i5ZE4Ox0020CzBgmZsA8zt0YhBcgJnWmRymQSl+N6luR7U?= =?us-ascii?Q?xSFPyKpoRXCXbKhLbpQpW7EdUpOXuF2PbmKgniCmr16JeKx0W24YkCvs0l0h?= =?us-ascii?Q?Wp2teFvLJ6sgfgJ2GTv/qd+1X43HknJ+XtusOiLmXFOEVEM97SMhKYlOCULU?= =?us-ascii?Q?DBKos/nhrwccgHa9Cxl/uGp7Q49B7psqCm2nFKBxTDPyf8jjXKRZj9xp2vIw?= =?us-ascii?Q?IZjYWhjgst3b5M4CeLxxEw35Kjpozmeuqm254O17OQMSB92Lq6u1Q/QRdOEf?= =?us-ascii?Q?wmJrX0F+OZL4uMQ8bHzNPxG599k/zLysdieFvAkrFUX3MGwx5dRccZdiLwsn?= =?us-ascii?Q?lXLpF6+FGA1a3ZpXibTNEFWQjGpWPBL+iFJaUNrjWrzgJLbkA9w8Vy9xho3S?= =?us-ascii?Q?4w9kqxlOmo2uMD15hLys4oVpD5yfnubiqffBpfeBjjRu9T2sCVuO9k48cHas?= =?us-ascii?Q?RJkWuGH8BGQBVapnTeqETpYc4un7evzP/Q7xgH8Bjv++AFeqBNgFzOs1EqLf?= =?us-ascii?Q?Tp/CJR3b+aqM0aF4j3PJSQbSuw5eiTY7mhdVJJeWsffqA8+AuxnYnFM72Rg+?= =?us-ascii?Q?Us3LfMwq6m1wqaik4hHNPC4f0nftar3lhBMSIZ9rm2J6sEsxzadGwLP7UOU7?= =?us-ascii?Q?TczbcY+OxGAQy/9hRjzZJQrguOwN5h5Z/5D68L2vynBWhG3Ae4Se2N/H6Gdf?= =?us-ascii?Q?MRGFzLbN93lzVT25sW4DKy01Mt6Vp+0/LGH8DTECyIIMom+yf+YjJHMGD3vV?= =?us-ascii?Q?jIQXTa2SjG7QmP7YAg27lROEbheDYVRNEvhFi7Q6mmKNr78c1H7phVVkfYEt?= =?us-ascii?Q?+t644nDYPn57xd2AwhI0WPadGIE1YgV08seAM5K91KkNmE94wNLm65mBUjMV?= =?us-ascii?Q?w7ZLYKUe6Rl4whKkkPNzSGNaOh1NfzZB7Ke70o20Axfsu/aUPDRQqL82NbqD?= =?us-ascii?Q?aZApO6Uxu+C8wq0hzPCOWxMxyVPLgGEOSihEIrF82WLtQPGLS1frahgCMsxM?= =?us-ascii?Q?wcXsWoCMT4iNDbLmfyZyNEzwgBckMFwGZuHEUhHfVilQVoNHk8inr+AiOhY6?= =?us-ascii?Q?ESGS7Dr9iXkdyKvzMxUDc8xuEWgmbIY8V7miTJ0br0z7ZyWEKzQysyYoFj8V?= =?us-ascii?Q?b2N5e4+ujs8AyEEoydAWC1EVGRV3eLBPz+iSToRGwHe+JteiL3T02XHWiSmo?= =?us-ascii?Q?eWRH9bLXpJ739ICRCoISdmV3Uw9zhk6gA2iSx3EPESIXyvwXUczuNWK4m7WX?= =?us-ascii?Q?jFyHoahqqRG8CK+HjqcyEmaSc4Wx2tLjYHkbOJ9CbtUHxmN1bcOpkuQT/ezR?= =?us-ascii?Q?iTTHRbP7YhDjOdFf6HDvhZMSvXzZ0FcwoWFkMEWx?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1739.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a8d33bc-e456-4770-650d-08daa2216872 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2022 13:49:19.5825 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4huMWv6+J0+UFg3d+fhFuGLxf8qKBDyK2D01Ch0OebTjXp1khucmH5ZjrNSlPUZdnZBovr+hQEUxwWF3Dxpxuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6036 X-OriginatorOrg: intel.com 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 Hi Chenbo, Thanks for your efforts. > -----Original Message----- > From: Xia, Chenbo > Sent: Thursday, September 29, 2022 4:38 PM > To: Pei, Andy ; dev@dpdk.org > Cc: maxime.coquelin@redhat.com > Subject: RE: [PATCH v2] vhost: use dedicated variable for vhost message > result code >=20 > > -----Original Message----- > > From: Xia, Chenbo > > Sent: Monday, September 26, 2022 2:58 PM > > To: Pei, Andy ; dev@dpdk.org > > Cc: maxime.coquelin@redhat.com > > Subject: RE: [PATCH v2] vhost: use dedicated variable for vhost > > message result code > > > > > -----Original Message----- > > > From: Pei, Andy > > > Sent: Friday, September 23, 2022 10:33 AM > > > To: dev@dpdk.org > > > Cc: Xia, Chenbo ; maxime.coquelin@redhat.com > > > Subject: [PATCH v2] vhost: use dedicated variable for vhost message > > result > > > code > > > > > > 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 dedicated 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 > > > 0182090..6d93495 100644 > > > --- a/lib/vhost/vhost_user.c > > > +++ b/lib/vhost/vhost_user.c > > > @@ -2954,6 +2954,7 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > > struct vhu_msg_context ctx; > > > vhost_message_handler_t *msg_handler; > > > struct rte_vdpa_device *vdpa_dev; > > > + int msg_result =3D RTE_VHOST_MSG_RESULT_OK; > > > int ret; > > > int unlock_required =3D 0; > > > bool handled; > > > @@ -3046,8 +3047,8 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > > handled =3D false; > > > if (dev->extern_ops.pre_msg_handle) { > > > RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, > msg) !=3D 0); > > > - ret =3D (*dev->extern_ops.pre_msg_handle)(dev->vid, &ctx); > > > - switch (ret) { > > > + msg_result =3D (*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 */ > > > @@ -3065,12 +3066,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) !=3D > > > 0) { > > > - ret =3D RTE_VHOST_MSG_RESULT_ERR; > > > + msg_result =3D RTE_VHOST_MSG_RESULT_ERR; > > > } else { > > > - ret =3D msg_handler->callback(&dev, &ctx, fd); > > > + msg_result =3D 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", > > > @@ -3095,11 +3096,11 @@ static int is_vring_iotlb(struct virtio_net *= dev, > > > } > > > > > > skip_to_post_handle: > > > - if (ret !=3D RTE_VHOST_MSG_RESULT_ERR && > > > + if (msg_result !=3D RTE_VHOST_MSG_RESULT_ERR && > > > dev->extern_ops.post_msg_handle) { > > > RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, > msg) !=3D 0); > > > - ret =3D (*dev->extern_ops.post_msg_handle)(dev->vid, &ctx); > > > - switch (ret) { > > > + msg_result =3D (*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 */ > > > @@ -3118,7 +3119,7 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > > "vhost message (req: %d) was not handled.\n", > > > request); > > > close_msg_fds(&ctx); > > > - ret =3D RTE_VHOST_MSG_RESULT_ERR; > > > + msg_result =3D RTE_VHOST_MSG_RESULT_ERR; > > > } > > > > > > /* > > > @@ -3127,17 +3128,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 =3D ret =3D=3D RTE_VHOST_MSG_RESULT_ERR; > > > + ctx.msg.payload.u64 =3D msg_result =3D=3D > RTE_VHOST_MSG_RESULT_ERR; > > > ctx.msg.size =3D sizeof(ctx.msg.payload.u64); > > > ctx.fd_num =3D 0; > > > send_vhost_reply(dev, fd, &ctx); > > > - } else if (ret =3D=3D RTE_VHOST_MSG_RESULT_ERR) { > > > + } else if (msg_result =3D=3D RTE_VHOST_MSG_RESULT_ERR) { > > > VHOST_LOG_CONFIG(dev->ifname, ERR, "vhost message > handling > > > failed.\n"); > > > ret =3D -1; > > > goto unlock; > > > } > > > > > > - ret =3D 0; > > > for (i =3D 0; i < dev->nr_vring; i++) { > > > struct vhost_virtqueue *vq =3D dev->virtqueue[i]; > > > bool cur_ready =3D vq_is_ready(dev, vq); > > > -- > > > 1.8.3.1 > > > > Reviewed-by: Chenbo Xia >=20 > Applied to next-virtio/main, thanks