From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C13E2C83F1A for ; Fri, 11 Jul 2025 20:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:CC:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1HDpD8cEwX3VGV2PGnBcQNJmIZcdlOeX7Zo+E4EV5yw=; b=ArxDOltGs5bgDGgVTot/f5OfKW 2C2tC1E2TdJIRHoGIepEQLDx48EqYqt2Nw0WbyE/8Q6dc1CRYG+OrbhSW7Vc1o/sULSE1pjCdXrKc YYwiTbKkQUCke47nG2Z+Gavvzuh5o+e/iTGmvkE+7gN4I8lKtaiv8qgTnzUHZhAlpuw7Maxi3SySG N8+DLXse92FTNT1R5dWAxWlceAtJEU8OgEO9I60F/mgaRPRPi/ayss02Pw0QNUo6KkQzN85MVcVrr hQ4+BNzFmyw42viSUlPeOR1EaiXcrEDK98qUnkSKCN3sFCjWfFU6Nx+hXYUctwAT8jTrwqle5Nes8 eKZby2GQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uaKZg-0000000Fo4h-3BAi; Fri, 11 Jul 2025 20:42:28 +0000 Received: from mail-dm6nam12on20613.outbound.protection.outlook.com ([2a01:111:f403:2417::613] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uaJcL-0000000FfSa-1awV for linux-arm-kernel@lists.infradead.org; Fri, 11 Jul 2025 19:41:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mj+dqKISFqnfaeIl5NThJIABGpdJ2hSdWfkJF6A6WHw54dri2S1TackPgHOL5YKDZ01xOmEjSpWzC9TcIi9oR3GKwu60d1vhTXFkPfp199hlf0qIIHryaURDajtb2Zsy06S5QmbZHCorULcOYxRIkesnSB5TzYJVUdpFpNiYZxnQ5AdXWy3Oaw4dLYxBgxva26sYLmNeHGNmedPb4LXfuNJ4AtkFCMG8T3LAwI07vRS559LRmPpdAHDiKJm3rmiehKxOVXsK2MtrTy7GcFmqM1cqmI4Tjun5ZLVo7A8fBcxR7G++URY61FFp3g3qgsDIPBJbZ2wZsrCRMXXN2gEraQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1HDpD8cEwX3VGV2PGnBcQNJmIZcdlOeX7Zo+E4EV5yw=; b=nrVvf7Nq6QQe2+46P0/0sctIMDre0/M3UjH+Q6uIM9SkY2PQ2gV4R+wZ04UM28wIOv/YjrycElkFEETzkezH2ne+P5uILBv4ULqP1BKCtJXow0DsUFt+CXO/4ZjmEEAl7U18uWqB977JSkMVO9wmbSN0C20wUrb4MW1RZclPt2xIksbCvPP+8hleCJZrJplMTASr8IrSzbYPgnHBDtj6LKot2W+wzw15Z09X7Nj/XdUngWK6k9yRlBGNCx/W5N6SGcVjAUXb69nr52zwX0AEXG0gi7SA8NLQoJkRrdAAys3WUUwVRJe6+JGpJv8D0oDK7RHH1tz6abQcy4PNG6D+3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=1HDpD8cEwX3VGV2PGnBcQNJmIZcdlOeX7Zo+E4EV5yw=; b=TKJAmGolThoV4ZQ4UvdINXduwX7iy1+46Mq7PFh8zw29HwFO7yT1uVOAqiY9/ZR//pez2Gx3SpESmaqy9UlaBs/XfFN1Vyg8CailzoTyMIRbdcrFqVEO+0FafPNgWpOXEqgJ2HnLb48TBxhrRACBkJqvGlEyMZUPJTwuL19vxaHhv1yDY+yaKXxwY+S5dJde+8lCAs4RDMIPDMvRTQzz42Jg6k/OmoKHtTrUEbFO7O5skrEYijb55eXgBnHEF9gY0jbC+hbhMIvcCZjMMC2PgrpfAE0zEIqV676pltXmJ6aYPWesKOguXMrMn/oCmSRr7McvcFh7/iCRUhK+Ejk/pQ== Received: from CH0PR03CA0213.namprd03.prod.outlook.com (2603:10b6:610:e7::8) by IA1PR12MB6065.namprd12.prod.outlook.com (2603:10b6:208:3ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Fri, 11 Jul 2025 19:41:02 +0000 Received: from CH2PEPF00000147.namprd02.prod.outlook.com (2603:10b6:610:e7:cafe::ad) by CH0PR03CA0213.outlook.office365.com (2603:10b6:610:e7::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.23 via Frontend Transport; Fri, 11 Jul 2025 19:41:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CH2PEPF00000147.mail.protection.outlook.com (10.167.244.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Fri, 11 Jul 2025 19:41:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 11 Jul 2025 12:40:45 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Fri, 11 Jul 2025 12:40:45 -0700 Received: from Asurada-Nvidia (10.127.8.14) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Fri, 11 Jul 2025 12:40:44 -0700 Date: Fri, 11 Jul 2025 12:40:42 -0700 From: Nicolin Chen To: Jason Gunthorpe CC: , , , , , , Subject: Re: [PATCH rc] iommu/arm-smmu-v3: Revert vmaster in the error path Message-ID: References: <20250710233003.1662029-1-nicolinc@nvidia.com> <20250711164226.GE1951027@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20250711164226.GE1951027@nvidia.com> X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000147:EE_|IA1PR12MB6065:EE_ X-MS-Office365-Filtering-Correlation-Id: eabbe004-434f-4637-93fa-08ddc0b2ddc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jHE9eeWOwLO2RejcaD+aU0IZ2vtPi6ECcUOZsoBuUnYJIKK9wtmFTBaII+Ij?= =?us-ascii?Q?+VEzeMiCvlf76Iyljk06HTyizkzALjJ+PlI5mBwz7ahwO3/wGRTnUQoYF6eR?= =?us-ascii?Q?BWLHnEXLvx+6POko6AeWVv+MzsNDhh+lR/6ybpHcgpBJDKRiAbnx26wErsjL?= =?us-ascii?Q?Nu3RQWThc6bi9BAhCcCCagCd5vrgDog6QcGLXYjnzgdrbySmsUfH9dTy78Q1?= =?us-ascii?Q?z8AnqbNtT+H7mevCnUcD9qeLmcyNdVl0FeKfkqVZGX6VbrA4VejtlphmDWeM?= =?us-ascii?Q?sauyAgLn9i8EuUYTURgW6LpLdQzoFAZBRZ7SdkH/O01IUoNul+eGuTjcUBLN?= =?us-ascii?Q?ljAuVc+GjQH8SKUD/6DxJYcJE7GopPa9H/JwPqXOCZHWB7dqbw1i2hByttuH?= =?us-ascii?Q?2LBuPNNPQIU3jGoL0Vej+wZ2aIlFsoAsaBml+YuHTem7ZZZGoqrYNx3EYDmu?= =?us-ascii?Q?A0j4B32v10G6Am1qGuwiq9NKHJbtv5pa1HtkzYUXvzqPTYoiP7w8ol5clk4A?= =?us-ascii?Q?29wknlZkpEknmhkh7nxoODKUPISl0YMH+Ege9PidjElRAkozkgD529dFszNw?= =?us-ascii?Q?eTv0cC15wnDyjS9cmcL5hnStoZW1SfIx9phld5dnKcWTnD/0zlSX68+yg8lx?= =?us-ascii?Q?OfRSzXra3cO/ID9qvFVGTT2oSqNd4ZFL8LtG2P7yWitbcOY7+/dBW9Z+P0yb?= =?us-ascii?Q?mS4oIkti5Mm5p2ON9SFuZFdDh44GrCU/rVCFupmXWZ8biLw63GrYLGEPWky1?= =?us-ascii?Q?IW5sKUIcBYKOIq8YFG+fldRWvlk204cH3vdQzKXCia1Goj98ybqz++5HpJNG?= =?us-ascii?Q?n/GD2snDIOoltH4LobvBdMTIrYwTbHk5oaIrJhqO3FOh6p2DpZhkVpfq50Fj?= =?us-ascii?Q?JZHNcOx2NJh25nArNuRnt+2O9er/5jW8L1DSnhsJ6aJa/0R2qVN/7dX1omT2?= =?us-ascii?Q?/B+L0QT+CHR2fZu539qkrkeEBl4O47upmiVIaB/l6rAh6XdjEBtCmL3PTUvs?= =?us-ascii?Q?gs6T3woesM97vbIgV2tbtgnhehWE3HbUXKuW/PzC/vJW7QyBeaUBXdHb3D/Y?= =?us-ascii?Q?/grOKvF7K8/E46mSTR+zJu1251sUrZmzqeG7vIVxcoTIEEPaWuadOi7oeTKe?= =?us-ascii?Q?FXFrYbig1THov4bMr6dp+pPflzecA1B5FWyfEUokqP6AUf5Ihs5Z9FneT9l9?= =?us-ascii?Q?rHVhOgQzT6CpNt02nYNp2oteYqC5P+yuhEqrGRT7YP0jTNP/nr7Ssk4zre1Y?= =?us-ascii?Q?3LQ4bgc7T44joTwZxZbNg26yyLe9FKEPZKF/aHD3HBb/Kt7SnjVSUh9hu07Y?= =?us-ascii?Q?wNMMGKH9G3ZHNd/M/GwA56jNJbXHVIpM0P3ySwos21RguDVlzaAfIoxdrtFa?= =?us-ascii?Q?9KwUXasQry8haV7DtRZTQeP3hTeRv6Aw2SKnzJejdIICouAu6G+JYKdzF1PF?= =?us-ascii?Q?8/Z/gsvgyqhbNiMemcxB36gQ0epH7fgTwESQKSCa63Qiy3T0FvvooHV1CM6k?= =?us-ascii?Q?uypVTmttrYdE6aqhj7CoROlhrp2FktROwTiv?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 19:41:01.2275 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eabbe004-434f-4637-93fa-08ddc0b2ddc4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000147.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6065 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250711_124109_422695_2AC90F67 X-CRM114-Status: GOOD ( 16.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jul 11, 2025 at 01:42:26PM -0300, Jason Gunthorpe wrote: > On Thu, Jul 10, 2025 at 04:30:03PM -0700, Nicolin Chen wrote: > > The error path in the arm_smmu_attach_prepare() was introduced with the > > arm_smmu_enable_iopf(). Due to a rebase issue, it forgot to include the > > revert of the vmaster. > > > > Move kfree(state->vmaster) to the error path, to prevent memory leak. > > > > Fixes: cfea71aea921 ("iommu/arm-smmu-v3: Put iopf enablement in the domain attach path") > > Cc: stable@vger.kernel.org > > Signed-off-by: Nicolin Chen > > --- > > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > The patch is fine but the commit message is a bit confusing > > The error path for err_free_master_domain leaks the vmaster. Move all > the kfrees for vmaster into the goto error section.. > > Reviewed-by: Jason Gunthorpe OK. I will respin one fixing that. Thanks! Nicolin