From nobody Tue Oct 7 14:56:32 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 210E327281B; Wed, 9 Jul 2025 06:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043468; cv=fail; b=td32yFCHfBTClm/NGff4umJlbhiH1/mhod8JFxwM/kNpnubIYRknTPglkTujyNi3gtbLCE1msQd3ZeWwxFC1A1YnMBt1iKajZyOas7lnIO6xGTUiFJCJ/ec7wfArgWWZC4WN6tlLS5nd/A5yZC/Vit5Gy8znGzDbcydGqJnbPOw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043468; c=relaxed/simple; bh=6zWwDCopnbZLaxi0t0UOLIa7Fp0Qp86aZE1sq1ICn9c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lojzpz0+HRsvz+BtHGEMx4mKAX2skJaUJx6t05nA0/Sve88uyyJAzj2T6dqkKVmn3pKoGDBQP8z4GQUe5c9AUfv0w2UACLAKknqDTv88fpabgpGfaBW+wnpN/7oKU11mtahLfBwDvyu5JDCfhujxxRKYx2/gLvWUkFOXqkXXIlY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=SSrWBu4m; arc=fail smtp.client-ip=40.107.220.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="SSrWBu4m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pUioyGLOMukAed1lO7ySHR24hH/snlLWvneDQnfNWcAG7Lr8uv0D84qQsPxMOTj6RF3Mq8NQHu2mr4MyFNzUu8LR3qQbksV7kRjcZjXr5nHBebdzp7jGPkLzcmdr9DYhLEVhgqmqgD+KCrFi5GgC3Pdff3T3SYE87L7zkcervvBn9Cp6jtOFqDlQTCIy91zoLvY3XAxWvg6OzNfMvOoiTCeQi1plZKX3Dg0DjucuFrdp6vTPmrEIg7oz9o9TC3CXPSJwxL6fLHEhC+QrekUc5ta1z4G9luC6FQ0NQMJCZ35dEFEQw3jvQm8kU9rZAITXaCWn6vNpgeiYMDv/B5uG5g== 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=oOUK3XujX1rGsw4kogej0gJm9gjltYG3Kn+A75MPBCg=; b=LU3Ltmxwneu+2U+wzaRT/gRsS8XHTbnZw+EpP3TNm9IiGJX2ljw3PwNZjVSYUfCrg+wDdgpHXFV5jc3GGsNTXxida/dEt5LUuS3uAeZUlx5+sizx02Fa5ZlSS2sHFzexpxJjiGc1aVOksdPl+xkeQXBWnN2y4O31XUvzO0pO7xbxqx0tgNCYwVHGh2HX2zX9AKJh4zTt7zu2piSvhZk8qFqmytUbv6mZTQAYCoqnHpk+aGSG6Ojjjxm4lygFapIH3RhXWNcOvCCdKjscYErUI0cUgebvsxWxsWlzNSM8o/CzifEREMNQ8PAMQz31XEDBhMsdGxCW4DYgcBDUvNh6cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oOUK3XujX1rGsw4kogej0gJm9gjltYG3Kn+A75MPBCg=; b=SSrWBu4mkU6REaD5EGRcPm7SHL5+nE2SFQuQfmuJ8VgHSEZL43pCsgZbTvF5Qp2Tk5KMepbg/IMPzTY26ig+TOu1sTaV5YYDVtm6+q/uh8sRbCE57n5HGac4OALsAWhVqlMscHTW+bQHwnRIrQrfatErW0TjZRneLT5UD5IBgmw= Received: from MN0P220CA0016.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:52e::26) by PH7PR12MB5735.namprd12.prod.outlook.com (2603:10b6:510:1e2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 06:44:23 +0000 Received: from BN2PEPF000044A4.namprd02.prod.outlook.com (2603:10b6:208:52e:cafe::67) by MN0P220CA0016.outlook.office365.com (2603:10b6:208:52e::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 06:44:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN2PEPF000044A4.mail.protection.outlook.com (10.167.243.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 06:44:23 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 9 Jul 2025 01:44:22 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 9 Jul 2025 01:44:17 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v4 1/5] drm/ttm: add new api ttm_device_prepare_hibernation() Date: Wed, 9 Jul 2025 14:44:00 +0800 Message-ID: <20250709064404.839975-2-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709064404.839975-1-guoqing.zhang@amd.com> References: <20250709064404.839975-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A4:EE_|PH7PR12MB5735:EE_ X-MS-Office365-Filtering-Correlation-Id: da74b663-d019-49a0-9a02-08ddbeb40a56 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TloYBhGbrHmD3vFxIGtOYhTKVMpvsmq4+/5/bolNfZUEM22eXDBBYElq9hUj?= =?us-ascii?Q?nZIjnx15eEf51JOhfa+QVkfV2fhf6K7jThkmmi2HqVFs5cXmU1wg3ehHRzMd?= =?us-ascii?Q?IpDFisHWjTVt6uxwM7UBR2phrf93PpZlN1q9yZqGjV3QeYczCzAnuhcqSoo2?= =?us-ascii?Q?E0nj2/UHoilUXdo+hmFcwJHAnKTSmChRCA7zBQwEyb7on3kgHf4/mNkduv4S?= =?us-ascii?Q?EmHq4XNPm8iIhT+wpYIv1MddhyhWk0g76AQUsb8AWkV0qa0u8oDF358zUuqK?= =?us-ascii?Q?qXhDycUM4Hgvfr7yFWfdIHiAB6vBOwm3WlqL9bjJZjk9pDaiO0eAP94VpJ2m?= =?us-ascii?Q?P4w2Ngq5hctShW64MMI4Lzt+4Ozlj2rs0OpdDucrNaDoY0CjvO6OtTByyRgO?= =?us-ascii?Q?GkEFPHpi4MgunpLXuX1pLibjM5MjoWLMuKkiRAHYPwpxmWoPQAw3+fpj1fOM?= =?us-ascii?Q?Etw/pgJrYT7kfzundS3OFCkHA033xVz9CHLTNuoktS8m4hcC1hehD9MWvS9x?= =?us-ascii?Q?aTpaesMQaB7/IYwrjPcemYc5S5GCFnPLEXP4IEsFFg6mjI9yy7uQcUBlxzsg?= =?us-ascii?Q?MREFsJfiUlge9poKlSBLZtK/2va8zh8AI68C7+xQTHN8qGfOxOaRHa2oWgcY?= =?us-ascii?Q?NF33rWfVZMFAiJlIPBGQe2/+O2R3eo7WNhTAtpTee4fyx75JzwCfDBMAeOrq?= =?us-ascii?Q?4RAQPFnzNdMz8WL6pRhplGG8FLwAgG9sX59Evmwi4n10SkS5ptTJg8EWn68E?= =?us-ascii?Q?rczruq7j2jsaPN1WjPcFRiPPuADrY7g41aQYCsV1i6t2zllUmNzkl3ZWgotB?= =?us-ascii?Q?+Y8X5GAKjg9lfXlSMJ01kMUFLzjxblX1NM1RL+A4NvG2ENV/JFBoiMyN+dbN?= =?us-ascii?Q?Yz1Y9VIORiCkxs7WoOteJxG7aX0NvbKelmGmGmTGERRUD8CgulJqQTggCzYG?= =?us-ascii?Q?zDL1QJ8Pw/TAEkX7jqiyVrrjhB0NMkECKh4bpBvqqmZdLSNcO86z+CVgBi0+?= =?us-ascii?Q?FQUTfhWBnKhphKwV7027EpqJrpM9Wb5ACmY1QRbB0KOZtkaJHJPu3fTPHYW1?= =?us-ascii?Q?4m54vDVE4kr3rFo1iNYafhyWHqwI/USTZLHTYRYpARekhuhlfu9c5jzUvuBG?= =?us-ascii?Q?UGhssyIu/weB67KEWfhYHCIik/wdJZnQ/wCT25S4pM0pFYwmQTVgyTPnc7G+?= =?us-ascii?Q?+m5W0L/A7JyITKdo9rmkWHfogNakEqjkNhrGNHP20TMJ9IAGlQMw2ZWXDsFB?= =?us-ascii?Q?hYQw5JrhPcMfT/XuY1inMDlYrTMyTAKc5dk/JGz0l9yQYzahKOwIzfs3ZowS?= =?us-ascii?Q?kpZxP/joP3NONSrGS81yy0CAZYyvskipBG5rjWYXVIWlas3jM1N4W9heDqCR?= =?us-ascii?Q?eiG5aEhJt7y5b0cAFoxJXFCWL9FHkgMbZAqCbu8QcAwAQAYk3yym01kiGYhr?= =?us-ascii?Q?KASPwN7a8bVahm7bQCsGcwoW7AXlqZ1SsbyjhQTsmKZbBrgqcQXJmrAOPFd/?= =?us-ascii?Q?WUxPFptuqCZmKya26h0mEsv02mFRX0G+iODcabKEvjAhnH/rZkjgoGJY/A?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 06:44:23.2894 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da74b663-d019-49a0-9a02-08ddbeb40a56 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5735 Content-Type: text/plain; charset="utf-8" This new api is used for hibernation to move GTT BOs to shmem after VRAM eviction. shmem will be flushed to swap disk later to reduce the system memory usage for hibernation. Signed-off-by: Samuel Zhang Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/ttm/ttm_device.c | 23 +++++++++++++++++++++++ include/drm/ttm/ttm_device.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_dev= ice.c index 02e797fd1891..9c9ab1903919 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -123,6 +123,29 @@ static int ttm_global_init(void) return ret; } =20 +/** + * ttm_device_prepare_hibernation - move GTT BOs to shmem for hibernation. + * + * @bdev: A pointer to a struct ttm_device to prepare hibernation for. + * + * Return: 0 on success, negative number on failure. + */ +int ttm_device_prepare_hibernation(struct ttm_device *bdev) +{ + struct ttm_operation_ctx ctx =3D { + .interruptible =3D false, + .no_wait_gpu =3D false, + .force_alloc =3D true + }; + int ret; + + do { + ret =3D ttm_device_swapout(bdev, &ctx, GFP_KERNEL); + } while (ret > 0); + return ret; +} +EXPORT_SYMBOL(ttm_device_prepare_hibernation); + /* * A buffer object shrink method that tries to swap out the first * buffer object on the global::swap_lru list. diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h index 39b8636b1845..592b5f802859 100644 --- a/include/drm/ttm/ttm_device.h +++ b/include/drm/ttm/ttm_device.h @@ -272,6 +272,7 @@ struct ttm_device { int ttm_global_swapout(struct ttm_operation_ctx *ctx, gfp_t gfp_flags); int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *= ctx, gfp_t gfp_flags); +int ttm_device_prepare_hibernation(struct ttm_device *bdev); =20 static inline struct ttm_resource_manager * ttm_manager_type(struct ttm_device *bdev, int mem_type) --=20 2.43.5 From nobody Tue Oct 7 14:56:32 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99CCB2749E3; Wed, 9 Jul 2025 06:44:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043474; cv=fail; b=m7V8OhkI7Lt2YZmx4iPdWb9OG4dCBB64/WyMzUIvmKFiStHaWNDKzkiRP30sEu85v0go0KlKNLzjo3L7L6wSN/6UT06DPC8QApvpRLTCw3UyrBgGIbqHGelN+vwTswaMxrkUrq7XbRp6nhMnGO2bVZ/F2d5V2arcGW+jM93FqJM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043474; c=relaxed/simple; bh=TV/azgZM0123VmrHV/+ukjn1LiBjTeWNWme6wukM2YU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lhvoJwqPyQvvs1r1Jgv+uriFkdEz+0ZKYwllQrmFNER9cui+vWiYifIjebXWd2bwigUEqxj7rSI8v5atIg/SPS+E8ZKLmRG1IxQWLm3RQ0cV94i807DitD6s+DYWGYVi3dZY6VE/xN9xtRBcRTMOUAyBFvF/9KxDg1mDVazGL6Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ctmOYHZe; arc=fail smtp.client-ip=40.107.244.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ctmOYHZe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qhdlqBGsBK0h0NqRY1LynuuXucjobMuLIbPt/xmqxnciuOOFKFT/jtAGcsp77/YsdSciBa8YgFAoxKkdHcaa5g5qQ4H0VW71+iFM/fqUTgeuOLDdXSs9v0BJ0J7nZbt6lqY0wIRvCZ85bJI0MtONFuvlhU0HwhRBsDberu++KOb1lB91OoeWoeuBZbCASIU/Auxl/KR2CDdl99UVU9q7cZBz89FFZZwS6yQv4hGLMLl98dKfWZZ6Iuk3O5mxqvTeCJuLk9Wt7WKLNSL8Wk+N4T6aO5KhQfQZ6hmsxWhE8hNgWvnBxL4vSI69kHiByVebv1V42kTy8xX/k/FY+823Og== 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=WoHTEnZKNxQwWmck8BFskTfr9fp6tbIxa6dAuUSSrZE=; b=X8ApNtr8qFSkxA619jPW5XFm8oAnwHJQ2qml15eqqGDPul9D+hisnkKhy5bRaPprrnC9HJLnqRxVy1TX2fGfnQkRKfeqARNkfkEddjk+Dl0j2pCUneG+pXkug2ggco9qcnHtnj/TBgprnDcxGPVtoO4MyFdgFW8KAXBDnOmMAugvyVPvDdIkJUFDQgaU4y05zAtP7tjor+M94WTppPQNonNdG/TG8f43cX/Kuyi2Cx6AiU7OQBplJVqi12TOJ9ZZlLkDM92M0+wQfdpTsooCpMOJNGqhn8Lj5j1EDzrFX1LB6Q169Z+8E/3jaL/+oEgbzvOgzxfh3a6zlfy6ljPbrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WoHTEnZKNxQwWmck8BFskTfr9fp6tbIxa6dAuUSSrZE=; b=ctmOYHZeHREIM3TlXi5VSeH1hJFUmx3Pzi/2tX7QGRqNkxsm+P6XXR/YiYUXqULBDHei1RVRnrjMvxEBLnW9JjZQTm6r/syAyuaIx7VC+Da5PGo7g9NMRY5mrXlk280Ty3m/jpMVlxiZl6KTPp9zHX47TKqu5Odxm9NzZ6x6/O4= Received: from BN9PR03CA0137.namprd03.prod.outlook.com (2603:10b6:408:fe::22) by MW6PR12MB8759.namprd12.prod.outlook.com (2603:10b6:303:243::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.22; Wed, 9 Jul 2025 06:44:29 +0000 Received: from BL02EPF0001A0FF.namprd03.prod.outlook.com (2603:10b6:408:fe:cafe::d3) by BN9PR03CA0137.outlook.office365.com (2603:10b6:408:fe::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 06:44:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BL02EPF0001A0FF.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 06:44:29 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 9 Jul 2025 01:44:28 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 9 Jul 2025 01:44:23 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v4 2/5] drm/amdgpu: move GTT to shmem after eviction for hibernation Date: Wed, 9 Jul 2025 14:44:01 +0800 Message-ID: <20250709064404.839975-3-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709064404.839975-1-guoqing.zhang@amd.com> References: <20250709064404.839975-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB03.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FF:EE_|MW6PR12MB8759:EE_ X-MS-Office365-Filtering-Correlation-Id: be3a26f4-098f-44eb-aa7a-08ddbeb40dd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VWFVTXVYSFVISHpPVkxlK0F1T3U0VzZJU3oyVnhmZWQrUDBjZ1lIMFQ3aC9h?= =?utf-8?B?Wm1ucm5nSGNEeWhSelRpWHR0YWdOdnNXSklDVEFaR0NiSWxtMnBhb09acVMy?= =?utf-8?B?UmltanB5V0ZzTmpKUEVIRFU5TnFCYlkwNFhMTTNDTkFzQmpLR2Mzem5yckx3?= =?utf-8?B?UzVPUkpndXNkWTVlRmJQWCtDc3VmcGNJaGZCUGFZeEFMQ1gvSlYwNnJERW8x?= =?utf-8?B?OE43VTI1OFU2OTF4aGJwTTdCZWc4T0ZRM3pHcTV0VWI0bGNpZVUzTzJDVG9K?= =?utf-8?B?RU5WanhsR0c2b3BQL0QweXp0WXpYaDZBR0w5dGpLYnpETGxsV1plMUlzN2d5?= =?utf-8?B?MkhsNE5xRVZMNVF1VEJlZERvaU5xY1NWZjlqQlIzcDc0bjlDVjZKWGdUM0or?= =?utf-8?B?ZmE2dGFLZm5EOExISG11ZzZqZEVEL2VFWjN4Vjd2RW1ZSXd2QXBYdHFSU3Fp?= =?utf-8?B?MUJhV1ByV2lwWkU3ZGpxZU9aM3puTCt2S0hTNGNkVjlNT3dUVmRwWWxWbGc0?= =?utf-8?B?TnpwMnpqUm8wbzlNWW9mamE5WDZzeUhqR0JERUNTQzA1NlR6T3l0SU05MVNi?= =?utf-8?B?MkRGVFhEeFV2M0hBY3k4VkQ2bHNqekRPbzNRN3VORTU1Qk9xUXZMclFqUGlX?= =?utf-8?B?aHNQYWdKZEpLcGxJYjZWU3JOem1BWHBNS3J3R2tQOVMvN3ZmeE80bTREdG1Y?= =?utf-8?B?Z0dscVZiNGVGZUhuRGVrMnI0UjR1OXFJYjc0WTJPNnhiaTNNN3BsMjlwRkxr?= =?utf-8?B?Q1N3clJGU1hlK2EvTERlTTBJNGR5SjZOUjNMTFNKbCtIQnE3bndDWHFaUk83?= =?utf-8?B?dnBObGVrRHFPMXRXSjVFOVFJOVNpVUxEQW13aThaeCtQaFRvd3k3OVlWNEZk?= =?utf-8?B?ZjVzak1SRGY1MXFMNGNqY1FLZkd0dFlsaG84OU5OTlVoZXRIbTNRWVZwQkMy?= =?utf-8?B?NHZ6OGJxUHAyTytKNUtuTHp0SmxEYmFRQUUyZHhTS2tvMzVmb0d0cmt6dTNY?= =?utf-8?B?aGQ0RDUyYnBoUmpiZFRLYkp1cys0dlJaYVF4U0M1akozTWJwZG1oVWNSVXFT?= =?utf-8?B?ZmZHN1Uvc3I4YUFTcU4rQ3JPYmFXV0VMRld4S201aFg2MGlOWnFGdlVtdkdr?= =?utf-8?B?UmNudFNFMlZJVGg0SUZlN2JhdjlrZk9JT3Z6TGMzd28vSlVHMzhyeEZMUzdY?= =?utf-8?B?VHlRV1k1UCswT1lsaFRBZHNEclJxeG1qWkhrLzE1bFVabElwVTRhVk1LYjFY?= =?utf-8?B?dEhNcGpkeDhJUDdmSXE2MXNCbUR0cWg4L0dibEtEQVR1bmVTd1Y3ajZ6Rmpo?= =?utf-8?B?bUtxalVKZEUwVmxUZU1qY09BR0x3aDdXOXN3Y2xacWViUk92SzZPelo4Ris5?= =?utf-8?B?RlFERXVOWWpxaXJIMkNDUXVvMzdnZFNxUjh5Sm1FSEREcWNMZEJpa2xGU2JQ?= =?utf-8?B?MUh1dG1ndGlWUmdreDdzWGdvTXFpUHU2dlJzeDNZQkc0dXR6blV6VGg5K2Nj?= =?utf-8?B?TDNoSkJ5OXV3c3NOMXBaRUpMR3FoWDZMTVJnNmkxbkhMaU5LWXA0QnZWdk5T?= =?utf-8?B?QTU5QVNLbDRnVC9NSnlGMTRzbE9DdzJIQldRbFFpV0xPVVBmQlo1RTVkdTM2?= =?utf-8?B?UEJlc0JBSzFNSk43bjVHalViYXFLL3IxSkJ1d05wRWE3K2hDb3FlUzlMWnJj?= =?utf-8?B?cVRiejRyeksxdnpNREVtMWtWandYUkNqU2ppNVgvWlVwNzJFTkdCdFF1azZi?= =?utf-8?B?ME80SmRldGlkOUx6dHYyTE5OZWlTMEI1WEFtOUVqZVM2aldpZXNMRlN0WTd5?= =?utf-8?B?bXVYbnIyS0ZMMTl0NkVhSlFXNlpPMTdOM3N3VG53aVE5cDV1YVdyc0hTMm1F?= =?utf-8?B?bnVqZW9iLzFUbUJDUW50V05lM284M1VkRTdaUHFLem0xSjd4bXJGOGl1TTZI?= =?utf-8?B?NWJaZzd1NUN0Tk92cDNYeDlzZzBvNTJDT21UbDdiald0Vlo5TjFiQnVEbTV2?= =?utf-8?B?RDFtV1UxaFk5ZHhmdzl5aFl2WHRqZjRQaXA4YXhCTEV6S0ttdlFJbS9xOEJy?= =?utf-8?B?V1hYcklqVk1pRGRDK3hlNDFFNmgzaDFKb1VoZz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(7416014)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 06:44:29.1197 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be3a26f4-098f-44eb-aa7a-08ddbeb40dd0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8759 When hibernate with data center dGPUs, huge number of VRAM BOs evicted to GTT and takes too much system memory. This will cause hibernation fail due to insufficient memory for creating the hibernation image. Move GTT BOs to shmem in KMD, then shmem to swap disk in kernel hibernation code to make room for hibernation image. Signed-off-by: Samuel Zhang Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_device.c index 684d66bc0b5f..2f977fece08f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5021,8 +5021,16 @@ static int amdgpu_device_evict_resources(struct amdg= pu_device *adev) return 0; =20 ret =3D amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM); - if (ret) + if (ret) { dev_warn(adev->dev, "evicting device resources failed\n"); + return ret; + } + + if (adev->in_s4) { + ret =3D ttm_device_prepare_hibernation(&adev->mman.bdev); + if (ret) + dev_err(adev->dev, "prepare hibernation failed, %d\n", ret); + } return ret; } =20 --=20 2.43.5 From nobody Tue Oct 7 14:56:32 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B6D926C3BC; Wed, 9 Jul 2025 06:44:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043481; cv=fail; b=aq5UYGbLHnSAphITExiSPwOH+goLr1XuDIEkyWQpkQ4tdJ9cwB9KiTSUSndf7PTmRzBfjq4AUihawaueAeOp4PhqErkHRIMS9YBsfhk4gwjLprwYBO/FAPkbKMXn7YLP/syCkaSxB3WyxIQdo8SJkHIjURyu/Nl6Mw5gBXBzk/Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043481; c=relaxed/simple; bh=gxCKMvwPA8vcVBQChOLDDUjBgyF0rI7YkuL8BkQ40zg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Xh2Pbgo2A8jAwUYCSuGBoMLga8dA2/5eKDKGpK2Oqj22Et/Y0HJWi11LQfDD9eUPjpgNanpR05oOhswubRpajCeZZG/Za/HWCmRJ8kb5JL2MuNgK9DPnSggbClkg5735wrkntAPFE2JOZhUBOiFwoaAmWyCXoyajZVcQmsU2jDM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=pUFxRUzW; arc=fail smtp.client-ip=40.107.94.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="pUFxRUzW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WEVpqy52VL3FKpojAhhP2RLXM0ZZ3CVa9S+ym0/8LAKQX606tnzle3yQ2wWceb5cgu7hDd+zCRBzfdKGiC8m5HGJD7LvFV1MlcLy6ibMXFkxVBHKiHTmcPFGI7NM4sGOsoUAskfGGSUN0XnOOYz/cmMbeTRfVHm6zEvRJz+WlWlx3ZmAadlhNWhISON7FbGdmQsll4iuYzZfV+Pk7iUflRtoqkxEnTNF5RFkkfewCx8fd6GN4YICXdJKK2vh6zBhXLVkGEL4L10adXC/PlBBYXtmO/6ldf8Kg3cKZImnWE4FXcJMbmz3zWHXaohOOsJrrxtQY75rLrfRDzxoGnG3Tw== 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=iPUolXeLQdrBVInU0Qawb5A+BH4a310feGspIdffEug=; b=YWdsl/w5gxB3B+HUCvY4L6Owv6vaBVN2i0fyxM72RRzXHTxF01y7jt4B2WOKYzCipyj/AxrGxiTRBc2fsI1/oDNTH7/66xEL+9sDb5yj/AzbR3aoDTMgBgCvb3MO9DdQ63UAwZrrDHsBgSW989MzFe7obmAnAYNf8ES/GapvT4MGH451bQxnnOvcYjMIuIiA7vvUjCkov0aSVEbTJMslUNlP1LWt+xIbjV5/Pa1+XMm0cHy/f6ZScMcmptHD2DFNtJjeCp3rEdxtR0n/Mad6GKpmu51a4nAGEEkHYjrfLVaPYiZOmRqrssVyxkvoNzqS0soekHky+r4mCpFgKEFsNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iPUolXeLQdrBVInU0Qawb5A+BH4a310feGspIdffEug=; b=pUFxRUzW2Fc/AnMh/axl/Y9/3+DHRiKp6mugjVeysZNI3XQeQy34KCDonezUaTsJy+PEGvs0wMK5Yu1W1PlSlbKcWA2waftHmhO4z1Z3jjbsbhRCYhvE6arcoyDBsLlTaANTCb4Ntw+zKYCGSjRymJyJGRNGIdsXiYVXAafAHJ0= Received: from MN2PR11CA0028.namprd11.prod.outlook.com (2603:10b6:208:23b::33) by MW6PR12MB7088.namprd12.prod.outlook.com (2603:10b6:303:238::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Wed, 9 Jul 2025 06:44:35 +0000 Received: from BN2PEPF000044A0.namprd02.prod.outlook.com (2603:10b6:208:23b:cafe::aa) by MN2PR11CA0028.outlook.office365.com (2603:10b6:208:23b::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 06:44:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN2PEPF000044A0.mail.protection.outlook.com (10.167.243.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 06:44:34 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 9 Jul 2025 01:44:34 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 9 Jul 2025 01:44:29 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v4 3/5] PM: hibernate: shrink shmem pages after dev_pm_ops.prepare() Date: Wed, 9 Jul 2025 14:44:02 +0800 Message-ID: <20250709064404.839975-4-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709064404.839975-1-guoqing.zhang@amd.com> References: <20250709064404.839975-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A0:EE_|MW6PR12MB7088:EE_ X-MS-Office365-Filtering-Correlation-Id: d8c8f3a2-927a-4d73-061e-08ddbeb4113d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|82310400026|1800799024|7053199007|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ADQ3Truv3IPISREAfKw3FUL88jhuv+yLL0EU450GBBMm7SP/PSjEoIcrL5zM?= =?us-ascii?Q?NF0svOMEY9UCk8kE3S0dNPDrwOOjDDYSZsFIV81jgZuVL2Q8iHauG7V2UnvG?= =?us-ascii?Q?as0l7VClKO7lZRJZM/0BiwfIIbLJ0G5oexq0ycY9ZlkCk51TB9AzxQzVkiUQ?= =?us-ascii?Q?ElBZ/Cen9wio2Kwbro3W13gXXiuJAr+SepF7wkFw0WzukVLfh52Ymkcl8vI5?= =?us-ascii?Q?ZQvHP3oBOmYxI54KIWAQigmhhE1m1o6IyDylFeyqnxHjb0jpyMTctNyi5DgX?= =?us-ascii?Q?f6qWxpOOe61+2Y/JpjPb4/fbxSrgt/k8dE/kmgR29zclMxwQDlp5HYPzYwrV?= =?us-ascii?Q?/LmAcGAE8JaNZ9+vuLYoJRV8CpDLYlxcXq6NtTfjEeYQwtw0JDoNkuS1qxTx?= =?us-ascii?Q?lfcXyI5a07tTOVkIwbVsMpbZV/icwvUviC4lL3qxRks1395YWNNIqzLDX6Go?= =?us-ascii?Q?OquU+bB99Tw02I/WnlW71MpUU+b9IVyhNVKjTaUmVhmHhJ0UkM7JXib6bclc?= =?us-ascii?Q?hIKp6wwHV4wC6vfQVWB3ARRGvwPied1oQ6TrkuOGA5QL3Xb+Anv+j7Ai78z4?= =?us-ascii?Q?g6FaMnY4Wm7y9arE2cuIGbDt3JLiWQUuqhQgn6f89igI0GPz5obhlxhkdYX2?= =?us-ascii?Q?CAP7wT41TOHzCVGMkDB/sZQfKkOpPWfz3qBNf0dwzqSu7lv18KKNsVlFurpT?= =?us-ascii?Q?10KZof8P9vYt1ng1XxjG/glbQeNAC2G+t5/wZ2ZvtRocM1c5Ke57dbIDbqn7?= =?us-ascii?Q?EaKCrXvnE2WypvC2HfaW6L93C3ZG1XywqjCC7/KUfmNSfT0G6fgY6sQrsA0H?= =?us-ascii?Q?y4IrYp2Hs97TLtLDSn2GkBDKYhMz0ZKq4q6OkejZ/Lo6oKuv5bTN6gKKgAaR?= =?us-ascii?Q?9JVyjzMW3XNQv3OCvbv0D/oScMcLK3xKk+w36lfnVBrv9EopIfczsLV32ur4?= =?us-ascii?Q?Gqm4mw7G+baHZQet0j2jQhxqgmf0doxBp6z4gwBSIkHTpel2jigDBtjD6iMO?= =?us-ascii?Q?1nEd3egBHQD36Q744QCQsnD4qxeuI3ybArTXi6Paq5VHDk4Wm5dJv10GVExk?= =?us-ascii?Q?Jh0R5SUzlaHh5Z940ZSfuVotLyM8xDDNNcZMO5Et1OdXgTZd0+syikwy8eDx?= =?us-ascii?Q?z3Y/NgJJaBvCrrc+LzmkRRHDrzIjbA1JOVidTTbAipx6sqQcfWCWkaLrdkfr?= =?us-ascii?Q?wx8WgFPYKmrpCSugWDb3a5qsQDcvsN/VWpU1mWyRAzyO+PoWtDrQnLOWBW13?= =?us-ascii?Q?D1VE4hIJByw1om5IULCZt2erd2jN/9wxc9cbR3Aq6VJ2YL1Ug1UwFd7eS4Ka?= =?us-ascii?Q?YanyC8FB0F67a7omuy3QRmJjdfdNEghULRnUsZA7YOm9oxnQGT8wBe+JRKyU?= =?us-ascii?Q?Y7SHqv4RU3tu0bN8PH+vkv5tVIKj+67/zfBKys4rGx5dP1TgIU8rizsxiCfg?= =?us-ascii?Q?Picup5fuwf8ei8qXMiqy4Lnkj/9bYfDhRflDZeqyKCEMhZM6s6HbVnZNWctR?= =?us-ascii?Q?HEDr5sF7Tc+TwXZJVNNhSEptEVBzzNWKEzMzANJ3b/OQL5cTk6vL9qV/nA?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(376014)(82310400026)(1800799024)(7053199007)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 06:44:34.8656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8c8f3a2-927a-4d73-061e-08ddbeb4113d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A0.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB7088 Content-Type: text/plain; charset="utf-8" When hibernate with data center dGPUs, huge number of VRAM data will be moved to shmem during dev_pm_ops.prepare(). These shmem pages take a lot of system memory so that there's no enough free memory for creating the hibernation image. This will cause hibernation fail and abort. After dev_pm_ops.prepare(), call shrink_all_memory() to force move shmem pages to swap disk and reclaim the pages, so that there's enough system memory for hibernation image and less pages needed to copy to the image. This patch can only flush and free about half shmem pages. It will be better to flush and free more pages, even all of shmem pages, so that there're less pages to be copied to the hibernation image and the overall hibernation time can be reduced. Signed-off-by: Samuel Zhang Acked-by: Rafael J. Wysocki --- kernel/power/hibernate.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 10a01af63a80..7ae9d9a7aa1d 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -370,6 +370,23 @@ static int create_image(int platform_mode) return error; } =20 +static void shrink_shmem_memory(void) +{ + struct sysinfo info; + unsigned long nr_shmem_pages, nr_freed_pages; + + si_meminfo(&info); + nr_shmem_pages =3D info.sharedram; /* current page count used for shmem */ + /* + * The intent is to reclaim all shmem pages. Though shrink_all_memory() c= an + * only reclaim about half of them, it's enough for creating the hibernat= ion + * image. + */ + nr_freed_pages =3D shrink_all_memory(nr_shmem_pages); + pr_debug("requested to reclaim %lu shmem pages, actually freed %lu pages\= n", + nr_shmem_pages, nr_freed_pages); +} + /** * hibernation_snapshot - Quiesce devices and create a hibernation image. * @platform_mode: If set, use platform driver to prepare for the transiti= on. @@ -411,6 +428,15 @@ int hibernation_snapshot(int platform_mode) goto Thaw; } =20 + /* + * Device drivers may move lots of data to shmem in dpm_prepare(). The sh= mem + * pages will use lots of system memory, causing hibernation image creati= on + * fail due to insufficient free memory. + * This call is to force flush the shmem pages to swap disk and reclaim + * the system memory so that image creation can succeed. + */ + shrink_shmem_memory(); + suspend_console(); pm_restrict_gfp_mask(); =20 --=20 2.43.5 From nobody Tue Oct 7 14:56:32 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2086.outbound.protection.outlook.com [40.107.244.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 570EB275859; Wed, 9 Jul 2025 06:44:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043487; cv=fail; b=j+VVOqoKNfwX0pOs9hap8uEqrql4nLYtbk1siSBYElD6RfYNbfNUlL/LlZN3jD4Y+dNXxCaAPKFSuke360dOTmDBCBH8JN3SDORU6Nl0gMZcWNUXI7n20zEU/SB70sksA4K6iwUMKIn2WwbZM7yL3mqfv05Qfr6AWxyFNIwp7q8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043487; c=relaxed/simple; bh=NwFdpFYj4gBtv+cLXUE2cXwh6BPJ9QfZu1PS1VBB4uI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lK2MTbe1sY6OeHZNaM2DN1OhM23u16rwmDTXD7kdk7a7Uh7tl+qYhkVwUa3sW0aHzx5xjuzqnp887ZPDBuTdIIOb+xVAIK8CF5riifNtGeBz6X8gaYT0fhOQiL05+Omhx5dqD7w+Eyhjpuzoi+3kqhM66rA5saSnz2ptb8q+jII= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=FYJbhbuk; arc=fail smtp.client-ip=40.107.244.86 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="FYJbhbuk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LyqmykfvESh6aetbT/UJ+Btg5OVt7ag7860ENS9Cc+qhK2S7T7u4vD/3PK9bpS6LMgcqHJew1IWmWOlyz37gQqT8O7k3nbg8o1TQmJUlZxasccEO7NSiIR6X4wKOfGiQ2TICG+lk+E9k//NUPxGTxhFfAtNmnEgZ6C9AJOAUrKLnx/mqjLuCfwf49XEy7mKa4wAD9hDRvWdxqmm1hd2cRT+QPAxxSOmMwCcXetEYtIa/SmO+oHwTAf5gTVuEZpZ3dTXCpB8qT+lapS7v8qAd3mmDFhZ4/geq9M+sR/PFbcR6PsZrfFHtjwy7JIMNbS0MBNDO3oUJiRxM9okB+pvtSA== 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=ljj7zchQsTgffJ177SfkG1Fp1JkVAGve+OKBjCkBdnc=; b=ARh7MgH1Ye6QmSBPqzt66lsXO4HdU4UMcJ8QbOHrqHv7K1wp1KV9cTzZI+djlF/6wSXaOPN19IHTtG00HRwvkKZjstl318exHInX7kUX1F6jF3SSJq4JZcY+cyZIj0UDA6PsPAy0N1cwZv+wiXvgYJSznc3tS3znC1/rOxEmO1KP4bzlBLNeUQ8H6Yerm69M3OuR/GCEI0+wygVXiVTTlbdf50cD8NY4uMNobAN4nT86xh1JYpcs7oooYjY4P3cRhV9hyk3j4+KtXrP60TlHsclnErTfdopjZ+iioR8fAFQsIly5LTrFgaNq7OB5iXhOQONm0/mU50Bw+sCdz5oa2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ljj7zchQsTgffJ177SfkG1Fp1JkVAGve+OKBjCkBdnc=; b=FYJbhbukfMctJrVI89lk0RGTMsEWAGwfPDz0nbLuG13gXp43OdF7LwuX9rZZ7MvT+cfwaJCvfOkbdOAm+sR0mYqYtLxdl/uwyYV6HYqlsrtksp9Qeg5+Knp3GI4sL448NBOEm5V6DV1JDvw4fwDAarmHXYI9vGCaIsJFz4wqix4= Received: from BLAP220CA0001.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::6) by SN7PR12MB6765.namprd12.prod.outlook.com (2603:10b6:806:26b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 06:44:41 +0000 Received: from BN2PEPF000044A2.namprd02.prod.outlook.com (2603:10b6:208:32c:cafe::bf) by BLAP220CA0001.outlook.office365.com (2603:10b6:208:32c::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 06:44:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN2PEPF000044A2.mail.protection.outlook.com (10.167.243.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 06:44:40 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 9 Jul 2025 01:44:40 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 9 Jul 2025 01:44:34 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v4 4/5] PM: hibernate: add new api pm_transition_event() Date: Wed, 9 Jul 2025 14:44:03 +0800 Message-ID: <20250709064404.839975-5-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709064404.839975-1-guoqing.zhang@amd.com> References: <20250709064404.839975-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A2:EE_|SN7PR12MB6765:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c216511-c823-4808-15b0-08ddbeb414c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|7416014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3GKu4RGOLFFA5ijRwI27ZjiGjNYAfxKHBkxXaTQTRqJgeYnqAPsXMiNn31z9?= =?us-ascii?Q?EjYKLyY0X5M/llIspEPlwqM81r6dxrmlrY0AN3wfavlvcN5P0wTNyx9yiYus?= =?us-ascii?Q?vYlzsgTZLDfeRFRSxhYnLvaUw/W+54iIQ8xJdfYHvxvRTQI27bRu+KrZmLOe?= =?us-ascii?Q?W1VL+wUvCEa/SBMaavZdv2OkoCDaqDCn4DVcziiG38ASVSsJw3H84PtcNr4H?= =?us-ascii?Q?WZ3ugn7IZBPzCix624Z003iOdJflxH8ON62KLoQwri1pKOvCePmBOqtuRzmG?= =?us-ascii?Q?bcJgSde+EreEQ2IdcsulGgu4ieuI295tw8JK3JCZcOkw97SZR1mANPQfSL7Q?= =?us-ascii?Q?0PO3/aT7EdWbUy0u0W91q127pBzj0XHXmO00N05khb/Gd8CNgSTZZL2a62td?= =?us-ascii?Q?9Ztk39E4S0kwxp44KBbTfBY+hAFJ0XkDvOHipukz8OvYpEoFLmOkrOVTTUfC?= =?us-ascii?Q?C6EG2aH8BdO+U3Hu3b542wtyOvezLEQiJzKiftyWlSeJSsMQEOIt+ISJtc2L?= =?us-ascii?Q?H8/pbNQMe80wp+GHilwt2130x1rMl/F1P2q4qO3B7/WVMc7Pt7XHk85EXtx3?= =?us-ascii?Q?5CMme8fqDGAELC7fs/gjRAvlp/Hn+raV31/VPr7NLwEcgew9jI2QqTNzd13K?= =?us-ascii?Q?WSSd0T7HBwX9c8ZDHI7YEZS100AQp5DLSruDLv/63ztsfHBB1GXFyL79R50F?= =?us-ascii?Q?0H8Vs6lm0IzkK7y2pAzMkpsMmAJCkJoxgSZN1wYn/itfU+8YiVky6FdSj+va?= =?us-ascii?Q?HLzlTAKtvYMlWMfCrEC27CWEsyR8GyIXkrMsT9pcugfu6vNgap5ghD5QfVlA?= =?us-ascii?Q?7XlQyldxbFDbXBcDsV0qkN9TyFDmtYytSe95tiioGLtYAt66a01pkASihADS?= =?us-ascii?Q?8Cqceleiiz+YYWMZDL9pSFBQR4mhZcwcN5ZzPLy0ytA00uhSGvJgM+zHfWCe?= =?us-ascii?Q?VaA0BqT2qHIJrV2n0NpF7+Nrin07SJsQ5bKds4aqnONciicGkuHKGnsCRC9q?= =?us-ascii?Q?ZgynbxiysYI398a9wg0TKwYkf4k820lb4YnN4Yt6gpkUA1B0QwPm6XPEOkXl?= =?us-ascii?Q?GgqKWT1ORbcExi095KEhCvrxLrVPwfPDzGi7g3MoGGHMcH3crE9v3XPKynS1?= =?us-ascii?Q?LsihOSp7DGP3YxIDRLyOoaFYkNJCoFPQbyTzRkIGIwcPnUwUot+NoFBouNxL?= =?us-ascii?Q?tMeNSTYkr/ObYisHDPuzlaFpxFc/AB8yT0HtqpJ2/+8UeMDE6iMtqz7yPyha?= =?us-ascii?Q?LJXVkMwijNf3vwlz4i17QzNf95dr9zKTH55TBjt6XjBmnWSlaZgdDVLiXAsY?= =?us-ascii?Q?JiAaqncKFDQub+hdsNJ6cmyKu+eQ5I3ytAV7eBF6XdaWEmkSeMXNR6snHqfq?= =?us-ascii?Q?QARrgmsPudj5AmGZmRZmkCblftjf390ZBTjJpin/jZdrOghFx9mgMdeuHhQi?= =?us-ascii?Q?iZXTx+oUIltiEWHUMw/7tLE7BcQxmPsy1No6kxBJpNV1al5BDY7y7i3dSe0j?= =?us-ascii?Q?ccY/3KrgoTBPLwTyRH3bDKx03R2fVHClxr5kyirHGqmE6xdly4soXWc+rQ?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(7416014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 06:44:40.7752 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c216511-c823-4808-15b0-08ddbeb414c3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6765 Content-Type: text/plain; charset="utf-8" dev_pm_ops.thaw() is called in following cases: * normal case: after hibernation image has been created. * error case 1: creation of a hibernation image has failed. * error case 2: restoration from a hibernation image has failed. For normal case, it is called mainly for resume storage devices for saving the hibernation image. Other devices that are not involved in the image saving do not need to resume the device. But since there's no api to know which case thaw() is called, device drivers can't conditionally resume device in thaw(). The new pm_transition_event() is such a api to query if thaw() is called in normal case. The returned value in thaw() is: * PM_EVENT_THAW: normal case, no need to resume non-storage devices. * PM_EVENT_RECOVER: error case, need to resume devices. Signed-off-by: Samuel Zhang --- drivers/base/power/main.c | 5 +++ include/linux/pm.h | 85 +++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 40e1d8d8a589..7e0982caa4d4 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -62,6 +62,11 @@ static LIST_HEAD(dpm_noirq_list); =20 static DEFINE_MUTEX(dpm_list_mtx); static pm_message_t pm_transition; +int pm_transition_event(void) +{ + return pm_transition.event; +} +EXPORT_SYMBOL_GPL(pm_transition_event); =20 static int async_error; =20 diff --git a/include/linux/pm.h b/include/linux/pm.h index 78855d794342..7e7b843ba823 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -471,58 +471,59 @@ const struct dev_pm_ops name =3D { \ #define pm_ptr(_ptr) PTR_IF(IS_ENABLED(CONFIG_PM), (_ptr)) #define pm_sleep_ptr(_ptr) PTR_IF(IS_ENABLED(CONFIG_PM_SLEEP), (_ptr)) =20 -/* - * PM_EVENT_ messages +/** + * pm_transition_event() - Query the current pm transition event value. + * + * One example is used to query the reason why thaw() is called. + * It will return one of 2 values in this usage: + * * %PM_EVENT_THAW: normal case. + * * %PM_EVENT_RECOVER: error case. + * + * For other usage, it may return other values. See :ref:`PM_EVENT_ messag= es` + * for all possible values. + * + * Return: One of the %PM_EVENT_ messages + */ +int pm_transition_event(void); + +/** + * DOC: PM_EVENT_ messages * - * The following PM_EVENT_ messages are defined for the internal use of th= e PM + * The possible return values of %pm_transition_event(). + * + * The following PM_EVENT_ messages are defined for the use of drivers and= PM * core, in order to provide a mechanism allowing the high level suspend a= nd * hibernation code to convey the necessary information to the device PM c= ore * code: * - * ON No transition. + * %PM_EVENT_ON: No transition. * - * FREEZE System is going to hibernate, call ->prepare() and ->freeze() - * for all devices. + * %PM_EVENT_FREEZE: System is going to hibernate, call ->prepare() and + * ->freeze() for all devices. * - * SUSPEND System is going to suspend, call ->prepare() and ->suspend() - * for all devices. + * %PM_EVENT_SUSPEND: System is going to suspend, call ->prepare() and + * ->suspend() for all devices. * - * HIBERNATE Hibernation image has been saved, call ->prepare() and + * %PM_EVENT_HIBERNATE: Hibernation image has been saved, call ->prepare()= and * ->poweroff() for all devices. * - * QUIESCE Contents of main memory are going to be restored from a (loaded) - * hibernation image, call ->prepare() and ->freeze() for all + * %PM_EVENT_QUIESCE: Contents of main memory are going to be restored from + * a (loaded) hibernation image, call ->prepare() and ->freeze() for all * devices. * - * RESUME System is resuming, call ->resume() and ->complete() for all - * devices. + * %PM_EVENT_RESUME: System is resuming, call ->resume() and ->complete() + * for all devices. * - * THAW Hibernation image has been created, call ->thaw() and + * %PM_EVENT_THAW: Hibernation image has been created, call ->thaw() and * ->complete() for all devices. * - * RESTORE Contents of main memory have been restored from a hibernation - * image, call ->restore() and ->complete() for all devices. + * %PM_EVENT_RESTORE: Contents of main memory have been restored from a + * hibernation image, call ->restore() and ->complete() for all devices. * - * RECOVER Creation of a hibernation image or restoration of the main - * memory contents from a hibernation image has failed, call + * %PM_EVENT_RECOVER: Creation of a hibernation image or restoration of the + * main memory contents from a hibernation image has failed, call * ->thaw() and ->complete() for all devices. - * - * The following PM_EVENT_ messages are defined for internal use by - * kernel subsystems. They are never issued by the PM core. - * - * USER_SUSPEND Manual selective suspend was issued by userspace. - * - * USER_RESUME Manual selective resume was issued by userspace. - * - * REMOTE_WAKEUP Remote-wakeup request was received from the device. - * - * AUTO_SUSPEND Automatic (device idle) runtime suspend was - * initiated by the subsystem. - * - * AUTO_RESUME Automatic (device needed) runtime resume was - * requested by a driver. */ - #define PM_EVENT_INVALID (-1) #define PM_EVENT_ON 0x0000 #define PM_EVENT_FREEZE 0x0001 @@ -537,6 +538,22 @@ const struct dev_pm_ops name =3D { \ #define PM_EVENT_REMOTE 0x0200 #define PM_EVENT_AUTO 0x0400 =20 +/* + * The following PM_EVENT_ messages are defined for internal use by + * kernel subsystems. They are never issued by the PM core. + * + * USER_SUSPEND Manual selective suspend was issued by userspace. + * + * USER_RESUME Manual selective resume was issued by userspace. + * + * REMOTE_WAKEUP Remote-wakeup request was received from the device. + * + * AUTO_SUSPEND Automatic (device idle) runtime suspend was + * initiated by the subsystem. + * + * AUTO_RESUME Automatic (device needed) runtime resume was + * requested by a driver. + */ #define PM_EVENT_SLEEP (PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE) #define PM_EVENT_USER_SUSPEND (PM_EVENT_USER | PM_EVENT_SUSPEND) #define PM_EVENT_USER_RESUME (PM_EVENT_USER | PM_EVENT_RESUME) --=20 2.43.5 From nobody Tue Oct 7 14:56:32 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2044.outbound.protection.outlook.com [40.107.223.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F325827877D; Wed, 9 Jul 2025 06:44:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043491; cv=fail; b=iAkvStukp4z+b4b6HrfzNx3z9pjjqZE5v5nglrGDUgFXuMlpyBI1Fqo4oKHg65kJ9uCaoaB5jWvhn3gCBS6qZTQb03mzmUTThTD7UzHTSRESMqkfrxmhN3bo+E7+NvHVFeEEraL609+57HyCbSEXl9qCxphmiNveq89pH038Y8E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752043491; c=relaxed/simple; bh=+zR5edlwMmi0hgM1ONGRaSn7Y+hjmFJf2IqjcILk+FU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mx3VP2TExraTBO4moi5dYW1/gN19hXZEfLWM5+VwpsO+p1TZJzjsL5ORxUGHo0ObhZRpb4YfmJM2WvhEcSp2s9WKByrMVIFRd1NJzSN+h21ZVRv7cxY6htSZnogvWoKbk6ybbQOxqDNg0Oxc4KHP+plJs6lHcFhTuXUXbhkSt4E= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=OzZfvsUX; arc=fail smtp.client-ip=40.107.223.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="OzZfvsUX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m8sbCT5KDFruxdLAWCWXSHOpPniNoRxc2jNjUGSARXfcj7Jee/ub9k3+vIzOzitTAd3BzxE/2wQGOHlFzz+2hRa1pQk50ETe/ZtzsbAZmBduRpx8JTZjDNgFs0MjwGNiqfVXdDLKpd+2uBYR6aIZwLL+FCV/fFhJ6F7keRujUXZ41ZxZqqf/dnKhKQcjzvG95RvZ3GN0ZXYwmzZnI59N0szgWQDt+7Hs+aX6DQfIiPuvAVVFwvtFdB7fUDGMfWPnEXWbact1/mGxUYKKOShjLUMtNagAdpUt1OPcBk5OL/y3qey39IfViGGM/iX7RsoHf0A5Yvnj0uoKfbkD77Z1hg== 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=KkJLoTId2FA37bRFRZ2PSUtBrJasZON80ybgzxWyU40=; b=EhuoZJd4SkJhUyXhuvpT3S0A9ca22gEAKZ8wYxNDBpDJCSdZTXEc1wcY/xDLiFczmnc3pVIQKn4KEtjJLA/Ixc1/xP5zhQlOQHIhY+nPQXOj2gc/fgZLqP9/fWpYYPRkW3ywQagjuXDW74xszFVOqXYGElnWn48cmr7Ex0LkazT0w9jfwZjlXU0KemwII1kqFkkri7xdyecGj+2mMvXcwIxFY5j5/IRRu50i22HYtXO5m2/k0666YMm1HsheSsH56eazqMa8GNaQIDCVlYYj12DQzqYAbAz8P2+pt9DiIplNTaY+OdY5koai1TeFGEH8XtiBMstKEpICufrLSIlmHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KkJLoTId2FA37bRFRZ2PSUtBrJasZON80ybgzxWyU40=; b=OzZfvsUXl0EjimMRQAug4DybKT2AL1/qrvs1A9QK6Su9tmd2QyE6/98MlngoUXQNr6IJbFgTEsee1pYrL497agqNH9QL1H5afRBHHbj9SFQnkSlPt5s3yVizLe7K70qz3PPJcOzR7YglBxZQHLyI/QL6tDfMpJ5HnlfaISNghko= Received: from BN9PR03CA0177.namprd03.prod.outlook.com (2603:10b6:408:f4::32) by DM4PR12MB9072.namprd12.prod.outlook.com (2603:10b6:8:be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.28; Wed, 9 Jul 2025 06:44:46 +0000 Received: from BN2PEPF0000449F.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::f9) by BN9PR03CA0177.outlook.office365.com (2603:10b6:408:f4::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 06:44:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN2PEPF0000449F.mail.protection.outlook.com (10.167.243.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 06:44:46 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 9 Jul 2025 01:44:45 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 9 Jul 2025 01:44:40 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v4 5/5] drm/amdgpu: do not resume device in thaw for normal hibernation Date: Wed, 9 Jul 2025 14:44:04 +0800 Message-ID: <20250709064404.839975-6-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709064404.839975-1-guoqing.zhang@amd.com> References: <20250709064404.839975-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000449F:EE_|DM4PR12MB9072:EE_ X-MS-Office365-Filtering-Correlation-Id: a3ad93f4-f0ee-4285-52db-08ddbeb41814 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?eccAdfrHFvW+kc3UgIkS/8aY0Y+vXHOn42BQe1oiq/J+kCNPmcCtDIMYuztJ?= =?us-ascii?Q?hCZN8ejboFzWRZAy+FHUVIO0+K9Sg7mBjshIA7fLmdfgLfmNjmTLUKz1aSaA?= =?us-ascii?Q?v/K89RLKDAlQgLKfxVHzJJkrGpmDJBYsUc168Euyyy0TnkfSmWA5+gHLQi33?= =?us-ascii?Q?rLIgnrH7tHfYNW4QaDGBI/xI/nFan7GWlTikUiE+nuCpZC5zf7AMTkpKL3nH?= =?us-ascii?Q?95R8Lk+GSPD+P0mbhzuSwCZJRbiitjps7HDWZ4kK4KPmrmjWWI7FqXhDET5X?= =?us-ascii?Q?RTr7YJtQQNZa6yOcQZUe2/A3cjyr7aggjgam8JMVJC8CMNyrnclxsky4lEFy?= =?us-ascii?Q?c0Onb0DGfjPTpRp5UuJb9o1g/EoFn4MUet7ECrWUos3K7OlMwSn5wmIIYqjj?= =?us-ascii?Q?IFV6vwUYpC2QjDKc5Gv/Z1L+CqtpELkKzysxNtfzVO9ehIk6be5zTVqp9huE?= =?us-ascii?Q?4E9ud5hLHU3NrUY9IPTRHjQMYxlys29bsHvI/BzlM1CrWlrQ1qkA60gJYPq2?= =?us-ascii?Q?f2UlqgLK279nDA/NxJWYf0D2+OByVU/yWeVQHU3++/38Ywsx/oF7nk7ZSzmP?= =?us-ascii?Q?Gs7CE/4L/YTX7cp6zpa7PM7RwYRMXC9ubbOyA/1AVU2M/En7JEEwxAi0c5zU?= =?us-ascii?Q?KV1qdFzK88c56j8laRJpQls0Hd49g5zCr3YFTQe39VabN/1EwDdo5tF1meor?= =?us-ascii?Q?67VR8yPCt+XKpbfmj4i2k1EhrR6fbr4NMNvUeXvNLzAvZlDQ01VSVJuKulHi?= =?us-ascii?Q?VzZ4qzo6J+F16291D7fyQH8Kt8FMRoyCirQFXzy3JRq6VrT57vvKJZegGA5W?= =?us-ascii?Q?onA2ir0tcibO0O/f0ylfXS5k+5AwbLLrO3VwJ7ZHWae01mwiQP4y6Q4bwXdH?= =?us-ascii?Q?Q+oEmxzmyYm2C1jKG5SedDRL6ix8fHoVuFMPuCbg1O1RLJJIKYv2COxSiLjI?= =?us-ascii?Q?qUkUvYccDB6dbMYQ6nMj/xsj9oZgDYhTBxEWM6iZu5DyyAySD4a3tetg7C/v?= =?us-ascii?Q?N2GgwbNssjbslrz17GhxYjA8aXAgvyRmtB1pM12JUi1s71Ymcx4iePZQrtcp?= =?us-ascii?Q?JEdM+0xYrvw6pxglAwuGKxNk9mcFu1LDIziG8QiT+GOeGiwXrmsAQ6A17CU9?= =?us-ascii?Q?8DcpxDEFHjiQtCRNP9NMMBN4uBrU0i2faS17bjx7UM6MQJqUneMxVLG+PtLx?= =?us-ascii?Q?YlLRbFF7OwJS7JcssiLzNPjVCV50LAIKXX7AvbZ+BZKRiQvVJE7U9AxWQAAZ?= =?us-ascii?Q?btb8sibJh0SfH1m8zRDzmAwXlHrpKQy+ToWle/AZg8pnyJxPhGkMg17s11qq?= =?us-ascii?Q?uccuHfTUShFCyITKQ7qBMFNn7T9xyW6c4sOMElMojLVDJJTdvJGBopA6atPk?= =?us-ascii?Q?5q7O2ifrSK5ay1siCswxEkEA98rWidksC2y18yQZx3j2iamLhimTc4sbOa/i?= =?us-ascii?Q?Tvtb9IOP8S9Ar9Qsc3N/nH9U/ztroO/oSMn+08iAVlJTgG6wMH9/hGSK0PJc?= =?us-ascii?Q?CNsjUHTK/zKq+zJE03a02sPdpyNJdovDRGwKgHWJy+9zdxEk8G4k9e3Y3A?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(7416014)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 06:44:46.3428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3ad93f4-f0ee-4285-52db-08ddbeb41814 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000449F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB9072 Content-Type: text/plain; charset="utf-8" For normal hibernation, GPU do not need to be resumed in thaw since it is not involved in writing the hibernation image. Skip resume in this case can reduce the hibernation time. On VM with 8 * 192GB VRAM dGPUs, 98% VRAM usage and 1.7TB system memory, this can save 50 minutes. Signed-off-by: Samuel Zhang Reviewed-by: Lijo Lazar --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_drv.c index 4f8632737574..c37285a8b2c5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2541,6 +2541,10 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) if (amdgpu_ras_intr_triggered()) return; =20 + /* device maybe not resumed here, return immediately in this case */ + if (adev->in_s4 && adev->in_suspend) + return; + /* if we are running in a VM, make sure the device * torn down properly on reboot/shutdown. * unfortunately we can't detect certain @@ -2654,8 +2658,17 @@ static int amdgpu_pmops_freeze(struct device *dev) static int amdgpu_pmops_thaw(struct device *dev) { struct drm_device *drm_dev =3D dev_get_drvdata(dev); + int event =3D pm_transition_event(); =20 - return amdgpu_device_resume(drm_dev, true); + switch (event) { + case PM_EVENT_THAW: /* normal case */ + return 0; + case PM_EVENT_RECOVER: /* error case */ + return amdgpu_device_resume(drm_dev, true); + default: + dev_err(dev, "unknown pm_transition_event %d\n", event); + return -EOPNOTSUPP; + } } =20 static int amdgpu_pmops_poweroff(struct device *dev) --=20 2.43.5