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 6E575A00C4; Thu, 29 Sep 2022 10:45:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 52F0840E5A; Thu, 29 Sep 2022 10:45:50 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id E670940694 for ; Thu, 29 Sep 2022 10:45:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664441149; x=1695977149; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=RMUJUmzMFjT9hE+SpcSYzuGgIM8ExiG2/5If7mZ+zAs=; b=il85Zqqqk/eW8kiWq4yeVEMG/Uf+KSUXiN+NRnmk78UNNsCRyJVKua0I MwkMx57xfmHOUOwzVy7xF0N3uXau/SiCWp+gyCWDXjtzBXVWrMAXWk8/4 kRcTCiSM5ZFmX/CQgFtcIdCckJ8j6PiFwYgcJ+kD27KhWzBJN3edrpiSk m3mdsL+zWGnll/f4s6A0nJDtpu3xdsrfIDfqCHE5kp9sBgNp1HLq2DHjf 5YAoJvtD67GBmqlPrfT1aKx6fiKOtHg+JLbnYhw2nf9IiBZtphS9ilM9p /7vFQ7QpK8kH4we+XLeGJdAp/FDmZwhXWpZ7lAH/zHceBPF/Knnnh6C4U g==; X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="301809380" X-IronPort-AV: E=Sophos;i="5.93,354,1654585200"; d="scan'208";a="301809380" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2022 01:45:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="684749644" X-IronPort-AV: E=Sophos;i="5.93,354,1654585200"; d="scan'208";a="684749644" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga008.fm.intel.com with ESMTP; 29 Sep 2022 01:38:28 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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, 29 Sep 2022 01:38:27 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) 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; Thu, 29 Sep 2022 01:38:27 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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 via Frontend Transport; Thu, 29 Sep 2022 01:38:27 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.40) 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, 29 Sep 2022 01:38:27 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E9Cq8tr9p87mhqIvN5v+FlORGtKxZH0SlB+vBtrA+TiRphSa3RjM91XciLC50OiUu/RryevTKYFc2FoFAmHJ/DpYLGOXgIcv06Zew2K81tRxCB+wDHoPWfP2MkRulTHB3qtx8OHNmnUXkFU5sVzIq9ZcKQ4NTN8+0yZjQiiQauVQ94GlmZQDi65xGm6M2XeIIsNOYW1hmc1eoDKVqMlVfsbD6P3nxa4XIJtnNHSPLkxDdt5If0FPZsBvdcV3MT1+TmyLKdzXyTCjLLyhXlv7K3nQFoPDSPtT4qiyGmMX8FFAGksvQ5PHgmvPqlrX8Q229rLVGVUcfKklbRNpwLHhOg== 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=c2ICuLMYqiTnAE/4DTx+yvqZhiy/KVZsqRs0tEcBI2o=; b=bBP7cFbc3AxbnWDWOVUR0DuotMVn/tyoM9A+ag+u6IrIT4OgGoTa+6/22QkmNgiBmccH+tM5fkSa4nzJQThd6fHPbuoPomnjOM1rinVk9BEzTlyHpIT/UXRNweM2bAtMN1Mhk3jmWnQ8Rqtd6rMfA726M97wuGtMZrgbUMuXLBlI1eFELPdB5ZvFhDVdI2amkWKOmXa9oPAjJ53W5GhA+VaGcEIxnl6LgxWAVcDTJtEPa2dEt4pK0RdKm3Jg3UcSrXC7Yjykti4CwZDGfcrIxl/rivde3tzsFGfMnxe2enUYiH1MMnIvIQ2onWjBaCcOhALwGBlA2H8AvlPE+MvzSg== 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 SN6PR11MB3504.namprd11.prod.outlook.com (2603:10b6:805:d0::17) by DS0PR11MB7286.namprd11.prod.outlook.com (2603:10b6:8:13c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Thu, 29 Sep 2022 08:38:25 +0000 Received: from SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::39bf:57b1:4824:d40d]) by SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::39bf:57b1:4824:d40d%6]) with mapi id 15.20.5676.017; Thu, 29 Sep 2022 08:38:25 +0000 From: "Xia, Chenbo" To: "Pei, Andy" , "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: AQHYzvTiz9C6YpNDdkuzmHqgcM1vrq3xTIVAgATTJeA= Date: Thu, 29 Sep 2022 08:38:25 +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, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: SN6PR11MB3504:EE_|DS0PR11MB7286:EE_ x-ms-office365-filtering-correlation-id: 8f52c202-4ee0-4105-0b08-08daa1f5f9c3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hD46NalMvBm3CnEyQUWjjTSokBuANSfwofRROWaqS0amMJYYau0SkNbD3Rpj5Y4F/FtBNh/tHEQ4g0qrOlGp70yIR6oQkLfooTztP1sAlxEFB2+nzLh3vuwVSDFW6I5ml3D9bHcnOsuPLnBMBPb5KR56NYpyYbs7nuR+IxZWd6iWeQGRbvSnWgSJzAK0C8rWR0i30zjg1uJ/WFHjxI8xdHY8TJpaiTRJOH/lFdWy93bnrY8fQ8S+EKngx1A4mpilntjA9Vh+UQ/ljwcEYQuVbBb54x3zWsdv4bZmA6XgYQJsjHuxqx3R1/yn8FUDAFtJjIc2EiPMChf1UlaGHgrK1WhCGg42uO2GRHUS9KHd9Le9rO6ftj4U2uzMaXoHKDNgoRd5wF/TY8bfT0BmCMSrWC3k85wej7uJ58/iGPOixhCF72KJoF0mYlyCQIgQmOPra5HUz1r9Hdfsz1cj+lmczQ1q3Xq4ZaQeQdzh50nJIaJaYsAYXIXTB6PYgKXIauub2U1kSEEuglzCsMSWJnobzCT6QYsf1WHFdmJmN9mIG1roW2iu4u4wk6/zG7W2QeK9CMoyCSzbJRliiNYAJPyJJw4wHomKWI/A+Hu1tqUfJZgA0qP6+7UB/C+/2csAogRWVRcIGQelxUfy2y6kFVmTtxBHXmqPP9K4831x+b2IT9GnAIqUjC+Vz73d96jeanllKfucgi3fBcMihpVW3e+KCibVow+gIsc4aQ6iaOcXeVTfdQfF8ITJ8Q9tqV+LO/nVY9ywdljrQ5qKxpT6XXEemw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB3504.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(136003)(39860400002)(346002)(366004)(376002)(451199015)(86362001)(38100700002)(82960400001)(33656002)(122000001)(38070700005)(186003)(5660300002)(15650500001)(55016003)(6506007)(71200400001)(26005)(53546011)(478600001)(9686003)(41300700001)(7696005)(8676002)(83380400001)(66476007)(2906002)(4326008)(66446008)(316002)(66946007)(64756008)(110136005)(76116006)(8936002)(52536014)(66556008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?5lLh/JK22x1+OqpsXrhfRaIEOJ2IPbcQewp4Xh46dDSiuV19Q3BBoIgPMOxw?= =?us-ascii?Q?mMqtwOOKzFoyKuM9PKuZiVup0Ay3vSRBNv8S4WagPeODhmecGfHUrW94wHP1?= =?us-ascii?Q?u+OFjC+ZQGxoXBuzVK20qbzaFsgECcyL6jxB2a0vx1gPAQDJ68SkjLsENFzn?= =?us-ascii?Q?1JavbHKI/ZqSgZU6/vI8Fx89iCZ1BEhAZ6gxvat/zbuxfCkhIuR3T7XeFNuN?= =?us-ascii?Q?J4pDVMQ0WO8grmDgguOoRJtSFtHjtAQocD2fxoCtPKBVxuQvaoCz3mno+U8x?= =?us-ascii?Q?JKNnRHQFF2OxpKaMyaxD4HyO7esSjLgqopv6qh12dtLhPdUz1VvPN8lVpbsB?= =?us-ascii?Q?JQidSedj1Uei3LXrRpRDlOhy8Agw4lnV/WQ24K1HucrHtMwRXcW9n1USt1Ce?= =?us-ascii?Q?Xp3HodbUTJh3Xejhpfde7jhW6/qC4eI1dX5jphal0Si0yKzwuvNAeMkXmJw0?= =?us-ascii?Q?fUiONINXrc0HjG/4q8jQ8AYv0v1bXJlzfh/0eJ46xK01yyiC/xo1y+C5nos4?= =?us-ascii?Q?MpVFGxF673kmWpXIR9GsvkpPpCu6q+Ib8lvQJKmqcxW7NfMjs6jVZyhVrUg2?= =?us-ascii?Q?CFw4s7HxQg+Hpjahi5uu7NzPdz/ncL2LE/KWoYpPUAIQBT/am2xulD/ANpdM?= =?us-ascii?Q?t1Sk8HQW6qS0lX7kPRoumlQwb/n99BhA/2mGv5sKDQcHeVpySMDfsfVshwym?= =?us-ascii?Q?Bx3i3UtWJjJE0MAro6OUpoVSoGiE9gipHmzztKB1c9x8DnNgTaspHkvoZwhk?= =?us-ascii?Q?6HZg+sfyg7hiwSvidwEs0AN9DSac63c1DxQKpJl5jMEPhY2kTeWSE9Re0pDu?= =?us-ascii?Q?ipKQEPvNp36TkOQafIMmRrwLijAkxT5wYBBJKvQjTqnQlP7FkfxJxr2kSUo1?= =?us-ascii?Q?8XLMaWIoKb0dHokzJ/xRui/lP5PP0hjPX5tpU3rfLcHTsWfZ5OjD0mOZLuBN?= =?us-ascii?Q?Oc28jUf5TF9V8MCFoRw/gmGRfkj5DpOemnFQvy6l3pWPajGL7Nb5ldVErVif?= =?us-ascii?Q?IhCNA2Q0H4abpX3taSIZdM9rTUsFb+jsz8+VHhqH1qspjk+6VkedxXgJYSLg?= =?us-ascii?Q?mpa+S1JUd/h7IjUbkOibvDlebspwitHp0mBY/nddFDtJWjTGniAz2+eCvK5O?= =?us-ascii?Q?NSGSMGZ5/g1H09g4t8An7sGHsnhRj7HRcEx2ImdCZv5alv1P1oaZ+o4hUBBt?= =?us-ascii?Q?ZYQaLQivmzv8f02TrdKyMY43DywtTQ1kNsnIP9x3+10GyC+zD+iRm2DFRFI/?= =?us-ascii?Q?gGYYKpzcHDHTmb36JlFzvxTmXoH5sc/x5DegS+8lTcHRIhHF9DtbJ7Ktf2l5?= =?us-ascii?Q?e0EtwipJyYyoNjg3w5PeF/O0EvTUrOWJ5gLMMgENrTSxUACDWvTeD1SNdRgm?= =?us-ascii?Q?R1LtJmBu11it/9TFQYHG0BSh4nkgbdF5470TZLngYKmvs8Ko5lVchdFWgSy5?= =?us-ascii?Q?tSGn8kfPYAK8JvZCvtV99f9k25QrIAPMkrNwOU6kJDEXX3bmwYC2zcNTKjR6?= =?us-ascii?Q?hzozPyMSWccd0N5aBYdqDPJx8T9LPDHpdsWUd4TzN/e6/b11ueOshp3zVf20?= =?us-ascii?Q?vETtN2JBe4nT4GW48ugRBwnServGEn3PejxUDhri?= 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: SN6PR11MB3504.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f52c202-4ee0-4105-0b08-08daa1f5f9c3 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2022 08:38:25.5402 (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: /f11F2k+Icml9q/aQOWJgdz/qAkANRrAey9r+xmQ9VRyCQTqrczuP4bwQ7Kh/eljNrEsaIW5zgqlexWkK3ymhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7286 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 > -----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 >=20 > > -----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 *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; > > @@ -3046,8 +3047,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 */ > > @@ -3065,12 +3066,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", > > @@ -3095,11 +3096,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 */ > > @@ -3118,7 +3119,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; > > } > > > > /* > > @@ -3127,17 +3128,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 >=20 > Reviewed-by: Chenbo Xia Applied to next-virtio/main, thanks