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 D75FEA054A; Fri, 23 Sep 2022 04:30:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86284400D7; Fri, 23 Sep 2022 04:30:09 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 246664003C for ; Fri, 23 Sep 2022 04:30:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663900207; x=1695436207; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Gvc/Yk2YgfmztbNk3IVOfOcLeCbKViKMixw82RLXQ24=; b=jaTqYQ3VRynJA/gvNfGVwZ/2H5wA4zlrXhHtfhvthsesHpPG18EbP0vP vyTxshPEIw2LCpVPJeucy6Ja6hNxRt0zRHQZIPsD3XeTL19wghM7m5kIX qB6OMYZLuPNoQ8rfucmPUl3QaviMcE8EqxldWQeG5UEAkIQ+kTOWT+k+W wPnL498k3gsdzgQlQGbQUe86kg1SoCKx0m9szvJOJdLJAnG46VupfQrnF rO1aXRDUn+sd4KTd1a2KYgjUBZjMY2Xw7gwJKafrGeAbpyBImjT63mIDV t+LkV1aO2EIEosnlcmw2kYr9VyL1Nq11mamKunbgU+FiuUs/vuYhuXlSv A==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386779868" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386779868" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 19:29:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="948854388" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga005.fm.intel.com with ESMTP; 22 Sep 2022 19:29:57 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 19:29:56 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 19:29:56 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) 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, 22 Sep 2022 19:29:56 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.42) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 22 Sep 2022 19:29:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OeHRS5RanyDHRZllYKhW8LVcbXBjF8Q7EcCQIzWX1zIeQ+wmuetQNBf3kgQTDRSaw6jroiTxdoauREhh/kjpgif/CqgxpfSGCWTftK2OeG0Q7cXelYBL6ruLv684h+9feLS5KjOrXID5qiOWwwZIOJB0wfYCSnOMBsAbWVYVHd+Ic+sgEILhp43pmyeHWOgF9LTbXkKa9WEvzvrQj9cZD3k1+UdHe45HfXJExcmoDH3n43s4f5SEHT0BNEKkbOO2ivEeWqQiDg9OmKqRsxdbAOvlvZFvktXF9Y/hWgai+ys00BmCwudRh9VYXCL/OvF8Sh3WSeYqfsjLqJ+OPn3xDA== 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=4O4TJgMsPv4L6n2zSj7HnbPITs5JTxvUGgJ5rM4lisM=; b=DrHTd8ms+qGn3L4CAuH4mX7oia0oPDUmsNQlHY2cj7ogSdgai2S19kLfAVLQdWXzHyZ1I1zIWrwAR1KmF9qJUEKhO32Y91uQmMxEjEIsjXue/Xu7+VfbaxiR+09zRqz0yxAZl+xx3/6rsNamggXROf+TRIy7afgPslUiPt7utwQnE19qm3eW/KeOoEtMZ8JMjupfJzaYOcKXxjCfSm6+336CIEhjTLYcA7Cqt4yobzgiJ5+xz2Dj0tSNVS4PwNtBIWpsyw9JBCcjR3CH1QRZXC9qs0KI5zPWXny0Ykg5TCO5Z4hnM+7Z/xx/PNeqQJCGpAwHOSzNgF0AXvAKIiRuAA== 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 DM6PR11MB4754.namprd11.prod.outlook.com (2603:10b6:5:2ad::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20; Fri, 23 Sep 2022 02:29:53 +0000 Received: from DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::4cf2:7f87:f969:3ef9]) by DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::4cf2:7f87:f969:3ef9%3]) with mapi id 15.20.5654.020; Fri, 23 Sep 2022 02:29:53 +0000 From: "Pei, Andy" To: "Xia, Chenbo" , "dev@dpdk.org" CC: "maxime.coquelin@redhat.com" , "Ma, WenwuX" Subject: RE: [PATCH] vhost: use another variable to store vhost msg result code Thread-Topic: [PATCH] vhost: use another variable to store vhost msg result code Thread-Index: AQHYmlG9ST/Mg/qEgEmq/sjifOXsY63r2M5QgADbAAA= Date: Fri, 23 Sep 2022 02:29:53 +0000 Message-ID: References: <1658110002-191064-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_|DM6PR11MB4754:EE_ x-ms-office365-filtering-correlation-id: 3e21e1a9-f885-4d23-1d69-08da9d0b7f91 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ihw5WJ36lydCYV/gEHgBp0VtFf+9bYSz36bZSuSIYKV1Y7JLP2lQeLVsIJy1nuKB5CBGo2Qu4bDkJsIY7F7ueYnOx11lNn7fP0lczbRcpdd260p/S/1AAfU0nAcGzTTkHCXt6q7R2qFkQ5/LctE1xJkAY2ez6ppaqg+W/Q4pZERUdD/1BCLqc/PWEWEQQ6493mgZF/TOHy/AChyXhgdFuWq70J3bLHMNUgDXVPY3W2CKYoMtpHo5eMVogsChWRM0f0lHdfD+/ZdVIFNK2RQvXr8brpuM7XHy1L6jCzEiObn7bYhnZmJLkQeR4glTDWZVKqTuvpWB7FbU+txtBwydZvDGfR6r2Zgc4Hcnx0QCVmwo7bmNHdxNjSr4aTnCd5mr7CTvqSuBg7DoaolKmYFH0aQztzZVbSNQ8WJ9BvSotQ2tf96UwxPqIxQs8Mev6LhjPgz8aGjK5lIKVJzfTs8TCb7Z/Nn6+mTJRoUKqhkUVvyf8iwYmC0sRRJMeNaq7TQjspTVg9M+3Xzrs/durLfsDb5HX6Yl6mvqc/uX18cKuwIiXQAri1nJVeMGyYXaXfGzk/yJidZHxJ0ZpQKaUBBWcQqEYHjVxSYm0n+FXTYsyELWCTD0/L8plsY39EjWzNrPmjsBXP7lL5XhkQFbUpkp/t9pKa7fMGKxx7oUEIIXG3Mjx+Ytgv9nQmVTuAAt3O0sLmEJOZ/jvvcsdiyne2j2RBJc3Mo3ON0oijMZqGTprroO5AXMB7QWkaNMfmmYgon6N+3Mp2tBsRKgMXgwVUKIHQ== 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)(346002)(376002)(366004)(136003)(39860400002)(396003)(451199015)(55016003)(52536014)(5660300002)(53546011)(122000001)(71200400001)(33656002)(83380400001)(76116006)(8936002)(6506007)(82960400001)(186003)(41300700001)(478600001)(38070700005)(2906002)(38100700002)(86362001)(107886003)(8676002)(4326008)(7696005)(316002)(64756008)(66446008)(9686003)(26005)(66946007)(54906003)(110136005)(66556008)(66476007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?9+ubUFx3ml3uzJnRILNGvmbtMZWVISCV5iyIA3fauFpNxfG7g/e7hyNJgulk?= =?us-ascii?Q?vP/zuoYLjfl0is2n3rrU2M30YOnib9IKj876G04opKCQUgg1WhnVOBArAro9?= =?us-ascii?Q?r9Xu+68ji9wT9g2kI4SSbqEYMKKIPjN6jfS4x2I4eqE1FI8qTgmP0Bjuqpzb?= =?us-ascii?Q?2hQ40GlA6LSxIaRuv6DTSTKwMBmCcUIWSGy6rMaSzsCTFT9wpIyzdQ8HXMTX?= =?us-ascii?Q?76+3FI9NsWRePvLNvWPvBO9oYIOdvJL7gCRilkp9E+cREJ71oXGyep4iUZPS?= =?us-ascii?Q?NyBbyLYJt3RGZBBQEhPrLRlePTAvtY1obmN0UVFoTxf0UzyebSTYL9/0NKKu?= =?us-ascii?Q?Uz2sVXhaUHjWTUJwdgG0RnQW/PLyP5oxY2OuVctrB20nrHF3jEnukZWCfirq?= =?us-ascii?Q?GrjuBckss5LhuuT+aB8P6u754a1vp9JvD+PozBCc0bmH2Z/cryjolvjawX32?= =?us-ascii?Q?d9cxYlzKt6kpCCBFVZiRhenhZ0FlFP1RIdcWyKQbZR20+u1i6ONTqwrK7n0J?= =?us-ascii?Q?2WgcDkAf+Tlk53P6pH5hlsrW8ydsqIOMsWDsqHSX6cBfkY68wjwDKnDNVn00?= =?us-ascii?Q?8ybTO3/d3AUVYZ+miQ5D201ezO2Bdt8rAhRXSrZtBpVRGEZLO0MIliWrZy4G?= =?us-ascii?Q?71DLMQU+Cv25H6tw3h/8Fabok/zVnrCNOi3tAw03L0Jx6ONX5nP5Q96rC2zB?= =?us-ascii?Q?xNr3ix6pBzIl7rnAYX3WuACA6mXXCWVSQvKaNnKxilsn4mwxTBskg6pZOQVT?= =?us-ascii?Q?OPxiLjhWxODtbDpUaWTF4VXFxO5Xdf5uHWksc5F2WDXroqcQ6mGOMOuNfuWW?= =?us-ascii?Q?ycwJ7VFbFIzG8fuAGjOUOxfYJXd2RA3KBiFYPQ085KGD+4qGfnvTx0WWRInI?= =?us-ascii?Q?7dtURg++g/9BssIjcnpE4lJOyMVdrtoaSc5PPTtwNBBEntYVApgRZhFfmbrH?= =?us-ascii?Q?EgifWByxf9VCwDRLRVun2AB7kz6UbXTaYnz9Ba7TJVZ7XGzCmeX53Ahmj+9N?= =?us-ascii?Q?Q/4yVozpX/2t6TIM4OPEOJTWPYNV6zRrDu+t+5tJgyimf3FjJjJpUsBv5sXz?= =?us-ascii?Q?7jdu3EOB6qyDpE8dMeRo1i4tZl8gQxp2SzAFv+LDQ/in7VKzCIhNCrdWfBps?= =?us-ascii?Q?zKQQWO/xaTOsatgWx7hiwxL1lkWLiXGKS4zOZOWzx47Sc9zArKv8Xh4e/u3+?= =?us-ascii?Q?FT1tkWkTOri2vmNQzJV1b+R4FlRXXZM20G34CaoKM7AKbP00KalHHdLw4Pfh?= =?us-ascii?Q?rNekjTbEVvvjGMRx/8LL5ojpG9Y9cFzr7Xj9fsUExrzpIn95TklOlEgGHzFq?= =?us-ascii?Q?Njhwap71FWv351/v8PqOW3NO8l52afIO3Dp79lnY9WN8G8pPX5yndslZt+hj?= =?us-ascii?Q?tTqMkRZ4SWrWFYO5LHW/7m4y0PfB/9Pbzv75f6KpRZBTI1zll6EnNPVPkEIw?= =?us-ascii?Q?GuBuh42EwD+xMeQE1A3I/4MBvYDeOppIyS4SkWuS291hzY18WaWWXd1o4uuV?= =?us-ascii?Q?15k86CMA1biwsrt6AClN1CUTUBqXi8fdS7icmKxdStwBmtnfUD1uJ+QAhGeR?= =?us-ascii?Q?nTcA3n0p1xWi+28Ei+w=3D?= 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: 3e21e1a9-f885-4d23-1d69-08da9d0b7f91 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Sep 2022 02:29:53.6451 (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: KmevSjXfKkwbReKkX5sCYVRsdok3jsaH5+nW00IdGtjFMKJzq3Zuc68poUiw3CTEzy2DqckGjoNlFuAyBTEHRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4754 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 reply. I think your suggestion is good, and I will send a V2 patch to address this= . > -----Original Message----- > From: Xia, Chenbo > Sent: Thursday, September 22, 2022 9:27 PM > To: Pei, Andy ; dev@dpdk.org > Cc: maxime.coquelin@redhat.com; Ma, WenwuX > Subject: RE: [PATCH] vhost: use another variable to store vhost msg resul= t code >=20 > > -----Original Message----- > > From: Pei, Andy > > Sent: Monday, July 18, 2022 10:07 AM > > To: dev@dpdk.org > > Cc: maxime.coquelin@redhat.com; Xia, Chenbo ; > > Ma, WenwuX > > Subject: [PATCH] vhost: use another variable to store vhost msg result > > code >=20 > Patch looks good. I suggest to use title: > vhost: use dedicated variable for vhost message result code\\ >=20 > Thanks, > Chenbo >=20 > > > > 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 =3D RTE_VHOST_MSG_RESULT_OK; > > int ret; > > int unlock_required =3D 0; > > bool handled; > > @@ -3061,8 +3062,8 @@ static int is_vring_iotlb(struct virtio_net *dev, > > 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 */ > > @@ -3080,12 +3081,12 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > 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", > > @@ -3110,11 +3111,11 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > } > > > > 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 */ > > @@ -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 =3D RTE_VHOST_MSG_RESULT_ERR; > > + msg_result =3D RTE_VHOST_MSG_RESULT_ERR; > > } > > > > /* > > @@ -3142,17 +3143,16 @@ static int is_vring_iotlb(struct virtio_net *de= v, > > * 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