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 C62D3A0543; Thu, 22 Sep 2022 15:27:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65DDE40156; Thu, 22 Sep 2022 15:27:09 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 66729400D7 for ; Thu, 22 Sep 2022 15:27:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663853227; x=1695389227; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=RPI97GhkfjZR2IIz9lTMjWzaGkw+5ss8IoZGLijIKqg=; b=kd2DGUjRwj8qBSS7YBMsJUjgd/ZNj2Tv4xU4URtuWrTXuV2/S7XMloRT HM0eVaPB4V4e+uBlbPM6KPnagL/fztWiZZZEkhJEPPgqQCSryQyUjz2O8 xfz/ATguvOo198BW4Fcge/1x6t+3c7cuy2xZPfbSiQdARXYRiMClXnDkl C6699lqEI1ZL9rHmSr8zchHmaxVCO910H9eG+B0HUIfg7s0ED5wzXigin zM9fDHrNM2d+2WHQtmNA9OnCRjDAkoJmG9hjcyfaqFitdb4TlisOO0Ose ah0PG+ix09LTU4mWBSEghH0/NLnu2KUEtyX6yQzkXvvBQ1jwMnxuTSb44 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="326614651" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="326614651" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 06:26:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="619790485" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga002.jf.intel.com with ESMTP; 22 Sep 2022 06:26:44 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) 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 06:26:43 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX608.amr.corp.intel.com (10.22.229.21) 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 06:26:43 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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 via Frontend Transport; Thu, 22 Sep 2022 06:26:43 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.47) 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 06:26:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eARga5lklZQ8BHiPal1qKn2F/uQ9JWew6olktDcH2ByTOwmXeNWD0xXm/CtwFl5SQt/s7HvSc93gV4RXt/4KdKjYC226RdRnITXoFX+ERiOZ83AUbU6af1KLeaTK2FniZ7kg+fzP65PYxpNC1WQNif3GRB29G41+M/v1QtBwO4LZ+5VVU1TwOPW/FTX3GP8zN3L1wcM0vpNZTF5/Ll/om4Mh4X02V1i5vjoQhQwKxW17VMwBjnEJ6cacsf60GM1luYqru+WTe4GJGQahBdVLLKmAuVjrj+4+KttSGvjcfzikJlP5Q22Pfx4PJ2FLCuH6kIh1SSrmYsROvZXOYBaVFg== 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=PmtBIaaBoK1zm+pQZwas63dCd8a6L5YruSERbKogE78=; b=Mb/pSIYAfjXXjfJ/GjpGMPOxfXu7DXIlaGHLIic5neF+M2aotp1hYV/IPecxF7sZBo3i5VKBsPHP053VzFyF1crfGW0gK8xFEAgAZjHxC8U3b7efvqr3PjmE2IuuDjM+AWZ2sCI60qqk3Kv1wRQbwyEgr8loLpUErP7CUnN22QZKy0jqlh0LI8rPVABWXxBU6s2Uowz2MnSfZnlBmBJwOL5zlvqXhGh8mQvV7bjkEz4mnj0J4PRhZFH8Zsn2JnqKHbqr+1dTK/vmgHxNnSU/Gv3a7zEdgbodvZ5xteFHfG2Hn8gUh+uBiFI2r9ZAyxdeOk5ngzxRIcU5ASfNwi982g== 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 MW4PR11MB6619.namprd11.prod.outlook.com (2603:10b6:303:1eb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Thu, 22 Sep 2022 13:26:40 +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.018; Thu, 22 Sep 2022 13:26:40 +0000 From: "Xia, Chenbo" To: "Pei, Andy" , "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/sjifOXsY63r2M5Q Date: Thu, 22 Sep 2022 13:26:40 +0000 Message-ID: References: <1658110002-191064-1-git-send-email-andy.pei@intel.com> In-Reply-To: <1658110002-191064-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_|MW4PR11MB6619:EE_ x-ms-office365-filtering-correlation-id: 9aaccc4c-0691-4395-1c61-08da9c9e159b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ghbm9fndfaOarpZtAya06opUL+fKNz9mgodd/9BaP5du5jXpJGykcjXfA7BHyIV1v3aEIq2Yd5ZG2VChYOz6h2oNunrssqSbzhxhHJCczHL7FMAR9cToEmNB+Bxny9py1eEEo+RzMzQjblD3sIARKWLeQTJTyztNIR+aWoMBgmc/9BUkzTukqM8WY7XjFF1hIDpnuJ/WwG/E20KRtyLpMDv2KpV3R7L52FtV57oN/WOH+0BlsVoXoAq72HLe0XdD+b4TEK9sUHF18c0fCLnyyowK9pGWAl0SrOf9dduZBwFyCU2TGK7I1eXPiLxF9ai8lWNXreQW7X51Ekgw8Lwz/vVbVmRkNu5kHp//u6AAMc1E9WquvY13e0xbJXPEWsEyfpDSUYijlhqAX+P7QcLnb37pzkBdC0azuBUpbKD6kpmAXIdkJjJjoEqGc2pdReGONpyqk3te+v9yTnZkKTKSOjtOz7ntbA6FMwAqcy8Vs3di2kP4KX4vRCCO597DU7E3z9z0kFQ8evF6YL7qv1EEzeyMZcEXLAW1H0VPHaEBc5AvWjz4qc7rkL60Rs2pVdxzZv2JuDkjYeLMhSAq6Qr8f88aBRcZVMBzeqefmkzg8QZCKzE8VQ6Sq9/qxK75BMcDKqM5yuTqHvwv3Y8PD1Wj6U3EDusAZeYcc8qkYRi6NP/s3vDzXHUqVhVppW0hr6Fp1FxyowxDwIjCrg30T93R8a8/5HXavPdcr6Zcr1od7raMu5MuF+sHFr2v5D8L/PJoKbkBlPAhSD1yvumq2JTraw== 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)(136003)(396003)(39860400002)(366004)(346002)(376002)(451199015)(110136005)(316002)(55016003)(66446008)(478600001)(107886003)(76116006)(54906003)(38070700005)(66556008)(4326008)(64756008)(66946007)(8676002)(122000001)(86362001)(83380400001)(66476007)(2906002)(38100700002)(5660300002)(6506007)(26005)(41300700001)(7696005)(9686003)(53546011)(71200400001)(8936002)(52536014)(82960400001)(186003)(33656002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?CVxiKAvDOz6VnV3v60MRPhRsr+SAyB3nK3H7+6pMgApuveAuoFo2pANKMiOu?= =?us-ascii?Q?82PNtM8vGLa0YLc7vGxgHCxJnfgH61V93Xnh6GWN1pKh6CrZc9gGIX4Zx8a5?= =?us-ascii?Q?SSyIfaorDtgZtQdnpA4ReGK4LTH3PgH/mP9D12fAXOIneXMryDuBW/n7iYXc?= =?us-ascii?Q?Xzd1qikUZOq9Q7n8v6dKS2RXdYAcblXwQp5HaeIijSqca6/9l5nez0tL7zgt?= =?us-ascii?Q?zLJIlwXVnn/X9RcLr6F7W3H0bnHka/vhvFMsgAcIIu1BZw0boww/EtBbnMeJ?= =?us-ascii?Q?Ka8dW55dh5WXW92MXVI2h9hmzR6IAF/hShxJQhS8w0mqTXnzhSSKx0S6N0vG?= =?us-ascii?Q?BMqVFiLteblvDnLMV1e2lJopaByO+fHX5P7+oa8+kScPeeIHQbvJSUY1mX9n?= =?us-ascii?Q?YFLgEW4k2EmsT8jku723YqL/0oOTnqTqa88v9iL/ZLivFXhuUm6Dmy7s8MUa?= =?us-ascii?Q?nw2NZ3jOwyX6fYSFBcfT7qPcr4NYeTHiUrSFBxHy8NS4OIyGeIf/1lbobUCI?= =?us-ascii?Q?7juZMYYztE96rW+gETnK3dzM2DRGgJ+PcbtiQvaZchaM+FxnZVtIj9oBiQFN?= =?us-ascii?Q?xs1kvn6P/WQQE9SjHeAzmxx1ijGd+cWNUGnEgMSIlfbOyzMpQz90J9P5qM7U?= =?us-ascii?Q?RYH5Snwa6Z/mLAEiV7IWBTJl7+1ZP0YNHikVJaZ3oN0aUSOCqGErRfT20JVn?= =?us-ascii?Q?zgmdsH6/3NiX5aeg/sa+P/JTAtNI+8BZe5rGymrEsIDjJgCys/ICLwtKSX0X?= =?us-ascii?Q?bszoTsYaKFk61lwXWAg+Dg95sZneRvjb5ncR9CW6PkTgNgwXfxxhciq6L06S?= =?us-ascii?Q?ckf2MfxNnJf9NZBUu39Nsn1bQu5C2OuH9ZHL4giTv8g36vrgQSekg5RgbrqN?= =?us-ascii?Q?OIP8aIVT1ExJ+vy63/WfE60qDuWqvXPZpg3H8X4ckcZj6e3HhJMSKZxz8uh5?= =?us-ascii?Q?jg3MNCU3aOvh7Mt58k/LYsA/EmVDvOMSoQ2Udj8MHrY4KQmXL30kBEr0NxxK?= =?us-ascii?Q?06PHOLO6EW4MpTa7mBush8MiEWp/v9K+w189fVcDZK33mI/VZF5LtVGb0MxL?= =?us-ascii?Q?/0FtmNViGz2QqBfrQQKrjl6Q1C0dLCRCkfH9Dc1375qWUck5yxaOTz3Ku6CF?= =?us-ascii?Q?si39X+gKHoPwgG9IdQGsf+uhJu7/DX3HKHfKycst0ff2pT5US1QJxazGCLuh?= =?us-ascii?Q?x7sJttRQSFVK08J5PF6LVk6yGGMuPY4nM64UHnmR6EuGd7aMXiDo77x/v/Mg?= =?us-ascii?Q?iVGQ2usxFFUPfW01NUUnFCNvdHtvgVgxtrmzdA+IyWWZ6FBgFIYSixzYV+Vh?= =?us-ascii?Q?swXQMoB6Gg0Xa+stkny7tK1qeaTvGulV0vX95nDJpq6HWGQkWRTwQQRHZYMQ?= =?us-ascii?Q?OC+XlGfA3rcvKJfSFZs1bJ0iaY0GtErz3JaIqB+zkkh2hK8qWJF+29gZ8IHn?= =?us-ascii?Q?MJYjbs8VsBh+YCpPVlb6bfXPi3QcG0WnmXTylnV8uRJoEROPSMXMAwGR4ihM?= =?us-ascii?Q?zzFJXP193FDnfl/bmAyM3wrXJ3GUV2pK4W88Cr/lPhXPV36Wmo7ZoqmJkj3q?= =?us-ascii?Q?CMzc3aa3zFFyKxAOrV+ZNCEdoDVZgInnU1OIIo5S?= 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: 9aaccc4c-0691-4395-1c61-08da9c9e159b X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Sep 2022 13:26:40.7130 (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: oHLwq4rOydP4cZgX4catHiunRdLaNDf7hNGgAUkNGQzEHDe28MTFNWMzqVnVAnVsUCiIVPacp65ITgeiJzpcoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6619 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: 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 Patch looks good. I suggest to use title: vhost: use dedicated variable for vhost message result code\\ 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. >=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 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 *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", > @@ -3110,11 +3111,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 */ > @@ -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; > } >=20 > /* > @@ -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 =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