From nobody Tue Oct 7 14:04:46 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2042.outbound.protection.outlook.com [40.107.236.42]) (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 7B54628B51A; Wed, 9 Jul 2025 10:05:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055542; cv=fail; b=jcHfF9M7LdViHkXl44z+mFeXE/hwYY0AeXoxtOHtlRgKei1Zl08qoy12DpFIxrGbN4FeJg35JLSbmaZuHWawcz1+36uSHu2UeshX0RLD7HC6rlc3tg2veXgtFUY6ywWgiPj1oO/CByw2h5Yac99Poz0LFY6fQAChkjlgfS3vr1A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055542; c=relaxed/simple; bh=sFvVgaHTBobDA41pYekmyMXs6AFmgM+mmvTb0dnRpYs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GTbaoLYKBz0yFKohgpRLjUp6cJu8c2IKTtUTz6wXqpd+kuWsudxY3Deh/Rt63ckeLorp+pg8Ng/BbDvWYWpp0nxeM129P4nFCgqz+gJKFi7yJ/QHK9n29wUc6upmUl+s0EWM5qwqLEcTHFOPDR4nv36Fj230Q93D0gfP8raF1IU= 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=VYZVsKZR; arc=fail smtp.client-ip=40.107.236.42 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="VYZVsKZR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GI2GDjCV0TLb6G6YbIbIcf6VSgdkOV9HBttAmAQioin2fSwIk3k+juTyQzm+haFGoykgxsbpZeWBKGIPw4axT6eZ0KOLAk0Ni7dYY5mWYBpzF3IrW4Nu95ZIy7+70TWiPd+rEciAEem0SwtVFl0ivzrQTMqWhRONyJYPPgs1LErgg0ulalRaRXySS791QspnXuSYmlNhCh0vO7yg7XU61Es+gsk0vH1TDwJA9IV6cNmKJdtYKGp+4D7DJXQ2YyE3zH4xQXjy2S4ZgJ/VQSeKkq1eJTsCIycI/iZjoCqCyLsM59isEx/vPQkncK4RZn4YnomBG4s5QYh9d/PuhIVRJw== 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=XTRSVa2DGfIa3N2ZrPVZSMaNXu2+Au1JeBXVqDuQKsU=; b=SuIUEhUK2hPE41tBC7Ei9jC+x+gF5zdgN2eTZ3a7T+sHr3aIwEaqxIU7IQPIPomeiSEPK65RFROFzm1lj2ozcObZyItYPdAE0xKGEhTbdXKxoRNm5ejSz0jceMCrIK7rfYrVLEgDKwxveAGBUkVDQ1fnzuCqfg21TbOC8FAdWYe/M6EVJGlcSu44zP8Pp+e3WxPcMvTW7SiQPIrrtcye5kpxN7VK8kg50m7ePj6fu8vhFJL0HFOOteKu1XmKX1RVAtK9PvgpfhspwSsWPU20c42cpXngx9qjSaV+cFyply6c140hWejYWbFXop4q4A4i/hShgxYDNWC2LliodennPw== 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=XTRSVa2DGfIa3N2ZrPVZSMaNXu2+Au1JeBXVqDuQKsU=; b=VYZVsKZRAziE1puWUKxrwtDq/wWn3Mxak5FSy5QAWRXbJIusNYwqG8U1ljKDcIp6xFRZ7DL7OzHtEKn8AnYNZh4He3LUQiqboiNloQRhbgbgx4yCyniMdg+ikPtw18SCTXQ9xLyDmtAHdaLs4qEO66k8eNPcJTf6zntKZSZUBBo= Received: from SA0PR11CA0122.namprd11.prod.outlook.com (2603:10b6:806:131::7) by CH8PR12MB9791.namprd12.prod.outlook.com (2603:10b6:610:254::14) 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 10:05:37 +0000 Received: from SA2PEPF00003AE4.namprd02.prod.outlook.com (2603:10b6:806:131:cafe::5f) by SA0PR11CA0122.outlook.office365.com (2603:10b6:806:131::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 10:05:37 +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 SA2PEPF00003AE4.mail.protection.outlook.com (10.167.248.4) 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 10:05:37 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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 05:05:36 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) 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 05:05:35 -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 05:05:30 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v5 1/5] drm/ttm: add new api ttm_device_prepare_hibernation() Date: Wed, 9 Jul 2025 18:05:08 +0800 Message-ID: <20250709100512.3762063-2-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709100512.3762063-1-guoqing.zhang@amd.com> References: <20250709100512.3762063-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE4:EE_|CH8PR12MB9791:EE_ X-MS-Office365-Filtering-Correlation-Id: f25d19a0-abaf-4b22-ee8c-08ddbed026e3 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: =?utf-8?B?WFJKL2R0V21IcVE1cTBJZndQU0g1bVk4QmVqYUVXZ0xCbXJHelFVdXZ4eG5Z?= =?utf-8?B?NXFQQks4WURTUU4zZEZmTHd3Q1V0NEZZSC9RTkxwQWw0Y0pmN0ZnVHNFbHRm?= =?utf-8?B?N25DZ2hEYS9MT3pzVTN5cFZCTFMrS2dMcmU4bWhvZnl2QXBuNFc5UW43T1hU?= =?utf-8?B?aXhkUVNPcmNkK1d3K2RHRE9vbmhjdGZsazN2OTdyN0ZjNTJaYmhURC8vcTRG?= =?utf-8?B?Ty84eGpCS2ljS2dwS3RDdWhJNUxpcTJ0TXBPcGtMdFd1QlNVR0pkN1p0ODVl?= =?utf-8?B?YnNLQnFaRUZtUWc3TjAyM2xyNEFxT2QzN2dWcnp5MDQ0RmdMc3YvZHpMSGp3?= =?utf-8?B?MVM2NHVXcmk0M1pXNHB1NXRFeXM5UWRNdEZ0TzAycStoVFRsQnhXQTJWYWt4?= =?utf-8?B?SDRIMlhUank2czJ0YkhMVlNZQ28zT3V0cGdIa0d0QzYyUi9DM2RQY0x2M2FU?= =?utf-8?B?NFVaY0Z5YW9wb21QazhnNC9TcFE3U3lLcDBUaDVPeGt6eldNOXRsSEI5NjVP?= =?utf-8?B?ZllYdXRLeDVpaHVBL0R3ODFyYWVrOGthUEpjbUtSOG1RcGlieVdFbGMvT0F0?= =?utf-8?B?WUVOd25MN2xMZW15dmZzaGtYZmpNbWd4SEZFYksxL0RDb1B2bnoxWW8yTmRI?= =?utf-8?B?SGJ6blIzUWV2SGdSVDZxRGJENDRKS2FBZHdTckZxalFFWnczR3BGQzNSSG5M?= =?utf-8?B?NlIxT1c5VVZlOHhLQ3lNQzExemhySVR5R3Exa3N5b1NmOXpPaS9vYmxXWHB3?= =?utf-8?B?TlhqeUNGWGRla0hvNmZ3SThHVVpmeXd6QXpnYUNyNlhaSGhBTlpMeng5d25Z?= =?utf-8?B?a2JHUTcxYzB2Tk1EKzlUcFE1RXdIVzVQeUUxL1BPd1RnVjluRFpKRSs3WnBT?= =?utf-8?B?a1Q5M3VPbHJ6b0N1R3A5QTRQMUw3ZGdjVjNaVENmK3Y4WjJFNWJWcGFiY1cz?= =?utf-8?B?b25YN1A0U0dJbk9GWlBaRndwSm1JWFZGeGlCWDQwN0gwRytLTWdlcno3d3dC?= =?utf-8?B?a1E1TnNkaHZVQ0d3amg3TnFsT3VTSHFiTjJVZC9xd0hWYTFFdVpQM2JJY3c5?= =?utf-8?B?eWxrSGRXTXM1cnVxZVVRL0U2YytKcnc4eUNiaVVqdXliRkI5eFFhMHRMTWhT?= =?utf-8?B?R3dnVVFQZ1RZcmdSem5IeThMWkw3aVpZOGMvNVN3Qk85YnUzdmtHcWVmYzln?= =?utf-8?B?QjZFT0Z5ckw2YW43cUtudHlzN3hIb1RTWXp1NDg4ek82T1B1SEdOY1krb3Fr?= =?utf-8?B?Zkw3YmRwT0VBTENjQnk1SUtYQXBxNWt0WklNcHZiTjJKWmIwcEtBS2NvbW05?= =?utf-8?B?eDRhb2lmYzNNSmlHREJUNTRpTVh6bUQ2MlV4QzFTTER4Tm01cVNJdFI4VTcz?= =?utf-8?B?Y3F1azQ3MW1yVzBWT2NwWFRHcjdMWFc0ei9lck9OZm1lUThDbXR4UXdoMmtM?= =?utf-8?B?UXdkTUt2OHdZdW5wN3doWUVxL216UDBXZEppVmlQVVNwaG5kMmU1Wm9zVENW?= =?utf-8?B?TkF3VUtqYk40R3BHdkFPSzk3Q2lkWENCOWtVOGZqUE5XU2ZqOEZiWG5iWm03?= =?utf-8?B?OHZaR29pbmUyWCtZd3ZpNUgrcVMyVzFYK2IwdEZwSjlsczA1NmNOc0VxN0hL?= =?utf-8?B?S1MvdU92VE9VU25YNzRjcGg0RVhoVnVnck1Qb25NOUxFNTk3QmJKZlhEUkpS?= =?utf-8?B?OVlyU3ZOOEd0QUw4SXN0Tm91N0w1YjRSaFpCSTYxZUg5dWZLU1kvRXdEUDhp?= =?utf-8?B?UzJIdGpvbXpQMnAxakxFSks2UGRUQUVSVUIvM21Kc2UrOUQ1UEtpN0FXb2ky?= =?utf-8?B?V2tUeXpPdTAyb0s3djJJL1ltM1pJTlJFVGQ3RU9KZkJhQXg0UlNpbi94OFpy?= =?utf-8?B?K0lhYXZzUDVDRnJtTDR4VnUvMFBVOGtQWVRBbWtYTXBMcVRsNlF2UXNYc2NN?= =?utf-8?B?bGg5a3QwSzFHQ0FwZnJYaU9kcDlEajBnaGV6SjZpZjZCSGZTZjVzUm1DYWdr?= =?utf-8?B?b1F3ODBpWFJ0KzBpSWdwNlZtSlFFbkt0Z2kyK3I1RjRpTlBybTBnL1pMYWRs?= =?utf-8?B?akp1VCtYOUdDa3NLcUJRUWxwUWZPTy9LUlNHZz09?= 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)(1800799024)(36860700013)(376014)(7416014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 10:05:37.0768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f25d19a0-abaf-4b22-ee8c-08ddbed026e3 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: SA2PEPF00003AE4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH8PR12MB9791 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:04:46 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2086.outbound.protection.outlook.com [40.107.237.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 E4BED28BA92; Wed, 9 Jul 2025 10:05:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055547; cv=fail; b=uTj5nUYU67SLW4C9mytjQu9RayOdyWJGi5GotSEJRiINcL1hRaTVRrgkJe5gWTsck67ZcROagwjVYHle6BPsB/kUNYDgQ/FYjq9UUv1T0uW3K2KjpQEbPiLAR4IEfYOG/LS6Hu3RbbiiKtGis2tjDChrpqrLEidc8QSoUc/4XOA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055547; c=relaxed/simple; bh=TV/azgZM0123VmrHV/+ukjn1LiBjTeWNWme6wukM2YU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OlD0C9UfinBr4pEOhlN0qksJzBy5bedlUKEwK5t91gTB7QrRlD8GfbIAtNIIhJxi+rmxjj/oloArNcefaPX3xYPSSE+G2osjjswHsdxFNo4QBYwPI7BQrqu3chNb4axHGT1O5W+CJIMkV8wkS1O0hy0Q023Z5Uww2X3SVmTtx5I= 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=Hyok4LuO; arc=fail smtp.client-ip=40.107.237.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="Hyok4LuO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tzBgrAgzGcGvEq2MkIC13Bcayai8FcD74+cfLnwKh8HUAnyTpzHmlRQV9JANnKskYG19OgfzkXvnXbtUi/4ALLVy/qCd4GFMIgbHTLfuD3YNLcrkQAe4F0DE0KOCcovPmXwtgWSiv5i8s6wDwZOCIhIYROupwf2OomBnXQqyOwUY3rnf955kuGyI88cqXSHd3LgUCYhoCb1De05S9wS6Psm9QDFUE49w59+3gHF/KD1RsHGrZcsr/Hn1F5dWqVwYpVIEtJmHPm4CAElVodBKZRxaa/WwLcyqH4C3l4sAUieamJOjpbSVqzPh1cnlL1SqpARHmpOLMnlPWebrn9T+yw== 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=LlEVCCXSdPCupyO6mXkTgptWibijrRqAdwnkg2tNTzQSBO698oOnKO+6im5gJfDINU/NtJOCzjqGATLeItyDr22HcQ/xDI+kk0B+1zmL0+yYGl4hJXruBnAfDWrGlTngY0g8NLfhY1SbFhAfGJuvVesNThoDGEoZsqx2PuS1qWs8rpn/C0BrGZmgoaOW3vckBGtzkYANM2ns8BLwupDGYitEKD+CvE31Box8BPpThjLDvWEwVdFEy0xJ3NGs6bGwW9/iJpmGinPxssq3altuYyRD1ni0XF/9hzI94FU9CivB1wWBkSOx30Gi6BXdeXRH3gGrwXv5X2AtLY7NkOIfEA== 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=Hyok4LuODfYrbsCC251hEMegyxDtXjrKQQ1x3/eLbaJYM3KtqPNNN3E/SrtECxjEjsmh3yHAEVYdp028trqkFdpnMm0f4LCO2zXMZuYuAIIUbAS5NnayNicrctcYP5zK6WjDKFAPGgi8C/1ffqhUuYS1CDGgfQeuIRzNwHaTExM= Received: from SA0PR11CA0143.namprd11.prod.outlook.com (2603:10b6:806:131::28) by CYYPR12MB8938.namprd12.prod.outlook.com (2603:10b6:930:c7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.23; Wed, 9 Jul 2025 10:05:42 +0000 Received: from SA2PEPF00003AE4.namprd02.prod.outlook.com (2603:10b6:806:131:cafe::2a) by SA0PR11CA0143.outlook.office365.com (2603:10b6:806:131::28) 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 10:05:42 +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 SA2PEPF00003AE4.mail.protection.outlook.com (10.167.248.4) 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 10:05:42 +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 05:05:41 -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 05:05:36 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v5 2/5] drm/amdgpu: move GTT to shmem after eviction for hibernation Date: Wed, 9 Jul 2025 18:05:09 +0800 Message-ID: <20250709100512.3762063-3-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709100512.3762063-1-guoqing.zhang@amd.com> References: <20250709100512.3762063-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: SA2PEPF00003AE4:EE_|CYYPR12MB8938:EE_ X-MS-Office365-Filtering-Correlation-Id: bf780416-6e98-4da4-4496-08ddbed02a2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cGRYbXhzWThFREVQYkk3ZGVaeWJyc3p1ZXIrc3NBM0FVeE5sZUJaV0hWVGF3?= =?utf-8?B?OTlzWHJvcmhrR1FXeUVyUWdNaGtWQWg1cXcyb1FUNEw5Q0Q5MWFrR1ZmL1pV?= =?utf-8?B?Tmt0RHNQM0VtcjdSK1U5SXI4RXhNcEtlVXRBSW4wRVQrdUtxQ25pSG8ybFVl?= =?utf-8?B?V2FVRmlBWXg5K2JGUG51Y0xlMlZsc3VVeEdzSFpnd0NLNXN4TG0xVXF2THpZ?= =?utf-8?B?bEZYVmhRelpSK1g4UUZNRW82bkFQSTFNS1J1NEE0NXV5UnZ2U3hGajFqL1Qv?= =?utf-8?B?OWRIRVpYY2JSamJUbGNoNTczckhFanBsNzJhVER3R1NKOWVqWEg4Nmk5T3lj?= =?utf-8?B?NmMxZEFjZjkxU0daUkRLNkwydFpCelNlcjh1ZmZMeUMyUlo1djcyMm9lWGxz?= =?utf-8?B?SG1rYVkwbTJFcC9sUWExSVd0aGpBaVdIRUg2dlFFWU16WFV1Ulp0YWJRdVJo?= =?utf-8?B?eTAxcENucForcHAxeXdQa1k3MjI3ZlhHM29sOS9ROW5BTG9DL0hTb3RuUExO?= =?utf-8?B?Uzc2MGc1cVBpenRSL05sU2h5SXZiN0U1d3NlV1BtR1h2WmE3NnNmb2c0SWVD?= =?utf-8?B?ME1NQzQvc2pqWDVDZHAxSmUzVWozM1lzZklmZW1SSnlWbmtJMWd1bStwcW9l?= =?utf-8?B?Nk1DYm1BYytNaVhqVGVKMzQxZUVYNHFQUyt6bzJEcXFFVytyNU0wZ0ZZSFVt?= =?utf-8?B?Slk0ODNsaVJqeHZCNXZnU2hCRzFNR0pmeHpYTUFkQ0kzZ3l2QnVQa3d2TzRO?= =?utf-8?B?enFzOHl6SFhHbGhyNFZCaTBDUUlPemovNXpJaDR6dVdxMlM0NWpHV2lNWkZR?= =?utf-8?B?SWVvakVSU2Noa1RVK3NhSEhMeFROL2JZblZJMDlvODhKa1B4ZlZmenpEbC8x?= =?utf-8?B?WExWaHMzQVFURTI0Tjl4Y0dSUXovb3dYbDYwZ3FibE52RFNYMWZPZ3NEKzJN?= =?utf-8?B?RmROOFBWdFV0ODFMTnVHMEtuRkpGOTFVYjQvMXMySm1sQ3ZtaWF6THRrNFd6?= =?utf-8?B?ZWRNMHpycElZV2s2ZjVqbWVicTh2SnhOUmUwUzcraWx1eVQ1WWVDNjZjZDN1?= =?utf-8?B?ZlRySEs5eEptdTZoZmY0d0ZQbVBDanFaUk54ejlQMnF0VWhEMDFvaFNsWkJl?= =?utf-8?B?OC95QkFNYSt5WFZ1NlFJK3AvMDdaQXNxL1VVeUtIRE5WeFhCK0FxYnlod2JJ?= =?utf-8?B?Mk1wa1luWmRqamlJU0hXTDF1eWxzOGo2dU9HdlBpU0xjV1gwdFhHTnJBMUJ5?= =?utf-8?B?L3BNQ3llN2RxQWtLZFoxbTcvVEpnL3VTZmN5cS9MTDFtZFE3RWF2QVdRaUhX?= =?utf-8?B?MGJkRVBTR2ZCd3d5OVF1aFRiS292dnczdjNRamEzbzhsVlZ6a2pGbU9RcG9B?= =?utf-8?B?QXp0bStpb1ZuRFRPSDREK29vZ01jZW4rNE1USElFcklraGxYM3NGZVVCU1Jr?= =?utf-8?B?TnJXYzhMM3MxK0h0ZVZmL2ROK0NrYU1KSGtsUDVyYTlQbVdyN1l4T2F4c09D?= =?utf-8?B?bHQ3cXFrYzEzeFNXS2tlQ2dEZ0U5UEd6ektId1FTQTVCckIvUGdZWit0UGt4?= =?utf-8?B?TFJYTmVXbmREbGxKK3I5NGQzR0pidFEwWHByZUl6d2VtMGtmK2p4NldSbm1B?= =?utf-8?B?T0VObzhZN0pPY2s5THZzOS9UL252YmR5TGhaM2pJRGUreEFQdkJlVk11V0lM?= =?utf-8?B?Qkhha2tBME9wejJYdndFRzUzNno2MGlDbUFZRmxMeW5SRWxqSldjZDZUOEtM?= =?utf-8?B?azZTbWg3cUNyQ1FybXdpaTJBL1UxcUQ0aHZmdG9UWHJxdGp2N3ZFNU90Ukpz?= =?utf-8?B?SGN4Ui9hdHJlcEtnMWs4NElHd3BMQld1ZCtmSEQyL3Vja0ZBQnVsTGYvWGpi?= =?utf-8?B?YzRIcGRXdllabkFUNHZzMUNlZm1DYjgzNmhTakRxeXI3WWdQL201VENsUm04?= =?utf-8?B?OWx2bkRsenJBbzVhK1hnUFdzWSt6N0dLWUZGL0hZNkpiTGJuU1VaQ3hZOG9v?= =?utf-8?B?eE1XTGxRanlRcVoxaGl4U2dSRzNySlFpYjl5SWl0cEluNVpMb2ZkNnNjWFA0?= =?utf-8?B?Ujl4d21uSWIrSkpENjgvSlJWMkllU3BkMHZqdz09?= 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)(1800799024)(36860700013)(7416014)(376014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 10:05:42.5965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf780416-6e98-4da4-4496-08ddbed02a2e 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: SA2PEPF00003AE4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8938 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:04:46 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2080.outbound.protection.outlook.com [40.107.96.80]) (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 F160B28BAB5; Wed, 9 Jul 2025 10:05:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055556; cv=fail; b=QANUH87ZDcj0JxwY6qFvCElFOhcNnskZp/YxQFLeMY73ot2PAZ7iCWA6dZGWvKkAdPMatV1IgCsgnTwS8cscAZhGv2PhebyInQkJJkG3k/H/ejzje/SpRr8uNuuGg50W7Pv/6sKFS8Ns2OdQf/Hq8PdR04XIFy0UjS7IG0b7Brc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055556; c=relaxed/simple; bh=gxCKMvwPA8vcVBQChOLDDUjBgyF0rI7YkuL8BkQ40zg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n/GdXCDyle1l/nGO1yJL2Bwa2tX8iYOHyUiHSJ3qdYRqiRZKnlHTYLp1SytvqcNDmL9snk35NDEETuabBkwxK50s0dSwohdCY+q0v/bkl1U1fpe6XyFgc6SIKi6pIq1x+9YcUMBs3QEGA9NH5Z5LHNXjVuXpsACo8OvOsSp2aYQ= 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=zBz8+s11; arc=fail smtp.client-ip=40.107.96.80 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="zBz8+s11" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZDragFtfPiLTk/SxBSgxyAK4MfNy7W0JtigIeYRKRc9oEhHFaqfF6kvoZeT6Ykdc8nsGWuGQueIzh/8yV7xugB0mdXJbt3QEI+pQOfrwcZDGszPGR5Qt0fenuYl+fOsvAJJrwUsZJO3Y7VNLWfklg7tFchlBGC6AIBUNEo+gR8ncE/qoWr3MrxMd12WCf04KQ9VWBpHKIEJ1P7w17BVHCAVVZkBmwEg29qNxlbg0CeY33zhgQpvPTMu4DGhCMlkqNjfTyKiqo7ip6u73+ZorXsT1Cn8yUFyxUmnlcdVldgrW76LxBNNHdIiQ1WyCmqdhCvu1T4DLF221SWCP9pwaPA== 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=BnIMYZvLPApaNZL/apQKtPfjUcFhOAOepOw5yG3SmZng3wixEaqstpIga8xFKiuLl0a2kddarb4Z7UtYhN5mcXqK6cRyw4biPkC9jO4s8yzzBQBTYV2+YvsGRUuPe0zfbNdfH/33JJtvmRWXsY18xnzgcLmvRu+P/+4wamgAKnUaUbwmrjR9SDRjn0oLLLWRYDlfoYURrcghMxx0BYuePz+aDkHa9YjxB8IwEPX7BmixnRIE1sedr1FQAsfU2oLWft1n5LUWHGkZMe63w2dlcRhWLy+H4gRv9B9uY5nJjc7mYsdaMXX0OXc28lCMBrCTHIaRjzuO5/+D74HR3xl55g== 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=zBz8+s117C9dylCxk8vpgLcbgqyi1s1HiiqVpdA52b3Fu6lIxfaFDOnnVjOoTPEKwVu70rgKteHvass12rGyntBnafeOim+IM3q88La8MjdP6HphtufQVgLcMp2dT78HejG/ANWkpMyYwqd38ylFRGyXsYIMScXPkHElOnxAC88= Received: from SA9P223CA0013.NAMP223.PROD.OUTLOOK.COM (2603:10b6:806:26::18) by PH7PR12MB6833.namprd12.prod.outlook.com (2603:10b6:510:1af::12) 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 10:05:48 +0000 Received: from SA2PEPF00003AE5.namprd02.prod.outlook.com (2603:10b6:806:26:cafe::c) by SA9P223CA0013.outlook.office365.com (2603:10b6:806:26::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 10:05:48 +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 SA2PEPF00003AE5.mail.protection.outlook.com (10.167.248.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 10:05:48 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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 05:05:47 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) 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 05:05:47 -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 05:05:41 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v5 3/5] PM: hibernate: shrink shmem pages after dev_pm_ops.prepare() Date: Wed, 9 Jul 2025 18:05:10 +0800 Message-ID: <20250709100512.3762063-4-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709100512.3762063-1-guoqing.zhang@amd.com> References: <20250709100512.3762063-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE5:EE_|PH7PR12MB6833:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e45c198-6233-4c32-d577-08ddbed02d70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|7416014|82310400026|7053199007|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dIPOuKtr9/Mj7XJWpk0ODDvEPjjOA+E6t9BEffBKEr0radT+4/IU+WrB0W+n?= =?us-ascii?Q?8a7zEbuErG8Y+mCFcXyGNovliKgdhB+lc+bg2K8Oz+gznlniQ6MJEjgx4HcH?= =?us-ascii?Q?3BOYKhOCvqX29Z//b0MFzvApbinVIQmARXSIw7epEzoxZ3RYb/jIvrGG3Mod?= =?us-ascii?Q?l/YFw28b+lCtSc1KuwJklyZv+kpHRARhlM8g6J2MR9KUU2pgCwBb060tuOmt?= =?us-ascii?Q?9pujxFwuktohswOhYGrLDIA8FTcsOJ2DsIQHQZCIfVRjkPTH+9H+HBakO8Sv?= =?us-ascii?Q?Mmw/0/cdiq/ugFSQUVRTKVttxCHIhgmB6CHF7AnVEunj6a04LkXWmuEjAupZ?= =?us-ascii?Q?i9yhegYsHGrnG1UhIZyDMHVlF8T2w9maAzGEcP3Y80ibzzfIGlWQHTdNBAIU?= =?us-ascii?Q?In+lLl/3l9rwKUb6XG7bt4002aGKTMglW4AtCd4jgPri7tQ7lf5VFJ30LA5q?= =?us-ascii?Q?NPTdDEqcc/nkLjcooASD6i+IZjgS7O0BAeUCqsCoRs/nsdZFGbnReX70AkZZ?= =?us-ascii?Q?KTX/LCZJimO+8rpobcf1HyoA761n5zLUuoDfgukCAlfHSaGOisfrnOt73se8?= =?us-ascii?Q?kvFcFpowLmUWV2Q3g1OU/63JuecIBQ63EKX4yDr5P/1gEgr77BahTLI92ORq?= =?us-ascii?Q?o1RJ2HzIXmsKzbiAAQdxufC8qIrg/FaiP0fyn5itlqDGySqgWtCZxcIyfV/K?= =?us-ascii?Q?DUuy9dqI3Mvp/KOe2utBE7slkBa084u9seQDIJGVkqvQ5EjJzPfgGtK7Wpwu?= =?us-ascii?Q?0WSB/IZNU76Sg0RNPg16CIbjZhB4IoZ3gpsdoHZBqMjy5CqccwZhI2ddFDPE?= =?us-ascii?Q?pAHzQGJdRzH3ewKH9ZMEh964JZqD0Mirt5VVwL1vvFHcdP6tO1Qx2vrXUKVz?= =?us-ascii?Q?y3xbn/ct04ouXNEynwnguVC+npsRioed7b4RrFrAYua+Aqe8p8lCf10py2pg?= =?us-ascii?Q?2etiXQZiXhWlUEy4FGGRsA7+8Ay1jEjetl8cB8op2pYh2+OECcgrjO4tlGwz?= =?us-ascii?Q?1pCfvKdGU15ZBxhoyFzMTPkbYz50r0hj8ay6ofU4MNz58uWbAFnH4lcpzFhy?= =?us-ascii?Q?Vb2i1o9I68QR0YWRps1S2ancUN893T1dZSSngFGunz8Bw7vJFl1jF+brnr0D?= =?us-ascii?Q?aLmnhckjPqApcJ//hWj29CaWGSmQv+hNHJJTAzLlBjt++AWNAuDAZjG1cR2W?= =?us-ascii?Q?1zwOwukIjFgYXf6QbahLLahUiJm89Yo6EhX870CaI2ytSKjOcXB/Y+MzhZWr?= =?us-ascii?Q?jN6qMAWlgUbwWnMaa590xSXE5QRiMk/84aYXjqYPP4ZMDuEbO6hDR+9jV2aq?= =?us-ascii?Q?sit49abGdJAWvDvtaiNn/dSxtC6PFJNUmG8OSpdoZEC7VixxuzInAQpuxkIL?= =?us-ascii?Q?+kBERAmxvlqFEE/CJWksFqao8Glq2qNCg4FyNCKzEPEtu481hbsZNDG2hbKf?= =?us-ascii?Q?KVuMNEJjMd+4H6aSBc2circVEfVESVKFz6r6t3Kdy2+QdhOsBpLpLk1Jwrq2?= =?us-ascii?Q?+fQTqaAV6E76DT08UUrlN4KZGYeqvfUJ0o29tK6jqfC+arbZ7AnCA6GZfA?= =?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:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(7416014)(82310400026)(7053199007)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 10:05:48.0585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e45c198-6233-4c32-d577-08ddbed02d70 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: SA2PEPF00003AE5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6833 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:04:46 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2077.outbound.protection.outlook.com [40.107.244.77]) (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 9524D28C84B; Wed, 9 Jul 2025 10:05:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055560; cv=fail; b=TcnNM1U9vjwAf91CIxqxmoUu2lO7S1WeSnCgIxR1d+R0Z4cR9su/bLeXaDyML/eYgX39p/RPpCeOh4L3guW5L1hRqjO0m/qtfwaSysBTnfn1QPtt51uDR0LPd2HEtVWaFrCWV/N+FZSxKoCtMdqpusvEksd4y/Ao9jQgnkFu0bI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055560; c=relaxed/simple; bh=lio1ueVqjV8dkx9kbpWZFyBOlP87gq4oIXfuOcV7vmc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XwEfhKuFhERW7sfb/ORkNze73Z2nOmdNLfIQy9F+bINFWGcU8d+bcffl1+ZaqH9wjaQXnz80ZT27H3xm2MBT5E3/sT/7FUKG6/LW3/A1SMYtOYayIVRq5421ox8emzx7uaRGKVtblsWOahEJui4/FOTg61OJFU8Fmjf0EZA7aIU= 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=SXHn5M0Q; arc=fail smtp.client-ip=40.107.244.77 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="SXHn5M0Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TPC5cTY9leLNOroWtcesPeM0LWhSrRz9znYXOa777Kk3QpQqD9I+S8L1woEtiVsX7PegsJi3pI0mr4bkxjdiOwpD397PQd3nN+4y8AkJF4CNOhGkMaXElatkb+IMI+NfC5L9zAODkW30AmQ1YOBN60KXX+6i/aJ+DRRRLnoOsCBdC4VnNeRC/uhl7hkfGqLgM62RakQFApUtJDsyL9re/gcJqrJtdSgAaJn2NJgRxu4nTHf34Dat8Fbd83bsoatcXv85CPHUugky17nkH/hdTf6mDQS7kuCoayXpuhDzECuatoZWxyIPvHxBNF1TN/39UcCZbTRTAra2sTKsc5x4Dg== 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=1iP/0nTiOz+E/6L1nZdQagKM06XQp/ezk7nDDPYQ9J0=; b=aGXaxZo9PwpLY1uEjF7Z6N/lALZ6U/p1BRhLExhZZZmGFcp6VL8kYHkDxK77+4IMfFOqgYhFo4+P9s49iBo34TLAJAyyTsSigw9h2mfSyCGtzu86bUKcDE8LLBwO9RsMDAZ5H75rdZDmmSUHFBZAk65JAk6JG0f7qM6PKHgkTQK5J5e9IAL6x+X8hn0uLFGSQYZGxKLTtrFDKbuv3+HH7AY04fCRiepAOGEnY3qDxi/7kdltSO1toxcSA+OF4G3HOpscCNo06Mk7/4R0vFWKM7mtyCq/D0D9Qc6zecfeoFniBjohDr4yoxpp66QnrMiCs3eyQESDytImpG0/2czGWg== 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=1iP/0nTiOz+E/6L1nZdQagKM06XQp/ezk7nDDPYQ9J0=; b=SXHn5M0QVKAfAnuOdHcEfTyigwKLi3l0y/sZGQsmxbmbVOgP5r3kKyElj8s41yov5REtNqUCEZCuktit5ZmiM7AdmKMZO1LlBmib8ub/j2fhnBQO6+T6gOVorc09SqwW6LeAPb/YNjdgTfEUujr6Z+/xefusEec/wcvRy1AkCWc= Received: from SA1P222CA0091.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:35e::11) by LV5PR12MB9802.namprd12.prod.outlook.com (2603:10b6:408:2f8::19) 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 10:05:54 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:35e:cafe::fe) by SA1P222CA0091.outlook.office365.com (2603:10b6:806:35e::11) 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 10:05:54 +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 SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) 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 10:05:54 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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 05:05:53 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) 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 05:05:52 -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 05:05:47 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v5 4/5] PM: hibernate: add new api pm_hibernate_is_recovering() Date: Wed, 9 Jul 2025 18:05:11 +0800 Message-ID: <20250709100512.3762063-5-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709100512.3762063-1-guoqing.zhang@amd.com> References: <20250709100512.3762063-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|LV5PR12MB9802:EE_ X-MS-Office365-Filtering-Correlation-Id: 9acddbca-c08a-422f-5d87-08ddbed03102 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|1800799024|376014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MxZ/xyDdB+6h/0+Bnljo2devjKOOvizoHli8d3SeN2R7mHd5RNX3Jfaw1Y6h?= =?us-ascii?Q?uKLjRy2OPwVe5SML5Vl0sHRIESGNJwX1gT5tte0WueDNeReser6NIz2QZ6sv?= =?us-ascii?Q?w18TNgg1xdF4QmzyvcQdS3kqdtFsXUWFAr5f29BjC3hEzBstUXKixw+1+SsI?= =?us-ascii?Q?J5OT06iJ1z6pMh8ulT+JyjDj0sdHWXbf+buPQEA6WPGbzmxLiW0fj/Wt/1I1?= =?us-ascii?Q?buytfUy29tryLga/RDJk/KjlkFyo6TUdM4QM/HRzlvZEVQ23ls5Rcun4+/OG?= =?us-ascii?Q?Sxqb2FeQleP59U6GMni+J+6nE+Yc7ZT8Iird5HJpv6mrtPe4BNuMyut1xFHe?= =?us-ascii?Q?KBgikauewLy8Mw0EhywWmBeO6u4aqTjTrx9rz9wZJHJEKzxSaIIKgS8FVa6g?= =?us-ascii?Q?LdWW0YMwoJ+vkUW4K3Le3cNfyVwNGteA5rXhKTrj3Kqzj4GaRmRwmFVl3dRs?= =?us-ascii?Q?PS6AmI1twq28PVJ9ElDvz59WRAX/+5JC9UNKf+WqadviYX6vbPlL8azjCZZ1?= =?us-ascii?Q?rhKZXC9W3H6Az03Zo8l8kihFwoFE+uArZdXQ0VNEejyMfFmmImkEC8DxhdR7?= =?us-ascii?Q?JlcWGk5KMTe+PWuTkzuBFnkBdhWIYR+lE5f5T3mDsQbikleLXV4K4+tMjAPm?= =?us-ascii?Q?lJRhCntY2aZaVxkvGWgZ0YDnKuYcysBsxzgCm9sBphdk0OaBsWZWjv0FVduR?= =?us-ascii?Q?mCUzHkGAN6lc6ON4cON4O4iYPrDt2sObBHzePg8B7ZFvwYtnn7rz0AlEv1z4?= =?us-ascii?Q?/IGwX2yUZ3H/Epa1vmEgOV2YJm/+wb3Ng04K/BVA7c0RCUhivy+gbt+D1p35?= =?us-ascii?Q?QPF83xgfIWQBLTMAGNrKirc3FSeHSEP3cTD3pdZPNAp9J3m5sRaFn471xuZB?= =?us-ascii?Q?MsQvr50d+meZxBfd9uLpZNoAmUjhFWFtQvtaVr2IHEQZAv2pwkvH7+hBWEZv?= =?us-ascii?Q?l9r7Jzjb2b3+XSmQW2Su7vtRgvwRVQhwci3zrCWXloQVTruU1w/ixbku8q9W?= =?us-ascii?Q?MDpA9wN251lugv6LDlXbpeoAiiok/qyzgC1EPP2nrP32/YrMgO9BJ9sWoFlC?= =?us-ascii?Q?/27UOk13GC0NZ9w16gHVReTa1o70UMUgXnJ7JLbrYnCUXwT8YJGCNy+2Mt32?= =?us-ascii?Q?/U1I1SfIypPMf5jnx0igfgRW5KIQWuuACKOIxJ6W8GPf04mFEQC92A+tQFqo?= =?us-ascii?Q?KbpGdKqbICUmGXUMjAPvdBJG8tVtrHF29mDDtNT/Hxk4h4ibZIYtGweu0day?= =?us-ascii?Q?9kj/ntQpEqp/dS04ukicnIXE61gwVe+qTPyuFXhoLSlCuZaeN248rzYKbu3A?= =?us-ascii?Q?LM2E8T0S2WJccp9niAOQxnYB70Juu2v4IPCJcboTmPdrT/XAP0r6z3ObuW6a?= =?us-ascii?Q?PotyEsSSp49tete3BRR46gM4/YFNy2rdIjVm9eBGcIyS/qy9laOO5g48OFP2?= =?us-ascii?Q?7XXv95KzqM+xGw6Ui7MJ2dtpOzkbOWDfYmSfEnTIadWVnxGbxqZtxOK9sPQZ?= =?us-ascii?Q?cClWmA1ADpnTSPkvyGh92PG8yhI2EzTGSW66AmaEefKWvvRekKJ2hYVq2Q?= =?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)(82310400026)(1800799024)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 10:05:54.0423 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9acddbca-c08a-422f-5d87-08ddbed03102 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: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV5PR12MB9802 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_hibernate_is_recovering() is such a api to query if thaw() is called in normal case. Signed-off-by: Samuel Zhang --- drivers/base/power/main.c | 14 ++++++++++++++ include/linux/pm.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 40e1d8d8a589..ff78cf96f795 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -63,6 +63,20 @@ static LIST_HEAD(dpm_noirq_list); static DEFINE_MUTEX(dpm_list_mtx); static pm_message_t pm_transition; =20 +/** + * pm_hibernate_is_recovering - if recovering from hibernate due to error. + * + * Used to query if dev_pm_ops.thaw() is called for normal hibernation cas= e or + * recovering from some error. + * + * Return: true for error case, false for normal case. + */ +bool pm_hibernate_is_recovering(void) +{ + return pm_transition.event =3D=3D PM_EVENT_RECOVER; +} +EXPORT_SYMBOL_GPL(pm_hibernate_is_recovering); + static int async_error; =20 static const char *pm_verb(int event) diff --git a/include/linux/pm.h b/include/linux/pm.h index 78855d794342..f54a803f2afb 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -657,6 +657,8 @@ struct pm_subsys_data { #define DPM_FLAG_SMART_SUSPEND BIT(2) #define DPM_FLAG_MAY_SKIP_RESUME BIT(3) =20 +bool pm_hibernate_is_recovering(void); + struct dev_pm_info { pm_message_t power_state; bool can_wakeup:1; --=20 2.43.5 From nobody Tue Oct 7 14:04:46 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2050.outbound.protection.outlook.com [40.107.92.50]) (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 71DC728C02C; Wed, 9 Jul 2025 10:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055566; cv=fail; b=ZwWN3TwvFi3mSMxj9dZ2PL1OaNZlGGeiVSXPw5nZ6DrOVJzI2B6W9np5tdmZj3PMrdGAPLKaLdyMU7Bi0kXeyTt6PWupLR9ExMlpkgQE0lpoBS5xnQazmpicfGt3XBLJ2IF0k0DMW+aocXfbxPEtEP90onBOfb8/EcU1GBUTNFA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055566; c=relaxed/simple; bh=886wp6r3x8V6QyRQp0vIyjr9MdBiVxy7NpyIky32p/o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t7ItrrGP+hC1IRFlfivsmn+lzn4xlcSZe8jMjCDT5Bs8REa/RMlMUo/9SQirwpQYmXLyls3hTV8+V1UMup78j82w0WDMWWu62vz4bGCll4Nf4ShVqrcCTTQacCxQApWH9gkElc2IzbCHZe6YfNgTC0JufBZhU+AogmHruj9oEyA= 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=sGpfLbPo; arc=fail smtp.client-ip=40.107.92.50 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="sGpfLbPo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RmU1MxKkTzOtP4MmpakQ5auO6SfAmW4/NBKxUqhoo98Xd7doswLU1WiBGowuTQm327VBnfh9PyrQOJNMN+2rnz1qZQ9gqV0VIykr9qSvT8qmtPQTPmH7d3H/aggiOkdNHOlrdXT+GkuPTLN9np1XZFXD6lFj+XD+aXs5lmRvwC5SJyXlsaJUOEzii9Tqm8vuxAN+tY4BIkaMPR/vNPOMewqhhvtSPLe4olzjADIQnZfVUG50uZiBPNxW45Zoz4TKDLkyxYmMKaIJlGLP51yeANsOE5Asa9RvtFAM6eeeNFmkxUKKq1zr9i/GlGSVipXkvly2VqRPqtClIVl6f1dHVw== 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=AqRuNUr1X/c6qSZqGmFlIUjbdBiunAB0M33CLbQVPo8=; b=f4+tTeZaQHMQY2rnIrpvhy0sIfBmwPnqIFpB9Yt7vfC0/pCEsUiWUK7Oi63asx5QXk/lSf2ATGWn0X705lFvt8/O3Q20HnUmqaHKgpwFqct9dfsKXJQbgfAx4XklHahyyFIwcvbvxIy2NSm+Z8LAiDvvtrDRzhPB1meP8cHTBYiu4SGPb/VuRBVhcxpLKDI3UrHy7J68EQJ29lYZvpwhb+q7T6DNRZOINGGKsOnKcdbQ/CPpbG7j7JTIxwvA6zmHRHBy9xR/E9ev0R0nFiGJ2d5hf5DpvofgWn56ga7zeY2Mq+GX8T2PLp32nf9JC+vxS9T01iaJVn0pUYDFqkhwig== 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=AqRuNUr1X/c6qSZqGmFlIUjbdBiunAB0M33CLbQVPo8=; b=sGpfLbPock9LxITZgr7zpX4L/e1DN3O3fardfbmzQmQNpij+YE07gBKltxU3d785TPLO4yMDtx+lf7khjPxP3OtQHkIwTawtouZAlDjyOIpXrYsFIvpKrNuYS5SNYmGj8QeNHHpwbiUw4/Ns7PvBtfCaRZdpUa8/pXqAgu5DccE= Received: from SN7PR04CA0183.namprd04.prod.outlook.com (2603:10b6:806:126::8) by DS0PR12MB8072.namprd12.prod.outlook.com (2603:10b6:8:dd::11) 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 10:05:59 +0000 Received: from SA2PEPF00003AE7.namprd02.prod.outlook.com (2603:10b6:806:126:cafe::89) by SN7PR04CA0183.outlook.office365.com (2603:10b6:806:126::8) 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 10:05:59 +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 SA2PEPF00003AE7.mail.protection.outlook.com (10.167.248.7) 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 10:05:59 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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 05:05:59 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) 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 05:05:58 -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 05:05:53 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v5 5/5] drm/amdgpu: do not resume device in thaw for normal hibernation Date: Wed, 9 Jul 2025 18:05:12 +0800 Message-ID: <20250709100512.3762063-6-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250709100512.3762063-1-guoqing.zhang@amd.com> References: <20250709100512.3762063-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 (SATLEXMB05.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE7:EE_|DS0PR12MB8072:EE_ X-MS-Office365-Filtering-Correlation-Id: 17ff629e-326f-4505-12a9-08ddbed03448 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BC33KRkNvm1QxPyGWy1qhPzko8kkPTly/HN0Wq/5HvzrEjrgMjuRFxjFPFfb?= =?us-ascii?Q?ybpkNLgAWp41BGrMh4n5RD0xzLov5rFl1lR1y75ix7PaJgdmxt71uleaZRT1?= =?us-ascii?Q?mF/pB0j8wTanQRpI/yPU+dD/lFgfPg6bFVqdNwTyIqtrYMp11FFIwKnRRp3C?= =?us-ascii?Q?XT5IJBmuDA7B51Q0vEnwsQTl4Vj6EB+uvhHpBWY6zkwT3pDlu293MymI2Jhu?= =?us-ascii?Q?l3V5EYsurrVEUyC8wLBP2q5h99FA6POWFeB9ssKJslqhLqWZHMMYB9OYHwKV?= =?us-ascii?Q?hhBBeap/4MhRIZNr7YZMl9z0tG9yjxN1wrGBlIbTu57Rclu4LRKjQ6EZDGyh?= =?us-ascii?Q?+p8Ml7YMWVs/XwK8mr0adpYJ9MjMatF4doR/cBK4Jl0cBpUuVEs7FfyroRdY?= =?us-ascii?Q?5y+0mgzefLpNXsDLmfmQkQMDb3bmK4L0YNm5yvGSEIV+TTXa2CDme13a0LN2?= =?us-ascii?Q?MZbvX/QM5q9pVRtgWvlB/w9JlWwOOuvJZjIERezxyP5488BqFfH2pc25J1QU?= =?us-ascii?Q?Ro3Vt0A3thHX56/HvZ03LuPn//BVV6WKPO8NJDzSHqk8rdF7qDpd4WwDhdqo?= =?us-ascii?Q?q7xY3YRLl/yGmxiDgJZ5RbbYIFKAFJMgVFxHA31RH1z1gFsQIuhHfnRF8H21?= =?us-ascii?Q?iahBovUNdOqh7Pao0m6e64pa3wMiaIN8A9RiKRPRI2gT4ER1dm2DJeRQMhCZ?= =?us-ascii?Q?rvwbVYtrFFCxdof3krjG3BU+q9kMWxR3kSgt0mgSqJzZy+a/8EAzNb3DLLlA?= =?us-ascii?Q?sgLE37e/lLGoY85vgIYit04KTXLvPBVtG1QNooYGDfcP8tlFOjfk6KhTPw4r?= =?us-ascii?Q?YKqiMS+lM+Kqv98nQIumuxV/groUppzB+0Dv05RccghVGjdtbxRhjGlfHgDN?= =?us-ascii?Q?eFxoWQU2KykJNV7J57l3jtQWUppPgnOGoAS8jd5Sxam6EM1C6al0Tsygfl1r?= =?us-ascii?Q?WLGXPhlBjCPG7HLg6LVXIVVj9sSx8NNNbjxr4lDnyqDkkbSwk8TRwvG9C5F6?= =?us-ascii?Q?0clfg7PFvg6idUM+tEb5jvPTW6Vr9inQZvt6uBSttxAfCxlm8z8sRq7dVDaG?= =?us-ascii?Q?rk+N6q8RFkst+V2XkMzQhM4J+CV0V1mum1M6MPMvNt3Y3lP5nbS9J6Q9PrJB?= =?us-ascii?Q?jDG0SxUooSDd4nNug1uySMo3ETfUutnoh4pp1bT5bx9LaWRVqE2a++9Z34lr?= =?us-ascii?Q?serkDbhZLFZpOZ9F0XbyT1t11oo5bm7hIQdItThVa02fbWVqLUiCbYsrNkIK?= =?us-ascii?Q?08iScqlJt8W2PRocZbhlPlGul+6mnJanE8ACJzsucWQI4TVTk3JBhM6JzlI6?= =?us-ascii?Q?ADDXRoQlViNGTae1I7YW3BxHdlqngnS75fBn+gQ4jXVRDI1To6OYUGskxHEr?= =?us-ascii?Q?J9jyqi0YnBLTbg2m+9Hp9r8UUC9tj7a3IiwbJY7RtrnZP91WLYorPDHBx//7?= =?us-ascii?Q?A64O68518Wxk9o+e1zETD1h64m1SRgbCqj43OQ1+cbaprApp5YxbZeIQdqqh?= =?us-ascii?Q?C4e0a+bthLCA8esA5WEzOtLwmYSzephYkooKAqxGEP5RB0defwvF7EhUlw?= =?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:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(376014)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 10:05:59.5358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17ff629e-326f-4505-12a9-08ddbed03448 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: SA2PEPF00003AE7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8072 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 Tested-by: Mario Limonciello --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_drv.c index 4f8632737574..b24c420983ef 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 @@ -2557,6 +2561,10 @@ static int amdgpu_pmops_prepare(struct device *dev) struct drm_device *drm_dev =3D dev_get_drvdata(dev); struct amdgpu_device *adev =3D drm_to_adev(drm_dev); =20 + /* device maybe not resumed here, return immediately in this case */ + if (adev->in_s4 && adev->in_suspend) + return 0; + /* Return a positive number here so * DPM_FLAG_SMART_SUSPEND works properly */ @@ -2655,12 +2663,21 @@ static int amdgpu_pmops_thaw(struct device *dev) { struct drm_device *drm_dev =3D dev_get_drvdata(dev); =20 + /* do not resume device if it's normal hibernation */ + if (!pm_hibernate_is_recovering()) + return 0; + return amdgpu_device_resume(drm_dev, true); } =20 static int amdgpu_pmops_poweroff(struct device *dev) { struct drm_device *drm_dev =3D dev_get_drvdata(dev); + struct amdgpu_device *adev =3D drm_to_adev(drm_dev); + + /* device maybe not resumed here, return immediately in this case */ + if (adev->in_s4 && adev->in_suspend) + return 0; =20 return amdgpu_device_suspend(drm_dev, true); } --=20 2.43.5