From nobody Tue Oct 7 23:01:02 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2089.outbound.protection.outlook.com [40.107.92.89]) (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 2769928B4E1; Fri, 4 Jul 2025 10:14:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624065; cv=fail; b=oJCXwKYZY7foztdJjGfjAlXQEPnQtmcXefq3Fgas6lt+NzG200SIeBGP7+x+uDG4CAZnl4f5PFysefID3sodFRpWl2kaTayNlPHwRVK38bMb0BMDxaAnKYBCps03uYpm1fVYFRAKwAWetuNP95y5FlG0Kyr0QQGR6uenpnKXX0g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624065; c=relaxed/simple; bh=QNL7UOA+6olwgA/df28PF/Mvj1QsPUzH9jEMuccQy4M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OoMGKn50lohSzlErZ0HdytKkxArMtpcZQyK2t5WT32tV16k4TVZdA3qmPnTgVsxGj6VnQBHavW3hUN4AlZ9Qh+vOr1Ur+j1a2SfU+me4z0DEjZXUHliskukmWfl38C/q25COnw1r6rLCqPIQ6gaPLcMDR9HbfaOWAIBv0gxlmWM= 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=crq3aw+e; arc=fail smtp.client-ip=40.107.92.89 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="crq3aw+e" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=At4yNhEaDpGdmZ4JE3213DWAjW0p9fJMG0uyyQ8A9I6rEF7Te5hF5a5a7yc/AfErEFx7qWRuMwVcOCG/gjwRwq3i7MRWaETwxIAo0Rz6Rg5nAK1uPIhHsUXRQke6xNrcWZzeNU2E3OIkZtkJu2IdgxV0IYl7P2aPt9CiH7Em/PBFSMrE/shKo3HbS1qBnVgAFoT2VFUe90gdj88ADF/zjjnufAe+TQILYkvHqoZnXKvhFaDYTyutR/1Jct/5HCoVB1ARhCNnf+6IgqG3xa+qKoRU4VjQHPAVnitaxIAzT0xyjOTcChcNpYZCpPdx/DEecVy34TeqsEb1QM/mKqQ32g== 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=qDgMkhERxZUsPYLC/xIQteDtMz1k+K7qWV7n8Ev1GDw=; b=Z2JenqHOSDn3b1ewMPU243/IXUs2R1nH6RZZ8KjEBkQVcI+yafB9HouTWrS23ZayQK5FWilmaHqau50G0po9Bbg4oirg9UNHNTyaYgviRjF4YDW8c7QVUS1fROdpYN2PJm2fDTGEgUMPjmkxn8HCjJLs6B/vd64J6brdDX53V9SPQLB7nOeDhgC17hCeVmJYOrWCtIDuBV9Mm1QuJ7wbmUwqFtHmpaCxA6fg5enWOokfbgswuNScOyFVjsiaEibmaxyI4E0PMc6xNUoDPNXc6DsX/oCd9yBhSe6F6pvoNDN1fezWEJ7VUDE3q8HsvlJGa8gW93khUUKqWd2w59Z1Hw== 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=qDgMkhERxZUsPYLC/xIQteDtMz1k+K7qWV7n8Ev1GDw=; b=crq3aw+ek9+pH+AyUiCjnm0zh9h63C7pzPg7YrzLp61UQ5louF2ooWTkYsjoOlKfwAeHzV1KjG1I9wRiBZ+vdyKAV25q+YbzzRpuX/FfrglQfhNdBo5ayPbG1YB3wET+h3wLmaPAC0kjYyx9lNJUkQ0kI+uuQH1GCkbBlJvJ4Rk= Received: from BN8PR03CA0026.namprd03.prod.outlook.com (2603:10b6:408:94::39) by IA0PR12MB7774.namprd12.prod.outlook.com (2603:10b6:208:430::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.38; Fri, 4 Jul 2025 10:14:20 +0000 Received: from BN1PEPF00006003.namprd05.prod.outlook.com (2603:10b6:408:94:cafe::c0) by BN8PR03CA0026.outlook.office365.com (2603:10b6:408:94::39) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.22 via Frontend Transport; Fri, 4 Jul 2025 10:14:20 +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 BN1PEPF00006003.mail.protection.outlook.com (10.167.243.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Fri, 4 Jul 2025 10:14:20 +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; Fri, 4 Jul 2025 05:14:10 -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; Fri, 4 Jul 2025 05:14:10 -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; Fri, 4 Jul 2025 05:14:05 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , Samuel Zhang Subject: [PATCH v2 1/5] drm/ttm: add ttm_device_prepare_hibernation() api Date: Fri, 4 Jul 2025 18:12:29 +0800 Message-ID: <20250704101233.347506-2-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250704101233.347506-1-guoqing.zhang@amd.com> References: <20250704101233.347506-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: BN1PEPF00006003:EE_|IA0PR12MB7774:EE_ X-MS-Office365-Filtering-Correlation-Id: 897f841f-c445-4722-6afb-08ddbae38a80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014|7416014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FyoVmVAIeHzrNuPQeyEiO6UKfn8bGw9gUricwmcxons/8LSMe2l0MLD9veRW?= =?us-ascii?Q?paFaGpsUg06vAvJWa7wNjoz1mWujT8xLGzt+5z/d/y+xvV2HcUuk2XT7SxZy?= =?us-ascii?Q?Px6buTtW+IFIuVaz/G2bsLA2Pkjdf728We30TNNc7UmqoJVSySk6kJDGOLMI?= =?us-ascii?Q?myG0kj9yQ9gzLJ/wfFvLwKteS9EPtUAk8fDuYjSrfUdlktHBUuOYpaOxTl0k?= =?us-ascii?Q?baiiPPzowwWbIJjXQsPb7Fzs7GqpybA9hnYSfDjWcBX9l3MldBVC4fHV8Sya?= =?us-ascii?Q?XXDmAYcbjArVOmmWl0A4UEGUxHnY9w2JS7rxUHF0Q/JN+cY1+Df6DBIxWv9r?= =?us-ascii?Q?DSy4aVrE17bmFju14VPVWMPmYS7/8GUA8uXFI2B2pMGY2uBFj461STvNZtca?= =?us-ascii?Q?3JX3PK2HPvi3ZXlXbN+2g2PjDQpXIVp+TO4N77QQawtOTtqqdG5EjPvFnFQT?= =?us-ascii?Q?cf+lHwjuo0G4DSGL+mdbF2MoeqGZrkSWkjLRBqp5c7XTGQJAAsGTqiwz0+t8?= =?us-ascii?Q?j8w7/oZe7cZ+U2UMELPJmx3By2bz3WZpAXpFpDK9EsvvBUHpOe/CLkow4eHs?= =?us-ascii?Q?Gx8DQoWTgbTr5vHyXdaBOSlqboqwW8kytJwkROPadBebjgXCmiymuyyipqlf?= =?us-ascii?Q?A67+QUvRHZopaplnFwWsoMoXdQwtSQ6+seKlffSIVLtD4f3fFzNgdBv1ePix?= =?us-ascii?Q?BvsonzY49xfwJlsyUdZg9iOuZ1yS47rfknAu9krX5Gpl1IhgXfJLPIhYwNzM?= =?us-ascii?Q?ziU/6NjjehtrgQLoQKnIzmHBW6elCA9tweCUlj/ORKRsimSU3YKD4J3OaY98?= =?us-ascii?Q?SLKgt+/AES9k9DeRNLj1/LVIdXEfQYIj+vf0td6EleSHxue6rKhlIwGmLa+V?= =?us-ascii?Q?OExBmapjXdh7gtgQEmimy8naHi8GDUd43/LgGc/0FUpGoH+ezKxylYNCr/Of?= =?us-ascii?Q?vnn8MRhHLbaTZjxtEyMZOiH7P3xVAX8q401wtpFAs/vJ53SDuVPO8qMg5K00?= =?us-ascii?Q?9JbfxYrrQP8ob2jiAKu3W6avAWnrQmByJDFjEooOjqWZcTYZWfbcLdVpKgMI?= =?us-ascii?Q?K6jHXWQD4DyFJYMhXJwu5LecgrjUmI77UnbNIob/gaiVCp8ROADu2oFpRlRn?= =?us-ascii?Q?4LnKDT3u0p/2xOVyMfAn/aEvVK6vSsq320kIBRkEUW+gku0qYMDJnTv4I2zU?= =?us-ascii?Q?au2k3NlXmGhceEY/q5EjinmYN2OHGpLbZOkSkm5K2Qev7FrhWtSlIL3vi5Y3?= =?us-ascii?Q?mGBEDUc5lHsqJM60Oq/yiKgIxF4qzW8ECPWf88DJbRBD2zCh1I7KNfwTQV5A?= =?us-ascii?Q?5HckRHaj74Ye9mwFk9PAJe4xl+R3KiqS9xsBNWeSB7RG7C+ERi31eFXt9/g5?= =?us-ascii?Q?Dl6y7oLDZA7xVhCHHjClI7I9LHYzsTzW5NoLMdfqmaLsNBjUfsnVueD+kOiG?= =?us-ascii?Q?We8dOub/X4OHQl+OiX+ImYnAf+7WA9G3KtK/8D622AUuP6MZadVrmrGeDjsM?= =?us-ascii?Q?1Awf4g77g0ju1uMFbRflV7pazvCf3DhSnLrLeAb5UjdahuSP7fEf6H4+pQ?= =?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)(82310400026)(376014)(7416014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 10:14:20.0075 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 897f841f-c445-4722-6afb-08ddbae38a80 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: BN1PEPF00006003.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7774 Content-Type: text/plain; charset="utf-8" This new api is used for hibernation to move GTT BOs to shmem after VRAM eviction. shmem will be flushed to swap disk later to reduce the system memory usage for hibernation. Signed-off-by: Samuel Zhang --- drivers/gpu/drm/ttm/ttm_device.c | 29 +++++++++++++++++++++++++++++ include/drm/ttm/ttm_device.h | 1 + 2 files changed, 30 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_dev= ice.c index 02e797fd1891..19ab35ffeead 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -123,6 +123,35 @@ static int ttm_global_init(void) return ret; } =20 +/** + * move GTT BOs to shmem for hibernation. + * + * returns 0 on success, negative on failure. + */ +int ttm_device_prepare_hibernation(void) +{ + struct ttm_operation_ctx ctx =3D { + .interruptible =3D false, + .no_wait_gpu =3D false, + .force_alloc =3D true + }; + struct ttm_global *glob =3D &ttm_glob; + struct ttm_device *bdev; + int ret =3D 0; + + mutex_lock(&ttm_global_mutex); + list_for_each_entry(bdev, &glob->device_list, device_list) { + do { + ret =3D ttm_device_swapout(bdev, &ctx, GFP_KERNEL); + } while (ret > 0); + if (ret < 0) + break; + } + mutex_unlock(&ttm_global_mutex); + 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..b45498b398dd 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(void); =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 23:01:02 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2087.outbound.protection.outlook.com [40.107.223.87]) (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 147182F234E; Fri, 4 Jul 2025 10:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624068; cv=fail; b=qK3PmWQ6/5tTMXZMn4Sr6zU8eG7rOod0fWY57JJwP8Uqwwtik9u+P18OSP18Jp9xFFKThB/kFGXq1QkuqK2YjGKWwJ7glFo2G6sMRFeKs1lwPAhK3XHTWbB+fgiYracSQLYhRsUPqlABgbuo+HVyB0A+1CnQMjgnE5NAi3OpYW8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624068; c=relaxed/simple; bh=B/lOqwCmA61g9ceeOtENzGlAF4TsAKqanEv7hU8eT24=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BrJ+/yQHT8UuMBc8K7tvbvqV9ZsITILyRZqtl/gRGFE/b9VHrEEqDJrwpGAHW7A8g0cykR4vFWO0/He/hMg/s5avQ6/hYWq0ZjNWpnQd7AqaVTVlwGXiaPqzJh7u4y91FSxioAat2GE73Hqn24bACFeAYdf+BzAUVPMTkHTwPA4= 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=IlA86w+d; arc=fail smtp.client-ip=40.107.223.87 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="IlA86w+d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M8eewG0SYy4D+XXEM2ubeu/H3v0HC7LnaQCqb40Z8V1zWrMDJJBh61MobkKmyjTP/vx7dpr0RWT7X4yr6Kjf6sshSZAWRGJPJFbDtIKvwefOUdrQ4vPoeBTbSOKjyGBwtG/FZpPPVIi+iDnOYWe+rOW/XLMZkKMsRmeDGCes079Ie5FvcYEnc8PmPenUtsXoB+/JCLo6ZHPBuG7k1tsb3pqAlanh4lF6vQDY97kA/uGLoACjhdm9AhQcDGnxd4LaTRhvtItfHlXmfhIKQaRtjb9rs6tiQQwWUdH+tvFHa3eNXRBbujxi8glpGhBZM7urO12S8JheOFyBD30MR1zvCg== 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=khk92tWJqudEqkUAf8XgKfc2JRmxRaenPZMItyrzpg8=; b=roIZIxpTZa1B1V2t2o3dK/JPYbXLtPPxedx4r5kJbifDg7/CRgT/dsHmTCPt6isbojrm7/GUhQCPzNmyRlBC3IgJZJMs0RI2fcZFBbdpce2xuz0DwhLjvgwwgeEpZuHvKoLyQ0bL5jAhyVjul3P0gKRW8ydZJuPJxHdrxg3vlD3pAavkPv26j24aGtzalI0VWQf0Ztq+LHSgxzZvkXRu/BLWxVPU1zIVmkosgZ3KbJq6ll0akxVNSDT2z7ZRseKY72ck5v6zglNujInEdRCRcuTAaSeE/qKNZGim5REQ/UaNi2ZFtPw2o846B5+cI0mMaNmwWA75Wmtfqv6MAdkmXw== 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=khk92tWJqudEqkUAf8XgKfc2JRmxRaenPZMItyrzpg8=; b=IlA86w+dvLm9TmDNRrcc4okJh1EA7WdW07xoY0CT1vHqOXHjEOEaq/nD3ulHScCAuEiHG5jm1Z3CJnhmkDlwqHfA9Yn5Y0FP4bfyP+9VPMyLJ43FZgr43cL+TXpGYcV5Nr6BsuNrbXohTfuKMTbuIpzi+FxvJlpLcY9vTwNQPmk= Received: from BYAPR05CA0107.namprd05.prod.outlook.com (2603:10b6:a03:e0::48) by CY1PR12MB9603.namprd12.prod.outlook.com (2603:10b6:930:108::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 10:14:23 +0000 Received: from MWH0EPF000989E7.namprd02.prod.outlook.com (2603:10b6:a03:e0:cafe::a5) by BYAPR05CA0107.outlook.office365.com (2603:10b6:a03:e0::48) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.14 via Frontend Transport; Fri, 4 Jul 2025 10:14:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000989E7.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Fri, 4 Jul 2025 10:14:23 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 4 Jul 2025 05:14:15 -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; Fri, 4 Jul 2025 05:14:10 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , Samuel Zhang Subject: [PATCH v2 2/5] drm/amdgpu: move GTT to shmem after eviction for hibernation Date: Fri, 4 Jul 2025 18:12:30 +0800 Message-ID: <20250704101233.347506-3-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250704101233.347506-1-guoqing.zhang@amd.com> References: <20250704101233.347506-1-guoqing.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: guoqing.zhang@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E7:EE_|CY1PR12MB9603:EE_ X-MS-Office365-Filtering-Correlation-Id: 2730100d-6ba9-46a3-8181-08ddbae38c98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|36860700013|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WXf80uMaRngyYzbeBZFUPHi4c5WdCiKRid9Pzti8L2+X+jjJ1zu++wS2hfZt?= =?us-ascii?Q?hlMrkXd/2YK3EY5ePq1mBXNIGVQtsbfp/6DH3i4178D2gqhv2S5mitjZYD7N?= =?us-ascii?Q?Oujz1mYRw3uGFZkDkwol70zhrfBKUz9u1dyMgphAAw2X1yaYC+unC/AcHGo8?= =?us-ascii?Q?qQaXFY3HuRCuaZnbbcX1vRm0HNGkUVahRPKun5DfQ5+kA9P659vngwqXPOF0?= =?us-ascii?Q?5b9h8qbvKV4DXqG32KBE7cb/ds0/haE0yPpgOjaV//tL3WCoGhviktXQ1Or/?= =?us-ascii?Q?KknrGOMxPECHVFFhIZv/f9jzB1vhGhbAIsyAdiKk6vtZ71xBTW2AofZ19gW7?= =?us-ascii?Q?iK2RpJQ18B6+EiyZosasZY4g7/OPB/pesTC7liZJaMRR6RTMjJZ+SNtzAKV8?= =?us-ascii?Q?DYJZUIxSq8iY3M2RF+kaDksNXLaRAVTnvzk5WgEj6kLdg0MO11hWHykFSQEU?= =?us-ascii?Q?/GcUH0E+iCn8OhChq65F6CL22duSoDukOaqnXcDxRV/I4ugo8PU1gBIbKAt8?= =?us-ascii?Q?xeqXQl9Ud2JA8vKrtU/MwNM/o7mDQ5jBV4TFnVPIMpgMs/qSSdLKZm6Xw/rp?= =?us-ascii?Q?HTGajQISdbgATDlICmQGLyhCQmWI1Ff2U0tZN0XMtjxOVQHvs+3StXaKvSIP?= =?us-ascii?Q?20lB8nCqLinCMiLaQghrD7FBHx+WqGz/IA3wYUi8yEg8HLLiLLzg1tzitacR?= =?us-ascii?Q?k3ADcncXdPuYgHKvxoR+fyJhvPK/ntXDHr7j8IfRlzj+4B9AW9QiRkxZ8Xh5?= =?us-ascii?Q?RZERqa1kKoPGSPaIZWpBujqOvV1XN1qXmVnM50vGkQUV6BO5mY9IY51XVbjk?= =?us-ascii?Q?V3valNzVvOcUhIzK7IATwZ+X37n3R5iwkSes3iLriCfmtRfjnREdbF0yism2?= =?us-ascii?Q?lhLNI+4HQx2knSahdSCq0pRasTIwkv4hqyF2CbxBSv/LyGR5SiTAtOoJ1Eb+?= =?us-ascii?Q?0niofyrAANBoCYs0c90V4jv8zgbVhnzP19y0Fk95EqmZ+9ekL2xbfGhpINbv?= =?us-ascii?Q?jeLa0KSQ+YgU1eSIh81vHcZFYZESFf/89lyawAdhWj4QkzRDz3ZG74g62Mof?= =?us-ascii?Q?DocmqAyK15D+b5Q8bRIOsS33rc/NcyPfqupc6cbsHEhsJ8OHdrd22mhUrTeV?= =?us-ascii?Q?LiEadgxIJtCvy/Pn7srV7lPTh4mLxjgT3wRsyXpeIgKeEhyFI9OyF7kD5bYm?= =?us-ascii?Q?Ni87YHAFfZXsi+w7B+4dA6u3C4uYg341zEbgM3Bpj7oi+E7nlo/81RMATdZU?= =?us-ascii?Q?q1fsygiA6KftegGmRI9R7xvDxvTDxrBrL4Dp2X7/oNdLDfrQptSfaJhu/ef4?= =?us-ascii?Q?rBpZmcf9yKCTNhNSaCLBftyoUyTDce72ZuGKtNj2YziSh7mh231bM7r9KXPf?= =?us-ascii?Q?rZCl4r7tUSOJNuKK3ppxT84Yenbe+3/PVtZ3kYdAb3hRU8P4RZDoDwe54y2z?= =?us-ascii?Q?m63cNF0Q+LPGRQknABC8YZplVkp46jnF4/uCqqrFPadlSbnAalwAbNX6d8A8?= =?us-ascii?Q?vkXmv/nR0BG1RcM07mhrPHWtfgiXst7wAxcEuYoutyOVQ1NuT9m1gTfu6g?= =?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)(376014)(7416014)(1800799024)(36860700013)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 10:14:23.4279 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2730100d-6ba9-46a3-8181-08ddbae38c98 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: MWH0EPF000989E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB9603 Content-Type: text/plain; charset="utf-8" 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 --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 27ab4e754b2a..a0b0682236e3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2414,6 +2414,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, int amdgpu_ttm_evict_resources(struct amdgpu_device *adev, int mem_type) { struct ttm_resource_manager *man; + int r; =20 switch (mem_type) { case TTM_PL_VRAM: @@ -2428,7 +2429,17 @@ int amdgpu_ttm_evict_resources(struct amdgpu_device = *adev, int mem_type) return -EINVAL; } =20 - return ttm_resource_manager_evict_all(&adev->mman.bdev, man); + r =3D ttm_resource_manager_evict_all(&adev->mman.bdev, man); + if (r) { + DRM_ERROR("Failed to evict memory type %d\n", mem_type); + return r; + } + if (adev->in_s4 && mem_type =3D=3D TTM_PL_VRAM) { + r =3D ttm_device_prepare_hibernation(); + if (r) + DRM_ERROR("Failed to swap out, %d\n", r); + } + return r; } =20 #if defined(CONFIG_DEBUG_FS) --=20 2.43.5 From nobody Tue Oct 7 23:01:02 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2089.outbound.protection.outlook.com [40.107.212.89]) (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 77DA62F272E; Fri, 4 Jul 2025 10:14:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624071; cv=fail; b=azibIVS1NNDnwJzMG8YaAkpuM1d9LWzg7SSc2bHAPO2HWByGRl5G+PawGilUCaXURPqSCT8NcbWAxhR6DsnNz9f9/R6OWxajttBGsDeBj2Cv6cPulKJOx3f/tg5Q9ehzvYxxzGfSjcGJEIIawC8SjUV+S0pdyq5p1cAwdG4DRRA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624071; c=relaxed/simple; bh=jD1uccYsJQDqut0EAbTJhp+eHxjjbckOpWUfGNl/5AI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FBVCZ1mhxvxY7lS6sIm5VqJmQ+UhlJINCBc9JHvRfaQfQNsYFWndea8QYicly5IYYAgsrcx6tSBJw2SlKUmJgou59Hnqkcd/Cbc9d3BW0wIlYYf7foLSt+5iIhmqJ/B6u8QEPin/GQeZeOWz3Y1GFuzOJ3BPeBZNnLyomqrmhK8= 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=aoc5UyQF; arc=fail smtp.client-ip=40.107.212.89 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="aoc5UyQF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lxA9v1LxNSjPu4+s6Grid8yp+MOPYaz3Z20VXqsL0svy9d68WigT9pkIwthhd+U4NRm7jwDGiYZgKFywRLJ7NvA+ARL0WSzmLjODP9td0waO3D2XJmQJlIriLVJKt3v1nUD/nP2+9NG8P7dyUGq0DdZgDngcJyKFl6Z8CefvpCYhHYyWEZZbUFEvnPBRNLukMldTw6NyztEOkh6Jr5sApa9ZAu+4i/XYUa9vGPSsI3bA5tYI38O/2eVUHfJfoE30Eh0pcDsRDM5V52lAaDc80vNbgsstisS3/FiRUjH3BBMaRhP2fpDHrZk8SIwAx47eW3G0EZl60qvimaGWXJk+TQ== 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=y/kMdjNW6v3+pulSsqUQOCN4AFAHRvOBEoKn/Jk+vw4=; b=tLX7etbeMTlu0ldwR9+C6JP5bp9NkLXWyEEUBPAVvUKM7uGhvZd1bH5S7CdfsI9g8fOrRtZZ9sh+vUdgSsGqgb1/OIBKpZAreHTELBPuYt2E79xVOuN8OBOKjCCaPWvEMwpNm7LFXnlvSn4Ho3tY2e3PXV+ugK8sMdwUeRiyFnY6RgR1jVKTBOmdrV5GOVgBy31Yp+/rVsVKETo9aZCuQX8aX7DGvUOstFnhNxgMxj4ZX1K2nsX0DMhBd214XdKiGBMukxjWHP4/zRWUiF69BfCLAn7NMh6OiRCO2h2VkBQH/mclka2kem+GUrmns9AWGQKsBpv2lQbDOd9yTsjf6Q== 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=y/kMdjNW6v3+pulSsqUQOCN4AFAHRvOBEoKn/Jk+vw4=; b=aoc5UyQF1I5VtGHHhBVl0pe0kDi5q45f2xn/lkMKo2+H4X/N108oXpCd4Az8/4tQro7UFpnPdaK8LCDLajQnOPcUQpLT/kqmUFG+4MFfdm1y6BCfatoOscsh0cUfOUDLzm11RNsd2+gNF7cIfrO06iDIliJ4Lin9NoZTIvlj7e8= Received: from BYAPR05CA0084.namprd05.prod.outlook.com (2603:10b6:a03:e0::25) by SJ1PR12MB6073.namprd12.prod.outlook.com (2603:10b6:a03:488::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.22; Fri, 4 Jul 2025 10:14:25 +0000 Received: from MWH0EPF000989E7.namprd02.prod.outlook.com (2603:10b6:a03:e0:cafe::a3) by BYAPR05CA0084.outlook.office365.com (2603:10b6:a03:e0::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.12 via Frontend Transport; Fri, 4 Jul 2025 10:14:25 +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 MWH0EPF000989E7.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Fri, 4 Jul 2025 10:14:25 +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; Fri, 4 Jul 2025 05:14:21 -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; Fri, 4 Jul 2025 05:14:21 -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; Fri, 4 Jul 2025 05:14:16 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , Samuel Zhang Subject: [PATCH v2 3/5] PM: hibernate: shrink shmem pages after dev_pm_ops.prepare() Date: Fri, 4 Jul 2025 18:12:31 +0800 Message-ID: <20250704101233.347506-4-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250704101233.347506-1-guoqing.zhang@amd.com> References: <20250704101233.347506-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: MWH0EPF000989E7:EE_|SJ1PR12MB6073:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e586360-4f58-4438-0aa7-08ddbae38d8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tfKXNG45OgGOfHnIZtCOwvWkMGynEHgu2fWii+RFjqb6647EGWjfmlgHbRO8?= =?us-ascii?Q?1TZXgSnotjM9Ce415mCut8VVO2ulS7P5btmXFCLbwBfAxsPmCB9N/ZaQn3vk?= =?us-ascii?Q?2g5iQF6PwUURHOcUIwaAy84Odm6KIqmSZosNL0hwrWm/GSGSQvoqy9MYq6Zw?= =?us-ascii?Q?d83Ij2U+S5ZjMwKzfrJ2LGNkptUFnrMsk/+R/zNktdGAzU56Al2lCNAYfWKg?= =?us-ascii?Q?3t4cv+rwTgw4w/Ay3ogmgGoIAvaFotg/qRkgAmHhe8ib+cRa44iJEE/wCfoL?= =?us-ascii?Q?ozpDKD4nz92PrWXJLzGa9htUWyKR8C4oAOhDNJoUtxoH4NemjGzANkWOTDhR?= =?us-ascii?Q?/4cDMIPZmsBoAZMpR3MsmPP7Ast8u/WDLakcez5Bu4iG7zSwhs2YG2xQ5863?= =?us-ascii?Q?+qC8AOqq/adl0zJGhXltsbgan+pjU7iq6RD1p1q0+HrcEB2ENQ7ECguwySCe?= =?us-ascii?Q?Mg0r+DgXd8GFYoHzdzmJMpQmy18seimd60OmqD45y34a6VqQri8yGutuftYB?= =?us-ascii?Q?0SYHa8iFmvxr3vrinUZOCFizOF6eA9pq3AJWwVunr27g0l56fQENDKFAzzit?= =?us-ascii?Q?aI3JmBWhcWdZl9ahffcCubpKieBSMomAJVrkOotrMoKF+eVBDZho7/kD8FK4?= =?us-ascii?Q?kQ4tDlHFmvpTBXo+FmkiYg1/69XAKv+kxCV/Z63qFyGcBAdTbAhxZcOeNSnG?= =?us-ascii?Q?4hGe9eg5irqsqrGQ5uVe/3PouT+wkANXS+Bv6H4KwpIgkysw6qMusX6ySwNm?= =?us-ascii?Q?H8u7+zxVLqKHRcc3qGV9xmQMTheKtbtL4VetbRiCjG2oaO63N+jr1ySGfb0/?= =?us-ascii?Q?JKddzszFV02CAoSJHFOMg1YpZud1SbAHkrxV7JUJW32ahO84aYQ/VKhGwo9I?= =?us-ascii?Q?w8dbXF7dBFLFKZyJdm5/qCIlxc20J/VjlPR7M8zdXVAs7PpGbfAlADYPwcVD?= =?us-ascii?Q?xrX30IL6FElLu4DRM9UuWw6zui/98lO0NY9Xpj+v1K92wzpG7i+VLfzkj5me?= =?us-ascii?Q?AjfUDOtlu0rZttsDFHJ1jloZ8Rl++SmthaHEL8Trd8AVZZTl2/9ZvAj+Q1PU?= =?us-ascii?Q?4a2iuSuWf7IZDr/DMVK1n/xt32BUo6WDPy3mvMQ3geDN0IZFF/h2xa06ZDrH?= =?us-ascii?Q?K2GMa19UPUZ/wvKR8OhBn84WWofiV4m31qQmtGfHnAO07EuQEngizPm1D+OR?= =?us-ascii?Q?1uHrMhgpzTJcvldvYR+3U8I3Av9MJJHv25kPKqYT+nzQP4BWbiJLS3gN4Q9K?= =?us-ascii?Q?5E0elchwBsZtd+ecChKuer2RNBfkH3aeBbkB1bbb3rjbmeaN25KD+DvUyf/1?= =?us-ascii?Q?3PFVzHP/tY/WaGMgMhI1IQ2o8WBHeEYiOzOO57eIU7xZVi3aeWFRGKUNCRoS?= =?us-ascii?Q?3ZyY3OpsorZolG0UMHA9n1G+gXWkEKd19k2qF1kKH7tdiI0/BEUROPf/huzq?= =?us-ascii?Q?fHYVfZEPI5XGjxv1wcMK7V+rMoVx0Wa/I3tQrGH1nytTS9tq6eYJP5SCGNDu?= =?us-ascii?Q?cPWEZAXkdZmqGBjDaHhRFS/ISoNwYHh/Tz49xR5ETtRUkxavOL96xKTtMw?= =?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)(376014)(7416014)(82310400026)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 10:14:25.0444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e586360-4f58-4438-0aa7-08ddbae38d8f 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: MWH0EPF000989E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6073 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 23:01:02 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2082.outbound.protection.outlook.com [40.107.93.82]) (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 E03C22F2C51; Fri, 4 Jul 2025 10:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624072; cv=fail; b=siYTVtavM9cfvrfU7WyswX+3cKyUwna/ex8Sf4nZLrAemLG+UnnNmhS6v6nLcPfZUl34XFIK/aaJAGcuD5eCfwQ8reqPKGa2GlcedfK6kfsNLHXMvzdcNtFQRAJO4wE/Lu5zqSc95w2h3RXaScP2aWGW2Ip+r8eSKDE3VwNFGxo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624072; c=relaxed/simple; bh=+As7MupqexdGC3ExMmXhc3Tmo1Q/w+jqGCUcjvjjsFk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qyq7QVpGx4NVKuYoEmcKCmX8duR6q0Nfa8zMsqbR/nz+/1kZ96nhv4Ha+noaZpXlnFbpCp61BCgn58eXpg7JECE/X1zJXzeErCc8dX0o2o7Oj0Vz0tzIj+h5ipCY+knM37MRwmVQY891X+V/w/eJlELQU241f+9THeNX3Wk8QZk= 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=sOIR+tw/; arc=fail smtp.client-ip=40.107.93.82 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="sOIR+tw/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EnGfiiT+1cNil41CDz8I7O3hx8hn7RIi0HUIC8FW55BKFatuaKDDbzsdcSw3uCoGHluiqYjppmk1Jy5Ad/72G99GuecNOHREk4yL/LjtGWeyv6c4dJ6XViK+tDr0Won8kxaxChcjkyIQDd/c0taZS8cuF7eFJJNrZwD11ArYdQDKvA3N3mVl00QSTetronNrZoa4ttEF6BS9tV8i8exeN7eFzQ0eUdpIfKOCUK7SsDcmXittnfW3ParVmxj2Ay0bJxrXMbAvovQWrsGcAFsYBVOB/P42QohuEDCwjcNRHnkxl3+UuEo71QMjAxRkD6n24X6IGWUC4yHHySpYBFy3ug== 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=8Uel3kGi3YS7Y/E1TFsLBIbfwWVpvv62+BZ8FOiWdEQ=; b=VDI9D1skoxfHvmuuTSwc8jwPPJSXYyFsT8Qj+aS6qA70A1pbU0jQ2L/L4CWOibP8Su7XZIyXLxt5oriYqfQd4CyrwnXkrAKu9hcCqEosv+P+rEUsQiAfSlpA74tPE++eiaToahbeIkQDuZVEuIQD8O2UfmgSMAa/CU/PcRYdwLOwfnRLL6j0saZlctUbLAPc7DLW1ZOUE2+4S/u7RLjxlCIPbnOEo11J+1FqoSZ7AR+x7xKsDDwbNrEJ4UtX6B1LW9yvoizXizFOp3o+XuVQJYKx2xXh1UXY8D2T0mv85GKQs6qnrvXq2PkpP5Ltt4NJgsZYnVyj/CsvVrsWoJ03cg== 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=8Uel3kGi3YS7Y/E1TFsLBIbfwWVpvv62+BZ8FOiWdEQ=; b=sOIR+tw/Mo11kNSRHkXyb/VeGUnN22MIy3BzaNbf75rFDnedQPn6ayJtbvJw34uV1ySNejorMrT8bqjjQiVtsWDVZujFFRS9yVA5SYm/5Whrm/2FD6rZvqw+ikuS2dMoVdmNxseoF6He/0OURJ6sbL/ro+uxm1ih0OTReFMDsgA= Received: from BN9P223CA0009.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:10b::14) by MW4PR12MB7143.namprd12.prod.outlook.com (2603:10b6:303:222::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21; Fri, 4 Jul 2025 10:14:27 +0000 Received: from BN1PEPF00005FFC.namprd05.prod.outlook.com (2603:10b6:408:10b:cafe::29) by BN9P223CA0009.outlook.office365.com (2603:10b6:408:10b::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.23 via Frontend Transport; Fri, 4 Jul 2025 10:14:27 +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 BN1PEPF00005FFC.mail.protection.outlook.com (10.167.243.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Fri, 4 Jul 2025 10:14:27 +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; Fri, 4 Jul 2025 05:14:27 -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; Fri, 4 Jul 2025 05:14:26 -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; Fri, 4 Jul 2025 05:14:21 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , Samuel Zhang Subject: [PATCH v2 4/5] PM: hibernate: export variable pm_transition Date: Fri, 4 Jul 2025 18:12:32 +0800 Message-ID: <20250704101233.347506-5-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250704101233.347506-1-guoqing.zhang@amd.com> References: <20250704101233.347506-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: BN1PEPF00005FFC:EE_|MW4PR12MB7143:EE_ X-MS-Office365-Filtering-Correlation-Id: 70fc6ac0-c729-45ee-fdb4-08ddbae38f18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|82310400026|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5QnZo2fH55e3M0wNZY3LXxdN6Z6+lb5dqVXrh37SQpioKW1Niov/gLKBR79O?= =?us-ascii?Q?cqMKRYGhvE8OyBaI8TkWS4TePyO5YJKW0/aK+e+eAy/lu3PStSxQYXYfDfPi?= =?us-ascii?Q?VSBIVo71z6y71UVcljPpMsc+xhhBmzb6O2FME7RxeJBkYmZNR5F/bXERbrqs?= =?us-ascii?Q?hibK5ej2vtJwxO4PZRJ7A+9jTkh/6wqdrUZWh4jCduWgWHy4XuWtkhQpDlkd?= =?us-ascii?Q?CX4VYuz+OQiMs9t+V7NBm1PIaxXkVMkD2qNlZfDZ17t+p8IpshxLGtz2MBxd?= =?us-ascii?Q?p9usChF/cYeJ73JQb2cTMgxEF5zHSSCPz2FSy32RaSZRrhQh2cgGf9X1NIYX?= =?us-ascii?Q?Ro0XEXTWqKpfXSjbex9yzsKRlO6dIMOJ05KYPhKZFnnd1l2m80S53xKsD3+M?= =?us-ascii?Q?9ud6hJkSh+mbRiTUXyjNLSHXqt+0n5Crks7DRRIMy1D1GrPIux8NYphxGHWI?= =?us-ascii?Q?ulbWEvPI8YqfkBvr1UGPaypFwgOudsNqJ+LSw+EgWf0zHaRKSqQDjsJ7tINg?= =?us-ascii?Q?zAq/Gr0M2ucXfmABeIXu7hYDZw5w7VDJuGHTFoyWP41ta4e3KnJAULiUENn3?= =?us-ascii?Q?g5VTuckswTmJMovIIFd9r1I1/FuOp+ibdumnEaxG6EnFl60WHyYJkILqZpe6?= =?us-ascii?Q?6nS/HBV1Nq2nP28ha8W81mbM/5WrmMqbOzqJ+M6ueUCdA+Tmo/ICPh1FcOeC?= =?us-ascii?Q?1YYfaXBiVz/pxIo0rAAmeNMP76M7+SB7AxCjslkknLLNMY65ILkrgFTGM9XH?= =?us-ascii?Q?z8Ixvu1UtYs03QCrP5xk7jHKhyMAqmNYTcHYiBkmm+0kZ2NjsnKcD4guH5gd?= =?us-ascii?Q?i/3I7wNs37sReJt767F2oQRygia7tWLFC6Tu1a8SDxLYZSmaY2j17U8ANW6B?= =?us-ascii?Q?519lLTE4QXlbZ2WSYOm1LJ4LhrsTFFcZ+o271FMYziImS8DbpsMGc2sticYc?= =?us-ascii?Q?sEFzMRCsCjTtF//thBZG4GgkJfnVNDIRm/DeR9gxByy1fvp9UD3E50DjfTb3?= =?us-ascii?Q?b50ifmSCyzgYwjz4W8cRYe++vsZmMzfK8N0P93HmkTwlnd53oC2rAZdn1wX8?= =?us-ascii?Q?XuJEEa9fzckdAKRls0vQD1AG17zNrDMP/RK7L/EsO+VY4aDUt4YtRLiIwN21?= =?us-ascii?Q?uhUnJER/KU8ffTMOlkQ6qPF3Vhsv6wKep9ZdnAoNGOAtVUmqM5QqSpqg2G6F?= =?us-ascii?Q?0pRkrQbDUkIEyiWQNE/fXcEKtubmPYpLatcXZEX8GjupRqbCPFdJXSbO/iWy?= =?us-ascii?Q?dRvurVcMjBZWwDgvDBC6cMmixs0ZPOGqHyp6fbZ0zorfA/iAw/h3rSuOhkIo?= =?us-ascii?Q?Usdvc8K9dkUeq969uKP+DAs7m/zAw7xzFh5X0nq5aLl85UwQ6EncR5WJUg6o?= =?us-ascii?Q?7iOKI8RGxa/7c9GaxAdbk8xyQzCEn88GFpvX5phtFTuotKldo/RKfX1m7aQp?= =?us-ascii?Q?LPKYZ7FfCHg0InLlNpXSrrXQ1YI57IVcSPcbV1aUtOGse6G5pf40/32zzJZ+?= =?us-ascii?Q?pZvAnXqofYhhfrU=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)(7416014)(376014)(82310400026)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 10:14:27.7173 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70fc6ac0-c729-45ee-fdb4-08ddbae38f18 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: BN1PEPF00005FFC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7143 Content-Type: text/plain; charset="utf-8" https://github.com/torvalds/linux/blob/v6.14/Documentation/power/pci.rst?pl= ain=3D1#L588 Per this kernel doc, dev_pm_ops.thaw() is called mainly for resume storage devices for saving the hibernation image. Other devices that not involved in the image saving do not need to resume the device. But dev_pm_ops.thaw() is also called to restore devices when hibernation is aborted due to some error in hibernation image creation stage. So there need to be a way to query in thaw() to know if hibernation is aborted or not and conditionally resume devices. Exported pm_transition is such a way. When thaw() is called, the value is: - PM_EVENT_THAW: normal hibernate, no need to resume non-storage devices. - PM_EVENT_RECOVER: cancelled hibernation, need to resume devices. Signed-off-by: Samuel Zhang --- drivers/base/power/main.c | 3 ++- include/linux/pm.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 40e1d8d8a589..d50f58c0121b 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -61,7 +61,8 @@ static LIST_HEAD(dpm_late_early_list); static LIST_HEAD(dpm_noirq_list); =20 static DEFINE_MUTEX(dpm_list_mtx); -static pm_message_t pm_transition; +pm_message_t pm_transition; +EXPORT_SYMBOL_GPL(pm_transition); =20 static int async_error; =20 diff --git a/include/linux/pm.h b/include/linux/pm.h index 78855d794342..f01846852a90 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 +extern pm_message_t pm_transition; + struct dev_pm_info { pm_message_t power_state; bool can_wakeup:1; --=20 2.43.5 From nobody Tue Oct 7 23:01:02 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2062.outbound.protection.outlook.com [40.107.96.62]) (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 98BDD2EF9A4; Fri, 4 Jul 2025 10:14:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624079; cv=fail; b=LVi4m1HQeHR9cqtIKIE3CaSuNqZPmyPaqMGTsIHaojEeMV+udzKx0RGvP0uaIxXBwyrsx3LiryXharCSfQECpNq3bS/rgLhKnn+qfn8SCFeAaLwNvD8v/McBIvLdiOvnH1kJMXxFesMYXitFxlK9tqWrvaOYBoyD55wzSlyhnjQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751624079; c=relaxed/simple; bh=OB/37K9E8V7B+vuzNo7W17/knY2Bc7bBDnINzCR2Paw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SPRYHZFa+UCQ++fLUrezY/VHYNYoFqjflR5oqQWxgS3Q6i6Vy9ESKxfC1nwfo/UlkU/pIQGq+Pzkq+pVdLB5eTms+oGBpofZcZBcyvTOSzsEdsY9IRpgxU7jvCoSIWuv4YlCQh3Q9FKgs70Z3tnpQDRx9zgli148XUvaEiyQFsk= 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=Kl1SHi3d; arc=fail smtp.client-ip=40.107.96.62 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="Kl1SHi3d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qUrQMyGxbzp/6K8aziTxyr/4jar6r0E40+m54mpS8RcSIUt479skoTFhsj5rmbY+7S/NMld4GUq+nrZzjq/jzELBmnII8D47cjINLg0siuf8LzVUdldBZo0QUocl3YPZy3X+DqRlPyybiy5SN8kLzeT9GzmflA80ASighixT0pOH1kWkHY4DBkmMM3u3ns60lP49aML6Wqo+d1kLvlJclm1RM1w47EX/r0ya1RBoWmUeQGB+wZKVTnEdXawaXKs+hU6JiNzl7v+5tBRNzW/WkiG0DVlnU/hy5spxoeT5qcs2VMYZP/hcg0+Y15plvQ+hOV9BQ66MR7fUhxndr2k47g== 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=70WR1xM7vooAdxAFQ1aI8VMwDAPuSwpgKB6gTrqSqNc=; b=JLoEsmYpgOiXZ/5zr/GCf0m+BI11dF0k4x1LZj1KJsh187ojSUNYwxQ2RpRTp3WWXtvtUkZhsFO2BgJVf0qtTYrxoDU9RY3AqPkiVa66Wai15CXtRnJuLdr6EkrBZrepHN1KbHT/AI/jRqLNksEwgK8Uz0G/CfnWeFSB0zzVs9A8wPZgm0rfaPdr+RGcTjlMsB03j4ropWjc/CcA3BLLh5uQTYvtxM4F/6Wt7RHqw25wbPXAgW/l/84G0GgHXDO1F81BaKr/h87y6jP8ZkSttW09mcjUQcLLW+p4xtFtiSxmaJEwfS2NVRXICvLd8e4VerefpetvGIViUm9hJd1ogQ== 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=70WR1xM7vooAdxAFQ1aI8VMwDAPuSwpgKB6gTrqSqNc=; b=Kl1SHi3dWS6q0W9ba8GyslmenZWfCWtSEyS2PCzTRSlL1gksVjRYQaLDmBUZhx0Gh9qN1N+FdrYX8aT4Z1NZlgnMRdHpmUCTXRCut9/kYPGBlPUf9WgMkmpMtxj1xUWZK1RA4dEELS+srlwBSfV4bvpgIPiprqI9xIjbcSmIGmI= Received: from BN9PR03CA0792.namprd03.prod.outlook.com (2603:10b6:408:13f::17) by DM6PR12MB4299.namprd12.prod.outlook.com (2603:10b6:5:223::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.23; Fri, 4 Jul 2025 10:14:33 +0000 Received: from BN1PEPF00005FFE.namprd05.prod.outlook.com (2603:10b6:408:13f:cafe::d0) by BN9PR03CA0792.outlook.office365.com (2603:10b6:408:13f::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.22 via Frontend Transport; Fri, 4 Jul 2025 10:14: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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BN1PEPF00005FFE.mail.protection.outlook.com (10.167.243.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Fri, 4 Jul 2025 10:14:33 +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; Fri, 4 Jul 2025 05:14:32 -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; Fri, 4 Jul 2025 05:14:32 -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; Fri, 4 Jul 2025 05:14:27 -0500 From: Samuel Zhang To: , , , , , , , , , , , , , , CC: , , , , , , , , , Samuel Zhang Subject: [PATCH v2 5/5] drm/amdgpu: do not resume device in thaw for normal hibernation Date: Fri, 4 Jul 2025 18:12:33 +0800 Message-ID: <20250704101233.347506-6-guoqing.zhang@amd.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250704101233.347506-1-guoqing.zhang@amd.com> References: <20250704101233.347506-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: BN1PEPF00005FFE:EE_|DM6PR12MB4299:EE_ X-MS-Office365-Filtering-Correlation-Id: ec9577e4-927a-4a5f-df08-08ddbae3925c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|36860700013|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZxovNvAH8xZ9H8MUyCOdb5urn7FDqtOIpAclfeSOlnd33Y3IZXMe2ixUnAmg?= =?us-ascii?Q?dRVuBdrz1rIo1FThy+l4SldDL/9quk3KYDqtWhfkd4h0TCF1uegmjnw7ogOA?= =?us-ascii?Q?38mq5HdTiEXV5jj2dQufUFNkD5thecZXOFclEJQmIICTIgyAYijZ+VXzvwbF?= =?us-ascii?Q?uYWu1vB8QJQhJkIYhPu7gPGSo1Fx9+kqIPBUL7g3vwAjYHMBy7EfvAUI7Jot?= =?us-ascii?Q?lEXIfhgQqJ2A5yoE1P2PiO91uup665P87wa6mVotAYee5OZv295mQ+U+ZY3S?= =?us-ascii?Q?599zrIcoeHfLmJqy9aB2TkfpkSwaXdsvPVflAbNMPcDu9czBSC2x3Wb7n38e?= =?us-ascii?Q?88ahCb3CipfaeFRnSP51yhLSQUymQPPSMfN/A8+uVIWjM1vjvdS/bmD83pP4?= =?us-ascii?Q?Uld262BjBbOwkx2pbrOk6zhiVr5YRpwa2ZMVzNNWC04HNn7JkW5vA+z6StDc?= =?us-ascii?Q?irjnS2EaR4M9GfJdMuminTxWqw9wowZcZd6xDOg8sq8S1ObkrphFPc+qiAFj?= =?us-ascii?Q?K3OOGCbP4jKjD8xMArzzvDbNfvXLtjZsQy2Joh0HBsog5DmAX7X0cAu2X0Eo?= =?us-ascii?Q?SYs9vWYeRgraUD7rVYpRM0R3goSk7jtyRT8WpI/p8Jk/ULLxCV3oQ7+u7TUt?= =?us-ascii?Q?gMkNKd34aNUhPUuRhnXI0QRLKu0isOWCYFXfJJ7yu9UzrZuiXQ7q3yH586Or?= =?us-ascii?Q?RHlk4g2BwDkmcVQX6Ithy6ju93IofK3tnZiqU797GrPfNrDBJT6cHM3cKWAR?= =?us-ascii?Q?bWQfDpCebv/HFcenDTpiJBm9+FXaMMDO+kmpBS/j1IebDVP2CXfwv4vSgNW+?= =?us-ascii?Q?awZs0gtKaStgAjhU6FhNuLyZI7URpeQYn+BJuMFZey8FhGUXC0q9vrO4lnBW?= =?us-ascii?Q?jvSYlO+5sfwUWcytvpZtaS6nvHbp1hSfL5nu1TXhFR2QGA3Hvj51sWtspzJp?= =?us-ascii?Q?P3HzRaL3Ge0XRPJanCfU06mV5xLTPSLuyQcbXuPU13/+Olk7BFNATunaIrQj?= =?us-ascii?Q?aZ0I++IZKdy5SVQAT6x/bzSvAzMrH6fp87ELSwgUz3EiVn7+zFk+iB6uGJ/t?= =?us-ascii?Q?73biMveEz2pSlVSTTph0Fmf1p1+J5rIHRqUlv0S5wfarP5H40hY+dnhrL+ka?= =?us-ascii?Q?FawA4AJvoWYoLUDThfHCx9ibxFOk+E4JOIXkJBdd5ITxeN+szWmT+DWhX4Wn?= =?us-ascii?Q?urXxABK1Phc4bcm1YVZDYm44gafwsjph3eERu2NyrvkRmG7q/DYm0Z5lSeDh?= =?us-ascii?Q?ydIkeut/0NE47kjYYZwyk+ZTVpmfzQNVdzKO6DocsERMPwWOy9YpbqAskwIH?= =?us-ascii?Q?osYac4kDgB8ZUsA+8M+H6uGwzs7z5dtY0ml/OYJiKJ6QR77S+M8zpIWVCs+5?= =?us-ascii?Q?RzZvTbMg4/d4ctKvrP96AQ3EYcXXBOSjjBE4g49NAU0RCBNdJJ+xBGqWEs7Q?= =?us-ascii?Q?oN9crwzjCnm/iqCsqU7kVWWTlO8JEWAb75G2JqaXTjQuUcAnIU8h8V6TiL65?= =?us-ascii?Q?x7lOXp/BP6WVESfAnFV6/fphFrFiOXMVxAD0Fbqt0XDpmV3o1ENCWV/lAg?= =?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)(376014)(7416014)(36860700013)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 10:14:33.1953 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec9577e4-927a-4a5f-df08-08ddbae3925c 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: BN1PEPF00005FFE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4299 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. For cancelled hibernation, GPU need to be resumed. Signed-off-by: Samuel Zhang --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_drv.c index 4f8632737574..e064816aae4d 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 @@ -2655,6 +2659,10 @@ static int amdgpu_pmops_thaw(struct device *dev) { struct drm_device *drm_dev =3D dev_get_drvdata(dev); =20 + /* do not resume device for normal hibernation */ + if (pm_transition.event =3D=3D PM_EVENT_THAW) + return 0; + return amdgpu_device_resume(drm_dev, true); } =20 --=20 2.43.5