From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B523D48981 for ; Fri, 16 Jan 2026 11:14:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF38E6B0095; Fri, 16 Jan 2026 06:14:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CBD546B0096; Fri, 16 Jan 2026 06:14:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDFA36B0098; Fri, 16 Jan 2026 06:14:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id AA8E36B0095 for ; Fri, 16 Jan 2026 06:14:26 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 511141BF7A for ; Fri, 16 Jan 2026 11:14:26 +0000 (UTC) X-FDA: 84337568532.11.D5EF057 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by imf08.hostedemail.com (Postfix) with ESMTP id 215E916000E for ; Fri, 16 Jan 2026 11:14:23 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=bW9K26Sq; spf=pass (imf08.hostedemail.com: domain of francois.dugast@intel.com designates 198.175.65.18 as permitted sender) smtp.mailfrom=francois.dugast@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1768562064; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HXz/2GJovMVLVExCiYVPnXmobh6yI5gfzJqWHYp20YM=; b=hs/Ixy0Lw3TBDEfZ0LJPRf+oVpDMVsQuue2Mf57qsF6+UwmmsWNKtwEq7BP3WXdaj1qCdW 4TP/W47+LUMP6Chpyizg0r9wXqnMI1rN5JgL8M67UXm9p5blNp7lIuwyNR6DKu01iq22F0 t6M30XP+2fMt+8I6AngILudx9WWdTWE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=bW9K26Sq; spf=pass (imf08.hostedemail.com: domain of francois.dugast@intel.com designates 198.175.65.18 as permitted sender) smtp.mailfrom=francois.dugast@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1768562064; a=rsa-sha256; cv=none; b=Ryeya6fsgkstvTa8bkxhe5Df9OBuUtmiJd4AGh3Rb6uxLjr8uEw9Kb+5OigmbvAfvfaWU3 /EMKm7cXx9rhiIU2uXHHxvoM4D8sDb7XppSinfFKWdOJHsZ9GAOAEO2LWKYsthx6O9IjCA +HIvK8kTmIxM/LEUd4JEh5++IMpWXzw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768562065; x=1800098065; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BK76FMI8CJ7OZ/2YeDFlZCG47Z9Dl6/mSfhqgU9FeZY=; b=bW9K26Sq7ncyxCagEvGIg/1Yyq2KVynty4jkmvj+reqfxuRd3XPqwZ5X Ip2fb7+eTRMPbXbIbjEkRUM5po5YNL6em0W7g8ZiGDEL6zhJ3LrjdSKio EIS4YNESeA/HY0eHOYrGSqjXsf+thsWGEq0uema1Vf1eJvYYzHkzbtJ2W 99AwIBLMDNMvp/ee1dJ9SyzlqhAi4dqyD4d8u4lAliihTzaMT5jgCUpoR j83srJUImlsveLL9bHUE0cxbMxDFjPd50eXtFsHfcrrtR5RZyZDT316qn GGR0ARINhNU+NtPDRYVOAWw7VOuqXpcLW/8nKnpzUeaTm8fKqEAzKYehX g==; X-CSE-ConnectionGUID: FvNmr0D6SHai/KVNhK6ZKg== X-CSE-MsgGUID: RjshZqXUQhWSnvHBSyyQhA== X-IronPort-AV: E=McAfee;i="6800,10657,11672"; a="69930698" X-IronPort-AV: E=Sophos;i="6.21,230,1763452800"; d="scan'208";a="69930698" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2026 03:14:24 -0800 X-CSE-ConnectionGUID: kxnqdSMWSmOdJlYBM0k5/w== X-CSE-MsgGUID: GAveIsO/TLKVvJAto9fufg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,230,1763452800"; d="scan'208";a="209713492" Received: from fpallare-mobl4.ger.corp.intel.com (HELO fdugast-desk.home) ([10.245.245.100]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2026 03:14:20 -0800 From: Francois Dugast To: intel-xe@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Francois Dugast , Matthew Brost , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Michal Mrozek , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan , Alistair Popple , Balbir Singh , linux-mm@kvack.org Subject: [PATCH v6 5/5] drm/pagemap: Enable THP support for GPU memory migration Date: Fri, 16 Jan 2026 12:10:20 +0100 Message-ID: <20260116111325.1736137-6-francois.dugast@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260116111325.1736137-1-francois.dugast@intel.com> References: <20260116111325.1736137-1-francois.dugast@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: cbrwd3em46wpbejahitfzg8698gc63tp X-Rspam-User: X-Rspamd-Queue-Id: 215E916000E X-Rspamd-Server: rspam08 X-HE-Tag: 1768562063-742654 X-HE-Meta: U2FsdGVkX18t42ge10Sv1J3CmSJaAo1rjmhKX0oIOQYwee2MUT1lNuBrAYGP/rXmNARKf30wL1HChgvHVcK9FaBAoGAFw+e6k5Gg8izeFdcrm1pk+fZVoVXnPT4z/LexjvRQMTeN+u7jh4gScHCMjvoyYbg9hG44qkLu+24LDcm2GJazIMKXWhYucixDPgw3GqAOGmwhPiQY5ns1B9jxOmuIjoqgI2cKlBRL5c2DbIvn9BRL9+C+WUr3YjqGQrc/agcL9M1HqQ/Ek1BA69aTwXAnKB3mLTdl2cSQk8kr4vnGjpPBoB++sLCgcUvhr9kZ4ri6F0QgLYHqeWyFonekUe0B0nERrm0MdfQH949pXIn8KVadqZmbYXe6167WUovK3zdtcUKuZMKDUAX0bXdtQA7JY01DnCvFzLyZzU5yOtU0T0akFZtmMZ03j0zmDLjZsFsM+xfoChzFN+GO0zgYZjrN7bkyQ9VgtOMSTbtzc04W4JuSpByBIA/Nm2ddtKc0LfdHZsQfQzVxXLydFKGoHtSUbzR8OraSLRRqciRLsXbU58GhMmqvwT2MS50Y6KbHzV0uHvlY3vhFbLVlryt/4heuLlUOK7q1YeYRSiUUedebMdgdVvu2oJp+iiiKFUwScN7JS3OH3N00i7Q2idb87ojLopXaak++uvnwS0njozJGp2K4ZVU2S0OEN4F/Z2s+cSM+12skJTgk5khMxju6o7V16RN6T+dJgQUq4bc+jpOo2y8eMZv8n6jjUMscrMWym8J/3kiYApobH9pjT/pNpkySr4Cavh3UZN8BWuxTtAOInUOfKF3T3DGdWm9Ol73UD51EuwZta7/NOih61l03mIGjSP0tecr46+Ur9K7u8ycO1au8TPLXEluH9ztp5fCNPIn1TAiIz9lZOvluoWh/N9QFIzgETFlrs+/xQlXRvCNhACMjNlkt/BCAYRffQL4GjLFnlKrt6856VAeYSOm SBLkno4X xasmf9grSRIzCpaKcEIQBhUCs+/6NW+riczjdjB7R8cLK2+zSc/lQfl8yKbHMPDtN8h5t7GnEVVrePWow+RdSjXWi344KvnOYuC7uzoUSG2FCe8suEWJJC3cyB0UWb7yI43pKyGOVSjZ7REHPQxVo+w5AE2ruee/Eix/9Wm5M8vPT18qiYJ5o3R9lMXyS5yvcbUaHg/MwCt8vmaev7rVlDoVstSSMbgW4W1N70bBbkdd7GR/pYX9zHnayWWgJDzXwCwSNbRx0/76E8kE7i6YnOnF+l8iV5opS37PdKtRcYD9+aHolfB/HcvsP9CVIhX5dzvXv7eZza35cJUimTF6SF8SeckNTrRkQbNdEPV5xuLoZXFrx1XwAbveEA5nZoNmV+E7+3n+rK8zzBmV0ZIh2rJAq4Emtwn40Ht+ext5hPPQlEw+1poASjA0U20lRxp8KEHotdJ3qYsaPUtiXX4iA3Q2GZTSNqwhdqsvIa9Zy+1jPo8Q= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This enables support for Transparent Huge Pages (THP) for device pages by using MIGRATE_VMA_SELECT_COMPOUND during migration. It removes the need to split folios and loop multiple times over all pages to perform required operations at page level. Instead, we rely on newly introduced support for higher orders in drm_pagemap and folio-level API. In Xe, this drastically improves performance when using SVM. The GT stats below collected after a 2MB page fault show overall servicing is more than 7 times faster, and thanks to reduced CPU overhead the time spent on the actual copy goes from 23% without THP to 80% with THP: Without THP: svm_2M_pagefault_us: 966 svm_2M_migrate_us: 942 svm_2M_device_copy_us: 223 svm_2M_get_pages_us: 9 svm_2M_bind_us: 10 With THP: svm_2M_pagefault_us: 132 svm_2M_migrate_us: 128 svm_2M_device_copy_us: 106 svm_2M_get_pages_us: 1 svm_2M_bind_us: 2 v2: - Fix one occurrence of drm_pagemap_get_devmem_page() (Matthew Brost) v3: - Remove migrate_device_split_page() and folio_split_lock, instead rely on free_zone_device_folio() to split folios before freeing (Matthew Brost) - Assert folio order is HPAGE_PMD_ORDER (Matthew Brost) - Always use folio_set_zone_device_data() in split (Matthew Brost) v4: - Warn on compound device page, s/continue/goto next/ (Matthew Brost) v5: - Revert warn on compound device page - s/zone_device_page_init()/zone_device_folio_init() (Matthew Brost) Cc: Matthew Brost Cc: Thomas Hellström Cc: Michal Mrozek Cc: Andrew Morton Cc: David Hildenbrand Cc: Lorenzo Stoakes Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Mike Rapoport Cc: Suren Baghdasaryan Cc: Michal Hocko Cc: Zi Yan Cc: Alistair Popple Cc: Balbir Singh Cc: linux-mm@kvack.org Reviewed-by: Matthew Brost Signed-off-by: Francois Dugast --- drivers/gpu/drm/drm_pagemap.c | 73 ++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c index 801da343f0a6..e2aecd519f14 100644 --- a/drivers/gpu/drm/drm_pagemap.c +++ b/drivers/gpu/drm/drm_pagemap.c @@ -200,16 +200,19 @@ static void drm_pagemap_migration_unlock_put_pages(unsigned long npages, /** * drm_pagemap_get_devmem_page() - Get a reference to a device memory page * @page: Pointer to the page + * @order: Order * @zdd: Pointer to the GPU SVM zone device data * * This function associates the given page with the specified GPU SVM zone * device data and initializes it for zone device usage. */ static void drm_pagemap_get_devmem_page(struct page *page, + unsigned int order, struct drm_pagemap_zdd *zdd) { - page->zone_device_data = drm_pagemap_zdd_get(zdd); - zone_device_page_init(page, page_pgmap(page), 0); + zone_device_folio_init((struct folio *)page, zdd->dpagemap->pagemap, + order); + folio_set_zone_device_data(page_folio(page), drm_pagemap_zdd_get(zdd)); } /** @@ -534,7 +537,8 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, * rare and only occur when the madvise attributes of memory are * changed or atomics are being used. */ - .flags = MIGRATE_VMA_SELECT_SYSTEM | MIGRATE_VMA_SELECT_DEVICE_COHERENT, + .flags = MIGRATE_VMA_SELECT_SYSTEM | MIGRATE_VMA_SELECT_DEVICE_COHERENT | + MIGRATE_VMA_SELECT_COMPOUND, }; unsigned long i, npages = npages_in_range(start, end); unsigned long own_pages = 0, migrated_pages = 0; @@ -640,11 +644,13 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, own_pages = 0; - for (i = 0; i < npages; ++i) { + for (i = 0; i < npages;) { + unsigned long j; struct page *page = pfn_to_page(migrate.dst[i]); struct page *src_page = migrate_pfn_to_page(migrate.src[i]); - cur.start = i; + unsigned int order = 0; + cur.start = i; pages[i] = NULL; if (src_page && is_device_private_page(src_page)) { struct drm_pagemap_zdd *src_zdd = @@ -654,7 +660,7 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, !mdetails->can_migrate_same_pagemap) { migrate.dst[i] = 0; own_pages++; - continue; + goto next; } if (mdetails->source_peer_migrates) { cur.dpagemap = src_zdd->dpagemap; @@ -670,7 +676,20 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, pages[i] = page; } migrate.dst[i] = migrate_pfn(migrate.dst[i]); - drm_pagemap_get_devmem_page(page, zdd); + + if (migrate.src[i] & MIGRATE_PFN_COMPOUND) { + drm_WARN_ONCE(dpagemap->drm, src_page && + folio_order(page_folio(src_page)) != HPAGE_PMD_ORDER, + "Unexpected folio order\n"); + + order = HPAGE_PMD_ORDER; + migrate.dst[i] |= MIGRATE_PFN_COMPOUND; + + for (j = 1; j < NR_PAGES(order) && i + j < npages; j++) + migrate.dst[i + j] = 0; + } + + drm_pagemap_get_devmem_page(page, order, zdd); /* If we switched the migrating drm_pagemap, migrate previous pages now */ err = drm_pagemap_migrate_range(devmem_allocation, migrate.src, migrate.dst, @@ -680,7 +699,11 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, npages = i + 1; goto err_finalize; } + +next: + i += NR_PAGES(order); } + cur.start = npages; cur.ops = NULL; /* Force migration */ err = drm_pagemap_migrate_range(devmem_allocation, migrate.src, migrate.dst, @@ -789,6 +812,8 @@ static int drm_pagemap_migrate_populate_ram_pfn(struct vm_area_struct *vas, page = folio_page(folio, 0); mpfn[i] = migrate_pfn(page_to_pfn(page)); + if (order) + mpfn[i] |= MIGRATE_PFN_COMPOUND; next: if (page) addr += page_size(page); @@ -1044,8 +1069,15 @@ int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation) if (err) goto err_finalize; - for (i = 0; i < npages; ++i) + for (i = 0; i < npages;) { + unsigned int order = 0; + pages[i] = migrate_pfn_to_page(src[i]); + if (pages[i]) + order = folio_order(page_folio(pages[i])); + + i += NR_PAGES(order); + } err = ops->copy_to_ram(pages, pagemap_addr, npages, NULL); if (err) @@ -1098,7 +1130,8 @@ static int __drm_pagemap_migrate_to_ram(struct vm_area_struct *vas, .vma = vas, .pgmap_owner = page_pgmap(page)->owner, .flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE | - MIGRATE_VMA_SELECT_DEVICE_COHERENT, + MIGRATE_VMA_SELECT_DEVICE_COHERENT | + MIGRATE_VMA_SELECT_COMPOUND, .fault_page = page, }; struct drm_pagemap_migrate_details mdetails = {}; @@ -1164,8 +1197,15 @@ static int __drm_pagemap_migrate_to_ram(struct vm_area_struct *vas, if (err) goto err_finalize; - for (i = 0; i < npages; ++i) + for (i = 0; i < npages;) { + unsigned int order = 0; + pages[i] = migrate_pfn_to_page(migrate.src[i]); + if (pages[i]) + order = folio_order(page_folio(pages[i])); + + i += NR_PAGES(order); + } err = ops->copy_to_ram(pages, pagemap_addr, npages, NULL); if (err) @@ -1223,9 +1263,22 @@ static vm_fault_t drm_pagemap_migrate_to_ram(struct vm_fault *vmf) return err ? VM_FAULT_SIGBUS : 0; } +static void drm_pagemap_folio_split(struct folio *orig_folio, struct folio *new_folio) +{ + struct drm_pagemap_zdd *zdd; + + if (!new_folio) + return; + + new_folio->pgmap = orig_folio->pgmap; + zdd = folio_zone_device_data(orig_folio); + folio_set_zone_device_data(new_folio, drm_pagemap_zdd_get(zdd)); +} + static const struct dev_pagemap_ops drm_pagemap_pagemap_ops = { .folio_free = drm_pagemap_folio_free, .migrate_to_ram = drm_pagemap_migrate_to_ram, + .folio_split = drm_pagemap_folio_split, }; /** -- 2.43.0