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 F0845A00C2; Mon, 26 Sep 2022 08:58:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93BD2400D7; Mon, 26 Sep 2022 08:58:00 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 8740C400D5 for ; Mon, 26 Sep 2022 08:57:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664175478; x=1695711478; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=V9oiltPepmW9x67OG2EgalA1ANmaR6+2w7w/MoLS3RQ=; b=JugYeiSHrdGuy3cSdh+8Xl8+9LdSBIab2m8bVdE/utYAWVbCPG117CP6 vjc2oMD6sSW61FsUaTe31H9Q2VDCKXDVRnX6QYNHOAdYiLTRQt3jDQaaz P4udkdndD2FjbRSPilBUsU+R0N30NwyVggnvc1Z5cRDpsZttTDyBuhCWR zTTmpbhiLylSwcaRYx6zXpZPDmJfbRGO7wbKxJyLxcA8JXyU5NzpU5eSg AxVNsURBevPVG0Jh6GWtiwnmvMTGfQTRNHe+OYXdSQSDTV/CGfJvjhQin Wbk8Y77yxC3iC2eV1GFGx6dZ68bqT1ZM1qPCfk5f4AabryWQ7WjtRrTHZ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="362784536" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="362784536" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2022 23:57:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="654154238" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="654154238" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga001.jf.intel.com with ESMTP; 25 Sep 2022 23:57:42 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) 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; Sun, 25 Sep 2022 23:57:41 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sun, 25 Sep 2022 23:57:38 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Sun, 25 Sep 2022 23:57:38 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Sun, 25 Sep 2022 23:57:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TpzQ//Q4X90LDjd66hsFZX+rN7NsahW513onWofbJKI0P+bxs79aklZ2qDNDRnFacwfdE08ddW6OvDbWnYItPhhSIHRYu6r9kT3/mzjmAs0fOsVYQH/BysNu47zcHDovbKmEWFjtuuIF9OGuIFrEuddq/tmNQXXF/DDI3eBTFlOtud4TE8V0ggrSyp+J5awyt2B6++UKXbPQ+ypqFfz8zyFlUOzLMiXPAIZXb8ZVJZ7dRXo6yVv0YgLEjLlMCShwgdZ+bGybX9EJvCHCI6S/kqoOLX7I0oFY/ffaT3FZWNmqe01ja/VtEni58POfT4UYdUyohc7f67KV7VzM4xUOrA== 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=9YQgfR4fMSSPum48egmFHQhmREx1+oBrYsTyuWCBWJk=; b=SOI0yumZeyo5ddvL7co6HVJYkr/kFo0bonhsb6KEt8SHGb9+Wr5gg3uqJYuoJ9I3PtuibbmJiBQhwq8sSrfVCNp/I04qk2n8X9iznlSfnReoo9NgzbIXdtFm9/lhSPSk6HSr53EW7oGQKHyU15UzJ/o8Tp/RIsWpaSEhDt06kcJQGPLwCJtojfr8b2oFtsChYj7TYGMmNfo6eYAHf93pMZNP9mfN5BTWAqUtVWJTs9A0m4JINmDKCgajfCG/G1s+5HYhthknbUcUvs3ku4Hpdn9qNoFqAyBtUJQ6bw4g61dqum2t8IA3Epf4tYbahB4eB1ZuPj9/aVbJ4X/9/wV/UA== 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 CO1PR11MB5186.namprd11.prod.outlook.com (2603:10b6:303:9b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Mon, 26 Sep 2022 06:57:36 +0000 Received: from SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::408e:79cb:b715:b8ac]) by SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::408e:79cb:b715:b8ac%4]) with mapi id 15.20.5654.025; Mon, 26 Sep 2022 06:57:36 +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: AQHYzvTiz9C6YpNDdkuzmHqgcM1vrq3xTIVA Date: Mon, 26 Sep 2022 06:57:36 +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: <1663900369-294749-1-git-send-email-andy.pei@intel.com> 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_|CO1PR11MB5186:EE_ x-ms-office365-filtering-correlation-id: 15ddc42d-81f8-41aa-0cf0-08da9f8c650b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9C6mDWP5zulEvA0KBtKtOmJ5Avkka03Qvm/jH4WnZXcpDASgfJ/LnzaNVRiSEgvVGpZrrIW5VmoR9/4or3Cv9WDTZTeOy0blUSq/a8Q/lZRfnrrAhmoKfm1uL8fYMV1s+Ho0TAYhu64AkSf9ONKpU1HtK1vn+IFVADj/yoprEsF4JMcoM45K3X4U9hSt2xum8cAw70D950RX6j8T8KIJRUHMcAJJ+Y8YJ/TUEId+UqHYjRcwCx4dZsBbO8f+BA1vOqNCcjMo/Lyoes7EY/xweNB5FmxTavkhDHaq3uJummgCz4w0LjTCGKdkhDkhipcKyRfHe8o4awoXdS7J5rxMEe4uqwKAWHuMOT36PdGTkg0BKmGgR+DaK/tPRy9coVgqgnPrChDv62j8wSbNosf3uKRhhmP/1W0R4twKxJbbUFcFC/+rlN0pbrGxgmdDEB8S35kq9wAPmxZfCrrA7P04ARB0gMOIv70qjtg7enuff6F3RJKIr0L8kuFNYpG+rE8z+1M6qHeVol2ccdCssDy4tfySuoeMznquLZVzwE1xlMlVz1sz2EUMfngx7qOScfMN+XtveoQLDmVCTfdR0I5zTXcE1Uaes3+1Ze3sHfEKRlMInjGoDl/sJcwwJ3gA88fWzEta7kw2GkFP8JO+t/WD+0Tvyvc1w+NOP4eZQuWvfQXYaASFE2pFWyKb3XKNt47/2U0vOTe1EhKNs8MltOloI2FH8aNj9m8GeoWtvSrfHqJj1xSvcgqwCOojnbtPaOettOmomMdzLAfAGC82EUZmqQ== 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)(366004)(346002)(376002)(136003)(396003)(39860400002)(451199015)(110136005)(33656002)(86362001)(38070700005)(5660300002)(82960400001)(38100700002)(122000001)(83380400001)(186003)(6506007)(9686003)(26005)(41300700001)(76116006)(478600001)(4326008)(66946007)(71200400001)(66476007)(316002)(66556008)(7696005)(8676002)(66446008)(64756008)(55016003)(8936002)(15650500001)(2906002)(52536014)(53546011); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?SG3UUDUuZstbBgGQ33llBSk3IOqJrhQftJ3hyy7PEe0mOb79Xm/hvzEu3FMB?= =?us-ascii?Q?Htwg3KI+fxsKUy7E58MeHN5qIsAK4IIRy/jFAQryfvZGj0qGr+wX8xgDeym7?= =?us-ascii?Q?UZpI9FyRzf2TIusD89GY1k3tQ2OXIl83F+rJTD5bemQBCiH+CCyhUMnd3Q0c?= =?us-ascii?Q?VxRTSame6i9FNBNorC7Vk5J+HfVyHSIARhxyxCuF9JU0+75egc+Bovs5oh7H?= =?us-ascii?Q?Yxi4y2Rizu/MnC2Tp5D4a2gYqHbANu7AvYZXImF13bWsBr/dEx25II7xnVZ/?= =?us-ascii?Q?Mc+6uFz9QarfGuSZ1AEtxT6eDiqTdrmIORuVRWk9KS0FKmxUK9guSHbP9QVG?= =?us-ascii?Q?ezpn1P6JZbaapGc+u9JAUQ+CxU6nFZBOafANc6RfDm3f+jC3BuPZJw+g5fN/?= =?us-ascii?Q?Mp8xoDs/x5sf9BxlWxhymAWhP2DUCJrymaxo4KWBGHMmKIl53VfSz5HBK7qc?= =?us-ascii?Q?08DKIN/CxjsNh9s1zuWcKEeAjDh6aw27IAtboeSN/6qOjZ2IEZ1zeMrMRBo9?= =?us-ascii?Q?h+6LRe+410mqOi7Vu2TTPFuvaMJuGdiFVNt0a/2LeOMOoklg/rBFTjhDWa4p?= =?us-ascii?Q?tzMyu/LNrkn6cuZPySfs6B+TjNj7/1objK496zMkNYGVVfFbcX5cSc0e6J5o?= =?us-ascii?Q?Z9CTRVHOMQDUAaQUB9T7gkW4SNzccKsOUqZaz1bctzqAxbr5Lcya3kNI7kVm?= =?us-ascii?Q?4ERViXZmoOcWPwAV2wKLhhDjf6WP+NpOdZBt4yxostC7FC7WU0Qdim+L5WEN?= =?us-ascii?Q?NE8TefqAv5Vl4PNbq4+sFin6C9lzwGJfjuvyzWItuqcY0JTIoRScWX76JNe5?= =?us-ascii?Q?WZImFytCjWHInIMVrhhefvfxXqpfl5VdFbWoaoebl9MNF/sVOuASCl686Ocd?= =?us-ascii?Q?F4qFT8oepsR9q1hGMalfAvCcD7kT+G+TiMGm7UTcuB1x/+21YbnBB9T4+g0X?= =?us-ascii?Q?axYsIENNJ+UHtAwJOwMiJPjk97f2bg1wIjtN4E5k7tdaVxuz/H6pWCBo1J4w?= =?us-ascii?Q?2QNzV0FCbEZVzKfTpwSTgCWNIzwyLyC6bgXfIYcEGhnqKOld9qj7r9w3y5bA?= =?us-ascii?Q?VgeVg2irgywGKCHGALpZvXgdsTl3wkBXUi6xkpo5EVnNqTZk76rvn+9qZvbh?= =?us-ascii?Q?1xkZduzgjSoBc8nz0qUrRRW9tBSoH2+CmX2W89Ugk5Xitj5/JYOpfjHMQLYB?= =?us-ascii?Q?ZrtrMT47xr60vmxBFZ6MSOun/shMetGvy17B5DqX1VKA8XoLW3i4uPV2T38L?= =?us-ascii?Q?Wsf53AXhtbLxWCU7FGfQGdz8N8Fb6w+l7/7x3W1Z5OCMbL6Tt+ooVvXusIP9?= =?us-ascii?Q?qq3sbYcHTI7RCL3MJcHZnGMmmD0pyPu05ekCc/2jiDJ1Xcn+MVofGkHmJdCd?= =?us-ascii?Q?R6hNfWr98ZGY1PghML/tkVHfKJon1CK6Y2d40gK4GanK8DELgf6nxBVoO7lj?= =?us-ascii?Q?rJl+8Jt1RSArdsTAAiPsipsNLIjeGxPeeqJRxUnqxkNGw3MNforsUbn7+aLg?= =?us-ascii?Q?wkN0HzPxXofepcOlRbgRqZGx3n21Zq4NLinSL7PoRXSaZg7dPo26/JIMDmLO?= =?us-ascii?Q?DqCKub0T3iBU9ClOwbPHOOVcaCypsRdrTjoxka0E?= 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: 15ddc42d-81f8-41aa-0cf0-08da9f8c650b X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Sep 2022 06:57:36.5338 (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: tNQtQQu1h/NffX8LvjGImDuIDFd4ZAK3EX6CJNf+NxmeX0zUpWUeBV7h02NXkZOR+asEFGZdxusrWPovHz8a9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5186 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: 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 resul= t > code >=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 dedicated variable msg_result is used to > store vhost msg result. This can improve readability. >=20 > Signed-off-by: Andy Pei > --- > lib/vhost/vhost_user.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) >=20 > 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 *dev, > goto skip_to_post_handle; >=20 > 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); > } >=20 > - 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, > } >=20 > 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; > } >=20 > /* > @@ -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; > } >=20 > - 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