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 1965743929 for ; Mon, 22 Jan 2024 14:10:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE284402C9; Mon, 22 Jan 2024 14:10:54 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2082.outbound.protection.outlook.com [40.107.93.82]) by mails.dpdk.org (Postfix) with ESMTP id 1D9074028B for ; Mon, 22 Jan 2024 14:10:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fq2YK1wkDYUON8I6tgsDUOvomvHxEZSEUIr5vm47uQ1vtFMzdEK/Q8Lu741YnxYZG/43RC8+B5zY+9s0lRNhWlhASA43Qh/tRQaJ9Yt/+hX5y6xdCp0zjkFg/cazmmeynkGM+angYMYNDTgd9culKpellvT1E7YUFEbR7gA5r1vDaoLuwJDehCywRdkmQ31yM/jMi+Z+x/4tdIiS+2BjLXZJMTgE/XT//ZK3sdAunIoGddYg/b+IsYoks7HxfATrLxfXQP9Urtda568gMN3FmHx8D82NkMKOP+8HYr7YoOxiLhxCoA9LhuQgm/DF/Y06xCDVoFB0Ft/HkUUI799kKQ== 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=U8G9dB87ARONWQg573amcjdtAnkSyyX/pHGkes4js6k=; b=NMKuyE215++c1Y1Uxfu9EQALEG6TA7vfBI3GM7HX9QOtiVWBBUnas9CLPsdG4R24NTXXkHDOtg7wyrmFbxGmVY85T1vUX3mXrEnskhkHm7000SuHJ439LmjuYVO5fPjz9EBaKIxedVrYaCiP0XJe24X3VwnQ52O5x/9KI1IYqyMHSO1ri33t4OenXr/4LvyHG6Wl03UFDMqnJj8r/ADdmwPAtqL8XJ2JhU9weFbeiORRo1nj/20Lhpj3tQsm1kRamNLaL0uRQOBhU7lfNnjBjSlRM3DobR7gh5u/VlEs79znZkHVIpIUkj8DQGoG9eZCBmKVFdAk8/8YC4UkNpUGow== 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=U8G9dB87ARONWQg573amcjdtAnkSyyX/pHGkes4js6k=; b=mAas5+DGC6cplfhOv9vo5jt0pxjEzI+AQ5vXJPwj/BLTEbahzzh5DBLAS45NOtPiIaBEnN5BxxxpoU7woZvXjTPiid5cCaTEPJDLZIAqaZ8LsrYy0qRb0MT4cSkbwgWDKx6Gi5LDkp0slDU2EulVfmpkaYGT6wOJkj6kS2IxRmSnsTxKe0s6Q/Ipy+XWwfyISyjIVjw1FN0wpRxvEarJ6Q0mgu3T1SmexvW0NNuNww6OoM2FWRF5rlyO5yTqHGo02ECukkn3hGvwJ4r/Fo8FwnAgR/h4kUTRmHePHHHoV2nfCWtRH2iY86qYxn2TS91l1gP+yfMtITAi+LCfo4r7zw== Received: from DM4PR12MB5373.namprd12.prod.outlook.com (2603:10b6:5:39d::14) by DM4PR12MB5037.namprd12.prod.outlook.com (2603:10b6:5:39a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.32; Mon, 22 Jan 2024 13:10:51 +0000 Received: from DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::5ab4:fef8:634b:5973]) by DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::5ab4:fef8:634b:5973%6]) with mapi id 15.20.7202.034; Mon, 22 Jan 2024 13:10:51 +0000 From: "Xueming(Steven) Li" To: "Xu, HailinX" CC: 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+QLZspFBKrDUdHOQgBFqiuA= Date: Mon, 22 Jan 2024 13:10:51 +0000 Message-ID: References: <20240111105158.3508078-1-maxime.coquelin@redhat.com> In-Reply-To: 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_|DM4PR12MB5037:EE_ x-ms-office365-filtering-correlation-id: 42bed530-b645-41ca-b8ca-08dc1b4b8ee6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oQ1vsJjdlZQUQsMzoVepSkKpIUVODOUt+AM8exMi/SB7dgyeAXvLzYvYteDz/dl1SZPnQCZUzUVt9tM2lHpH6neEoDCh7Q7KScS2wJyXKDKyObpazXj5jUmRhZJClWvg869v4cy6hjfPJWzIkCTPqYohwuWJ+mQx7ASkUkaiL1iYpcXOICOipecGM1ydr3F5mf+IhCrrXjpAWh7TWr3TuqvbxVhaBz8jbwgGJAxQx9kwJ0KQnYkxmxl/xs/eT6dXebF0rEjSSxAcuGIgyqyoNuLGbM4t33bOYjg/zPRwykA8ed9WwVLa6gzkjlv6H74Ux+yhOogdSbpmS+VU/0zGLz0v+UlVfh89G1xeA71Mqmgh8Th6s6PygETkmd9pWfQ/Wq/TKt1LzjhRh1iMMB9YccKzz2Tw6lxin1xzv0haduZOoZE7FQzHT3ULPUbnqawkthCrjW0ZJ7kUu6jN5mi3JnDctGQpCd/4aXQhmNvPm/IWyc42ZbA600CKuHm6sjNNT+Is3XiHFnPApUSWg9/+vXV/cj/RRWWZGKV0FSCaroxaEuCgnew9XfoeBPt0YaOcZfDCStqCtZV32LAVoUVgbjl9U70mQBerDniDkRl+ZErBnlhza+zHtJYbTTaahyCd/Hic1GB/4R1S1woknsk0sg== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(55016003)(83380400001)(86362001)(33656002)(38070700009)(53546011)(6506007)(5660300002)(8936002)(8676002)(4326008)(38100700002)(71200400001)(26005)(122000001)(41300700001)(7696005)(9686003)(66446008)(966005)(64756008)(6916009)(66946007)(66556008)(54906003)(76116006)(66476007)(316002)(52536014)(478600001)(2906002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?DB79IWdcSJSA4nUoqfg1N/0RrDdYZ4dbJnP4r2hJQFH/idQ2dURejjMcH8NL?= =?us-ascii?Q?Ii4B+lynLXK0zqKMtF6v/w2uKaRKql+K5hpsNkphpN7MCp5bCpOmQuTo5NOX?= =?us-ascii?Q?yscsxPfH007RyW+XYRLzD0XMyvbLxDvxSFJ9Nbwr5esaxwYtAq7TP0WTMhpV?= =?us-ascii?Q?YtJJv2jD4n1qCL26GiggrNJvi4uSsewtj3qkHg91/rsEJfM3i5xNonkrsHML?= =?us-ascii?Q?4/67uZbDEDNQ1ydAyC+leeonVqH2Srmbw9CUF7Ny+NhUFLX3OhCdEnyKyGTG?= =?us-ascii?Q?pdClxdRig+ewPAkkcBlxc0OwvY+zOa+yFirB0OsrcherL33Qaf1zmqLIj5E8?= =?us-ascii?Q?GD48U3EtjZ9elgXs32EwR/bMj1i2qLEjCIYqSsm2rmNzxHZkl50mIeElpa+D?= =?us-ascii?Q?/lLL8Id5HfBQgYJFLTl5LxWsh7jtY+noY+ytI9OOa//1+0Nbv3F/u5bCEpw4?= =?us-ascii?Q?eVhb0fdQ+CLWEh4otfofmYubv1SpKKy7K3z5M9p+N4DryktrD9txqpJXUMQ0?= =?us-ascii?Q?jKhSWZdKOJJdSDjPDE1muGgjCsJtKhcX8tx2yDntkWuGBqpBZRKyrRvLl2Lp?= =?us-ascii?Q?7mZF9xKzpydWLVkQa7qwZDruwOi6Nn22JkxdGYd6+adn3+10ENfc79mlSt06?= =?us-ascii?Q?WDJshGsIkXsuANlG8y4AQ8mPhA0O/VwBMQ9OmY99bzyAyGKlhmRRpX2l/1q9?= =?us-ascii?Q?rRsel2h96e+I3LRQY4uIKO+ArRa13rl2gq1VoPunhIc0MBpY4xnQCi1ekRpV?= =?us-ascii?Q?w5mg/zm5cWehmQmxLOrruk7xIPJTwBsml/MWjj5yQDjhsW2kxXLpVd8Yl5vq?= =?us-ascii?Q?2Q3eh3H+wHZxGgafs+LM5pPFdnO1MNJirckymZKxkwZkeL4P+6vXbDSBnVCq?= =?us-ascii?Q?3xXW/+9xQqVoFkWAKesy9PtR3Qz/zLdtiUvx7F9hGr4y0LbL3eHrC1rMFBlw?= =?us-ascii?Q?aljUeyDr2H4jhfl8rGsQiy/ynn1mrInA+zZfh0TodEgNQFWo7U2XPH3StcZS?= =?us-ascii?Q?lqlw76qU1bdcMXjc+xXKKG9ktoA0SEwHP7cb8Ks1wk87+N49YWfjD1aiy7vO?= =?us-ascii?Q?t3P4tCvS38viVHbxhrk2mRbDCa8hfZqlH8gR2uEv2dWQp+gauMBYTEUSCt3n?= =?us-ascii?Q?m8sYR0GBJSFZZueqYkZ0bVZUcwfnhf7E+QvAnR9SMCEgoQXnoMmjfjiN3X8U?= =?us-ascii?Q?GoHFx22pMlfkgjGJ+Mi25j1hKk03ylx3sGJMuCbLfKRKPdax70e0Q8JM/Gc0?= =?us-ascii?Q?nmPdZps8vEAHNMUe2Rqee9NZGLfLE5WMkXVE8BJVoWoNfHnEEMHVXgL2GTRy?= =?us-ascii?Q?rhSgWK5QgIvTsMg1c5MQRQKaNzMNSzyjfGTM1m2V8cmQv6NE4aq9fEwiN1tz?= =?us-ascii?Q?8pz21w2n60Pxqpw1tvnFlIduONor5nZiS9e/RfSsBaQ0/4oPBr1cmdaDfjwB?= =?us-ascii?Q?UTT4gNvYacsBGXQxUmOg1j2aLmIjYMFbWfHRX/KmrtUc8MOK1XaHZD01tpSG?= =?us-ascii?Q?o95KyES5JMZ/8ecIz2HSgfxhS94mc1xeXVW1Y0ufVJ6k8aDGZ536PeMFCG59?= =?us-ascii?Q?QBl2f2EKG0q5eCsRMPWCnFsyne/z/y++OckfHuQO?= 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: 42bed530-b645-41ca-b8ca-08dc1b4b8ee6 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jan 2024 13:10:51.3270 (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: RGS74ggqiLeXYtZIMWhc3jbcIePm3izBUWtSTdl4LMnsX/ukodbbhXVrfqdOY55Xlreb8lA0YAYRmokgh+YUbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5037 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 Hailin, > -----Original Message----- > From: Xueming(Steven) Li > Sent: 1/11/2024 19:11 > To: Xu, HailinX > Cc: Maxime Coquelin ; stable@dpdk.org; > ktraynor@redhat.com; dmarchan@redhat.com > Subject: RE: [PATCH v22.11] vhost: fix missing spinlock unlock >=20 > Thanks Maxime! >=20 > Hailin, could you please confirm if it fixes > https://bugs.dpdk.org/show_bug.cgi?id=3D1338? The CI passed with this fix, w/o your further confirmation, I'd assume it f= ixed. I'll send out 22.11 release if no objections. >=20 > > -----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 > > > > Two regressions were introduced when backporting below > > patch: > > b4c4e5675c85 ("vhost: fix missing lock protection in power monitor > > API") > > > > First, rte_vhost_get_monitor_addr did not release the lock in the succe= ss case. > > Then, rte_rwlock_read_lock() was converted to rte_spinlock_trylock() > > instead of rte_spinlock_lock(). > > > > This patch addresses both of these issues. > > > > Fixes: a07736eb68da ("vhost: fix missing lock protection in power > > monitor API") > > Cc: stable@dpdk.org > > > > Signed-off-by: Maxime Coquelin > > --- > > lib/vhost/vhost.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index > > 40ac350e21..9e28198528 > > 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; > > > > 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; > > > > - if (!rte_spinlock_trylock(&vq->access_lock)) > > - return -1; > > + rte_spinlock_lock(&vq->access_lock); > > > > - if (unlikely(!vq->access_ok)) > > + if (unlikely(!vq->access_ok)) { > > + ret =3D -1; > > goto out_unlock; > > + } > > > > 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; > > } > > > > - return 0; > > - > > out_unlock: > > rte_spinlock_unlock(&vq->access_lock); > > > > - return -1; > > + return ret; > > } > > > > > > -- > > 2.43.0