From nobody Tue Oct 7 11:45:06 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2054.outbound.protection.outlook.com [40.107.236.54]) (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 18B1A2877FA; Thu, 10 Jul 2025 06:23:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128619; cv=fail; b=KjMv5gRkzl+9YMzavb42Bxuw8M4FXnw8Cb1Z6UCSehElZGAW0EOcXV9P3ttNLjUyN3XpJPPhXLNnRgEmYKjlSoCyBKm62ecu8aKrHuJLdI+kMrtorMkZ5+z5XC0ozwMnEFHgwtAsl4JzmxQvEn0V/fnhrhC0wu8yhTW5nQJKoZ4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128619; c=relaxed/simple; bh=AekQcix+PNdWC57UGDcPHE9luKoab2lxnZtBSmd7LkI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uqxnztT6p6AxCX7OJNSCChR6CGbN9NwIbNN1tcVDnsfEqIy3rfrbtGxwnq5fd0Pfc38xtawckM51Voecmj1L4mdlvO/n7qpmQjgX+EOumRvudYUe5SKXhgqlC9jNZ6jNK+brWJwVXVW73Q9UyTnBAJRRDO45XStB41rmr3DswqU= 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=RLA7hKfR; arc=fail smtp.client-ip=40.107.236.54 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="RLA7hKfR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jYaIuzOiBSVxWhxBycXTZ14haHO7yz8viwhMpv24aoeFLyJ0ptffVPlNNH5har8fGbYjRGcVNXMgRzIMLKZXIvSP5ILnKMqdoNX8rnIvRrElS0HLWbkTIrsS92wGX7oYIDJvMcXwEAT3ljrcQ1JjDAIQvT2R/37p0Q2HBWfh1iPEnGQTYqXdNw6TJ0WQV9cOFbmeZk5RH3JGMLPN2pfm0DQBQbndZ56IBt3xA0+cp053Scpp/bNlox/KwIzBos0bDgEHgZbf6Gj3K52kmKskT+z56mhcnpOg5VB3GoE+Br4domm7FEnotabDUh7ghhKj6f0ZsHI1SynxW+2kHP8mFw== 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=C3Z4oLBNeoS8a5Ppz0+Y1yVN7K+UMdF+6X/wKhVC8Pg=; b=FuflTPl3h+HZxkhisEBgwAnP/GugxG9CM3UsRmPiwybkihCeOP/Nr8INa1gk33miI0jXOQ28Fk1hT4UBnbhUaN2l+qG3QK8Lv1ZCwBNoyRRnfBhSgJ3zqdIqbBUdZ2G40lvMGduG5C6uoNDrWmaT7TkqlWcFOozWFsFOCaR87q/+jFaCYWkQAses8UEo+1ZLeH/GgYNUm11ZggdCeb7QwZosWiUQILreqmj3/9/Haj2qM/JndFtn71rpDZ1Fz5pqLqs6El8a5KWl40bHbl0hUiJdbmWaWgceTzam8uLoVI2sz/6nJub8zJH/l5mWtPJ91kAkKrzOiY+Waafd0rJiuw== 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=C3Z4oLBNeoS8a5Ppz0+Y1yVN7K+UMdF+6X/wKhVC8Pg=; b=RLA7hKfR2TQaKj/Sq74sbFhKvXfA2tJjkGeWYx6UMgtvS7fACexx5ShyyOiCKoV4ikBcjk3r4lWGGJP/SC+L52UAyURUsCYtI3Joy7qBBrf7BT6UIJJEeMj61PpUO9WjYGt7TZ2sG4/8Q9JnJPsCd9SRttIYAT4a5H5F3K8VhaE= Received: from BL1P221CA0016.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:2c5::29) by SJ5PPFF62310189.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::9a9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.30; Thu, 10 Jul 2025 06:23:34 +0000 Received: from BL6PEPF0001AB73.namprd02.prod.outlook.com (2603:10b6:208:2c5:cafe::21) by BL1P221CA0016.outlook.office365.com (2603:10b6:208:2c5::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Thu, 10 Jul 2025 06:23:33 +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 BL6PEPF0001AB73.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:33 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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; Thu, 10 Jul 2025 01:23:33 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Thu, 10 Jul 2025 01:23:33 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 10 Jul 2025 01:23:27 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v6 1/5] drm/ttm: add new api ttm_device_prepare_hibernation() Date: Thu, 10 Jul 2025 14:23:09 +0800 Message-ID: <20250710062313.3226149-2-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250710062313.3226149-1-guoqing.zhang@amd.com> References: <20250710062313.3226149-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 (SATLEXMB05.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB73:EE_|SJ5PPFF62310189:EE_ X-MS-Office365-Filtering-Correlation-Id: 57357fde-a40d-4005-9d82-08ddbf7a4bf7 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?Yy9HRkUvdWpqa1JIcTRFZmZMc0lLZHZBcGtpQnI1bWFFU2lYME9oL2s2cFlV?= =?utf-8?B?ZGtJNENyZUhuK0ZhOTY1SnJnd2ZqdEJydDFOK01aVFRpQ2pPWFcxL01GNWFW?= =?utf-8?B?TERtZllyWkN1U1duZnduNjUyUWNjcGdEcmhUTnVOczNyQk1CN1B1VUhyR0Y0?= =?utf-8?B?d0d6eXJjZ091ZnlUWEgyVmhnN3p2SUlGWHNIVnd2VnZsbXVzR2pmczhDYTBL?= =?utf-8?B?NkFqQWxxSWpqQnp6TVZSdEg3bmpVeG9rbUNZNVJUSmd4Tm9xaW1wVW5OdEpU?= =?utf-8?B?TENnUS9VekZka2FPaXNSWWwvZlE2TkJtR0o2MTUrQ0dPRjZWUkFLMkp5ZTNx?= =?utf-8?B?MDZMakNsT0VBMzd6SlhwSFBVL3ZDVFZrYVJYenRlcVdvMWdJS2NtQ0duZkpk?= =?utf-8?B?emJwK3BXb21HMXZ5dFBuR0pYUTN6SHVnY3hrekJpQ1RETlU0c28xRmRjNGxu?= =?utf-8?B?RS9FOFpxMHlEbmt1cUgxRmIrQmdpbGxBek1tOHZaMnBsdURGazdjeW9Xakgz?= =?utf-8?B?UzVkeEhVUUxxVURaOW9kUHR0WEcybDVTeTVqMURJSnVaek5vcllGbnBuVXMy?= =?utf-8?B?SFdOK0hYd2FQbTMxQmMySStxaWZvTFQyMU15L0h4Zlg2RUkvZHFkV3g2R3Rx?= =?utf-8?B?bG8rTzYwdXh1cEwyVmtZbnRUdHNVYjE2RnZtL1Avd25vMDRDYUJiTEhHQTFM?= =?utf-8?B?MVpiY3Q1WTRjMnR0ZGFBMkdLR0RPMW9WUTdCYWQ5SHNIOEtab1hKbExQMlVt?= =?utf-8?B?dXl1dzlvQTVTMGt6QUFEMHo1d2dlTEQ0SVUxN3JUTk0ybUd0M01WU2ZoaUlS?= =?utf-8?B?L0pPSWdYZml1YmNSM2dqYnFlclg4MnBCQUtST3FwK3hVc3NKZDNVenhkaWRF?= =?utf-8?B?Smd1SHQyZjFweDNLMVRaNDcwZlAvNkxGTXUvb29lODlDR2lLQUxVWmJJMXBx?= =?utf-8?B?VWwyUGozWTI4clFXZkhaSC9ZTmd4cXNHRVY2Tk10S1pqM1Fqd2hsZ2hMS1ph?= =?utf-8?B?MHZLcWtpMHB6WFVhaE15S05USUd2SWV3SXJtMk5xcVp6NGMrRkhPS3c5REg4?= =?utf-8?B?T0tZdEJvc2RGUCtFb0dQMU9zZ2kyVndxY0JIdW5rL1NBN3lGNkhMaW9NSisr?= =?utf-8?B?SW4rNFMrb2t2bVUxQXhxV1FvM2hHTVFjWTltWFpHL1Z0RXNZOVM5ZUdHSFdx?= =?utf-8?B?MFZkMXNCcjRzQXpFYkdqdlNucHo5SVlFRDVMVjNmWXgyMTlObHcwRXJTTEFY?= =?utf-8?B?SUZtZTVOa3ZSbXo3RS9RQmJRQklwWXhiUE4wQXJhV2tzU2lOUnJqdVMySWtQ?= =?utf-8?B?SHpqaVVEYjVQVGZsK25IMGdZUENhZXltRDJNRk5LNW5YYXp3MDhUeHJuZFUr?= =?utf-8?B?Q2hsbjhua2QzeUY2SW0wVHJWOUNnb2JIZjhBbGt2U0JqbUtFQWlTekVhcG5m?= =?utf-8?B?bi82bE8ra1Y2dFh3ZDZUWlNzZ2VFWm03UlFMYlJNYVBpa2ZWdVhuMXJJQ2Ro?= =?utf-8?B?d0lxVWp2ZDdvRzZXd0RBMmJYWUU3SGJoOTJib1VpL1pka3VHc1FHWVhObWJC?= =?utf-8?B?YmtkdjRBcFhlQW1ZYkNHYjN0a2NnM2lDckh3OHNIdlJWbVhyZzQ1M0dnSUtV?= =?utf-8?B?Z3BoV1RJakFGOUxlV1ZERUpkZ1p1dG9lU2RWZHgzc1RSNDlkQ2hxSWZDSS9s?= =?utf-8?B?MkdzRXpyNEtFYmwvZVBmUHNDZGNnZytrdkhMUVI4bXdsaHQ0WGtzUnFWdEpP?= =?utf-8?B?QXcwVGRqVVJiMmxNbHNuNW4rdy9PaE1ib0NuRnlKdUlGTllybEFoUVJIZDJl?= =?utf-8?B?WEFWeVlabFNGaklmdGJTVFAzd1JMN1JvcFBXWEN0VHppNFVnQWRrTUo0bzRX?= =?utf-8?B?WGN5REg4d0RJbWFxMkcxWUhRTXYyTkh2d09MU1NZdVM1cmJkSWFsenIrYzlt?= =?utf-8?B?aWg0SmQ3NmhNSzZ2WVFiM2NNaGZpSFhSZ1BBL2Y1YjZWOWRicHFaSzhudFBw?= =?utf-8?B?V1QvOHZNQi8xNUo1Q0ZncGIwR2o2ejA2U0dQSEZlbm80ZW5kZ1BEOHhiV1BF?= =?utf-8?B?UUZDN0ZzRG5mOFkwMGxGd3FWYmZqY0dhL2ZOUT09?= 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: 10 Jul 2025 06:23:33.7478 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57357fde-a40d-4005-9d82-08ddbf7a4bf7 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: BL6PEPF0001AB73.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPFF62310189 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 | 22 ++++++++++++++++++++++ include/drm/ttm/ttm_device.h | 1 + 2 files changed, 23 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_dev= ice.c index 816e2cba6016..c3e2fcbdd2cc 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -125,6 +125,28 @@ 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, + }; + 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 11:45:06 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) (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 A702F28853C; Thu, 10 Jul 2025 06:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128625; cv=fail; b=Ul7B8WD7u1wNBwv5gg5cJrF8iL3eotq120ekljgn2sHNusMZyHpVy3/WOJ576prgFBo38e8Tm/ibnUSGTXC8M5fYPAUn0vJCaeSDeN38Tfp5WnZ3gHu1C9DeUlXnGcARN77qnxu4xzH51auEPU1a1JRJZeMNtMiJbLD/EVfol3M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128625; c=relaxed/simple; bh=kwW9Oq/qVn6AANbiEj2Rnd9IDe0U59apBpcAiT03pCE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BJLWlKmwIi+C+7stifa7A8ifFlYK1vYoqSBjd7zlh5We43F/21FooExGechLXAskNH0Z7B+Lv0x+t+70m7vMVp9BfT3/sMft9EHbZwCgKXwu9SXUGFyiLEv4szaIZG9QCNFdrPIEeH/xeQite61InACTioXP7ru5Ugp0BctMdmA= 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=P86Hg4AI; arc=fail smtp.client-ip=40.107.93.48 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="P86Hg4AI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oZ6mJ4q5BjaxkbhiAdQA+c1feKIBXgf+ewZpoEhweicNKx0c9uXla+DwGLU2YtDVbTNSmHEtnS3WosjuVn9Ak7idzjD7f4KUvLQTDbtjIXJUW1igJMG3x0DjEFonHVvf68gUmbHX+gy1tpxtiI6lhrnMuDet567b+XKigiNUfTAlbUOMTPl6VUc8igmQQCZAd/NVlF6ZtEIei7D2mBLTwR1dPUrFdLdZm4AogGg2Cw9DL0zfAONB5VCs2gU6mU3wsGpdpUrArvT+oNJ3CGzoioqvPEtMsqe2k0+ST7QxWLN6K3PKIRG/teZGZ++K4Ekrj8M9wv2wBFlhok6DSKsFWQ== 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=ru8LYGxvsrYd2i9KjHBkpvm+vgtJ3+RRX0zEPxvxteQ=; b=ZRZ/8XGEapzKMlDmhDLlfUF16i1o79fAfAYcyCQZIamIwZ4T10i7iwRMY6e9chlePJP1WuPn8tbWzqX4j83pORf7cuc6J20f6TaMa+gv7SwuPn1afJHyqnMqSye7TZ30AIdIbmyAHorZAhMDX/s99XKUkgL/8NgLekXTmsazJGmGq7XSUdvj3+MvWcNRjBGzgkoUkF6ys0kkzuMWhrBMg1rfY7gu0t8lfJ19lpBFAvqZ/CcdFYqcHn3lLqTdqdjVSfEEL99l/eOKKc30XUa2oYiWzh7iJHemW/ZI/qOxIpo+z+q2sXxRPgw0JaJIQd6dbrofBBtBSWplm0wsotP7cg== 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=ru8LYGxvsrYd2i9KjHBkpvm+vgtJ3+RRX0zEPxvxteQ=; b=P86Hg4AI1etKQ7Uea7CXucKcylkF/SxuEaLXXhazFddZEaQDT9HHMbg4Kcc38Vy9BkiFcDQJmgCTy3sx4DELDSNp8N0Azw7S48x5HamAPF+EamF9XfJfo5Yy2PVzGJAmmMpp0s0ZhojlezmKQhmG9q8uz5wJNx8s+OVa96oYSyY= Received: from SJ0PR03CA0357.namprd03.prod.outlook.com (2603:10b6:a03:39c::32) by SA0PR12MB4431.namprd12.prod.outlook.com (2603:10b6:806:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 06:23:40 +0000 Received: from CY4PEPF0000FCC1.namprd03.prod.outlook.com (2603:10b6:a03:39c:cafe::be) by SJ0PR03CA0357.outlook.office365.com (2603:10b6:a03:39c::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:39 +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 CY4PEPF0000FCC1.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:39 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Thu, 10 Jul 2025 01:23:38 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 10 Jul 2025 01:23:33 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v6 2/5] drm/amdgpu: move GTT to shmem after eviction for hibernation Date: Thu, 10 Jul 2025 14:23:10 +0800 Message-ID: <20250710062313.3226149-3-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250710062313.3226149-1-guoqing.zhang@amd.com> References: <20250710062313.3226149-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: CY4PEPF0000FCC1:EE_|SA0PR12MB4431:EE_ X-MS-Office365-Filtering-Correlation-Id: 93e6aae7-2fa9-42a6-f7c1-08ddbf7a4f6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|82310400026|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NGNkNGQ0MllYTWJDUkgyVUFXRlRFaWcxemY0SDJQeWYwb3ErZUg5Tk5GRmtE?= =?utf-8?B?a1lENks3L2RLNUM0Q3ZyRCt3VFp3L1NnMVlFWjVvbkN1MDF0ZWtuN3E3NU1N?= =?utf-8?B?cFVrSjNnMEcrd1R4b25WYkpORFlsd1k2akF0dWVzTTNLTnBWTjJBQkFXM25Y?= =?utf-8?B?VDF0aHpQckwwNjBPWnU1NG1XYkUzV2hKUTA0OWg5SEs5SVBwN1FRZkhTWGlx?= =?utf-8?B?VDk0WVhCaHNjSFh0bHpiSFRYOGNPQkpWMlZpUGtvUEpiZGhDdnRxU1NOVU1s?= =?utf-8?B?YS9uYy9qaEJSWE12OURPMEpwQVl2Qm5TUCtLTXFMS3V5RWFUbm5lWmpDeHdo?= =?utf-8?B?ZjBMNHpMdHNSRzBVWDI0cTQvMWEydW5BUXI3YlhCZFlaZk5PczFhK1BrNEY2?= =?utf-8?B?UldsY0V5WlU3UHZ2U09NZldMZ2xnMGdXaktQMDZ4ZWs1c1RpR1NPNUdoLzBE?= =?utf-8?B?UEozYlo5QVRlQmwzem9VSXQ3TFlSOU1GNUlraGl5Y0x4MDUyK1g3OTlHZTQy?= =?utf-8?B?ZjYwWERyaVhrMUZVNW8wbHY5Q0RRbXowS1hZRXRSbE9lL3hnVWZIYTJaYndN?= =?utf-8?B?TEFQdmEzUmxxbHhPL0dtMFhLWTB3Vkc2SytET3ZGUUV0eWsvRDlBRDRFVS9p?= =?utf-8?B?Y3J0UGxsb1h4dS9JaEtub29HSkkwZXdIZHVtUTVQL3RCVmpucWtNK0RkTkFS?= =?utf-8?B?TEhpZ09nUUM3UEdoS2NIR0o1TGJ2Ky9pQ3BEZEV0N0l5OUtEZXZZY0JiRmxS?= =?utf-8?B?dEZoZE84ZWRYeW4yYVYvK1QxbERMZWNsN0lmcDVpcDI0cG1GLzVOMkFROFc4?= =?utf-8?B?TUNMcWU3czhkeWNWMFJoTnhyWTY1eTVBZllnWUxjZXBWYVZsYUtsV25FMy83?= =?utf-8?B?bU9ITzJyVmlzWW5oOHkyZmwwRHdsOXBPampVN00vRGJCZk41Y003eFlRK1VV?= =?utf-8?B?WTBPcWFSWm1tajFYV0JxV2JqNkdtV3RpQzJyYTliOEtrY04vcjdJaHpDNGoy?= =?utf-8?B?cW5uMFBrRFlmZzUzcUswR25KaUZjZ3YzVWhqYitHeTA2RWs3eUtZTk5BQWRF?= =?utf-8?B?RWlmYndKYjI0dVBrV3duaWZUVHMvcU5Nalpoc2pOeGV0OXRBaUZIUDFoVUJH?= =?utf-8?B?QzRPK0paRTFqL2IwVnR2VDFyT0lxVDJaMzg0YnhVOWNDbjNvK3g5TzM4VDh2?= =?utf-8?B?RUkrN2VvYVk5eVdiUlNwa1lQWTJXbW11akl4NUQyQ0sxL0NpbkY3bHlSSDdn?= =?utf-8?B?R1FZT2Y3UWV3VVc2a0ZRUXBQTTJDMWxSK0J2SVovcUw1Uk14aHRxRkhHOFdF?= =?utf-8?B?QlpBaFJzdWFqZk5UOEptdmkzc2pRcG5ER0Fzd1hLaCtjbHJHeHlkWW9ZdDdU?= =?utf-8?B?Sy83ZnpWMFgzTDBUWTdXRzNvaEpxZkNCTSt1dWtWMnhKUE50RjhjM2tTVFNV?= =?utf-8?B?VE5BVFBoNmxRd1UwWW1wMUpWQUdZZ3VOUllQNWpHVHlnZGpsWk1SQjZtUlh5?= =?utf-8?B?SVYxSGJ5YTRIa3ZQcmsydzJObkdMN0l3L25rWU50M1U1Sm0zaEtzTU5TM0JL?= =?utf-8?B?Ynpla3hxMmRXWitZL25qMkUvbk55L1gyL0xCcHZYRGd0aTg5MHJvdjdpTjVX?= =?utf-8?B?MzZ3bjIrSVZ5WjlhaTR3NXFhOFl2TDFiSHBuaE1MS3VOVGd2eThoWnpicDR3?= =?utf-8?B?QTk1cWo1bmZEMDlYMDFvd3QvM1l4Qi9pVXFaSVhJblpwQjBTQVlGWFBlSmRD?= =?utf-8?B?WjI0c1FNeTFWbG1rblVwdnVFV01BZTBiTnhjN1VrdndzMENtYWd3N05TWURG?= =?utf-8?B?UWVxS2kycFpVdHo0ckJ5L29PcnVtMzJReFdtRFZ4azFacDFhMzZEV1FWNUsy?= =?utf-8?B?M1lHNkIwM3hhZ0FveHhTdTVMOG03VkVrYk9zcnR5SzN6MUo5UDNhL1ZhbDVS?= =?utf-8?B?SS9SQ2dIMlpjK2l3ZjRFeEVyTHFZZEdmU2FyMG4wU0hjKzNtQXlmdFM2TUpl?= =?utf-8?B?QThlWXBmellDZTlrbWJTemZyUmxBRjZjTTZFQ1Fzbmh6WDYxREh6djEvcURw?= =?utf-8?B?LzVUdWhON25oL2U2RDlhdDZyOVU1MDFDZlJBUT09?= 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)(376014)(7416014)(82310400026)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 06:23:39.5231 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93e6aae7-2fa9-42a6-f7c1-08ddbf7a4f6e 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: CY4PEPF0000FCC1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4431 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 45b44dec0d7f..f72c353bdbac 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 11:45:06 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2073.outbound.protection.outlook.com [40.107.236.73]) (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 945E1283CA2; Thu, 10 Jul 2025 06:23:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128633; cv=fail; b=ThKQsE1nbyNRly4woeZleTuADot1zzn5lNL5PvNx1zaaNcUs/vcNuAPklPyj0hHh13N/udh2e89CMIAuYHUlr4uXTX5wYS3QvBQ3EGFCL3vWgvpOLFkKuycQA8HxnbWQLh5PbJxBjXPyt9A6RiT96xBdmG5jdDBAeMS7VQuwqCA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128633; c=relaxed/simple; bh=LTDtOFNbdPmq40CKWosW+UnqWPEd3BpAKnyMJ+9ZWdk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aEIr7rGEY53czZcw+bsDT8wgIwLg9L+BInDcwhcqkv2ZoMaSUdbda81gR15DVLPwspI7QcTVK8qar2UJSIaGmhnrzcKlNw/fEII0Ti6xjsGU+zyO6woXqTXyPcGCiICygg8YSOQp+UUr1sUotTSzz/uD3BLDZGoLWqib4ZZAz0c= 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=IGsBjwn7; arc=fail smtp.client-ip=40.107.236.73 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="IGsBjwn7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BDWpRxjGs9eWHaHT2sWvZ2k7Xr5F29u6iXm9b1cqMUy5dhi/P9Bx4YQJhWmZDWks2gM5YN88oppFV2tRp7xQd9IFLEUogX/ULPkZg752R+K3HW9dRZtUEdgafAYrUAsLinfM1wKVrKw5sn1TWwFvC/P9zgenKwpck5poKu7bslUBWYY3ttbkc5+75A8UcRkm0HwxeP7wMkyBGx3lgDiuVASMNp1blEq+xvtaYo82C0fgoPVG45YxN93GVeuVkZ/Fr+npmm7DZrj/TXBRtf6s0gpeSVh3NCfMO/eursChHH7ZnvnHHcjnTc+j0+ir47cZjwodm91gXqzsYLkNS4wOEA== 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=cTT8ARgfjZ96BXHNzxfBs2erck2fbvYj4k+1BworKok=; b=gBO08F+SAJrwgy4MqmUCjUnJBRdfNIqf7an4UHZYlQcjEIDV/vCSFTE3nFpveZsQ+24nfBOwxJC2u8hxLbhF4hQczbv+DuSCUZuSRtEu8E33kByy4UOcNeM30nCd1Jcy1P4xZSA/iV/OhnC7iu/k6rAxshhRlJeeDlBaxke0ElFSMdIRjC0UxLMYxMpg+pmJkm6hDOlCPziixq5dN41Q6CSdta7ItrdwGjcsdkPnoCC0x+Gph8pcLWtEwctY/Wh433PYw1SA6mQhZJwMYDS2yrGvPKthCewQWY/yXTxZRMOennNq3EeFOf4VUyQxZz27lqqu7PRuaGy99kHCkqnU6w== 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=cTT8ARgfjZ96BXHNzxfBs2erck2fbvYj4k+1BworKok=; b=IGsBjwn7OuXjCmovbEXmunM/4A2MzfeV2SIy1kczGsrQzy3+7o5GmqGGVx2GwuHiVBa/9Rbdwc9A7Kex8fE+U/Wx96OK9vTY5bx69+GCbObH2elUd5XlgiL/XkeDp1fEjHW1OX06Ch4qPpfCOc/hegfg1CTQCiIzVUi65+8tFZg= Received: from DS7PR06CA0006.namprd06.prod.outlook.com (2603:10b6:8:2a::7) by IA1PR12MB6386.namprd12.prod.outlook.com (2603:10b6:208:38a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Thu, 10 Jul 2025 06:23:45 +0000 Received: from CY4PEPF0000FCC4.namprd03.prod.outlook.com (2603:10b6:8:2a:cafe::e7) by DS7PR06CA0006.outlook.office365.com (2603:10b6:8:2a::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.23 via Frontend Transport; Thu, 10 Jul 2025 06:23:45 +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 CY4PEPF0000FCC4.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; Thu, 10 Jul 2025 06:23:45 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Thu, 10 Jul 2025 01:23:44 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 10 Jul 2025 01:23:39 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v6 3/5] PM: hibernate: shrink shmem pages after dev_pm_ops.prepare() Date: Thu, 10 Jul 2025 14:23:11 +0800 Message-ID: <20250710062313.3226149-4-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250710062313.3226149-1-guoqing.zhang@amd.com> References: <20250710062313.3226149-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 (SATLEXMB03.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC4:EE_|IA1PR12MB6386:EE_ X-MS-Office365-Filtering-Correlation-Id: 531c7048-ab70-403e-56f7-08ddbf7a52dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013|7416014|921020|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2c3BMtAdKXGlU2YTVuKDvba3jZ3EIz+1bxJgDHyZDjV0NBmJOUSNK+5soKVV?= =?us-ascii?Q?/YLMnoBEuartAa43aiD06/MFjLCKnPNq2HnYZZhhWlHyVn9U3CfzrD7wQqsp?= =?us-ascii?Q?SQHPKBHEdeqsVHOJy7R6Fi1Y0kG6Fv982AaY8G139yciD0B9/SEpDG4ckmcJ?= =?us-ascii?Q?eqNO9KFr6Hlm+EOdEuir9HDGic6NwM8DvRKRpKZvaCDSCWFENYXqBGk/W/CJ?= =?us-ascii?Q?Sl9EuTVUecZ/CarMbsjdwOzFTUxgdNfRf8RWZ4QmgMFUCcCX0J6D11B2DuUd?= =?us-ascii?Q?XmTI7WCpuGErUqJocJd2EvY1j+zcdldyA9rwh0NI4hd2DpG+a/xI7WPgOflS?= =?us-ascii?Q?+leBRjEk0rvCnirj/mKFHKHK/iIBA/TXT+LDes3Z9eO6crCDveXGmt12Fu6R?= =?us-ascii?Q?vmYg11z6D2SxH1QED9gOYCwXsRn81dF+yis2DkGjc2Oe3b3CN6706FJwBF8/?= =?us-ascii?Q?snseAHDluw7zcEOSk+M1Bcqpiwjhy6p2qgyo0UnpnoZPbVm1lavswqK+Ls7D?= =?us-ascii?Q?MBs3eGWfzvJa8H6DVeHPuCgFg1Hj0NY2Jf1Bgr0/DweEm0XPSKT6M14mdhtO?= =?us-ascii?Q?pJCef/0wXt1/MDQUo9FBF1q6eCLz8TMXsahqkolAE6CXrRjc724ysoa4C5TR?= =?us-ascii?Q?i+jkeRE3PlGMIIKG51rUWNnj/poMLoV9GS+RroE2AwwZMZvtrROY7QZv0C8e?= =?us-ascii?Q?fUEgBPeNhKCKmtqYTHfD2uQ5XfqTw3F+Ti89xSdkv/bx4hzT9z91F2E7oG+q?= =?us-ascii?Q?vMRbWwk9EKbk9GlU6JSlVCf0+g21GrO1iBBrW6tEM64qJPbsPeaHh01k0QBQ?= =?us-ascii?Q?kuZdfKm5xnlL6dDUxTj2aeaw/r6x78aeZwkdbeCHpGGQvzxjxlbZW6NKJGPk?= =?us-ascii?Q?tDk7+Z2VE7krK/U1uvMgV/Ccytmr1VO7g7Ym7GPygfDk6I3ashylUpmpMUxq?= =?us-ascii?Q?e1fjJgTZD48Vyb+YRQzanbBRf2CJ8w12byo68nijEQPVBoWiEGitfmxRBrmX?= =?us-ascii?Q?STgjt3MH/L2PsqvolRtVLB0wZ33diwulkzbTyGXxHUV3rfvJCeYBklXI2QLD?= =?us-ascii?Q?Yx2QAjRgoTiTzQlGkZdaBXDFgkJJSE+L+O4H+XiaaizHeVWtmQhfbjbaFkkc?= =?us-ascii?Q?i5668j58bYqJT03P21KefrS2wP0Q4dJcVriwggCLOOPyYE6NZpyZ8i/tnEj8?= =?us-ascii?Q?YLY2pQVBWU3bw+c55IkqKBrsoXUErtTcmUjhnODKIfI7460ulvUHBKkwPsQb?= =?us-ascii?Q?tR26/E7M/8AZEy9xObTAt4AkMTvl45sK1D5G270zeVIPPFcOdKWKuEJ/GNrG?= =?us-ascii?Q?bwcKl537BqSrjCj8+YbVO+VgmqMiEKhzUOA5rA0yyL9C7QgDa/HfvTFFdi1q?= =?us-ascii?Q?POKupK9M+MVWbGKH5Thm1YeMabT+jZJN7mGhXQutfi0d769av1sj6LDwqKUS?= =?us-ascii?Q?FM7SeOPeFgBTrbZdZgQDWZejVlzsDBqm0c7SeHSTRuj4k46AwpzVUJAAfxmd?= =?us-ascii?Q?bMlkyQ9LudeNttwv2OabAw62E503Up04ZzCE21Rso4sWeOd98t0etyzdgw?= =?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)(82310400026)(1800799024)(376014)(36860700013)(7416014)(921020)(7053199007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 06:23:45.2730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 531c7048-ab70-403e-56f7-08ddbf7a52dc 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: CY4PEPF0000FCC4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6386 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 9216e3b91d3b..1f1f30cca573 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -381,6 +381,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. @@ -422,6 +439,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(); + console_suspend_all(); =20 error =3D dpm_suspend(PMSG_FREEZE); --=20 2.43.5 From nobody Tue Oct 7 11:45:06 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2074.outbound.protection.outlook.com [40.107.223.74]) (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 675A528AAEA; Thu, 10 Jul 2025 06:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128636; cv=fail; b=TlBAkLpzKHf5hI6XRAJvGYmdlKMs+1KHP16b6mlX3A8vk+OM7+KULbS3s3ny5eerfaUWwh9iqN+5aKUfoc3dcPpg9PUDd96fGWvSdpEXebB/pjVAH3WPDe9sb22ihRN3/G4gNPJ06dPlb/V39t7sglYNsICZKgaqXMRkBPMjTno= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128636; c=relaxed/simple; bh=EWnPHiNym8CswCixcZZ8L4CzNJoWiLM4yHPswEw6STs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uqhgbGTR+QmNW3W0KV6DOjXLv8tTFPI8DOvNvBGLnmQfM3emprZ5VOgFymzv06Ru34MrXscEdQ9zxxlztipqRPHffzfmbVpbN2koN7GMyjZHJOeSykFQFFLFj84IogHwah4MLy+APW8XH6cZ8wsABmsOXfba+7x6rrHOQ4vBiTI= 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=LQ9BLMrR; arc=fail smtp.client-ip=40.107.223.74 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="LQ9BLMrR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vJdH1D4w0BW78hWGFFro8poGhhro5Q1WTJe1tDDAFFBFFpfGXFv5J6BuKOof65c7ueGJ81pod2kRcXbES0y+rI5kakgq9RgD95Mcf673dB0BgUrSX2fW5wUw3bQjPgjaddfph8nPrV2G3oyx6k83JoBgvGvbAinOWGcUFlGgwH8J4KpGuZNrGwqnihqHS8RAz9Y49+x39qVFZ9vFr3QDO9IJQlpPFiUSMyNmdiL9zO2kznVAn5HuruOsLkY0QSqK1/bNcmuSchZBjNydr0uHsEenXjULNEcZkuOD3HDsFms9D69TpjMkGPpYtAzyDCQmr06ttHKre8wUX0jjziH+jw== 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=mhip2z1PdyAhIJEjRwtH8QTK2sEk2zYioa65zld3x5Q=; b=yK1r3z58P+Y+b7h3KeZmgwjfE3OvD53QmnjgyxZGdxWRNZ3Iu/3ht/nxZ2fv+sWS8yPpSQndesoLBmyEpsvUl3E9qZa1ma8oXC+/QT0mr6tqJutLBerP0vleFE+fC/B0/wgCnPK+ILQJl1SHJ9XdpGmaUht0a/+38OG4dz0DtssAEFom4OqkfLv8EgnwoDFYFTU6QCX++AgpB1ECaPT9T8wKWenZwNpKUUgrWlbibW1Sk9VL4pSrc3/ulqt9pfx5AUEYxppyJF4gw/AblJoyMvq5REjtO6ucdM/8AH3hxrNXSyEIK+x5tS0tuUbt0AhI5Gh4sGN7metoK21Zy/ioow== 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=mhip2z1PdyAhIJEjRwtH8QTK2sEk2zYioa65zld3x5Q=; b=LQ9BLMrRgqYCP8HfMzDh/FTxFjGTulIeZx4JlNEzyFbfxDjfYxev/5uDsoE34vG+mwTutpqy4Ut9MjStn93TwdXc7+AG2iGmJ5ZQkvNYcdUBOPx1GWGr1XZCvCn6+4Dxfdhh9YiIt9otu10NAytoB2P5dZUjsh8k/tOPSf/dgh0= Received: from PH2PEPF00003859.namprd17.prod.outlook.com (2603:10b6:518:1::7b) by DS2PR12MB9688.namprd12.prod.outlook.com (2603:10b6:8:27d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Thu, 10 Jul 2025 06:23:52 +0000 Received: from CY4PEPF0000FCC5.namprd03.prod.outlook.com (2a01:111:f403:f910::1) by PH2PEPF00003859.outlook.office365.com (2603:1036:903:48::3) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Thu, 10 Jul 2025 06:23:51 +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 CY4PEPF0000FCC5.mail.protection.outlook.com (10.167.242.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:51 +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; Thu, 10 Jul 2025 01:23:50 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Thu, 10 Jul 2025 01:23:50 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 10 Jul 2025 01:23:45 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v6 4/5] PM: hibernate: add new api pm_hibernate_is_recovering() Date: Thu, 10 Jul 2025 14:23:12 +0800 Message-ID: <20250710062313.3226149-5-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250710062313.3226149-1-guoqing.zhang@amd.com> References: <20250710062313.3226149-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: CY4PEPF0000FCC5:EE_|DS2PR12MB9688:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f0404d6-16d8-4283-cb23-08ddbf7a566c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9Dsk3ekJ5HWZmVHLQzovDf2ubwyAXSGY8M5tvcNjkyQyg7thqTUlrkxPa0PU?= =?us-ascii?Q?vW2MU6PNq3ehRBGuRnH+964cmgXR++pGe7mSu39U1IkXfPXQ46QH6xPjFcoE?= =?us-ascii?Q?SHR3F4k6dYcSab+B5XpsoIXdvSb3gKCmZvsOEOlS7S/zDKuH8KXxjB9gKgD1?= =?us-ascii?Q?p/4E7P5hrym3P4j3UDS6cLlPc8I/N2F1O7Xam1eCpJGfmydNsDNZ9rMqI4g4?= =?us-ascii?Q?7I7KdifKS6oybUnO6zlDdcsufD4qCgDSyKMue4EZoDL/7pq7fEYnFylMRwvW?= =?us-ascii?Q?sbx7OvjnhrrFo0VCC2jivrcnjA4d45498YkEzoRfnCSR7fIUPn/40HLRRncn?= =?us-ascii?Q?DJj6C57/RCmMYjNjzX/nAH47E7nnE1n6DJCr6yuwIjNQGrR4h3y6T3rGZ8E0?= =?us-ascii?Q?cRE4MnPowsoJ+3BBAdq0ZYV13qg4axlLFQ3Oun+vbyL3+Xra6py7k3RjxO5+?= =?us-ascii?Q?OMQeeDPpQjOWDtdmUZDQ3gcSIkGURPoGgh9CsiQwTJwJjbZqWyirqBdNZDqA?= =?us-ascii?Q?Aw+2RqYHEuVw/ObjwJNdmAWIQFEf0oTGivqBqd29vyafYu37/+tXDN0G9RyD?= =?us-ascii?Q?Rba6b+weoGMB03zlnzRKPbSGP154bQ9wMGMjUCdFQq52qDINzUyPLz+Xx4oQ?= =?us-ascii?Q?+Xh+bV3lCKaJzKjeDnXfZiZ7oV4TkgBTbtccZaaaHueBtatlqmU8MgOSQO39?= =?us-ascii?Q?1wBFP/CEUCiZLEr3ciTWaJFZXhYO6TQthyDERxEPvdIhBTdP4BXKnJEnzvo2?= =?us-ascii?Q?sTuSu+j2uL8zGIHD32ZFzKCFTXjjzgogIoBNTIJbLcpnZW6Wo7E9D0pr/f6m?= =?us-ascii?Q?DNzwW4ufWvZiL4tObei1baqrTevmM9ETp0ETAN5oNCR5/DVrKTdXZeroxEDD?= =?us-ascii?Q?Z5hYKL26/o9R2zrhqcUknxcrnEYVuOfYd9WkI3n6x95Yxw5Jw4BPq8LRlmYE?= =?us-ascii?Q?z0ivwkVPuPqCsMyDHelkrlMqCt5LRtNiYqGQH/3VpMXKGhk1YKpVGrUEmGTW?= =?us-ascii?Q?l/dc3fEVLLhUDeb/6KZGxmQRfm4qh20ozzP3UtlrFeMIlllEeTUWrlpI+GCi?= =?us-ascii?Q?rfMFpbybxf+w9yhB4TTFMFrN7Wd7dstqAtQDUAcC8Ahjwx5JYOhwhiG+O2YE?= =?us-ascii?Q?AAGlXkKu4/YMKLhDi08HSb1BnHWK+/6Tla0h7C+3JlB1ypDzvCx01IMJ1HFQ?= =?us-ascii?Q?YD0MnHBPX16toPdSbk4YD2rnEf0w8YEqhezg2PgJOv+nBK4K4dZhGXwc8SaE?= =?us-ascii?Q?GcgwsihKh5OHeD34DUY0q4irRYA7UDo3OXjpSKlL/Y0YI89yXWKIokhh9z6H?= =?us-ascii?Q?XZG9LV4Ocg2yG6ZLKx6Rebc8mGQqasT60pBAWyz3LULQRtV+4igISN/Po7++?= =?us-ascii?Q?looMGlqRnwoggVfmH7HcoYWzIaBEKzpJ2a8i5A1OezmyvWFDONRfvORbAh3K?= =?us-ascii?Q?xYewBtXouEuC4knScOdnJwjuEu/jlXIv4Ys/B4M/J17f+HgegG4JuPN6ybyC?= =?us-ascii?Q?uQuRhW9qvB6SpYAhI3eKsi3XR06nnhrWO2ggrYiwppsmZqyNZvNhM5nlYA?= =?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)(1800799024)(7416014)(376014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 06:23:51.2520 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f0404d6-16d8-4283-cb23-08ddbf7a566c 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: CY4PEPF0000FCC5.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS2PR12MB9688 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 Acked-by: Rafael J. Wysocki --- drivers/base/power/main.c | 14 ++++++++++++++ include/linux/suspend.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 24ebe7a635a7..c4817b379230 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -66,6 +66,20 @@ static pm_message_t pm_transition; static DEFINE_MUTEX(async_wip_mtx); static int async_error; =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 const char *pm_verb(int event) { switch (event) { diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 6a3f92098872..d11a124b7a91 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -426,6 +426,8 @@ int is_hibernate_resume_dev(dev_t dev); static inline int is_hibernate_resume_dev(dev_t dev) { return 0; } #endif =20 +bool pm_hibernate_is_recovering(void); + /* Hibernation and suspend events */ #define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ --=20 2.43.5 From nobody Tue Oct 7 11:45:06 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 757C228982D; Thu, 10 Jul 2025 06:23:59 +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=1752128640; cv=fail; b=mRkMHf1t8QxQP8hYzo/qvG2JOrlVLRSExuIHu/O3WUVMEbZRmIBr0JWnr6YCui/1QFRtL01CH8fH3O5BVLrr+yUfCIn2TCpePa6IqMSt/4cjBppuJwwTVYfxLTUF4E7glYvQAA9fMgV8ib6FZ/U5vh1hrXOhT2X1mnkwoaivQj4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752128640; c=relaxed/simple; bh=FnvTtNQk++SEkQrgDk1QB2UqOHajAPWX99rFSpbqlwA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MFs/+t/kHpDtZti65S1eqrgZEgyzP2wVY6MbdD5HXPszy3VhvXfLooO67YV9WrWMp2uaevijVvk34m8iDXhJewnE61ziJ2pH+fH8R9EBwokC3aKV3Uxg8qrNA13gtF2K6goFcGjgTm9i7T7CRnO8CASHris2Ob+ACIPKOUy/MyY= 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=vuX1svhw; 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="vuX1svhw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H3XDvH5/JkODqqYxYFC4/rObRR08X89DPw7BVoy/ar+qJ8D3FPlgs/Iw2UIsUB33X/ppm4jZOXHV7d+DvkGeng4Np0o9KKSWd1VF8Hpoc3o9Tc33BqxitK/yVYg6PAolp+AOVh+FoheGCdTxDRDNYZVBs8jovRtRbbquSV8v4GdPAdvm7gNervNpeudCzs6+BwsqjpK4ORZQq2fNVRrsv1G0uFJ9nNUoNWlgHfHKM6CXhtIW2O/I718++PBgDUI7YV4yo+PfSuLobJdhO951LkXP6Y3QDFS6pbHNa4HEMd/YfTl9h14e6FfZUXAeKUvbWEOBhdj11s0iZwCF700J3g== 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=vfSTMpMDhiIuTq3yjZ4aIK59TlX2Yq1gv0AJHdRSBWU=; b=bSNASPRd1gU2ztjxm1iMAgxRplIBCIBj2ZPObwZAIxPn4t1AuDUNy/a+8RFLxYXt31pmxrUjXCKodnlOJr5rKChJeXloY9nq1eMRuv6oEllTK+sTolrnKWBswjAD+qnVbi9WjJ8WP6F5USx7HD7VPDJPKYsdopiYLZpoFCEVoV0GYjL9FebDsRQC5Oi6ZfD+b8B5OPtifpulSLwGhEfdIkgwuOpmVqO8C/YImm0CXvvM/s8QrBvDyxh74NJrgDpPKaa0tZ+b6mTNr1Vmo/49FMPmeXclSH5p4BlJxQN+vi8bjFihncwQBU6DcKkZrz5zESXymoZPEB1ZqsrMgfnxwg== 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=vfSTMpMDhiIuTq3yjZ4aIK59TlX2Yq1gv0AJHdRSBWU=; b=vuX1svhwf379I5y5q7GjwoT1jszQ7OeU3A/FuLYhO7wEc6yPfjPz/gYXuCKdrQd6jHtRq81WVLXxFk1rmynK9TyKEGZF686vSKkdRMdmMmU4IEKtKUM8zxHlGrCm8nhG8/ZYAGaH8Wed5kYK1C1PCgPCdqo/tYP4a+/grZBKxzU= Received: from BLAPR03CA0137.namprd03.prod.outlook.com (2603:10b6:208:32e::22) by MN0PR12MB6077.namprd12.prod.outlook.com (2603:10b6:208:3cb::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 06:23:56 +0000 Received: from BL6PEPF0001AB74.namprd02.prod.outlook.com (2603:10b6:208:32e:cafe::31) by BLAPR03CA0137.outlook.office365.com (2603:10b6:208:32e::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:56 +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 BL6PEPF0001AB74.mail.protection.outlook.com (10.167.242.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Thu, 10 Jul 2025 06:23:56 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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; Thu, 10 Jul 2025 01:23:56 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Thu, 10 Jul 2025 01:23:56 -0500 Received: from hjbog-srdc-41.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 10 Jul 2025 01:23:50 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , , "Samuel Zhang" Subject: [PATCH v6 5/5] drm/amdgpu: do not resume device in thaw for normal hibernation Date: Thu, 10 Jul 2025 14:23:13 +0800 Message-ID: <20250710062313.3226149-6-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250710062313.3226149-1-guoqing.zhang@amd.com> References: <20250710062313.3226149-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: BL6PEPF0001AB74:EE_|MN0PR12MB6077:EE_ X-MS-Office365-Filtering-Correlation-Id: c4a7073a-44d9-48fb-216a-08ddbf7a59c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3lWqLs6Nwq3H6xi741Q6El3FFzzUF98Kc4Ml/qTpPmXZZjvMrBk1NDkLYxh0?= =?us-ascii?Q?VeqFZ/CSF5WAGsCah3hsiZ2rDqwvT1iPgoxkOPjHdkfSJ45neaad1Qvqryki?= =?us-ascii?Q?XLLQnqz7xzRL3ZYYDWuOFqbk15bPlorkUK0uMinvAA+rGigeb8c9wQm/3hvW?= =?us-ascii?Q?z1D6Ox4lgw5Onhv+XpXwr9MhVaWONy0KqIsEBtIGpUoLnEnxolNVgWKYP2P5?= =?us-ascii?Q?+Z8tqrrRzMWgNqz0Jo6h1vtUU8H24xE/UxWddRqLzXXkkA75QqdYxCZngA17?= =?us-ascii?Q?/tDILcowTKhOK3z7WSmTad7FpHB/AgbG1AmODM66UYyKNBjK6Y+ih283pDC0?= =?us-ascii?Q?Lg/CmN4sgVys4vClsNIOcWsV24Dr+fHXgg1xuBCLXi5RGu2roI3FRcc/u2tr?= =?us-ascii?Q?xthjZl1B2Xrp0n/PAd2jrk3mnT0euOdxSu/0iGDSrS2kIRpfMcVAI6FTdZat?= =?us-ascii?Q?gnH87443YNHFy9IoQKIwgYe488hkqi501ZK8VEWUixDG0QB04wJhTe8N37Cm?= =?us-ascii?Q?1D+iHgAToOMh+a+f2vuct3jSDtPNns1+UXP1KUStC6vT7WaajHuPv6THHTr/?= =?us-ascii?Q?TTMucNdyH6K2K1TxXtigCCNDiIJaDc/Oifm2oMlMzhB808KdUAUcfL+e+4PO?= =?us-ascii?Q?alm0H7TqqdVUIXnKcZ3Y0MYQJHXE131JzwdGFwrzY6ikOU3F46NtE9B2PybY?= =?us-ascii?Q?B5wWncZX8JWPOFFuSMwO4sa+gODNAkwNq67SW1UgG+XdM6CchHYL0GbHdgaT?= =?us-ascii?Q?RGcAjWaVNBDXzBVFabuB5J0VtSHHBcSL1yXp18AzdCRk4u87rFrminxmPiB0?= =?us-ascii?Q?9FTonzTUVY75O4MFxqZRL1FIuFdmcgEVsPx6vOt+jzgxuKl3i6di3PAL8JjF?= =?us-ascii?Q?D/SwEFQC5VNyRPFq7Fb9JcxQ9SIBaFIZKFwXDD9iXem9LYaTQIxPmlRZRDPs?= =?us-ascii?Q?+f1FfBAmeiJl97gIR0wx4Q9kJKFn04hij6Oe8gd6eOEuLQU61OtOuxMJmp7S?= =?us-ascii?Q?Jdske4fpasJkq+3eo7omjNZjhKr6qSaRn1+kd9X1zQklJ6Z9ewoDssq+Cp1L?= =?us-ascii?Q?Hbqbq5O086OqRAkTIQ3xvzBO/OMvJSdNW+aBhDAr/9XsZM1xvKV4SjASW7zS?= =?us-ascii?Q?JMf/CoUWimDxABtAtjFy1FpkEkJ3YKHKFlayF808X1FvUEbPS7JicDp6pSdo?= =?us-ascii?Q?fIIHslhUD58YNeVaFkCsDvHG9MYIqABUVAwmv7bseYEQBxIZ0E3gkHnYWJH9?= =?us-ascii?Q?E96j30BAEDAJYQyAzA1pB0ueYrVLOarhM0nTpsUEJ8Ywxm+z2UGRbxb2t89/?= =?us-ascii?Q?tVLugDoxSike4ty4y5DuuVgOt/hi8Chy6BSYJnt0ivNkuXYa2Xt8cw0imk6t?= =?us-ascii?Q?loUxQ0ifrNGdPUtMw7Zie8fiEjKAcqf520+1Oncs60AzNU6c0OX/B1N37y9X?= =?us-ascii?Q?+sm+zkAKdFDciOcfe951R/+CSSYHrsXnWnH8oc762IWff+vahFsdnomFO+k/?= =?us-ascii?Q?5PFjDDbEI8aukWm/XCVPzOd6WyKDOK4ql18oQ9lxUJE+SdHQjPayQ+nKcQ?= =?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)(82310400026)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 06:23:56.8916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4a7073a-44d9-48fb-216a-08ddbf7a59c3 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: BL6PEPF0001AB74.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6077 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 Reviewed-by: Lijo Lazar Reviewed-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 1c54b2e5a225..021defca9b61 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