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 C28A6438FF for ; Fri, 19 Jan 2024 14:52:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E2954029F; Fri, 19 Jan 2024 14:52:21 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2076.outbound.protection.outlook.com [40.107.237.76]) by mails.dpdk.org (Postfix) with ESMTP id 2FBEE40279 for ; Fri, 19 Jan 2024 14:52:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xho6tjQ7cxMEEHZk9Hj9qUXVVdPuo4i0vurLmxPhEZYgUpSkF68xgzkWXtmlgnfk0Txin/fZ6XyVb/scrm2YA5bdzQC+aFVTOQzzaDtSl+Q9U57zkzIpUu7m9E7q1xrdYvmkxIhRSYlRyptCi0Fvul1504vmavUam9bj6M4Kmp6ChMhTJRi8iIZHh+aUIypreZw8Q5vUQhKHnpaiSS+EW/nUusJjQMwCpv73Za3u9tOdgPmnlycptNVSKNCuuHSIicsK8O/sNHLqTPXc1fpqeX+YpXtBTCwOGM2Gq+kRopfC2khJGZIsrgwhtGB31a9zg0m30Ic40gWg+A+r5Dsf+w== 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=YJhI9OXTIZJ2JgftPiMVFL1gyGawNGMNFUYgcv2Y4vE=; b=NTnOB/l6Pf1Zg/vomx0tO8doCTghxXQBHkpB3s55Pv4te/gSbtj2I8sDoEHXRX/5Pd+FXAAFNUjebv2SvTUekkFK80fKjNKGGfKRWKAaCeOBVr+tNlBeow/zeZ/gvNqQn3XL4apo42so6ykR01qpZH5kDkhWQash0Ew4QQpfDmvF07oyf/5QokmnupTrE8GW7LDvM6jUFyssz3YMOTQvQ0wII1VmKqRp6OueX+ZTPVlf/a6s5JAgL9vdx7lkHwu9svyzpWayxHI6mfB2lvigV5R2eAZbInFAyLxNPXpTgooP/M/y9Nk2rtkegxW+8c2ETliZbFs3AwtKF9ZFJCE6HA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YJhI9OXTIZJ2JgftPiMVFL1gyGawNGMNFUYgcv2Y4vE=; b=IWyy+ZURbAVvtbO+RB/a4rDGIBHAvMCO1hbra2jVVSeIZ0YR27XEYLPSR/bHJEWRTYvqAbNogbGwqJAN4KwYY73iARiJPlmIsQQPkCiTaB/tdXwnhKYHdKCFWTqs1tSQmj4UO5x90V4CgzUartAAcdyOwycgrYXMEORuAkjGROptxkT73SdtvLSJyK0wUaYfcNCXsSUrwJnlJ6rhmMkBks8NMaSCC5rSFzc5WATm3o3hHtUztw0w7C2qvIgb32kpcyAzwmW8l0KenvSos+HWbvPjVmyjeKMRy5M207soanqbIqlhypLU8GkoaPT0tJlyJQ15rON0hjpFEjf0dpGmPQ== Received: from DM4PR12MB5373.namprd12.prod.outlook.com (2603:10b6:5:39d::14) by MN0PR12MB6126.namprd12.prod.outlook.com (2603:10b6:208:3c6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:52:17 +0000 Received: from DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::6e12:5648:d8f4:ab2d]) by DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::6e12:5648:d8f4:ab2d%4]) with mapi id 15.20.7202.026; Fri, 19 Jan 2024 13:52:17 +0000 From: "Xueming(Steven) Li" To: Maxime Coquelin , "stable@dpdk.org" , "ktraynor@redhat.com" , "dmarchan@redhat.com" Subject: RE: [PATCH v22.11] vhost: fix missing spinlock unlock Thread-Topic: [PATCH v22.11] vhost: fix missing spinlock unlock Thread-Index: AQHaRHw5vFqWZEQSP0iD+QLZspFBKrDhNDpg Date: Fri, 19 Jan 2024 13:52:17 +0000 Message-ID: References: <20240111105158.3508078-1-maxime.coquelin@redhat.com> In-Reply-To: <20240111105158.3508078-1-maxime.coquelin@redhat.com> Accept-Language: en-US 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=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR12MB5373:EE_|MN0PR12MB6126:EE_ x-ms-office365-filtering-correlation-id: 9327f203-d6a6-45f3-0c55-08dc18f5d972 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wg2IZ8s7bt0/Z/Lte7ZiX3Qg078dzjgAM/nw/pHir/lHXoK2mblZD6O2+zaiBP8AE07vJ5IJ+nVX0enXUaWiY7cfhTTGsaVCHegjdqOeuI1GNqV+Xs4CRncie5SscNc14wnp1gLUBlPTKXARXyCnVsLdPTEyF4ZRKIS8sd1Lq9IgwHF30aqUGARmj5lg3wB9axRjY158IuQ9CfV9SF0aV0rYed/cS0/8Fs3J1ePaCjyzO/Uj5gH6hn5wCtkvq8XsciJQmLUveisgH6L0rYB+HSUd3yu89VpXQZLbW9/bSWLeHFXoN1QyoGqmdSAq1q6i44sLCePGbWojmrLyra469hk7o3mFm6mMvrm/errcxWcDrIiGglgr0yEWsJdlBaAsX8PSbLD4oMpRedRAVmt3R1CFtvFlT/anYNQoX5p1JWJhXfxTgrBX1BdKzjJREg6HMO+NTjpI/JLqni6aDdg2Yb/lWA7v+COQI/dJiDx+4kUE0yl9YETwtFc3BwCI8lAc81Bf9rBk6xfTsdJHr5B9PRCqiUMP1ItCgsO3OwqxxaB1Omewv8AjnHJ/LluAHVhg+bC+H+NYxfB+jjIDRuKgeEYPuRa3FcHBWNwJWFHiMpQ= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR12MB5373.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(366004)(136003)(346002)(39860400002)(376002)(230922051799003)(1800799012)(186009)(64100799003)(451199024)(55016003)(38070700009)(316002)(5660300002)(64756008)(110136005)(66556008)(66446008)(76116006)(66476007)(66946007)(26005)(2906002)(71200400001)(7696005)(478600001)(8676002)(8936002)(9686003)(6506007)(53546011)(52536014)(122000001)(38100700002)(83380400001)(86362001)(33656002)(41300700001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jqr9LRcp61xP5XcJ1bRCgM6xcoKvO0CdY5y9iULHoxO4zfn6tBZxwwC0BDVA?= =?us-ascii?Q?uT7WVQHjl+oQiaV1lUOrVUByAoedeoTmqiu2DK5qiGjzk9O2myVO5Z78aTpn?= =?us-ascii?Q?d2LKs6B8/eZ4Hjnb8zaCN0+TKadUI+jLhhtabZAdXE31Ct1vLQZGKpCPXImq?= =?us-ascii?Q?BPAPxaD/bjOLrym3cofaH6Lccdy+zyBcvyU5GZ3c2t6bL/ugJ7nY/oiEhORV?= =?us-ascii?Q?XArUQbpwBzrAA1DjJvrV7+anrP/Z89CJ6d4w7aQp4TOOhotXN8vxDF2MZ1WM?= =?us-ascii?Q?dqRPa3GOG6qVWHY2/pX80QFzg11I/wOR1hv9zdnphjJBMDSfrI3mQQVQirXT?= =?us-ascii?Q?DmBYfdPklSOMH5QLiZjwCO+kKbCNRxW+F2+RreNYOl9Bors94OcwPtWw7Z+y?= =?us-ascii?Q?2wRxeLNwv/IfUQ3NCO6PoGbPB8Oo64FBzSOgXEiGq16PnsfdnUPtvx2UDGcw?= =?us-ascii?Q?iYpBKMxmlNBrwLsaTLCdbuIOK+gcrBKHQOaG+Vrgwdbsloiy7dAakOg32EPP?= =?us-ascii?Q?mWhYtqHowd/BuwJHYtSsYCxcv3Hn53mkwP+hP6zuroCs6CHMDXsTuyXuQlWN?= =?us-ascii?Q?/JJ3xLjvP+ztL8o7R1/1ZjqyGWT1yg0J+rq+H3+McSWkgEBu9KMAej+egZ36?= =?us-ascii?Q?z6R4TKlOB9OAr++49FFmZcwcEAQDbRZz/8CuNbxuV5EqCgpV+mHGcUnUNpce?= =?us-ascii?Q?p/xGxpxDBKQl7C8WThvUGymbG2wzzS/BDTVNcZ1GUnOvGpth1Ya6VrPm9TRj?= =?us-ascii?Q?CYk2QO54YiMAqbtVtGudpFg6oaqaZU2B4itav3Txt+GWZGpTzK18OEUZiUsY?= =?us-ascii?Q?QQ6GOIs/UupyWCB/dX3Vt2MWorAvEBegb5fzeF+ky6AGtHeM83jYT7/9+Q7l?= =?us-ascii?Q?OwcyMMD3GXm3Sly7bo0j3aPA5r/D2rIEfE5IaIez0s2srTTqk+Py/3CkQD3f?= =?us-ascii?Q?4SJxMRurvpy9szNnIHdQky6dMSSO4q7TZvuRWAJ+PcGZE7cuDgzZjs8G96Hn?= =?us-ascii?Q?CyV5mK1QraOteTvpHldWstArK86P2F9/EX4ousp6qM2n6AadkZnvLvjZjqKW?= =?us-ascii?Q?eUNIrRtavgX9zGuHLyj+e/jJHFOLCk7s54lsi9aFHOj0wid69JYZABdcb442?= =?us-ascii?Q?i5mXPCXh7lgsnKvh//CCFc5C34dQR7lNwG/FJMhqGdJHGnzdkAeMpRWMJ0Uh?= =?us-ascii?Q?h2G0qiP8jjtZ/I+Pti5GoaAQEqlGC2pUBOwEDE42Xpg5aKMKxTRX2j1UO3TM?= =?us-ascii?Q?SV6TYm3UqwFC26+hdJ8IDmTRhGJFUuZQ2MhVgKBTwWOEIjEJlNmdBScyIGl0?= =?us-ascii?Q?8sOhGF0sXFE/ERK9oDGjJBMwqheb5QW+5xIie3QxAy3n3Vn1oMu0WGRkZyGj?= =?us-ascii?Q?DDJ/p0fs1EN/HUhGHubv3F5IQLy91X4k1kQxwvke0es5FgWtdtXG1BCkzu97?= =?us-ascii?Q?th7cq6PM9e3CJyHlTHubGD4jyRZSXdSLNqvC0PBtxiEA9vaWEk34JJd4axMC?= =?us-ascii?Q?2uB7w3GGyeTlQ+KQ0UDaqgo0pgeu395sE0oIhtMjOqLXggwM10JcA4G3Kgfg?= =?us-ascii?Q?ggPxldvEh/qBxi6JwHwZIqgW5f4E4RYuJ4ThBqBZ?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5373.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9327f203-d6a6-45f3-0c55-08dc18f5d972 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2024 13:52:17.3592 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Y8CqvplC0NRFrcx888LF1WOAViJYQH4pTbtvd7JJQEA5/xbhGxPSw8XeRr63G+RFGRA8rrNFMLhm8DGj3xRw7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6126 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org HI Maxime, Patch queued to 22.11 branch, thanks for your help! Regards, Xueming > -----Original Message----- > From: Maxime Coquelin > Sent: 1/11/2024 18:52 > To: stable@dpdk.org; Xueming(Steven) Li ; > ktraynor@redhat.com; dmarchan@redhat.com > Cc: Maxime Coquelin > Subject: [PATCH v22.11] vhost: fix missing spinlock unlock >=20 > Two regressions were introduced when backporting below > patch: > b4c4e5675c85 ("vhost: fix missing lock protection in power monitor API") >=20 > First, rte_vhost_get_monitor_addr did not release the lock in the success= case. > Then, rte_rwlock_read_lock() was converted to rte_spinlock_trylock() inst= ead of > rte_spinlock_lock(). >=20 > This patch addresses both of these issues. >=20 > Fixes: a07736eb68da ("vhost: fix missing lock protection in power monitor= API") > Cc: stable@dpdk.org >=20 > Signed-off-by: Maxime Coquelin > --- > lib/vhost/vhost.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 40ac350e21..9e28= 198528 > 100644 > --- a/lib/vhost/vhost.c > +++ b/lib/vhost/vhost.c > @@ -2060,6 +2060,7 @@ rte_vhost_get_monitor_addr(int vid, uint16_t > queue_id, { > struct virtio_net *dev =3D get_device(vid); > struct vhost_virtqueue *vq; > + int ret =3D 0; >=20 > if (dev =3D=3D NULL) > return -1; > @@ -2070,11 +2071,12 @@ rte_vhost_get_monitor_addr(int vid, uint16_t > queue_id, > if (vq =3D=3D NULL) > return -1; >=20 > - if (!rte_spinlock_trylock(&vq->access_lock)) > - return -1; > + rte_spinlock_lock(&vq->access_lock); >=20 > - if (unlikely(!vq->access_ok)) > + if (unlikely(!vq->access_ok)) { > + ret =3D -1; > goto out_unlock; > + } >=20 > if (vq_is_packed(dev)) { > struct vring_packed_desc *desc; > @@ -2095,12 +2097,10 @@ rte_vhost_get_monitor_addr(int vid, uint16_t > queue_id, > pmc->match =3D 0; > } >=20 > - return 0; > - > out_unlock: > rte_spinlock_unlock(&vq->access_lock); >=20 > - return -1; > + return ret; > } >=20 >=20 > -- > 2.43.0