Remove device private pages from physical address space
Subsystems (26)
v3 cover Remove device private pages from physical address space
Introduction
------------
The existing design of device private memory imposes limitations which render it non functional for certain systems and configurations - this series removes those limitations. These issues are:
1) Limited available physical address space
2) Conflicts with arch64 mm implementation
Limited available address space
-------------------------------
Device private memory is implemented by first reserving a region of the physical address space. This is a problem. The physical address space is not a resource that is directly under the kernel's control. Availability of suitable physical address space is constrained by the underlying hardware and firmware and may not always be available.
Device private memory assumes that it will be able to reserve a device memory sized chunk of physical address space. However, there is nothing guaranteeing that this will succeed, and there a number of factors that increase the likelihood of failure. We need to consider what else may exist in the physical address space. It is observed that certain VM configurations place very large PCI windows immediately after RAM. Large enough that there is no physical address space available at all for device private memory. This is more likely to occur on 43 bit physical width systems which have less physical address space.
The fundamental issue is the physical address space is not a resource the kernel can rely on being to allocate from at will.
aarch64 issues
--------------
The current device private memory implementation has further issues on aarch64. On aarch64, vmemmap is sized to cover the ram only. Adding device private pages to the linear map then means that for device private page, pfn_to_page() will read beyond the end of vmemmap region leading to potential memory corruption. This means that device private memory does not work reliably on aarch64 [0].
New implementation
------------------
This series changes device private memory so that it does not require allocation of physical address space and these problems are avoided. Instead of using the physical address space, we introduce a "device private address space" and allocate from there.
A consequence of placing the device private pages outside of the physical address space is that they no longer have a PFN. However, it is still necessary to be able to look up a corresponding device private page from a device private PTE entry, which means that we still require some way to index into this device private address space. Instead of a PFN, device private pages use an offset into this device private address space to look up device private struct pages.
The problem that then needs to be addressed is how to avoid confusing these device private offsets with PFNs. It is the limited usage of the device private pages themselves which make this possible. A device private page is only used for userspace mappings, we do not need to be concerned with them being used within the mm more broadly. This means that the only way that the core kernel looks up these pages is via the page table, where their PTE already indicates if they refer to a device private page via their swap type, e.g. SWP_DEVICE_WRITE. We can use this information to determine if the PTE contains a PFN which should be looked up in the page map, or a device private offset which should be looked up elsewhere.
This applies when we are creating PTE entries for device private pages - because they have their own type there are already must be handled separately, so it is a small step to convert them to a device private PFN now too.
The first part of the series updates callers where device private offsets might now be encountered to track this extra state.
The last patch contains the bulk of the work where we change how we convert between device private pages to device private offsets and then use a new interface for allocating device private pages without the need for reserving physical address space.
By removing the device private pages from the physical address space, this series also opens up the possibility to moving away from tracking device private memory using struct pages in the future. This is desirable as on systems with large amounts of memory these device private struct pages use a signifiant amount of memory and take a significant amount of time to initialize.
Changes in v3
-------------
Thanks all for feedback and suggestions on v2.
Most significant change is fixing an null pointer redef when memremap_device_private_pagemap() was called with NUMA_NO_NODE.
Details:
- mm/migrate_device: Add migrate PFN flag to track device private pages
- Use adev->kfd.pgmap.type == MEMORY_DEVICE_PRIVATE
- mm/page_vma_mapped: Add flag to page_vma_mapped_walk::flags to track device private pages
- Track device private offset in pvmw::flags instead of pvmw::pfn
- mm: Add a new swap type for migration entries of device private pages
- Move softleaf changes to new patch
- Update commit message to explain the change reduces the number of swap files.
- Move creating the device private migration changes to a separate patch
- Remove predicates - we'll rely on softleaf predicates entirely
- mm: Add softleaf support for device private migration entries
- Separated from previous patch
- s/SOFTLEAF_MIGRATION_DEVICE_/SOFTLEAF_MIGRATION_DEVICE_PRIVATE_/
- Update comment for softleaf_is_migration_read()
- mm: Begin creating device private migration entries
- Provided as an individual patch
- mm: Remove device private pages from the physical address space
- Use numa_mem_id() if memremap_device_private_pagemap is called with NUMA_NO_NODE. This fixes a null pointer deref in lruvec_stat_mod_folio().
- drm/xe: Remove call to devm_release_mem_region() in xe_pagemap_destroy_work()
- s/VM_BUG/VM_WARN/
Testing:
- selftests/mm/hmm-tests on an amd64 VM
Revisions:
- RFC: https://lore.kernel.org/all/[email protected]/
- v1: https://lore.kernel.org/all/[email protected]/
- v2: https://lore.kernel.org/all/[email protected]/
[0] https://lore.kernel.org/lkml/CAMj1kXGtFyugzi9MZW=4_oVTy==eAF6283fwvX9fdZhO98ZA3g@mail.gmail.com/
Jordan Niethe (13):
mm/migrate_device: Introduce migrate_pfn_from_page() helper drm/amdkfd: Use migrate pfns internally
mm/migrate_device: Make migrate_device_{pfns,range}() take mpfns mm/migrate_device: Add migrate PFN flag to track device private pages mm/page_vma_mapped: Add flag to page_vma_mapped_walk::flags to track
device private pages
mm: Add helpers to create migration entries from struct pages
mm: Add a new swap type for migration entries of device private pages
mm: Add softleaf support for device private migration entries
mm: Begin creating device private migration entries
mm: Add helpers to create device private entries from struct pages mm/util: Add flag to track device private pages in page snapshots mm/hmm: Add flag to track device private pages
mm: Remove device private pages from the physical address space
Documentation/mm/hmm.rst | 11 +- arch/powerpc/kvm/book3s_hv_uvmem.c | 43 ++--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 45 +++--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- drivers/gpu/drm/drm_pagemap.c | 11 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 45 ++---- drivers/gpu/drm/xe/xe_svm.c | 37 ++--- fs/proc/page.c | 6 +- include/drm/drm_pagemap.h | 8 +- include/linux/hmm.h | 7 +- include/linux/leafops.h | 120 ++++++++++++-- include/linux/memremap.h | 64 +++++++- include/linux/migrate.h | 23 ++- include/linux/mm.h | 9 +- include/linux/rmap.h | 29 +++- include/linux/swap.h | 8 +- include/linux/swapops.h | 99 ++++++++++++ lib/test_hmm.c | 87 ++++++---- mm/debug.c | 9 +- mm/hmm.c | 5 +- mm/huge_memory.c | 43 ++--- mm/hugetlb.c | 15 +- mm/memory.c | 5 +- mm/memremap.c | 196 ++++++++++++++++++----- mm/migrate.c | 6 +- mm/migrate_device.c | 76 +++++---- mm/mm_init.c | 8 +- mm/mprotect.c | 10 +- mm/page_vma_mapped.c | 26 ++- mm/rmap.c | 59 ++++--- mm/util.c | 8 +- mm/vmscan.c | 2 +- 32 files changed, 781 insertions(+), 341 deletions(-)
base-commit: 7a45b8f10286a29b005fdcf1e4eb0ecff8675c75
Signature · 1 line
2.34.1
PATCH v3 1/13 mm/migrate_device: Introduce migrate_pfn_from_page() helper
To create a migrate entry from a given struct page, that page is first converted to its pfn, before passing the pfn to migrate_pfn().
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn and must be handled separately.
Prepare for this with a new helper:
- migrate_pfn_from_page()
This helper takes a struct page as parameter instead of a pfn. This will allow more flexibility for handling the mpfn differently for device private pages.
---
v2: New to series
v3: No change
--- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- drivers/gpu/drm/drm_pagemap.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 ++-- include/linux/migrate.h | 5 +++++ lib/test_hmm.c | 11 ++++++----- mm/migrate_device.c | 7 +++---- 7 files changed, 19 insertions(+), 14 deletions(-)
arch/powerpc/kvm/book3s_hv_uvmem.c +1 -1
@@ -784,7 +784,7 @@ static int kvmppc_svm_page_in(struct vm_area_struct *vma, } } - *mig.dst =migrate_pfn (page_to_pfn (dpage)); + *mig.dst =migrate_pfn_from_page (dpage);migrate_vma_pages (&mig); out_finalize:migrate_vma_finalize (&mig);
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -1
@@ -652,7 +652,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,pr_debug_ratelimited ("dma mapping dst to 0x%llx, pfn 0x%lx\n" , dst[i] >>PAGE_SHIFT ,page_to_pfn (dpage)); - migrate->dst[i] =migrate_pfn (page_to_pfn (dpage)); + migrate->dst[i] =migrate_pfn_from_page (dpage); j++; }
drivers/gpu/drm/drm_pagemap.c +1 -1
@@ -742,7 +742,7 @@ static int drm_pagemap_migrate_populate_ram_pfn(struct vm_area_struct *vas, goto free_pages; page =folio_page (folio,0 ); - mpfn[i] =migrate_pfn (page_to_pfn (page)); + mpfn[i] =migrate_pfn_from_page (page); next:if (page)
drivers/gpu/drm/nouveau/nouveau_dmem.c +2 -2
@@ -249,7 +249,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) goto done; } - args.dst[0 ] =migrate_pfn (page_to_pfn (dpage)); + args.dst[0 ] =migrate_pfn_from_page (dpage);if (order) args.dst[0 ] |=MIGRATE_PFN_COMPOUND ; dfolio =page_folio (dpage);
@@ -766,7 +766,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm, ((paddr >>PAGE_SHIFT ) <<NVIF_VMM_PFNMAP_V0_ADDR_SHIFT );if (src &MIGRATE_PFN_WRITE ) *pfn |=NVIF_VMM_PFNMAP_V0_W ; - mpfn =migrate_pfn (page_to_pfn (dpage)); + mpfn =migrate_pfn_from_page (dpage);if (folio_order (page_folio (dpage))) mpfn |=MIGRATE_PFN_COMPOUND ;return mpfn;
include/linux/migrate.h +5 -0
@@ -140,6 +140,11 @@ static inline unsigned long migrate_pfn(unsigned long pfn)return (pfn <<MIGRATE_PFN_SHIFT ) |MIGRATE_PFN_VALID ; } +static inline unsigned long migrate_pfn_from_page (struct page *page) +{ +return migrate_pfn (page_to_pfn (page)); +} +enum migrate_vma_direction {MIGRATE_VMA_SELECT_SYSTEM =1 <<0 ,MIGRATE_VMA_SELECT_DEVICE_PRIVATE =1 <<1 ,
lib/test_hmm.c +6 -5
@@ -727,7 +727,8 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, rpage =BACKING_PAGE (dpage); rpage->zone_device_data = dmirror; - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | + write; src_page =pfn_to_page (spfn + i);if (spage)
@@ -754,7 +755,7 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args,pr_debug ("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n" ,page_to_pfn (spage),page_to_pfn (dpage)); - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | write;if (is_large) {int i;
@@ -989,7 +990,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (dpage) {lock_page (dpage); - *dst |=migrate_pfn (page_to_pfn (dpage)); + *dst |=migrate_pfn_from_page (dpage); }for (i =0 ; i < (1 << order); i++) {
@@ -1000,7 +1001,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (!dpage && order) { dpage =alloc_page_vma (GFP_HIGHUSER_MOVABLE , args->vma, addr);lock_page (dpage); - dst[i] =migrate_pfn (page_to_pfn (dpage)); + dst[i] =migrate_pfn_from_page (dpage); dst_page =pfn_to_page (page_to_pfn (dpage)); dpage =NULL ;/* For the next iteration */ }else {
@@ -1412,7 +1413,7 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk)/* TODO Support splitting here */ lock_page (dpage); - dst_pfns[i] =migrate_pfn (page_to_pfn (dpage)); + dst_pfns[i] =migrate_pfn_from_page (dpage);if (src_pfns[i] &MIGRATE_PFN_WRITE ) dst_pfns[i] |=MIGRATE_PFN_WRITE ;if (order)
mm/migrate_device.c +3 -4
@@ -207,9 +207,8 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, .vma = walk->vma, }; -unsigned long pfn =page_to_pfn (folio_page (folio,0 )); - - migrate->src[migrate->npages] =migrate_pfn (pfn) | write + migrate->src[migrate->npages] =migrate_pfn_from_page (folio_page (folio,0 )) + | write |MIGRATE_PFN_MIGRATE |MIGRATE_PFN_COMPOUND ; migrate->dst[migrate->npages++] =0 ;
@@ -328,7 +327,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, goto again; } - mpfn =migrate_pfn (page_to_pfn (page)) | + mpfn =migrate_pfn_from_page (page) |MIGRATE_PFN_MIGRATE ;if (softleaf_is_device_private_write (entry)) mpfn |=MIGRATE_PFN_WRITE ;
Signature · 1 line
2.34.1
Re: [PATCH v3 01/13] mm/migrate_device: Introduce migrate_pfn_from_page() helper
Quoted 9 lines · Jordan Niethe
To create a migrate entry from a given struct page, that page is first converted to its pfn, before passing the pfn to
migrate_pfn().A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn and must be handled separately.
Prepare for this with a new helper:
Quoted 8 lines
-
migrate_pfn_from_page()This helper takes a struct page as parameter instead of a pfn. This will allow more flexibility for handling the mpfn differently for device private pages.
Reviewed-by Balbir Singh <[email protected]>Signed-off-by Jordan Niethe <[email protected]>
Quoted 165 lines
---
v2: New to series
v3: No change--- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- drivers/gpu/drm/drm_pagemap.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 ++-- include/linux/migrate.h | 5 +++++ lib/test_hmm.c | 11 ++++++----- mm/migrate_device.c | 7 +++---- 7 files changed, 19 insertions(+), 14 deletions(-)arch/powerpc/kvm/book3s_hv_uvmem.c +1
-1@@ -784,7 +784,7 @@ static int kvmppc_svm_page_in(struct vm_area_struct *vma, } } - *mig.dst =migrate_pfn (page_to_pfn (dpage)); + *mig.dst =migrate_pfn_from_page (dpage);migrate_vma_pages (&mig); out_finalize:migrate_vma_finalize (&mig);drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1
-1@@ -652,7 +652,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,pr_debug_ratelimited ("dma mapping dst to 0x%llx, pfn 0x%lx\n" , dst[i] >>PAGE_SHIFT ,page_to_pfn (dpage)); - migrate->dst[i] =migrate_pfn (page_to_pfn (dpage)); + migrate->dst[i] =migrate_pfn_from_page (dpage); j++; }drivers/gpu/drm/drm_pagemap.c +1
-1@@ -742,7 +742,7 @@ static int drm_pagemap_migrate_populate_ram_pfn(struct vm_area_struct *vas, goto free_pages; page =folio_page (folio,0 ); - mpfn[i] =migrate_pfn (page_to_pfn (page)); + mpfn[i] =migrate_pfn_from_page (page); next:if (page)drivers/gpu/drm/nouveau/nouveau_dmem.c +2
-2@@ -249,7 +249,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) goto done; } - args.dst[0 ] =migrate_pfn (page_to_pfn (dpage)); + args.dst[0 ] =migrate_pfn_from_page (dpage);if (order) args.dst[0 ] |=MIGRATE_PFN_COMPOUND ; dfolio =page_folio (dpage);@@ -766,7 +766,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm, ((paddr >>PAGE_SHIFT ) <<NVIF_VMM_PFNMAP_V0_ADDR_SHIFT );if (src &MIGRATE_PFN_WRITE ) *pfn |=NVIF_VMM_PFNMAP_V0_W ; - mpfn =migrate_pfn (page_to_pfn (dpage)); + mpfn =migrate_pfn_from_page (dpage);if (folio_order (page_folio (dpage))) mpfn |=MIGRATE_PFN_COMPOUND ;return mpfn;include/linux/migrate.h +5
-0@@ -140,6 +140,11 @@ static inline unsigned long migrate_pfn(unsigned long pfn)return (pfn <<MIGRATE_PFN_SHIFT ) |MIGRATE_PFN_VALID ; } +static inline unsigned long migrate_pfn_from_page (struct page *page) +{ +return migrate_pfn (page_to_pfn (page)); +} +enum migrate_vma_direction {MIGRATE_VMA_SELECT_SYSTEM =1 <<0 ,MIGRATE_VMA_SELECT_DEVICE_PRIVATE =1 <<1 ,lib/test_hmm.c +6
-5@@ -727,7 +727,8 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, rpage =BACKING_PAGE (dpage); rpage->zone_device_data = dmirror; - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | + write; src_page =pfn_to_page (spfn + i);if (spage)@@ -754,7 +755,7 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args,pr_debug ("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n" ,page_to_pfn (spage),page_to_pfn (dpage)); - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | write;if (is_large) {int i;@@ -989,7 +990,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (dpage) {lock_page (dpage); - *dst |=migrate_pfn (page_to_pfn (dpage)); + *dst |=migrate_pfn_from_page (dpage); }for (i =0 ; i < (1 << order); i++) {@@ -1000,7 +1001,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (!dpage && order) { dpage =alloc_page_vma (GFP_HIGHUSER_MOVABLE , args->vma, addr);lock_page (dpage); - dst[i] =migrate_pfn (page_to_pfn (dpage)); + dst[i] =migrate_pfn_from_page (dpage); dst_page =pfn_to_page (page_to_pfn (dpage)); dpage =NULL ;/* For the next iteration */ }else {@@ -1412,7 +1413,7 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk)/* TODO Support splitting here */ lock_page (dpage); - dst_pfns[i] =migrate_pfn (page_to_pfn (dpage)); + dst_pfns[i] =migrate_pfn_from_page (dpage);if (src_pfns[i] &MIGRATE_PFN_WRITE ) dst_pfns[i] |=MIGRATE_PFN_WRITE ;if (order)mm/migrate_device.c +3
-4@@ -207,9 +207,8 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, .vma = walk->vma, }; -unsigned long pfn =page_to_pfn (folio_page (folio,0 )); - - migrate->src[migrate->npages] =migrate_pfn (pfn) | write + migrate->src[migrate->npages] =migrate_pfn_from_page (folio_page (folio,0 )) + | write |MIGRATE_PFN_MIGRATE |MIGRATE_PFN_COMPOUND ; migrate->dst[migrate->npages++] =0 ;@@ -328,7 +327,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, goto again; } - mpfn =migrate_pfn (page_to_pfn (page)) | + mpfn =migrate_pfn_from_page (page) |MIGRATE_PFN_MIGRATE ;if (softleaf_is_device_private_write (entry)) mpfn |=MIGRATE_PFN_WRITE ;
Re: [PATCH v3 01/13] mm/migrate_device: Introduce migrate_pfn_from_page() helper
In reply to Jordan NietheHi,
Quoted 35 lines · Jordan Niethe
To create a migrate entry from a given struct page, that page is first converted to its pfn, before passing the pfn to
migrate_pfn().A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn and must be handled separately.
Prepare for this with a new helper:
-
migrate_pfn_from_page()This helper takes a struct page as parameter instead of a pfn. This will allow more flexibility for handling the mpfn differently for device private pages.
Reviewed-by Balbir Singh <[email protected]>Signed-off-by Jordan Niethe <[email protected]>---
v2: New to series
v3: No change--- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- drivers/gpu/drm/drm_pagemap.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 ++-- include/linux/migrate.h | 5 +++++ lib/test_hmm.c | 11 ++++++----- mm/migrate_device.c | 7 +++---- 7 files changed, 19 insertions(+), 14 deletions(-)arch/powerpc/kvm/book3s_hv_uvmem.c +0
-0
arch/powerpc/kvm/book3s_hv_uvmem.c static int kvmppc_svm_page_in(struct vm_area_struct *vma, · line 790
Quoted 8 lines
arch/powerpc/kvm/book3s_hv_uvmem.c +1
-1@@ -784,7 +784,7 @@ static int kvmppc_svm_page_in(struct vm_area_struct *vma, } } - *mig.dst =migrate_pfn (page_to_pfn (dpage)); + *mig.dst =migrate_pfn_from_page (dpage);migrate_vma_pages (&mig); out_finalize:migrate_vma_finalize (&mig);
Maddy, would you mind taking a look at the ppc ultravisor changes here and patch [PATCH v3 13/13] ("mm: Remove device private pages from the physical address space").
Thanks,
Jordan.
Quoted 139 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1
-1@@ -652,7 +652,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,pr_debug_ratelimited ("dma mapping dst to 0x%llx, pfn 0x%lx\n" , dst[i] >>PAGE_SHIFT ,page_to_pfn (dpage)); - migrate->dst[i] =migrate_pfn (page_to_pfn (dpage)); + migrate->dst[i] =migrate_pfn_from_page (dpage); j++; }drivers/gpu/drm/drm_pagemap.c +1
-1@@ -742,7 +742,7 @@ static int drm_pagemap_migrate_populate_ram_pfn(struct vm_area_struct *vas, goto free_pages; page =folio_page (folio,0 ); - mpfn[i] =migrate_pfn (page_to_pfn (page)); + mpfn[i] =migrate_pfn_from_page (page); next:if (page)drivers/gpu/drm/nouveau/nouveau_dmem.c +2
-2@@ -249,7 +249,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) goto done; } - args.dst[0 ] =migrate_pfn (page_to_pfn (dpage)); + args.dst[0 ] =migrate_pfn_from_page (dpage);if (order) args.dst[0 ] |=MIGRATE_PFN_COMPOUND ; dfolio =page_folio (dpage);@@ -766,7 +766,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm, ((paddr >>PAGE_SHIFT ) <<NVIF_VMM_PFNMAP_V0_ADDR_SHIFT );if (src &MIGRATE_PFN_WRITE ) *pfn |=NVIF_VMM_PFNMAP_V0_W ; - mpfn =migrate_pfn (page_to_pfn (dpage)); + mpfn =migrate_pfn_from_page (dpage);if (folio_order (page_folio (dpage))) mpfn |=MIGRATE_PFN_COMPOUND ;return mpfn;include/linux/migrate.h +5
-0@@ -140,6 +140,11 @@ static inline unsigned long migrate_pfn(unsigned long pfn)return (pfn <<MIGRATE_PFN_SHIFT ) |MIGRATE_PFN_VALID ; } +static inline unsigned long migrate_pfn_from_page (struct page *page) +{ +return migrate_pfn (page_to_pfn (page)); +} +enum migrate_vma_direction {MIGRATE_VMA_SELECT_SYSTEM =1 <<0 ,MIGRATE_VMA_SELECT_DEVICE_PRIVATE =1 <<1 ,lib/test_hmm.c +6
-5@@ -727,7 +727,8 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, rpage =BACKING_PAGE (dpage); rpage->zone_device_data = dmirror; - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | + write; src_page =pfn_to_page (spfn + i);if (spage)@@ -754,7 +755,7 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args,pr_debug ("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n" ,page_to_pfn (spage),page_to_pfn (dpage)); - *dst =migrate_pfn (page_to_pfn (dpage)) | write; + *dst =migrate_pfn_from_page (dpage) | write;if (is_large) {int i;@@ -989,7 +990,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (dpage) {lock_page (dpage); - *dst |=migrate_pfn (page_to_pfn (dpage)); + *dst |=migrate_pfn_from_page (dpage); }for (i =0 ; i < (1 << order); i++) {@@ -1000,7 +1001,7 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args,if (!dpage && order) { dpage =alloc_page_vma (GFP_HIGHUSER_MOVABLE , args->vma, addr);lock_page (dpage); - dst[i] =migrate_pfn (page_to_pfn (dpage)); + dst[i] =migrate_pfn_from_page (dpage); dst_page =pfn_to_page (page_to_pfn (dpage)); dpage =NULL ;/* For the next iteration */ }else {@@ -1412,7 +1413,7 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk)/* TODO Support splitting here */ lock_page (dpage); - dst_pfns[i] =migrate_pfn (page_to_pfn (dpage)); + dst_pfns[i] =migrate_pfn_from_page (dpage);if (src_pfns[i] &MIGRATE_PFN_WRITE ) dst_pfns[i] |=MIGRATE_PFN_WRITE ;if (order)mm/migrate_device.c +3
-4@@ -207,9 +207,8 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, .vma = walk->vma, }; -unsigned long pfn =page_to_pfn (folio_page (folio,0 )); - - migrate->src[migrate->npages] =migrate_pfn (pfn) | write + migrate->src[migrate->npages] =migrate_pfn_from_page (folio_page (folio,0 )) + | write |MIGRATE_PFN_MIGRATE |MIGRATE_PFN_COMPOUND ; migrate->dst[migrate->npages++] =0 ;@@ -328,7 +327,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, goto again; } - mpfn =migrate_pfn (page_to_pfn (page)) | + mpfn =migrate_pfn_from_page (page) |MIGRATE_PFN_MIGRATE ;if (softleaf_is_device_private_write (entry)) mpfn |=MIGRATE_PFN_WRITE ;
PATCH v3 2/13 drm/amdkfd: Use migrate pfns internally
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn.
A MIGRATE_PFN flag will be introduced that distinguishes between mpfns that contain a pfn vs an offset into device private memory.
Replace usages of pfns and page_to_pfn() with mpfns and migrate_pfn_to_page() to prepare for handling this distinction. This will assist in continuing to use the same code paths for both MEMORY_DEVICE_PRIVATE and MEMORY_DEVICE_COHERENT devices.
---
v2:
- New to series
v3:
- No change
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +7 -8
@@ -210,17 +210,17 @@ svm_migrate_copy_done(struct amdgpu_device *adev, struct dma_fence *mfence) }unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr) +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr) { -return (addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ; +return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ); }static void -svm_migrate_get_vram_page (struct svm_range *prange,unsigned long pfn) +svm_migrate_get_vram_page (struct svm_range *prange,unsigned long mpfn) {struct page *page; - page =pfn_to_page (pfn); + page =migrate_pfn_to_page (mpfn);svm_range_bo_ref (prange->svm_bo); page->zone_device_data = prange->svm_bo;zone_device_page_init (page,0 );
@@ -231,7 +231,7 @@ svm_migrate_put_vram_page(struct amdgpu_device *adev, unsigned long addr) {struct page *page; - page =pfn_to_page (svm_migrate_addr_to_pfn (adev, addr)); + page =migrate_pfn_to_page (svm_migrate_addr_to_mpfn (adev, addr));unlock_page (page);put_page (page); }
@@ -241,7 +241,7 @@ svm_migrate_addr(struct amdgpu_device *adev, struct page *page) {unsigned long addr; - addr =page_to_pfn (page) <<PAGE_SHIFT ; + addr = (migrate_pfn_from_page (page) >>MIGRATE_PFN_SHIFT ) <<PAGE_SHIFT ;return (addr - adev->kfd.pgmap.range.start); }
@@ -307,9 +307,8 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange,if (migrate->src[i] &MIGRATE_PFN_MIGRATE ) { dst[i] = cursor.start + (j <<PAGE_SHIFT ); - migrate->dst[i] =svm_migrate_addr_to_pfn (adev, dst[i]); + migrate->dst[i] =svm_migrate_addr_to_mpfn (adev, dst[i]);svm_migrate_get_vram_page (prange, migrate->dst[i]); - migrate->dst[i] =migrate_pfn (migrate->dst[i]); mpages++; } spage =migrate_pfn_to_page (migrate->src[i]);
drivers/gpu/drm/amd/amdkfd/kfd_migrate.h +1 -1
@@ -48,7 +48,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm, uint32_t trigger, struct page *fault_page);unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr); +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr);#endif /* IS_ENABLED(CONFIG_HSA_AMD_SVM) */
Signature · 1 line
2.34.1
Re: [PATCH v3 02/13] drm/amdkfd: Use migrate pfns internally
Quoted 83 lines · Jordan Niethe
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn.
A
MIGRATE_PFNflag will be introduced that distinguishes between mpfns that contain a pfn vs an offset into device private memory.Replace usages of pfns and
page_to_pfn()with mpfns andmigrate_pfn_to_page()to prepare for handling this distinction. This will assist in continuing to use the same code paths for bothMEMORY_DEVICE_PRIVATEandMEMORY_DEVICE_COHERENTdevices.Signed-off-by Jordan Niethe <[email protected]>---
v2:
- New to series
v3:
- No change--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +7
-8@@ -210,17 +210,17 @@ svm_migrate_copy_done(struct amdgpu_device *adev, struct dma_fence *mfence) }unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr) +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr) { -return (addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ; +return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ); }static void -svm_migrate_get_vram_page (struct svm_range *prange,unsigned long pfn) +svm_migrate_get_vram_page (struct svm_range *prange,unsigned long mpfn) {struct page *page; - page =pfn_to_page (pfn); + page =migrate_pfn_to_page (mpfn);svm_range_bo_ref (prange->svm_bo); page->zone_device_data = prange->svm_bo;zone_device_page_init (page,0 );@@ -231,7 +231,7 @@ svm_migrate_put_vram_page(struct amdgpu_device *adev, unsigned long addr) {struct page *page; - page =pfn_to_page (svm_migrate_addr_to_pfn (adev, addr)); + page =migrate_pfn_to_page (svm_migrate_addr_to_mpfn (adev, addr));unlock_page (page);put_page (page); }@@ -241,7 +241,7 @@ svm_migrate_addr(struct amdgpu_device *adev, struct page *page) {unsigned long addr; - addr =page_to_pfn (page) <<PAGE_SHIFT ; + addr = (migrate_pfn_from_page (page) >>MIGRATE_PFN_SHIFT ) <<PAGE_SHIFT ;return (addr - adev->kfd.pgmap.range.start); }@@ -307,9 +307,8 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange,if (migrate->src[i] &MIGRATE_PFN_MIGRATE ) { dst[i] = cursor.start + (j <<PAGE_SHIFT ); - migrate->dst[i] =svm_migrate_addr_to_pfn (adev, dst[i]); + migrate->dst[i] =svm_migrate_addr_to_mpfn (adev, dst[i]);svm_migrate_get_vram_page (prange, migrate->dst[i]); - migrate->dst[i] =migrate_pfn (migrate->dst[i]); mpages++; } spage =migrate_pfn_to_page (migrate->src[i]);drivers/gpu/drm/amd/amdkfd/kfd_migrate.h +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_migrate.h int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm, · line 54
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.h +1
-1@@ -48,7 +48,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm, uint32_t trigger, struct page *fault_page);unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr); +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr);#endif /* IS_ENABLED(CONFIG_HSA_AMD_SVM) */
Looks good!
Re: [PATCH v3 02/13] drm/amdkfd: Use migrate pfns internally
In reply to Jordan NietheQuoted 7 lines · Jordan Niethe
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn.
A
MIGRATE_PFNflag will be introduced that distinguishes between mpfns that contain a pfn vs an offset into device private memory.
Quoted 6 lines
Replace usages of pfns and
page_to_pfn()with mpfns andmigrate_pfn_to_page()to prepare for handling this distinction. This will assist in continuing to use the same code paths for bothMEMORY_DEVICE_PRIVATEandMEMORY_DEVICE_COHERENTdevices.Signed-off-by Jordan Niethe <[email protected]>
Quoted 78 lines
---
v2:
- New to series
v3:
- No change--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +7
-8@@ -210,17 +210,17 @@ svm_migrate_copy_done(struct amdgpu_device *adev, struct dma_fence *mfence) }unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr) +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr) { -return (addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ; +return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ); }static void -svm_migrate_get_vram_page (struct svm_range *prange,unsigned long pfn) +svm_migrate_get_vram_page (struct svm_range *prange,unsigned long mpfn) {struct page *page; - page =pfn_to_page (pfn); + page =migrate_pfn_to_page (mpfn);svm_range_bo_ref (prange->svm_bo); page->zone_device_data = prange->svm_bo;zone_device_page_init (page,0 );@@ -231,7 +231,7 @@ svm_migrate_put_vram_page(struct amdgpu_device *adev, unsigned long addr) {struct page *page; - page =pfn_to_page (svm_migrate_addr_to_pfn (adev, addr)); + page =migrate_pfn_to_page (svm_migrate_addr_to_mpfn (adev, addr));unlock_page (page);put_page (page); }@@ -241,7 +241,7 @@ svm_migrate_addr(struct amdgpu_device *adev, struct page *page) {unsigned long addr; - addr =page_to_pfn (page) <<PAGE_SHIFT ; + addr = (migrate_pfn_from_page (page) >>MIGRATE_PFN_SHIFT ) <<PAGE_SHIFT ;return (addr - adev->kfd.pgmap.range.start); }@@ -307,9 +307,8 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange,if (migrate->src[i] &MIGRATE_PFN_MIGRATE ) { dst[i] = cursor.start + (j <<PAGE_SHIFT ); - migrate->dst[i] =svm_migrate_addr_to_pfn (adev, dst[i]); + migrate->dst[i] =svm_migrate_addr_to_mpfn (adev, dst[i]);svm_migrate_get_vram_page (prange, migrate->dst[i]); - migrate->dst[i] =migrate_pfn (migrate->dst[i]); mpages++; } spage =migrate_pfn_to_page (migrate->src[i]);drivers/gpu/drm/amd/amdkfd/kfd_migrate.h +1
-1@@ -48,7 +48,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm, uint32_t trigger, struct page *fault_page);unsigned long -svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr); +svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr);#endif /* IS_ENABLED(CONFIG_HSA_AMD_SVM) */
PATCH v3 3/13 mm/migrate_device: Make migrate_device_{pfns,range}() take mpfns
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn.
This causes an issue for migrate_device_{pfns,range}() which take pfn parameters. Depending on if the device is MEMORY_DEVICE_PRIVATE or MEMORY_DEVICE_COHERENT will effect how that parameter should be interpreted.
A MIGRATE_PFN flag will be introduced that distinguishes between mpfns that contain a pfn vs an offset into device private memory, we will take advantage of that here.
Update migrate_device_{pfns,range}() to take a mpfn instead of pfn.
Update the users of migrate_device_{pfns,range}() to pass in an mpfn.
To support this change, update dpagemap_devmem_ops::populate_devmem_pfn() to instead return mpfns and rename accordingly.
---
v2: New to series
v3: No change
--- drivers/gpu/drm/drm_pagemap.c | 9 +++--- drivers/gpu/drm/nouveau/nouveau_dmem.c | 5 +-- drivers/gpu/drm/xe/xe_svm.c | 9 +++--- include/drm/drm_pagemap.h | 8 ++--- lib/test_hmm.c | 2 +- mm/migrate_device.c | 45 ++++++++++++++------------ 6 files changed, 41 insertions(+), 37 deletions(-)
drivers/gpu/drm/drm_pagemap.c +4 -5
@@ -505,7 +505,7 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation,mmap_assert_locked (mm); -if (!ops->populate_devmem_pfn || !ops->copy_to_devmem || +if (!ops->populate_devmem_mpfn || !ops->copy_to_devmem || !ops->copy_to_ram)return -EOPNOTSUPP ;
@@ -590,14 +590,14 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, goto err_aborted_migration; } - err = ops->populate_devmem_pfn (devmem_allocation, npages, migrate.dst); + err = ops->populate_devmem_mpfn (devmem_allocation, npages, migrate.dst);if (err) goto err_aborted_migration; own_pages =0 ;for (i =0 ; i < npages; ++i) { -struct page *page =pfn_to_page (migrate.dst[i]); +struct page *page =migrate_pfn_to_page (migrate.dst[i]);struct page *src_page =migrate_pfn_to_page (migrate.src[i]); cur.start = i;
@@ -624,7 +624,6 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, cur.device = dpagemap->drm->dev; pages[i] = page; } - migrate.dst[i] =migrate_pfn (migrate.dst[i]);drm_pagemap_get_devmem_page (page, zdd);/* If we switched the migrating drm_pagemap, migrate previous pages now */
@@ -979,7 +978,7 @@ int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation) pagemap_addr = buf + (2 *sizeof (*src) * npages); pages = buf + (2 *sizeof (*src) +sizeof (*pagemap_addr)) * npages; - err = ops->populate_devmem_pfn (devmem_allocation, npages, src); + err = ops->populate_devmem_mpfn (devmem_allocation, npages, src);if (err) goto err_free;
drivers/gpu/drm/nouveau/nouveau_dmem.c +3 -2
@@ -483,8 +483,9 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) dst_pfns =kvcalloc (npages,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); dma_info =kvcalloc (npages,sizeof (*dma_info),GFP_KERNEL | __GFP_NOFAIL); -migrate_device_range (src_pfns, chunk->pagemap.range.start >>PAGE_SHIFT , - npages); +migrate_device_range (src_pfns, +migrate_pfn (chunk->pagemap.range.start >>PAGE_SHIFT ), + npages);for (i =0 ; i < npages; i++) {if (src_pfns[i] &MIGRATE_PFN_MIGRATE ) {
drivers/gpu/drm/xe/xe_svm.c +5 -4
@@ -10,6 +10,7 @@#include <drm/drm_pagemap.h> #include <drm/drm_pagemap_util.h> +#include <linux/migrate.h> #include "xe_bo.h" #include "xe_exec_queue_types.h" #include "xe_gt_stats.h"
@@ -752,8 +753,8 @@ static struct drm_buddy *vram_to_buddy(struct xe_vram_region *vram)return &vram->ttm.mm; } -static int xe_svm_populate_devmem_pfn (struct drm_pagemap_devmem *devmem_allocation, -unsigned long npages,unsigned long *pfn) +static int xe_svm_populate_devmem_mpfn (struct drm_pagemap_devmem *devmem_allocation, +unsigned long npages,unsigned long *pfn) {struct xe_bo *bo =to_xe_bo (devmem_allocation);struct ttm_resource *res = bo->ttm.resource;
@@ -769,7 +770,7 @@ static int xe_svm_populate_devmem_pfn(struct drm_pagemap_devmem *devmem_allocatiint i;for (i =0 ; i <drm_buddy_block_size (buddy, block) >>PAGE_SHIFT ; ++i) - pfn[j++] = block_pfn + i; + pfn[j++] =migrate_pfn (block_pfn + i); }return 0 ;
@@ -777,7 +778,7 @@ static int xe_svm_populate_devmem_pfn(struct drm_pagemap_devmem *devmem_allocatistatic const struct drm_pagemap_devmem_ops dpagemap_devmem_ops = { .devmem_release = xe_svm_devmem_release, - .populate_devmem_pfn = xe_svm_populate_devmem_pfn, + .populate_devmem_mpfn = xe_svm_populate_devmem_mpfn, .copy_to_devmem = xe_svm_copy_to_devmem, .copy_to_ram = xe_svm_copy_to_ram, };
include/drm/drm_pagemap.h +4 -4
@@ -192,17 +192,17 @@ struct drm_pagemap_devmem_ops {void (*devmem_release)(struct drm_pagemap_devmem *devmem_allocation);/** -* @populate_devmem_pfn: Populate device memory PFN (required for migration) +* @populate_devmem_mpfn: Populate device memory PFN (required for migration) * @devmem_allocation: device memory allocation * @npages: Number of pages to populate -* @pfn: Array of page frame numbers to populate +* @mpfn: Array of migrate page frame numbers to populate * * Populate device memory page frame numbers (PFN). * * Return: 0 on success, a negative error code on failure. */ -int (*populate_devmem_pfn)(struct drm_pagemap_devmem *devmem_allocation, -unsigned long npages,unsigned long *pfn); +int (*populate_devmem_mpfn)(struct drm_pagemap_devmem *devmem_allocation, +unsigned long npages,unsigned long *pfn);/** * @copy_to_devmem: Copy to device memory (required for migration)
lib/test_hmm.c +1 -1
@@ -1389,7 +1389,7 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk) src_pfns =kvcalloc (npages,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); dst_pfns =kvcalloc (npages,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); -migrate_device_range (src_pfns, start_pfn, npages); +migrate_device_range (src_pfns,migrate_pfn (start_pfn), npages);for (i =0 ; i < npages; i++) {struct page *dpage, *spage;
mm/migrate_device.c +24 -21
108 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 4/13 mm/migrate_device: Add migrate PFN flag to track device private pages
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal PFN and must be handled separately.
Prepare for this by adding a MIGRATE_PFN_DEVICE_PRIVATE flag to indicate that a migrate pfn contains a PFN for a device private page.
---
v1:
- Update for HMM huge page support
- Update existing drivers to use MIGRATE_PFN_DEVICE
v2:
- Include changes to migrate_pfn_from_page()
- Rename to MIGRATE_PFN_DEVICE_PRIVATE
- drm/amd: Check adev->gmc.xgmi.connected_to_cpu
- lib/test_hmm.c: Check chunk->pagemap.type == MEMORY_DEVICE_PRIVATE
v3:
- Use adev->kfd.pgmap.type == MEMORY_DEVICE_PRIVATE
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 7 ++++++- drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 ++- drivers/gpu/drm/xe/xe_svm.c | 2 +- include/linux/migrate.h | 14 +++++++++----- lib/test_hmm.c | 6 +++++- 5 files changed, 23 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +6 -1
@@ -212,7 +212,12 @@ svm_migrate_copy_done(struct amdgpu_device *adev, struct dma_fence *mfence)unsigned long svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr) { -return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ); +unsigned long flags =0 ; + +if (adev->kfd.pgmap.type ==MEMORY_DEVICE_PRIVATE ) + flags |=MIGRATE_PFN_DEVICE_PRIVATE ; +return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ) | + flags; } static void
drivers/gpu/drm/nouveau/nouveau_dmem.c +2 -1
@@ -484,7 +484,8 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) dma_info =kvcalloc (npages,sizeof (*dma_info),GFP_KERNEL | __GFP_NOFAIL);migrate_device_range (src_pfns, -migrate_pfn (chunk->pagemap.range.start >>PAGE_SHIFT ), +migrate_pfn (chunk->pagemap.range.start >>PAGE_SHIFT ) | +MIGRATE_PFN_DEVICE_PRIVATE , npages);for (i =0 ; i < npages; i++) {
drivers/gpu/drm/xe/xe_svm.c +1 -1
@@ -770,7 +770,7 @@ static int xe_svm_populate_devmem_mpfn(struct drm_pagemap_devmem *devmem_allocatint i;for (i =0 ; i <drm_buddy_block_size (buddy, block) >>PAGE_SHIFT ; ++i) - pfn[j++] =migrate_pfn (block_pfn + i); + pfn[j++] =migrate_pfn (block_pfn + i) |MIGRATE_PFN_DEVICE_PRIVATE ; }return 0 ;
include/linux/migrate.h +9 -5
@@ -122,11 +122,12 @@ static inline int migrate_misplaced_folio(struct folio *folio, int node)* have enough bits to store all physical address and flags. So far we have * enough room for all our flags. */ -#define MIGRATE_PFN_VALID (1UL << 0) -#define MIGRATE_PFN_MIGRATE (1UL << 1) -#define MIGRATE_PFN_WRITE (1UL << 3) -#define MIGRATE_PFN_COMPOUND (1UL << 4) -#define MIGRATE_PFN_SHIFT 6 +#define MIGRATE_PFN_VALID (1UL << 0) +#define MIGRATE_PFN_MIGRATE (1UL << 1) +#define MIGRATE_PFN_WRITE (1UL << 3) +#define MIGRATE_PFN_COMPOUND (1UL << 4) +#define MIGRATE_PFN_DEVICE_PRIVATE (1UL << 5) +#define MIGRATE_PFN_SHIFT 6static inline struct page *migrate_pfn_to_page (unsigned long mpfn) {
@@ -142,6 +143,9 @@ static inline unsigned long migrate_pfn(unsigned long pfn)static inline unsigned long migrate_pfn_from_page (struct page *page) { +if (is_device_private_page (page)) +return migrate_pfn (page_to_pfn (page)) | +MIGRATE_PFN_DEVICE_PRIVATE ;return migrate_pfn (page_to_pfn (page)); }
lib/test_hmm.c +5 -1
@@ -1385,11 +1385,15 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk)unsigned long *src_pfns;unsigned long *dst_pfns;unsigned int order =0 ; +unsigned long flags =0 ; src_pfns =kvcalloc (npages,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); dst_pfns =kvcalloc (npages,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); -migrate_device_range (src_pfns,migrate_pfn (start_pfn), npages); +if (chunk->pagemap.type ==MEMORY_DEVICE_PRIVATE ) + flags |=MIGRATE_PFN_DEVICE_PRIVATE ; + +migrate_device_range (src_pfns,migrate_pfn (start_pfn) | flags, npages);for (i =0 ; i < npages; i++) {struct page *dpage, *spage;
Signature · 1 line
2.34.1
Re: [PATCH v3 04/13] mm/migrate_device: Add migrate PFN flag to track device private pages
Quoted 9 lines · Jordan Niethe
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal PFN and must be handled separately.
Prepare for this by adding a
MIGRATE_PFN_DEVICE_PRIVATEflag to indicate that a migrate pfn contains a PFN for a device private page.Signed-off-by Jordan Niethe <[email protected]>Signed-off-by Alistair Popple <[email protected]>
Quoted 119 lines
---
v1:
- Update for HMM huge page support
- Update existing drivers to useMIGRATE_PFN_DEVICE
v2:
- Include changes tomigrate_pfn_from_page()
- Rename toMIGRATE_PFN_DEVICE_PRIVATE
- drm/amd: Checkadev->gmc.xgmi.connected_to_cpu
-lib/test_hmm.c: Checkchunk->pagemap.type==MEMORY_DEVICE_PRIVATEv3:
- Useadev->kfd.pgmap.type==MEMORY_DEVICE_PRIVATE--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 7 ++++++- drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 ++- drivers/gpu/drm/xe/xe_svm.c | 2 +- include/linux/migrate.h | 14 +++++++++----- lib/test_hmm.c | 6 +++++- 5 files changed, 23 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +6
-1@@ -212,7 +212,12 @@ svm_migrate_copy_done(struct amdgpu_device *adev, struct dma_fence *mfence)unsigned long svm_migrate_addr_to_mpfn (struct amdgpu_device *adev,unsigned long addr) { -return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ); +unsigned long flags =0 ; + +if (adev->kfd.pgmap.type ==MEMORY_DEVICE_PRIVATE ) + flags |=MIGRATE_PFN_DEVICE_PRIVATE ; +return migrate_pfn ((addr + adev->kfd.pgmap.range.start) >>PAGE_SHIFT ) | + flags; } static voiddrivers/gpu/drm/nouveau/nouveau_dmem.c +2
-1@@ -484,7 +484,8 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) dma_info =kvcalloc (npages,sizeof (*dma_info),GFP_KERNEL | __GFP_NOFAIL);migrate_device_range (src_pfns, -migrate_pfn (chunk->pagemap.range.start >>PAGE_SHIFT ), +migrate_pfn (chunk->pagemap.range.start >>PAGE_SHIFT ) | +MIGRATE_PFN_DEVICE_PRIVATE , npages);for (i =0 ; i < npages; i++) {drivers/gpu/drm/xe/xe_svm.c +1
-1@@ -770,7 +770,7 @@ static int xe_svm_populate_devmem_mpfn(struct drm_pagemap_devmem *devmem_allocatint i;for (i =0 ; i <drm_buddy_block_size (buddy, block) >>PAGE_SHIFT ; ++i) - pfn[j++] =migrate_pfn (block_pfn + i); + pfn[j++] =migrate_pfn (block_pfn + i) |MIGRATE_PFN_DEVICE_PRIVATE ; }return 0 ;include/linux/migrate.h +9
-5@@ -122,11 +122,12 @@ static inline int migrate_misplaced_folio(struct folio *folio, int node)* have enough bits to store all physical address and flags. So far we have * enough room for all our flags. */ -#define MIGRATE_PFN_VALID (1UL << 0) -#define MIGRATE_PFN_MIGRATE (1UL << 1) -#define MIGRATE_PFN_WRITE (1UL << 3) -#define MIGRATE_PFN_COMPOUND (1UL << 4) -#define MIGRATE_PFN_SHIFT 6 +#define MIGRATE_PFN_VALID (1UL << 0) +#define MIGRATE_PFN_MIGRATE (1UL << 1) +#define MIGRATE_PFN_WRITE (1UL << 3) +#define MIGRATE_PFN_COMPOUND (1UL << 4) +#define MIGRATE_PFN_DEVICE_PRIVATE (1UL << 5) +#define MIGRATE_PFN_SHIFT 6static inline struct page *migrate_pfn_to_page (unsigned long mpfn) {@@ -142,6 +143,9 @@ static inline unsigned long migrate_pfn(unsigned long pfn)static inline unsigned long migrate_pfn_from_page (struct page *page) { +if (is_device_private_page (page)) +return migrate_pfn (page_to_pfn (page)) | +MIGRATE_PFN_DEVICE_PRIVATE ;return migrate_pfn (page_to_pfn (page)); }lib/test_hmm.c +5
-1@@ -1385,11 +1385,15 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk)unsigned long *src_pfns;unsigned long *dst_pfns;unsigned int order =0 ; +unsigned long flags =0 ; src_pfns =kvcalloc (npages,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); dst_pfns =kvcalloc (npages,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); -migrate_device_range (src_pfns,migrate_pfn (start_pfn), npages); +if (chunk->pagemap.type ==MEMORY_DEVICE_PRIVATE ) + flags |=MIGRATE_PFN_DEVICE_PRIVATE ; + +migrate_device_range (src_pfns,migrate_pfn (start_pfn) | flags, npages);for (i =0 ; i < npages; i++) {struct page *dpage, *spage;
PATCH v3 5/13 mm/page_vma_mapped: Add flag to page_vma_mapped_walk::flags to track device private pages
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal PFN and must be handled separately.
Prepare for this by adding a PVMW_DEVICE_PRIVATE flag to page_vma_mapped_walk::flags. This indicates that page_vma_mapped_walk::pfn contains a device private offset rather than a normal pfn.
Once the device private pages are removed from the physical address space this flag will be used to ensure a device private offset is returned.
---
v1:
- Update for HMM huge page support
v2:
- Move adding device_private param to check_pmd() until final patch
v3:
- Track device private offset in pvmw::flags instead of pvmw::pfn
--- include/linux/rmap.h | 24 ++++++++++++++++++++++-- mm/page_vma_mapped.c | 4 ++-- mm/rmap.c | 4 ++-- mm/vmscan.c | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-)
include/linux/rmap.h +22 -2
@@ -921,6 +921,8 @@ struct page *make_device_exclusive(struct mm_struct *mm, unsigned long addr,#define PVMW_SYNC (1 << 0)/* Look for migration entries rather than present PTEs */ #define PVMW_MIGRATION (1 << 1) +/* pvmw::pfn is a device private offset */ +#define PVMW_DEVICE_PRIVATE (1 << 2)/* Result flags */
@@ -939,14 +941,32 @@ struct page_vma_mapped_walk {unsigned int flags; }; +static inline unsigned long page_vma_walk_flags (const struct folio *folio, +unsigned long flags) +{ +if (folio_is_device_private (folio)) +return flags |PVMW_DEVICE_PRIVATE ; +return flags; +} + +static inline unsigned long folio_page_vma_walk_pfn (const struct folio *folio) +{ +return folio_pfn (folio); +} + +static inline struct folio *page_vma_walk_pfn_to_folio (struct page_vma_mapped_walk *pvmw) +{ +return pfn_folio (pvmw->pfn); +} +#define DEFINE_FOLIO_VMA_WALK (name, _folio, _vma, _address, _flags) \ struct page_vma_mapped_walk name = { \ - .pfn = folio_pfn(_folio), \ + .pfn = folio_page_vma_walk_pfn(_folio), \ .nr_pages = folio_nr_pages(_folio), \ .pgoff = folio_pgoff(_folio), \ .vma = _vma, \ .address = _address, \ - .flags = _flags, \ + .flags = page_vma_walk_flags(_folio, _flags), \ }static inline void page_vma_mapped_walk_done (struct page_vma_mapped_walk *pvmw)
mm/page_vma_mapped.c +2 -2
@@ -350,10 +350,10 @@ unsigned long page_mapped_in_vma(const struct page *page, {const struct folio *folio =page_folio (page);struct page_vma_mapped_walk pvmw = { - .pfn =page_to_pfn (page), + .pfn =folio_page_vma_walk_pfn (folio), .nr_pages =1 , .vma = vma, - .flags =PVMW_SYNC , + .flags =page_vma_walk_flags (folio,PVMW_SYNC ), }; pvmw.address =vma_address (vma,page_pgoff (folio, page),1 );
mm/rmap.c +2 -2
@@ -1871,7 +1871,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma,* if page table locking is skipped: use TTU_SYNC to wait for that. */ if (flags &TTU_SYNC ) - pvmw.flags =PVMW_SYNC ; + pvmw.flags =page_vma_walk_flags (folio,PVMW_SYNC );/* * For THP, we have to assume the worse case ie pmd for invalidation.
@@ -2299,7 +2299,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,* if page table locking is skipped: use TTU_SYNC to wait for that. */ if (flags &TTU_SYNC ) - pvmw.flags =PVMW_SYNC ; + pvmw.flags =page_vma_walk_flags (folio,PVMW_SYNC );/* * For THP, we have to assume the worse case ie pmd for invalidation.
mm/vmscan.c +1 -1
@@ -4203,7 +4203,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)pte_t *pte = pvmw->pte;unsigned long addr = pvmw->address;struct vm_area_struct *vma = pvmw->vma; -struct folio *folio =pfn_folio (pvmw->pfn); +struct folio *folio =page_vma_walk_pfn_to_folio (pvmw);struct mem_cgroup *memcg =folio_memcg (folio);struct pglist_data *pgdat =folio_pgdat (folio);struct lruvec *lruvec =mem_cgroup_lruvec (memcg, pgdat);
Signature · 1 line
2.34.1
Re: [PATCH v3 05/13] mm/page_vma_mapped: Add flag to page_vma_mapped_walk::flags to track device private pages
Quoted 22 lines · Jordan Niethe
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal PFN and must be handled separately.
Prepare for this by adding a
PVMW_DEVICE_PRIVATEflag topage_vma_mapped_walk::flags. This indicates thatpage_vma_mapped_walk::pfncontains a device private offset rather than a normal pfn.Once the device private pages are removed from the physical address space this flag will be used to ensure a device private offset is returned.
Signed-off-by Jordan Niethe <[email protected]>Signed-off-by Alistair Popple <[email protected]>---
v1:
- Update for HMM huge page support
v2:
- Move addingdevice_privateparam tocheck_pmd()until final patch
v3:
- Track device private offset inpvmw::flagsinstead ofpvmw::pfn
Quoted 7 lines
--- include/linux/rmap.h | 24 ++++++++++++++++++++++-- mm/page_vma_mapped.c | 4 ++-- mm/rmap.c | 4 ++-- mm/vmscan.c | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-)
LGTM.
Best Regards,
Yan, Zi
PATCH v3 6/13 mm: Add helpers to create migration entries from struct pages
In reply to Jordan NietheTo create a new migration entry for a given struct page, that page is first converted to its pfn, before passing the pfn to make_readable_migration_entry() (and friends).
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn and must be handled separately.
Prepare for this with a new set of helpers:
- make_readable_migration_entry_from_page()
- make_readable_exclusive_migration_entry_from_page()
- make_writable_migration_entry_from_page()
These helpers take a struct page as parameter instead of a pfn. This will allow more flexibility for handling the swap offset field differently for device private pages.
---
v1:
- New to series
v2:
- Add flags param
v3:
- No change
--- include/linux/leafops.h | 14 ++++++++++++++ include/linux/swapops.h | 33 +++++++++++++++++++++++++++++++++ mm/huge_memory.c | 29 +++++++++++++++++------------ mm/hugetlb.c | 15 +++++++++------ mm/memory.c | 5 +++-- mm/migrate_device.c | 12 ++++++------ mm/mprotect.c | 10 +++++++--- mm/rmap.c | 12 ++++++------ 8 files changed, 95 insertions(+), 35 deletions(-)
include/linux/leafops.h +14 -0
@@ -363,6 +363,20 @@ static inline unsigned long softleaf_to_pfn(softleaf_t entry)return swp_offset (entry) &SWP_PFN_MASK ; } +/** +* softleaf_to_flags() - Obtain flags encoded within leaf entry. +* @entry: Leaf entry, softleaf_has_pfn(@entry) must return true. +* +* Returns: The flags associated with the leaf entry. +*/ +static inline unsigned long softleaf_to_flags (softleaf_t entry) +{ +VM_WARN_ON_ONCE (!softleaf_has_pfn (entry)); + +/* Temporary until swp_entry_t eliminated. */ +return swp_offset (entry) & (SWP_MIG_YOUNG |SWP_MIG_DIRTY ); +} +/** * softleaf_to_page() - Obtains struct page for PFN encoded within leaf entry. * @entry: Leaf entry, softleaf_has_pfn(@entry) must return true.
include/linux/swapops.h +33 -0
@@ -173,16 +173,33 @@ static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)return swp_entry (SWP_MIGRATION_READ , offset); } +static inline swp_entry_t make_readable_migration_entry_from_page (struct page *page,pgoff_t flags) +{ +return swp_entry (SWP_MIGRATION_READ ,page_to_pfn (page) | flags); +} +static inline swp_entry_t make_readable_exclusive_migration_entry (pgoff_t offset) {return swp_entry (SWP_MIGRATION_READ_EXCLUSIVE , offset); } +static inline swp_entry_t make_readable_exclusive_migration_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (SWP_MIGRATION_READ_EXCLUSIVE ,page_to_pfn (page) | flags); +} +static inline swp_entry_t make_writable_migration_entry (pgoff_t offset) {return swp_entry (SWP_MIGRATION_WRITE , offset); } +static inline swp_entry_t make_writable_migration_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (SWP_MIGRATION_WRITE ,page_to_pfn (page) | flags); +} +/* * Returns whether the host has large enough swap offset field to support * carrying over pgtable A/D bits for page migrations. The result is
@@ -222,11 +239,27 @@ static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)return swp_entry (0 ,0 ); } +static inline swp_entry_t make_readable_migration_entry_from_page (struct page *page,pgoff_t flags) +{ +return swp_entry (0 ,0 ); +} + +static inline swp_entry_t make_writeable_migration_entry_from_page (struct page *page,pgoff_t flags) +{ +return swp_entry (0 ,0 ); +} +static inline swp_entry_t make_readable_exclusive_migration_entry (pgoff_t offset) {return swp_entry (0 ,0 ); } +static inline swp_entry_t make_readable_exclusive_migration_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (0 ,0 ); +} +static inline swp_entry_t make_writable_migration_entry (pgoff_t offset) {return swp_entry (0 ,0 );
mm/huge_memory.c +17 -12
@@ -1800,7 +1800,8 @@ static void copy_huge_non_present_pmd(if (softleaf_is_migration_write (entry) ||softleaf_is_migration_read_exclusive (entry)) { - entry =make_readable_migration_entry (swp_offset (entry)); + entry =make_readable_migration_entry_from_page (softleaf_to_page (entry), +softleaf_to_flags (entry)); pmd =swp_entry_to_pmd (entry);if (pmd_swp_soft_dirty (*src_pmd)) pmd =pmd_swp_mksoft_dirty (pmd);
@@ -2524,9 +2525,13 @@ static void change_non_present_huge_pmd(struct mm_struct *mm,* just be safe and disable write */ if (folio_test_anon (folio)) - entry =make_readable_exclusive_migration_entry (swp_offset (entry)); + entry =make_readable_exclusive_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry));else - entry =make_readable_migration_entry (swp_offset (entry)); + entry =make_readable_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry)); newpmd =swp_entry_to_pmd (entry);if (pmd_swp_soft_dirty (*pmd)) newpmd =pmd_swp_mksoft_dirty (newpmd);
@@ -3183,14 +3188,14 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,for (i =0 , addr = haddr; i <HPAGE_PMD_NR ; i++, addr +=PAGE_SIZE ) {if (write) - swp_entry =make_writable_migration_entry ( -page_to_pfn (page + i)); + swp_entry =make_writable_migration_entry_from_page ( + page + i,0 );else if (anon_exclusive) - swp_entry =make_readable_exclusive_migration_entry ( -page_to_pfn (page + i)); + swp_entry =make_readable_exclusive_migration_entry_from_page ( + page + i,0 );else - swp_entry =make_readable_migration_entry ( -page_to_pfn (page + i)); + swp_entry =make_readable_migration_entry_from_page ( + page + i,0 );if (young) swp_entry =make_migration_entry_young (swp_entry);if (dirty)
@@ -4890,11 +4895,11 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,if (pmd_dirty (pmdval))folio_mark_dirty (folio);if (pmd_write (pmdval)) - entry =make_writable_migration_entry (page_to_pfn (page)); + entry =make_writable_migration_entry_from_page (page,0 );else if (anon_exclusive) - entry =make_readable_exclusive_migration_entry (page_to_pfn (page)); + entry =make_readable_exclusive_migration_entry_from_page (page,0 );else - entry =make_readable_migration_entry (page_to_pfn (page)); + entry =make_readable_migration_entry_from_page (page,0 );if (pmd_young (pmdval)) entry =make_migration_entry_young (entry);if (pmd_dirty (pmdval))
mm/hugetlb.c +9 -6
@@ -4955,8 +4955,9 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,* COW mappings require pages in both * parent and child to be set to read. */ - softleaf =make_readable_migration_entry ( -swp_offset (softleaf)); + softleaf =make_readable_migration_entry_from_page ( +softleaf_to_page (softleaf), +softleaf_to_flags (softleaf)); entry =swp_entry_to_pte (softleaf);if (userfaultfd_wp (src_vma) && uffd_wp) entry =pte_swp_mkuffd_wp (entry);
@@ -6507,11 +6508,13 @@ long hugetlb_change_protection(struct vm_area_struct *vma,if (softleaf_is_migration_write (entry)) {if (folio_test_anon (folio)) - entry =make_readable_exclusive_migration_entry ( -swp_offset (entry)); + entry =make_readable_exclusive_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry));else - entry =make_readable_migration_entry ( -swp_offset (entry)); + entry =make_readable_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry)); newpte =swp_entry_to_pte (entry); pages++; }
mm/memory.c +3 -2
@@ -963,8 +963,9 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,* to be set to read. A previously exclusive entry is * now shared. */ - entry =make_readable_migration_entry ( -swp_offset (entry)); + entry =make_readable_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry)); pte =softleaf_to_pte (entry);if (pte_swp_soft_dirty (orig_pte)) pte =pte_swp_mksoft_dirty (pte);
mm/migrate_device.c +6 -6
@@ -432,14 +432,14 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp,/* Setup special migration page table entry */ if (mpfn &MIGRATE_PFN_WRITE ) - entry =make_writable_migration_entry ( -page_to_pfn (page)); + entry =make_writable_migration_entry_from_page ( + page,0 );else if (anon_exclusive) - entry =make_readable_exclusive_migration_entry ( -page_to_pfn (page)); + entry =make_readable_exclusive_migration_entry_from_page ( + page,0 );else - entry =make_readable_migration_entry ( -page_to_pfn (page)); + entry =make_readable_migration_entry_from_page ( + page,0 );if (pte_present (pte)) {if (pte_young (pte)) entry =make_migration_entry_young (entry);
mm/mprotect.c +7 -3
@@ -328,10 +328,14 @@ static long change_pte_range(struct mmu_gather *tlb,* just be safe and disable write */ if (folio_test_anon (folio)) - entry =make_readable_exclusive_migration_entry ( -swp_offset (entry)); + entry =make_readable_exclusive_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry));else - entry =make_readable_migration_entry (swp_offset (entry)); + entry =make_readable_migration_entry_from_page ( +softleaf_to_page (entry), +softleaf_to_flags (entry)); + newpte =swp_entry_to_pte (entry);if (pte_swp_soft_dirty (oldpte)) newpte =pte_swp_mksoft_dirty (newpte);
mm/rmap.c +6 -6
@@ -2539,14 +2539,14 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,* pte is removed and then restart fault handling. */ if (writable) - entry =make_writable_migration_entry ( -page_to_pfn (subpage)); + entry =make_writable_migration_entry_from_page ( + subpage,0 );else if (anon_exclusive) - entry =make_readable_exclusive_migration_entry ( -page_to_pfn (subpage)); + entry =make_readable_exclusive_migration_entry_from_page ( + subpage,0 );else - entry =make_readable_migration_entry ( -page_to_pfn (subpage)); + entry =make_readable_migration_entry_from_page ( + subpage,0 );if (likely (pte_present (pteval))) {if (pte_young (pteval)) entry =make_migration_entry_young (entry);
Signature · 1 line
2.34.1
PATCH v3 7/13 mm: Add a new swap type for migration entries of device private pages
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have pfns and must be handled separately.
When migrating a device private page a migration entry is created for that page. This includes the pfn for that page. Once device private pages begin using device memory offsets instead of pfns we will need to be able to determine which kind of value is in the entry so we can associate it with the correct page.
Introduce new swap types that correspond to the existing migration entries:
- SWP_MIGRATION_DEVICE_READ -> SWP_MIGRATION_READ
- SWP_MIGRATION_DEVICE_WRITE -> SWP_MIGRATION_WRITE
- SWP_MIGRATION_DEVICE_READ_EXCLUSIVE -> SWP_MIGRATION_READ_EXCLUSIVE
The SWP_MIGRATION_DEVICE swap types are meant as specializations of the SWP_MIGRATION types - they are equivalent except the new entries contain device private offsets.
Forgo creating new predicates for these new types in favour of new softleaf predicates that will be introduced in a subsequent patch. Currently the softleaf infrastructure does not have the means for creating new entries so provide swap entry helpers to that end.
Actually using these creation helpers is deferred until a later patch when the softleaf predicates have been updated, otherwise the existing checks for migration entries would be broken.
Note that SWP_DEVICE_NUM is increasing from 3 to 6. This reduces the maximum number of swap files in the worst case (i.e. CONFIG_DEVICE_PRIVATE, CONFIG_MIGRATION, CONFIG_MEMORY_FAILURE) from 24 to 21.
---
v1:
- Update for softleaf infrastructure
- Handle make_readable_migration_entry_from_page() and friends
- s/make_device_migration_readable_exclusive_migration_entry/make_readable_exclusive_migration_device_private_entry
- s/is_device_migration_readable_exclusive_entry/is_readable_exclusive_device_private_migration_entry/
v2:
- Add softleaf_is_migration_device_private_read()
v3:
- Move softleaf changes to new patch
- Update commit message to explain the change reduces the number of
swap files.
- Move creating the device private migration changes to a separate
patch
- Remove predicates - we'll rely on softleaf predicates entirely
--- include/linux/swap.h | 8 +++++++- include/linux/swapops.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-)
include/linux/swap.h +7 -1
@@ -74,12 +74,18 @@ static inline int current_is_kswapd(void)* * When a page is mapped by the device for exclusive access we set the CPU page * table entries to a special SWP_DEVICE_EXCLUSIVE entry. +* +* Because device private pages do not use regular PFNs, special migration +* entries are also needed. */ #ifdef CONFIG_DEVICE_PRIVATE -#define SWP_DEVICE_NUM 3 +#define SWP_DEVICE_NUM 6#define SWP_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM)#define SWP_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+1)#define SWP_DEVICE_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+2) +#define SWP_MIGRATION_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3) +#define SWP_MIGRATION_DEVICE_READ_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+4) +#define SWP_MIGRATION_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+5)#else #define SWP_DEVICE_NUM 0#endif
include/linux/swapops.h +30 -0
@@ -148,6 +148,21 @@ static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset) return swp_entry(SWP_DEVICE_EXCLUSIVE, offset); } +static inline swp_entry_t make_readable_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (SWP_MIGRATION_DEVICE_READ , offset); +} + +static inline swp_entry_t make_writable_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (SWP_MIGRATION_DEVICE_WRITE , offset); +} + +static inline swp_entry_t make_readable_exclusive_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (SWP_MIGRATION_DEVICE_READ_EXCLUSIVE , offset); +} +#else /* CONFIG_DEVICE_PRIVATE */ static inline swp_entry_t make_readable_device_private_entry (pgoff_t offset) {
@@ -164,6 +179,21 @@ static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset) return swp_entry(0, 0); } +static inline swp_entry_t make_readable_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (0 ,0 ); +} + +static inline swp_entry_t make_writable_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (0 ,0 ); +} + +static inline swp_entry_t make_readable_exclusive_migration_device_private_entry (pgoff_t offset) +{ +return swp_entry (0 ,0 ); +} +#endif /* CONFIG_DEVICE_PRIVATE */ #ifdef CONFIG_MIGRATION
Signature · 1 line
2.34.1
PATCH v3 8/13 mm: Add softleaf support for device private migration entries
In reply to Jordan NietheAdd equivalent softleaf entries for the device private migration swap entries:
- SWP_MIGRATION_DEVICE_READ -> SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ
- SWP_MIGRATION_DEVICE_WRITE -> SOFTLEAF_MIGRATION_DEVICE_PRIVATE_WRITE
- SWP_MIGRATION_DEVICE_READ_EXCLUSIVE -> SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE
As with their SWP_MIGRATION_DEVICE_xxx kin, the SOFTLEAF_MIGRATION_DEVICE_PRIVATE_xxx types are used as specializations of the SWP_MIGRATION_DEVICE_xxx types.
The new entry types have the following relationships:
- SOFTLEAF_MIGRATION_DEVICE_READ is-a SOFTLEAF_MIGRATION_READ
- SOFTLEAF_MIGRATION_READ !is-a SOFTLEAF_MIGRATION_DEVICE_READ
Update the existing softleaf_is_migration_xxx() predicates to reflect this relationship.
It is possible to distinguish the between a SOFTLEAF_MIGRATION_DEVICE__xxx and a SOFTLEAF_MIGRATION_xxx type using the softleaf_is_migration_device_private_xxx() predicates.
In practice, the only reason for introducing this new type is so we know when to not call pfn_to_page() on the swap entry offset once the device private pages are removed from the physical address space. That is the only time that the difference matters.
Creating these new entries will occur in a subsequent patch.
---
v3:
- Separated from previous patch
- s/SOFTLEAF_MIGRATION_DEVICE_/SOFTLEAF_MIGRATION_DEVICE_PRIVATE_/
- Update comment for softleaf_is_migration_read()
--- include/linux/leafops.h | 90 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 10 deletions(-)
include/linux/leafops.h +80 -10
@@ -28,6 +28,9 @@ enum softleaf_type {SOFTLEAF_DEVICE_PRIVATE_READ ,SOFTLEAF_DEVICE_PRIVATE_WRITE ,SOFTLEAF_DEVICE_EXCLUSIVE , +SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ , +SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE , +SOFTLEAF_MIGRATION_DEVICE_PRIVATE_WRITE ,/* H/W posion types. */ SOFTLEAF_HWPOISON,/* Marker types. */
@@ -165,6 +168,12 @@ static inline enum softleaf_type softleaf_type(softleaf_t entry)return SOFTLEAF_DEVICE_PRIVATE_READ ;case SWP_DEVICE_EXCLUSIVE :return SOFTLEAF_DEVICE_EXCLUSIVE ; +case SWP_MIGRATION_DEVICE_READ : +return SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ ; +case SWP_MIGRATION_DEVICE_WRITE : +return SOFTLEAF_MIGRATION_DEVICE_PRIVATE_WRITE ; +case SWP_MIGRATION_DEVICE_READ_EXCLUSIVE : +return SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE ;#endif #ifdef CONFIG_MEMORY_FAILURE case SWP_HWPOISON :
@@ -190,28 +199,88 @@ static inline bool softleaf_is_swap(softleaf_t entry)return softleaf_type (entry) ==SOFTLEAF_SWAP ; } +/** +* softleaf_is_migration_device_private() - Is this leaf entry a migration +* device private entry? +* @entry: Leaf entry. +* +* Returns: true if the leaf entry is a device private entry, otherwise false. +*/ +static inline bool softleaf_is_migration_device_private (softleaf_t entry) +{ +switch (softleaf_type (entry)) { +case SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ : +case SOFTLEAF_MIGRATION_DEVICE_PRIVATE_WRITE : +case SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE : +return true; +default : +return false; + } +} + +/** +* softleaf_is_migration_device_private_write() - Is this leaf entry a writable +* device private migration entry? +* @entry: Leaf entry. +* +* Returns: true if the leaf entry is a writable device private migration entry, +* otherwise false. +*/ +static inline bool softleaf_is_migration_device_private_write (softleaf_t entry) +{ +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_DEVICE_PRIVATE_WRITE ; +} + +/** +* softleaf_is_migration_device_private_read() - Is this leaf entry a readable +* device private migration entry? +* @entry: Leaf entry. +* +* Returns: true if the leaf entry is an readable device private migration +* entry, otherwise false. +*/ +static inline bool softleaf_is_migration_device_private_read (softleaf_t entry) +{ +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ ; +} + +/** +* softleaf_is_migration_read_exclusive() - Is this leaf entry an exclusive +* readable device private migration entry? +* @entry: Leaf entry. +* +* Returns: true if the leaf entry is an exclusive readable device private +* migration entry, otherwise false. +*/ +static inline bool softleaf_is_migration_device_private_read_exclusive (softleaf_t entry) +{ +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE ; +} +/** * softleaf_is_migration_write() - Is this leaf entry a writable migration entry? * @entry: Leaf entry. * -* Returns: true if the leaf entry is a writable migration entry, otherwise -* false. +* Returns: true if the leaf entry is a writable migration entry or a writable +* device private migration entry, otherwise false. */ static inline bool softleaf_is_migration_write (softleaf_t entry) { -return softleaf_type (entry) ==SOFTLEAF_MIGRATION_WRITE ; +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_WRITE || +softleaf_is_migration_device_private_write (entry); }/** * softleaf_is_migration_read() - Is this leaf entry a readable migration entry? * @entry: Leaf entry. * -* Returns: true if the leaf entry is a readable migration entry, otherwise -* false. +* Returns: true if the leaf entry is a readable migration entry or a readable +* device private migration entry, otherwise false. */ static inline bool softleaf_is_migration_read (softleaf_t entry) { -return softleaf_type (entry) ==SOFTLEAF_MIGRATION_READ ; +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_READ || +softleaf_is_migration_device_private_read (entry); }/**
@@ -219,12 +288,13 @@ static inline bool softleaf_is_migration_read(softleaf_t entry)* readable migration entry? * @entry: Leaf entry. * -* Returns: true if the leaf entry is an exclusive readable migration entry, -* otherwise false. +* Returns: true if the leaf entry is an exclusive readable migration entry or +* exclusive readable device private migration entry, otherwise false. */ static inline bool softleaf_is_migration_read_exclusive (softleaf_t entry) { -return softleaf_type (entry) ==SOFTLEAF_MIGRATION_READ_EXCLUSIVE ; +return softleaf_type (entry) ==SOFTLEAF_MIGRATION_READ_EXCLUSIVE || +softleaf_is_migration_device_private_read_exclusive (entry); }/**
@@ -241,7 +311,7 @@ static inline bool softleaf_is_migration(softleaf_t entry)case SOFTLEAF_MIGRATION_WRITE :return true;default : -return false; +return softleaf_is_migration_device_private (entry); } }
Signature · 1 line
2.34.1
PATCH v3 9/13 mm: Begin creating device private migration entries
In reply to Jordan NietheUpdate the migration entry creation helpers to automatically create device private migration entries when invoked on device private pages.
The corresponding softleaf predicates have already been updated to expect both migration and device private migration entries.
---
v3:
- Provided as an individual patch
--- include/linux/swapops.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/swapops.h +12 -0
@@ -205,6 +205,10 @@ static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)static inline swp_entry_t make_readable_migration_entry_from_page (struct page *page,pgoff_t flags) { +if (is_device_private_page (page)) +return make_readable_migration_device_private_entry ( +page_to_pfn (page) | flags); +return swp_entry (SWP_MIGRATION_READ ,page_to_pfn (page) | flags); }
@@ -216,6 +220,10 @@ static inline swp_entry_t make_readable_exclusive_migration_entry(pgoff_t offsetstatic inline swp_entry_t make_readable_exclusive_migration_entry_from_page (struct page *page,pgoff_t flags) { +if (is_device_private_page (page)) +return make_readable_exclusive_migration_device_private_entry ( +page_to_pfn (page) | flags); +return swp_entry (SWP_MIGRATION_READ_EXCLUSIVE ,page_to_pfn (page) | flags); }
@@ -227,6 +235,10 @@ static inline swp_entry_t make_writable_migration_entry(pgoff_t offset)static inline swp_entry_t make_writable_migration_entry_from_page (struct page *page,pgoff_t flags) { +if (is_device_private_page (page)) +return make_writable_migration_device_private_entry ( +page_to_pfn (page) | flags); +return swp_entry (SWP_MIGRATION_WRITE ,page_to_pfn (page) | flags); }
Signature · 1 line
2.34.1
PATCH v3 10/13 mm: Add helpers to create device private entries from struct pages
In reply to Jordan NietheTo create a new device private entry for a given struct page, that page is first converted to its pfn, before passing the pfn to make_writable_device_private_entry() (and friends).
A future change will remove device private pages from the physical address space. This will mean that device private pages no longer have a pfn and must be handled separately.
Prepare for this with a new set of helpers:
- make_readable_device_private_entry_from_page()
- make_writable_device_private_entry_from_page()
These helpers take a struct page as parameter instead of a pfn. This will allow more flexibility for handling the swap offset field differently for device private pages.
---
v1:
- New to series
v2:
- Add flag param
v3:
- No change
--- include/linux/swapops.h | 24 ++++++++++++++++++++++++ mm/huge_memory.c | 14 ++++++-------- mm/migrate.c | 6 ++---- mm/migrate_device.c | 12 ++++-------- 4 files changed, 36 insertions(+), 20 deletions(-)
include/linux/swapops.h +24 -0
@@ -138,11 +138,23 @@ static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset)return swp_entry (SWP_DEVICE_READ , offset); } +static inline swp_entry_t make_readable_device_private_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (SWP_DEVICE_READ ,page_to_pfn (page) | flags); +} +static inline swp_entry_t make_writable_device_private_entry (pgoff_t offset) {return swp_entry (SWP_DEVICE_WRITE , offset); } +static inline swp_entry_t make_writable_device_private_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (SWP_DEVICE_WRITE ,page_to_pfn (page) | flags); +} +static inline swp_entry_t make_device_exclusive_entry (pgoff_t offset) {return swp_entry (SWP_DEVICE_EXCLUSIVE , offset);
@@ -169,11 +181,23 @@ static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset)return swp_entry (0 ,0 ); } +static inline swp_entry_t make_readable_device_private_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (0 ,0 ); +} +static inline swp_entry_t make_writable_device_private_entry (pgoff_t offset) {return swp_entry (0 ,0 ); } +static inline swp_entry_t make_writable_device_private_entry_from_page (struct page *page, +pgoff_t flags) +{ +return swp_entry (0 ,0 ); +} +static inline swp_entry_t make_device_exclusive_entry (pgoff_t offset) {return swp_entry (0 ,0 );
mm/huge_memory.c +6 -8
@@ -3219,11 +3219,11 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,* is false. */ if (write) - swp_entry =make_writable_device_private_entry ( -page_to_pfn (page + i)); + swp_entry =make_writable_device_private_entry_from_page ( + page + i,0 );else - swp_entry =make_readable_device_private_entry ( -page_to_pfn (page + i)); + swp_entry =make_readable_device_private_entry_from_page ( + page + i,0 );/* * Young and dirty bits are not progated via swp_entry */
@@ -4950,11 +4950,9 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)swp_entry_t entry;if (pmd_write (pmde)) - entry =make_writable_device_private_entry ( -page_to_pfn (new)); + entry =make_writable_device_private_entry_from_page (new,0 );else - entry =make_readable_device_private_entry ( -page_to_pfn (new)); + entry =make_readable_device_private_entry_from_page (new,0 ); pmde =swp_entry_to_pmd (entry);if (pmd_swp_soft_dirty (*pvmw->pmd))
mm/migrate.c +2 -4
@@ -399,11 +399,9 @@ static bool remove_migration_pte(struct folio *folio,if (unlikely (is_device_private_page (new))) {if (pte_write (pte)) - entry =make_writable_device_private_entry ( -page_to_pfn (new)); + entry =make_writable_device_private_entry_from_page (new,0 );else - entry =make_readable_device_private_entry ( -page_to_pfn (new)); + entry =make_readable_device_private_entry_from_page (new,0 ); pte =softleaf_to_pte (entry);if (pte_swp_soft_dirty (old_pte)) pte =pte_swp_mksoft_dirty (pte);
mm/migrate_device.c +4 -8
@@ -836,11 +836,9 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,swp_entry_t swp_entry;if (vma->vm_flags &VM_WRITE ) - swp_entry =make_writable_device_private_entry ( -page_to_pfn (page)); + swp_entry =make_writable_device_private_entry_from_page (page,0 );else - swp_entry =make_readable_device_private_entry ( -page_to_pfn (page)); + swp_entry =make_readable_device_private_entry_from_page (page,0 ); entry =swp_entry_to_pmd (swp_entry); }else { if (folio_is_zone_device(folio) &&
@@ -1033,11 +1031,9 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate,swp_entry_t swp_entry;if (vma->vm_flags &VM_WRITE ) - swp_entry =make_writable_device_private_entry ( -page_to_pfn (page)); + swp_entry =make_writable_device_private_entry_from_page (page,0 );else - swp_entry =make_readable_device_private_entry ( -page_to_pfn (page)); + swp_entry =make_readable_device_private_entry_from_page (page,0 ); entry =swp_entry_to_pte (swp_entry); }else { if (folio_is_zone_device(folio) &&
Signature · 1 line
2.34.1
PATCH v3 11/13 mm/util: Add flag to track device private pages in page snapshots
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal pfns and must be handled separately.
Add a new flag PAGE_SNAPSHOT_DEVICE_PRIVATE to track when the pfn of a page snapshot is a device private page.
---
v1:
- No change
v2:
- No change
v3:
- No change
--- fs/proc/page.c | 6 ++++-- include/linux/mm.h | 7 ++++--- mm/util.c | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-)
fs/proc/page.c +4 -2
@@ -191,10 +191,12 @@ u64 stable_page_flags(const struct page *page) folio_test_large_rmappable(folio)) {/* Note: we indicate any THPs here, not just PMD-sized ones */ u |=1 <<KPF_THP ; - } else if (is_huge_zero_pfn(ps.pfn)) { + } else if (!(ps.flags & PAGE_SNAPSHOT_DEVICE_PRIVATE) && + is_huge_zero_pfn(ps.pfn)) { u |=1 <<KPF_ZERO_PAGE ; u |=1 <<KPF_THP ; - } else if (is_zero_pfn(ps.pfn)) { + } else if (!(ps.flags & PAGE_SNAPSHOT_DEVICE_PRIVATE) + && is_zero_pfn(ps.pfn)) { u |=1 <<KPF_ZERO_PAGE ; }
include/linux/mm.h +4 -3
@@ -4623,9 +4623,10 @@ static inline bool page_pool_page_is_pp(const struct page *page) }#endif -#define PAGE_SNAPSHOT_FAITHFUL (1 << 0) -#define PAGE_SNAPSHOT_PG_BUDDY (1 << 1) -#define PAGE_SNAPSHOT_PG_IDLE (1 << 2) +#define PAGE_SNAPSHOT_FAITHFUL (1 << 0) +#define PAGE_SNAPSHOT_PG_BUDDY (1 << 1) +#define PAGE_SNAPSHOT_PG_IDLE (1 << 2) +#define PAGE_SNAPSHOT_DEVICE_PRIVATE (1 << 3)struct page_snapshot {struct folio folio_snapshot;
mm/util.c +3 -0
@@ -1218,6 +1218,9 @@ static void set_ps_flags(struct page_snapshot *ps, const struct folio *folio,if (folio_test_idle (folio)) ps->flags |=PAGE_SNAPSHOT_PG_IDLE ; + +if (is_device_private_page (page)) + ps->flags |=PAGE_SNAPSHOT_DEVICE_PRIVATE ; }/**
Signature · 1 line
2.34.1
PATCH v3 12/13 mm/hmm: Add flag to track device private pages
In reply to Jordan NietheA future change will remove device private pages from the physical address space. This will mean that device private pages no longer have normal pfns and must be handled separately.
Prepare for this by adding a HMM_PFN_DEVICE_PRIVATE flag to indicate that a hmm_pfn contains a PFN for a device private page.
---
v1:
- Update HMM_PFN_ORDER_SHIFT
- Handle hmm_vma_handle_absent_pmd()
v2:
- No change
v3:
- No change
--- include/linux/hmm.h | 4 +++- mm/hmm.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-)
include/linux/hmm.h +3 -1
@@ -23,6 +23,7 @@ struct mmu_interval_notifier;* HMM_PFN_WRITE - if the page memory can be written to (requires HMM_PFN_VALID) * HMM_PFN_ERROR - accessing the pfn is impossible and the device should * fail. ie poisoned memory, special pages, no vma, etc +* HMM_PFN_DEVICE_PRIVATE - the pfn field contains a DEVICE_PRIVATE pfn. * HMM_PFN_P2PDMA - P2P page * HMM_PFN_P2PDMA_BUS - Bus mapped P2P transfer * HMM_PFN_DMA_MAPPED - Flag preserved on input-to-output transformation
@@ -40,6 +41,7 @@ enum hmm_pfn_flags {HMM_PFN_VALID =1UL << (BITS_PER_LONG -1 ),HMM_PFN_WRITE =1UL << (BITS_PER_LONG -2 ),HMM_PFN_ERROR =1UL << (BITS_PER_LONG -3 ), +HMM_PFN_DEVICE_PRIVATE =1UL << (BITS_PER_LONG -7 ),/* * Sticky flags, carried from input to output, * don't forget to update HMM_PFN_INOUT_FLAGS
@@ -48,7 +50,7 @@ enum hmm_pfn_flags {HMM_PFN_P2PDMA =1UL << (BITS_PER_LONG -5 ),HMM_PFN_P2PDMA_BUS =1UL << (BITS_PER_LONG -6 ), -HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG -11 ), +HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG -12 ),/* Input flags */ HMM_PFN_REQ_FAULT = HMM_PFN_VALID,
mm/hmm.c +3 -2
@@ -267,7 +267,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr,if (softleaf_is_device_private (entry) &&page_pgmap (softleaf_to_page (entry))->owner == range->dev_private_owner) { - cpu_flags =HMM_PFN_VALID ; + cpu_flags =HMM_PFN_VALID |HMM_PFN_DEVICE_PRIVATE ;if (softleaf_is_device_private_write (entry)) cpu_flags |=HMM_PFN_WRITE ; new_pfn_flags =softleaf_to_pfn (entry) | cpu_flags;
@@ -347,7 +347,8 @@ static int hmm_vma_handle_absent_pmd(struct mm_walk *walk, unsigned long start, softleaf_to_folio(entry)->pgmap->owner == range->dev_private_owner) {unsigned long cpu_flags =HMM_PFN_VALID | -hmm_pfn_flags_order (PMD_SHIFT -PAGE_SHIFT ); +hmm_pfn_flags_order (PMD_SHIFT -PAGE_SHIFT ) | +HMM_PFN_DEVICE_PRIVATE ;unsigned long pfn =softleaf_to_pfn (entry);unsigned long i;
Signature · 1 line
2.34.1
PATCH v3 13/13 mm: Remove device private pages from the physical address space
In reply to Jordan NietheCurrently when creating device private struct pages, the first step is to use request_free_mem_region() to get a range of physical address space large enough to represent the devices memory. This allocated physical address range is then remapped as device private memory using memremap_pages().
Needing allocation of physical address space has some problems:
1) There may be insufficient physical address space to represent the device memory. KASLR reducing the physical address space and VM configurations with limited physical address space increase the likelihood of hitting this especially as device memory increases. This has been observed to prevent device private from being initialized.
2) Attempting to add the device private pages to the linear map at addresses beyond the actual physical memory causes issues on architectures like aarch64 meaning the feature does not work there.
Instead of using the physical address space, introduce a device private address space and allocate devices regions from there to represent the device private pages.
Introduce a new interface memremap_device_private_pagemap() that allocates a requested amount of device private address space and creates the necessary device private pages.
To support this new interface, struct dev_pagemap needs some changes:
- Add a new dev_pagemap::nr_pages field as an input parameter.
- Add a new dev_pagemap::pages array to store the device private pages.
When using memremap_device_private_pagemap(), rather then passing in dev_pagemap::ranges[dev_pagemap::nr_ranges] of physical address space to be remapped, dev_pagemap::nr_ranges will always be 1, and the device private range that is reserved is returned in dev_pagemap::range.
Forbid calling memremap_pages() with dev_pagemap::ranges::type = MEMORY_DEVICE_PRIVATE.
Represent this device private address space using a new device_private_pgmap_tree maple tree. This tree maps a given device private address to a struct dev_pagemap, where a specific device private page may then be looked up in that dev_pagemap::pages array.
Device private address space can be reclaimed and the assoicated device private pages freed using the corresponding new memunmap_device_private_pagemap() interface.
Because the device private pages now live outside the physical address space, they no longer have a normal PFN. This means that page_to_pfn(), et al. are no longer meaningful.
Introduce helpers:
- device_private_page_to_offset()
- device_private_folio_to_offset()
to take a given device private page / folio and return its offset within the device private address space.
Update the places where we previously converted a device private page to a PFN to use these new helpers. When we encounter a device private offset, instead of looking up its page within the pagemap use device_private_offset_to_page() instead.
Update the existing users:
- lib/test_hmm.c
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
to use the new memremap_device_private_pagemap() interface.
---
v1:
- Include NUMA node paramater for memremap_device_private_pagemap()
- Add devm_memremap_device_private_pagemap() and friends
- Update existing users of memremap_pages():
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
- Update for HMM huge page support
- Guard device_private_offset_to_page and friends with CONFIG_ZONE_DEVICE
v2:
- Make sure last member of struct dev_pagemap remains DECLARE_FLEX_ARRAY(struct range, ranges);
v3:
- Use numa_mem_id() if memremap_device_private_pagemap is called with NUMA_NO_NODE. This fixes a null pointer deref in lruvec_stat_mod_folio().
- drm/xe: Remove call to devm_release_mem_region() in xe_pagemap_destroy_work()
- s/VM_BUG/VM_WARN/
--- Documentation/mm/hmm.rst | 11 +- arch/powerpc/kvm/book3s_hv_uvmem.c | 41 ++--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 23 +-- drivers/gpu/drm/nouveau/nouveau_dmem.c | 35 ++-- drivers/gpu/drm/xe/xe_svm.c | 28 +--- include/linux/hmm.h | 3 + include/linux/leafops.h | 16 +- include/linux/memremap.h | 64 +++++++- include/linux/migrate.h | 6 +- include/linux/mm.h | 2 + include/linux/rmap.h | 5 + include/linux/swapops.h | 10 +- lib/test_hmm.c | 70 ++++---- mm/debug.c | 9 +- mm/memremap.c | 196 ++++++++++++++++++----- mm/mm_init.c | 8 +- mm/page_vma_mapped.c | 22 ++- mm/rmap.c | 43 +++-- mm/util.c | 5 +- 19 files changed, 396 insertions(+), 201 deletions(-)
Documentation/mm/hmm.rst +3 -8
@@ -276,17 +276,12 @@ These can be allocated and freed with:: struct resource *res; struct dev_pagemap pagemap; - res = request_free_mem_region(&iomem_resource, /* number of bytes */, - "name of driver resource"); pagemap.type = MEMORY_DEVICE_PRIVATE; - pagemap.range.start = res->start; - pagemap.range.end = res->end; - pagemap.nr_range = 1; + pagemap.nr_pages = /* number of pages */; pagemap.ops = &device_devmem_ops; - memremap_pages(&pagemap, numa_node_id()); + memremap_device_private_pagemap(&pagemap, numa_node_id()); - memunmap_pages(&pagemap); - release_mem_region(pagemap.range.start, range_len(&pagemap.range)); + memunmap_device_private_pagemap(&pagemap); There are also devm_request_free_mem_region(), devm_memremap_pages(), devm_memunmap_pages(), and devm_release_mem_region() when the resources can
arch/powerpc/kvm/book3s_hv_uvmem.c +13 -28
100 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +12 -11
@@ -1030,9 +1030,9 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) {struct amdgpu_kfd_dev *kfddev = &adev->kfd;struct dev_pagemap *pgmap; -struct resource *res =NULL ;unsigned long size;void *r; +int ret;/* Page migration works on gfx9 or newer */ if (amdgpu_ip_version (adev,GC_HWIP ,0 ) <IP_VERSION (9 ,0 ,1 ))
@@ -1053,11 +1053,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size -1 ; pgmap->type =MEMORY_DEVICE_COHERENT ; }else { - res =devm_request_free_mem_region (adev->dev, &iomem_resource, size); -if (IS_ERR (res)) -return PTR_ERR (res); - pgmap->range.start = res->start; - pgmap->range.end = res->end; + pgmap->nr_pages = size /PAGE_SIZE ; pgmap->type =MEMORY_DEVICE_PRIVATE ; }
@@ -1068,14 +1064,19 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)/* Device manager releases device-specific resources, memory region and * pgmap when driver disconnects from device. */ - r =devm_memremap_pages (adev->dev, pgmap); -if (IS_ERR (r)) { +if (pgmap->type ==MEMORY_DEVICE_PRIVATE ) { + ret =devm_memremap_device_private_pagemap (adev->dev, pgmap); + }else { + r =devm_memremap_pages (adev->dev, pgmap); +if (IS_ERR (r)) + ret =PTR_ERR (r); + } + +if (ret) {pr_err ("failed to register HMM device memory\n" ); -if (pgmap->type ==MEMORY_DEVICE_PRIVATE ) -devm_release_mem_region (adev->dev, res->start,resource_size (res));/* Disable SVM support capability */ pgmap->type =0 ; -return PTR_ERR (r); +return ret; } pr_debug("reserve %ldMB system memory for VRAM pages struct\n",
drivers/gpu/drm/nouveau/nouveau_dmem.c +9 -26
@@ -109,7 +109,7 @@ static struct nouveau_drm *page_to_drm(struct page *page)unsigned long nouveau_dmem_page_addr (struct page *page) {struct nouveau_dmem_chunk *chunk =nouveau_page_to_chunk (page); -unsigned long off = (page_to_pfn (page) <<PAGE_SHIFT ) - +unsigned long off = (device_private_page_to_offset (page) <<PAGE_SHIFT ) - chunk->pagemap.range.start;return chunk->bo->offset + off;
@@ -297,9 +297,7 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, bool is_large) {struct nouveau_dmem_chunk *chunk; -struct resource *res;struct page *page; -void *ptr;unsigned long i, pfn_first, pfn;int ret;
@@ -309,39 +307,28 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, goto out; } -/* Allocate unused physical address space for device private pages. */ - res =request_free_mem_region (&iomem_resource,DMEM_CHUNK_SIZE *NR_CHUNKS , -"nouveau_dmem" ); -if (IS_ERR (res)) { - ret =PTR_ERR (res); - goto out_free; - } - chunk->drm = drm; chunk->pagemap.type =MEMORY_DEVICE_PRIVATE ; - chunk->pagemap.range.start = res->start; - chunk->pagemap.range.end = res->end; chunk->pagemap.nr_range =1 ; + chunk->pagemap.nr_pages =DMEM_CHUNK_SIZE *NR_CHUNKS /PAGE_SIZE ; chunk->pagemap.ops = &nouveau_dmem_pagemap_ops; chunk->pagemap.owner = drm->dev; ret =nouveau_bo_new_pin (&drm->client,NOUVEAU_GEM_DOMAIN_VRAM ,DMEM_CHUNK_SIZE , &chunk->bo);if (ret) - goto out_release; + goto out_free; - ptr =memremap_pages (&chunk->pagemap,numa_node_id ()); -if (IS_ERR (ptr)) { - ret =PTR_ERR (ptr); + ret =memremap_device_private_pagemap (&chunk->pagemap,numa_node_id ()); +if (ret) goto out_bo_free; - }mutex_lock (&drm->dmem->mutex);list_add (&chunk->list, &drm->dmem->chunks);mutex_unlock (&drm->dmem->mutex); pfn_first = chunk->pagemap.range.start >>PAGE_SHIFT ; - page =pfn_to_page (pfn_first); + page =device_private_offset_to_page (pfn_first);spin_lock (&drm->dmem->lock); pfn = pfn_first;
@@ -350,12 +337,12 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage,if (!IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE ) || !is_large) {for (j =0 ; j <DMEM_CHUNK_NPAGES -1 ; j++, pfn++) { - page =pfn_to_page (pfn); + page =device_private_offset_to_page (pfn); page->zone_device_data = drm->dmem->free_pages; drm->dmem->free_pages = page; } }else { - page =pfn_to_page (pfn); + page =device_private_offset_to_page (pfn); page->zone_device_data = drm->dmem->free_folios; drm->dmem->free_folios =page_folio (page); pfn +=DMEM_CHUNK_NPAGES ;
@@ -382,8 +369,6 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, out_bo_free:nouveau_bo_unpin_del (&chunk->bo); -out_release: -release_mem_region (chunk->pagemap.range.start,range_len (&chunk->pagemap.range)); out_free:kfree (chunk); out:
@@ -543,9 +528,7 @@ nouveau_dmem_fini(struct nouveau_drm *drm)nouveau_bo_unpin_del (&chunk->bo);WARN_ON (chunk->callocated);list_del (&chunk->list); -memunmap_pages (&chunk->pagemap); -release_mem_region (chunk->pagemap.range.start, -range_len (&chunk->pagemap.range)); +memunmap_device_private_pagemap (&chunk->pagemap);kfree (chunk); }
drivers/gpu/drm/xe/xe_svm.c +6 -22
@@ -452,7 +452,7 @@ static u64 xe_page_to_dpa(struct page *page)struct xe_pagemap *xpagemap =xe_page_to_pagemap (page);struct xe_vram_region *vr =xe_pagemap_to_vr (xpagemap);u64 hpa_base = xpagemap->hpa_base; -u64 pfn =page_to_pfn (page); +u64 pfn =device_private_page_to_offset (page);u64 offset;u64 dpa;
@@ -1700,8 +1700,6 @@ static void xe_pagemap_destroy_work(struct work_struct *work)*/ if (drm_dev_enter (drm, &idx)) {devm_memunmap_pages (drm->dev, pagemap); -devm_release_mem_region (drm->dev, pagemap->range.start, - pagemap->range.end - pagemap->range.start +1 );drm_dev_exit (idx); }
@@ -1745,8 +1743,6 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramstruct xe_pagemap *xpagemap;struct dev_pagemap *pagemap;struct drm_pagemap *dpagemap; -struct resource *res; -void *addr;int err; xpagemap =kzalloc (sizeof (*xpagemap),GFP_KERNEL );
@@ -1763,36 +1759,24 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramif (err) goto out_no_dpagemap; - res =devm_request_free_mem_region (dev, &iomem_resource, - vr->usable_size); -if (IS_ERR (res)) { - err =PTR_ERR (res); - goto out_err; - } - err =drm_pagemap_acquire_owner (&xpagemap->peer, &xe_owner_list, xe_has_interconnect);if (err) - goto out_no_owner; + goto out_err; pagemap->type =MEMORY_DEVICE_PRIVATE ; - pagemap->range.start = res->start; - pagemap->range.end = res->end; pagemap->nr_range =1 ; + pagemap->nr_pages = vr->usable_size /PAGE_SIZE ; pagemap->owner = xpagemap->peer.owner; pagemap->ops =drm_pagemap_pagemap_ops_get (); - addr =devm_memremap_pages (dev, pagemap); -if (IS_ERR (addr)) { - err =PTR_ERR (addr); + err =devm_memremap_device_private_pagemap (dev, pagemap); +if (err) goto out_no_pages; - } - xpagemap->hpa_base = res->start; + xpagemap->hpa_base = pagemap->range.start;return xpagemap; out_no_pages:drm_pagemap_release_owner (&xpagemap->peer); -out_no_owner: -devm_release_mem_region (dev, res->start, res->end - res->start +1 ); out_err:drm_pagemap_put (dpagemap);return ERR_PTR (err);
include/linux/hmm.h +3 -0
@@ -68,6 +68,9 @@ enum hmm_pfn_flags {*/ static inline struct page *hmm_pfn_to_page (unsigned long hmm_pfn) { +if (hmm_pfn &HMM_PFN_DEVICE_PRIVATE ) +return device_private_offset_to_page (hmm_pfn & ~HMM_PFN_FLAGS ); +return pfn_to_page (hmm_pfn & ~HMM_PFN_FLAGS ); }
include/linux/leafops.h +14 -2
@@ -455,7 +455,13 @@ static inline unsigned long softleaf_to_flags(softleaf_t entry)*/ static inline struct page *softleaf_to_page (softleaf_t entry) { -struct page *page =pfn_to_page (softleaf_to_pfn (entry)); +struct page *page; + +if (softleaf_is_migration_device_private (entry) || +softleaf_is_device_private (entry)) + page =device_private_entry_to_page (entry); +else + page =pfn_to_page (softleaf_to_pfn (entry));VM_WARN_ON_ONCE (!softleaf_has_pfn (entry));/*
@@ -475,7 +481,13 @@ static inline struct page *softleaf_to_page(softleaf_t entry)*/ static inline struct folio *softleaf_to_folio (softleaf_t entry) { -struct folio *folio =pfn_folio (softleaf_to_pfn (entry)); +struct folio *folio; + +if (softleaf_is_migration_device_private (entry) || +softleaf_is_device_private (entry)) + folio =page_folio (device_private_entry_to_page (entry)); +else + folio =pfn_folio (softleaf_to_pfn (entry));VM_WARN_ON_ONCE (!softleaf_has_pfn (entry));/*
include/linux/memremap.h +62 -2
107 lines not on this page · raw message
include/linux/migrate.h +5 -1
@@ -133,6 +133,10 @@ static inline struct page *migrate_pfn_to_page(unsigned long mpfn) {if (!(mpfn &MIGRATE_PFN_VALID ))return NULL ; + +if (mpfn &MIGRATE_PFN_DEVICE_PRIVATE ) +return device_private_offset_to_page (mpfn >>MIGRATE_PFN_SHIFT ); +return pfn_to_page (mpfn >>MIGRATE_PFN_SHIFT ); }
@@ -144,7 +148,7 @@ static inline unsigned long migrate_pfn(unsigned long pfn)static inline unsigned long migrate_pfn_from_page (struct page *page) {if (is_device_private_page (page)) -return migrate_pfn (page_to_pfn (page)) | +return migrate_pfn (device_private_page_to_offset (page)) |MIGRATE_PFN_DEVICE_PRIVATE ;return migrate_pfn (page_to_pfn (page)); }
include/linux/mm.h +2 -0
@@ -2038,6 +2038,8 @@ static inline unsigned long memdesc_section(memdesc_flags_t mdf)*/ static inline unsigned long folio_pfn (const struct folio *folio) { +VM_WARN_ON (folio_is_device_private (folio)); +return page_to_pfn (&folio->page); }
include/linux/rmap.h +5 -0
@@ -951,11 +951,16 @@ static inline unsigned long page_vma_walk_flags(const struct folio *folio,static inline unsigned long folio_page_vma_walk_pfn (const struct folio *folio) { +if (folio_is_device_private (folio)) +return device_private_folio_to_offset (folio); +return folio_pfn (folio); }static inline struct folio *page_vma_walk_pfn_to_folio (struct page_vma_mapped_walk *pvmw) { +if (pvmw->flags &PVMW_DEVICE_PRIVATE ) +return page_folio (device_private_offset_to_page (pvmw->pfn));return pfn_folio (pvmw->pfn); }
include/linux/swapops.h +5 -5
@@ -141,7 +141,7 @@ static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset)static inline swp_entry_t make_readable_device_private_entry_from_page (struct page *page,pgoff_t flags) { -return swp_entry (SWP_DEVICE_READ ,page_to_pfn (page) | flags); +return swp_entry (SWP_DEVICE_READ ,device_private_page_to_offset (page) | flags); }static inline swp_entry_t make_writable_device_private_entry (pgoff_t offset)
@@ -152,7 +152,7 @@ static inline swp_entry_t make_writable_device_private_entry(pgoff_t offset)static inline swp_entry_t make_writable_device_private_entry_from_page (struct page *page,pgoff_t flags) { -return swp_entry (SWP_DEVICE_WRITE ,page_to_pfn (page) | flags); +return swp_entry (SWP_DEVICE_WRITE ,device_private_page_to_offset (page) | flags); }static inline swp_entry_t make_device_exclusive_entry (pgoff_t offset)
@@ -231,7 +231,7 @@ static inline swp_entry_t make_readable_migration_entry_from_page(struct page *p {if (is_device_private_page (page))return make_readable_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_READ ,page_to_pfn (page) | flags); }
@@ -246,7 +246,7 @@ static inline swp_entry_t make_readable_exclusive_migration_entry_from_page(stru {if (is_device_private_page (page))return make_readable_exclusive_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_READ_EXCLUSIVE ,page_to_pfn (page) | flags); }
@@ -261,7 +261,7 @@ static inline swp_entry_t make_writable_migration_entry_from_page(struct page *p {if (is_device_private_page (page))return make_writable_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_WRITE ,page_to_pfn (page) | flags); }
lib/test_hmm.c +41 -29
151 lines not on this page · raw message
mm/debug.c +6 -3
@@ -77,9 +77,11 @@ static void __dump_folio(const struct folio *folio, const struct page *page,if (page_mapcount_is_type (mapcount)) mapcount =0 ; -pr_warn ("page: refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n" , +pr_warn ("page: refcount:%d mapcount:%d mapping:%p index:%#lx %spfn:%#lx\n" ,folio_ref_count (folio), mapcount, mapping, - folio->index + idx, pfn); + folio->index + idx, +folio_is_device_private (folio) ?"device " :"" , + pfn);if (folio_test_large (folio)) {int pincount =0 ;
@@ -113,7 +115,8 @@ static void __dump_folio(const struct folio *folio, const struct page *page,* inaccuracy here due to racing. */ pr_warn ("%sflags: %pGp%s\n" , type, &folio->flags, -is_migrate_cma_folio (folio, pfn) ?" CMA" :"" ); + (!folio_is_device_private (folio) && +is_migrate_cma_folio (folio, pfn)) ?" CMA" :"" );if (page_has_type (&folio->page))pr_warn ("page_type: %x(%s)\n" , folio->page.page_type >>24 ,page_type_name (folio->page.page_type));
mm/memremap.c +154 -42
255 lines not on this page · raw message
mm/mm_init.c +4 -4
@@ -1004,9 +1004,9 @@ static void __init memmap_init(void) }#ifdef CONFIG_ZONE_DEVICE -static void __ref __init_zone_device_page (struct page *page,unsigned long pfn, -unsigned long zone_idx,int nid, -struct dev_pagemap *pgmap) +void __ref __init_zone_device_page (struct page *page,unsigned long pfn, +unsigned long zone_idx,int nid, +struct dev_pagemap *pgmap) {__init_single_page (page, pfn, zone_idx, nid);
@@ -1038,7 +1038,7 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn,* Please note that MEMINIT_HOTPLUG path doesn't clear memmap * because this is done early in section_activate() */ -if (pageblock_aligned (pfn)) { +if (pgmap->type !=MEMORY_DEVICE_PRIVATE &&pageblock_aligned (pfn)) {init_pageblock_migratetype (page,MIGRATE_MOVABLE , false);cond_resched (); }
mm/page_vma_mapped.c +19 -3
@@ -107,6 +107,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,static bool check_pte (struct page_vma_mapped_walk *pvmw,unsigned long pte_nr) {unsigned long pfn; +bool device_private = false;pte_t ptent =ptep_get (pvmw->pte);if (pvmw->flags &PVMW_MIGRATION ) {
@@ -115,6 +116,9 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)if (!softleaf_is_migration (entry))return false; +if (softleaf_is_migration_device_private (entry)) + device_private = true; + pfn =softleaf_to_pfn (entry); }else if (pte_present (ptent)) { pfn =pte_pfn (ptent);
@@ -127,8 +131,14 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)return false; pfn =softleaf_to_pfn (entry); + +if (softleaf_is_device_private (entry)) + device_private = true; } +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE )) +return false; +if ((pfn + pte_nr -1 ) < pvmw->pfn)return false;if (pfn > (pvmw->pfn + pvmw->nr_pages -1 ))
@@ -137,8 +147,11 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) }/* Returns true if the two ranges overlap. Careful to not overflow. */ -static bool check_pmd (unsigned long pfn,struct page_vma_mapped_walk *pvmw) +static bool check_pmd (unsigned long pfn,bool device_private,struct page_vma_mapped_walk *pvmw) { +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE )) +return false; +if ((pfn +HPAGE_PMD_NR -1 ) < pvmw->pfn)return false;if (pfn > pvmw->pfn + pvmw->nr_pages -1 )
@@ -254,14 +267,17 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) entry =softleaf_from_pmd (pmde);if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw)) + !check_pmd (softleaf_to_pfn (entry), +softleaf_is_device_private (entry) || +softleaf_is_migration_device_private (entry), + pvmw))return not_found (pvmw);return true; }if (likely (pmd_trans_huge (pmde))) {if (pvmw->flags &PVMW_MIGRATION )return not_found (pvmw); -if (!check_pmd (pmd_pfn (pmde), pvmw)) +if (!check_pmd (pmd_pfn (pmde), false, pvmw))return not_found (pvmw);return true; }
mm/rmap.c +29 -14
99 lines not on this page · raw message
mm/util.c +4 -1
@@ -1244,7 +1244,10 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)struct folio *foliop;int loops =5 ; - ps->pfn =page_to_pfn (page); +if (is_device_private_page (page)) + ps->pfn =device_private_page_to_offset (page); +else + ps->pfn =page_to_pfn (page); ps->flags =PAGE_SNAPSHOT_FAITHFUL ; again:
Signature · 1 line
2.34.1
Re: [PATCH v3 13/13] mm: Remove device private pages from the physical address space
Hi,
Quoted 14 lines · Jordan Niethe
drivers/gpu/drm/xe/xe_svm.c +1
-1@@ -452,7 +452,7 @@ static u64 xe_page_to_dpa(struct page *page)struct xe_pagemap *xpagemap =xe_page_to_pagemap (page);struct xe_vram_region *vr =xe_pagemap_to_vr (xpagemap);u64 hpa_base = xpagemap->hpa_base; -u64 pfn =page_to_pfn (page); +u64 pfn =device_private_page_to_offset (page);u64 offset;u64 dpa;
drivers/gpu/drm/xe/xe_svm.c static void xe_pagemap_destroy_work(struct work_struct *work) · line 1704
Quoted 7 lines
drivers/gpu/drm/xe/xe_svm.c +0
-2@@ -1700,8 +1700,6 @@ static void xe_pagemap_destroy_work(struct work_struct *work)*/ if (drm_dev_enter (drm, &idx)) {devm_memunmap_pages (drm->dev, pagemap); -devm_release_mem_region (drm->dev, pagemap->range.start, - pagemap->range.end - pagemap->range.start +1 );drm_dev_exit (idx); }
There's some new failures on the intel-xe CI run: https://patchwork.freedesktop.org/series/159738/#rev5
Looks like the issue is a missing update to call devm_memunmap_device_private_pagemap():
drivers/gpu/drm/xe/xe_svm.c +1 -1
@@ -1699,7 +1699,7 @@ static void xe_pagemap_destroy_work(struct work_struct *work)* will do shortly. */ if (drm_dev_enter (drm, &idx)) { -devm_memunmap_pages (drm->dev, pagemap); +devm_memunmap_device_private_pagemap (drm->dev, pagemap);drm_dev_exit (idx); }
Thanks,
Jordan.
Quoted 54 lines
drivers/gpu/drm/xe/xe_svm.c +5
-19@@ -1745,8 +1743,6 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramstruct xe_pagemap *xpagemap;struct dev_pagemap *pagemap;struct drm_pagemap *dpagemap; -struct resource *res; -void *addr;int err; xpagemap =kzalloc (sizeof (*xpagemap),GFP_KERNEL );@@ -1763,36 +1759,24 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramif (err) goto out_no_dpagemap; - res =devm_request_free_mem_region (dev, &iomem_resource, - vr->usable_size); -if (IS_ERR (res)) { - err =PTR_ERR (res); - goto out_err; - } - err =drm_pagemap_acquire_owner (&xpagemap->peer, &xe_owner_list, xe_has_interconnect);if (err) - goto out_no_owner; + goto out_err; pagemap->type =MEMORY_DEVICE_PRIVATE ; - pagemap->range.start = res->start; - pagemap->range.end = res->end; pagemap->nr_range =1 ; + pagemap->nr_pages = vr->usable_size /PAGE_SIZE ; pagemap->owner = xpagemap->peer.owner; pagemap->ops =drm_pagemap_pagemap_ops_get (); - addr =devm_memremap_pages (dev, pagemap); -if (IS_ERR (addr)) { - err =PTR_ERR (addr); + err =devm_memremap_device_private_pagemap (dev, pagemap); +if (err) goto out_no_pages; - } - xpagemap->hpa_base = res->start; + xpagemap->hpa_base = pagemap->range.start;return xpagemap; out_no_pages:drm_pagemap_release_owner (&xpagemap->peer); -out_no_owner: -devm_release_mem_region (dev, res->start, res->end - res->start +1 ); out_err:drm_pagemap_put (dpagemap);return ERR_PTR (err);include/linux/hmm.h +0
-0
Re: [PATCH v3 13/13] mm: Remove device private pages from the physical address space
In reply to Jordan NietheQuoted 101 lines · Jordan Niethe
Currently when creating device private struct pages, the first step is to use
request_free_mem_region()to get a range of physical address space large enough to represent the devices memory. This allocated physical address range is then remapped as device private memory usingmemremap_pages().Needing allocation of physical address space has some problems:
1) There may be insufficient physical address space to represent the device memory. KASLR reducing the physical address space and VM configurations with limited physical address space increase the likelihood of hitting this especially as device memory increases. This has been observed to prevent device private from being initialized.
2) Attempting to add the device private pages to the linear map at addresses beyond the actual physical memory causes issues on architectures like aarch64 meaning the feature does not work there.
Instead of using the physical address space, introduce a device private address space and allocate devices regions from there to represent the device private pages.
Introduce a new interface
memremap_device_private_pagemap()that allocates a requested amount of device private address space and creates the necessary device private pages.To support this new interface, struct
dev_pagemapneeds some changes:- Add a new
dev_pagemap::nr_pagesfield as an input parameter.
- Add a newdev_pagemap::pagesarray to store the device private pages.When using
memremap_device_private_pagemap(), rather then passing in dev_pagemap::ranges[dev_pagemap::nr_ranges] of physical address space to be remapped,dev_pagemap::nr_rangeswill always be 1, and the device private range that is reserved is returned indev_pagemap::range.Forbid calling
memremap_pages()withdev_pagemap::ranges::type=MEMORY_DEVICE_PRIVATE.Represent this device private address space using a new
device_private_pgmap_treemaple tree. This tree maps a given device private address to a structdev_pagemap, where a specific device private page may then be looked up in thatdev_pagemap::pagesarray.Device private address space can be reclaimed and the assoicated device private pages freed using the corresponding new
memunmap_device_private_pagemap()interface.Because the device private pages now live outside the physical address space, they no longer have a normal PFN. This means that
page_to_pfn(), et al. are no longer meaningful.Introduce helpers:
-
device_private_page_to_offset()
-device_private_folio_to_offset()to take a given device private page / folio and return its offset within the device private address space.
Update the places where we previously converted a device private page to a PFN to use these new helpers. When we encounter a device private offset, instead of looking up its page within the pagemap use
device_private_offset_to_page()instead.Update the existing users:
-
lib/test_hmm.c
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveauto use the new
memremap_device_private_pagemap()interface.Signed-off-by Jordan Niethe <[email protected]>Signed-off-by Alistair Popple <[email protected]>---
v1:
- Include NUMA node paramater formemremap_device_private_pagemap()
- Adddevm_memremap_device_private_pagemap()and friends
- Update existing users ofmemremap_pages():
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
- Update for HMM huge page support
- Guarddevice_private_offset_to_pageand friends withCONFIG_ZONE_DEVICEv2:
- Make sure last member of structdev_pagemapremainsDECLARE_FLEX_ARRAY(struct range, ranges);v3:
- Usenuma_mem_id()ifmemremap_device_private_pagemapis called withNUMA_NO_NODE. This fixes a null pointer deref inlruvec_stat_mod_folio().
- drm/xe: Remove call todevm_release_mem_region()inxe_pagemap_destroy_work()
- s/VM_BUG/VM_WARN/
---
<snip>
Quoted 4 lines
include/linux/migrate.h | 6 +- include/linux/mm.h | 2 + include/linux/rmap.h | 5 + include/linux/swapops.h | 10 +-
<snip>
Quoted 1 line
mm/debug.c | 9 +-
<snip>
Quoted 5 lines
mm/mm_init.c | 8 +- mm/page_vma_mapped.c | 22 ++- mm/rmap.c | 43 +++-- mm/util.c | 5 +- 19 files changed, 396 insertions(+), 201 deletions(-)
The changes to the above files (core MM files) look good to me.
Some nit below:
<snip>
Quoted 23 lines
mm/page_vma_mapped.c +4
-0@@ -107,6 +107,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,static bool check_pte (struct page_vma_mapped_walk *pvmw,unsigned long pte_nr) {unsigned long pfn; +bool device_private = false;pte_t ptent =ptep_get (pvmw->pte);if (pvmw->flags &PVMW_MIGRATION ) {@@ -115,6 +116,9 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)if (!softleaf_is_migration (entry))return false; +if (softleaf_is_migration_device_private (entry)) + device_private = true; + pfn =softleaf_to_pfn (entry); }else if (pte_present (ptent)) { pfn =pte_pfn (ptent);
mm/page_vma_mapped.c static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) · line 139
Quoted 9 lines
mm/page_vma_mapped.c +4
-0@@ -127,8 +131,14 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)return false; pfn =softleaf_to_pfn (entry); + +if (softleaf_is_device_private (entry)) + device_private = true; } +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE ))
Would “device_private != !!(pvmw->flags & PVMW_DEVICE_PRIVATE)” be more readable? Also I wonder if “!!” is needed here, since I remember modern C can convert “pvmw->flags & PVMW_DEVICE_PRIVATE” to bool.
mm/page_vma_mapped.c static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) · line 152
Quoted 13 lines
mm/page_vma_mapped.c +4
-1+return false; +if ((pfn + pte_nr -1 ) < pvmw->pfn)return false;if (pfn > (pvmw->pfn + pvmw->nr_pages -1 ))@@ -137,8 +147,11 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) }/* Returns true if the two ranges overlap. Careful to not overflow. */ -static bool check_pmd (unsigned long pfn,struct page_vma_mapped_walk *pvmw) +static bool check_pmd (unsigned long pfn,bool device_private,struct page_vma_mapped_walk *pvmw) { +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE ))
Ditto.
Feel free to add:
Best Regards,
Yan, Zi
Re: [PATCH v3 13/13] mm: Remove device private pages from the physical address space
Hi,
Quoted 32 lines · Zi Yan
Quoted 32 lines
mm/page_vma_mapped.c +7
-0@@ -107,6 +107,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,static bool check_pte (struct page_vma_mapped_walk *pvmw,unsigned long pte_nr) {unsigned long pfn; +bool device_private = false;pte_t ptent =ptep_get (pvmw->pte);if (pvmw->flags &PVMW_MIGRATION ) {@@ -115,6 +116,9 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)if (!softleaf_is_migration (entry))return false; +if (softleaf_is_migration_device_private (entry)) + device_private = true; + pfn =softleaf_to_pfn (entry); }else if (pte_present (ptent)) { pfn =pte_pfn (ptent);@@ -127,8 +131,14 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)return false; pfn =softleaf_to_pfn (entry); + +if (softleaf_is_device_private (entry)) + device_private = true; }
Quoted 5 lines
mm/page_vma_mapped.c static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) · line 139
Quoted 1 line
mm/page_vma_mapped.c +1
-0+if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE ))Would “device_private != !!(pvmw->flags & PVMW_DEVICE_PRIVATE)” be more readable? Also I wonder if “!!” is needed here, since I remember modern C can convert “pvmw->flags & PVMW_DEVICE_PRIVATE” to bool.
Yeah, "!=" should work. I did need the "!!" - maybe because xor is bitwise? If it's not needed with "!=" I"ll remove it.
Quoted 9 lines
Quoted 9 lines
mm/page_vma_mapped.c +2
-0+return false; +if ((pfn + pte_nr -1 ) < pvmw->pfn)return false;if (pfn > (pvmw->pfn + pvmw->nr_pages -1 ))@@ -137,8 +147,11 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) }
Quoted 7 lines
mm/page_vma_mapped.c static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) · line 152
Quoted 5 lines
mm/page_vma_mapped.c +2
-1/* Returns true if the two ranges overlap. Careful to not overflow. */ -static bool check_pmd (unsigned long pfn,struct page_vma_mapped_walk *pvmw) +static bool check_pmd (unsigned long pfn,bool device_private,struct page_vma_mapped_walk *pvmw) { +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE ))Ditto.
ack.
Quoted 4 lines
Feel free to add:
Reviewed-by Zi Yan <[email protected]> # for MM changes
Thanks for reviewing.
Quoted 3 lines
Best Regards,
Yan, Zi
Re: [PATCH v3 13/13] mm: Remove device private pages from the physical address space
In reply to Jordan NietheQuoted 74 lines · Jordan Niethe
Currently when creating device private struct pages, the first step is to use
request_free_mem_region()to get a range of physical address space large enough to represent the devices memory. This allocated physical address range is then remapped as device private memory usingmemremap_pages().Needing allocation of physical address space has some problems:
1) There may be insufficient physical address space to represent the device memory. KASLR reducing the physical address space and VM configurations with limited physical address space increase the likelihood of hitting this especially as device memory increases. This has been observed to prevent device private from being initialized.
2) Attempting to add the device private pages to the linear map at addresses beyond the actual physical memory causes issues on architectures like aarch64 meaning the feature does not work there.
Instead of using the physical address space, introduce a device private address space and allocate devices regions from there to represent the device private pages.
Introduce a new interface
memremap_device_private_pagemap()that allocates a requested amount of device private address space and creates the necessary device private pages.To support this new interface, struct
dev_pagemapneeds some changes:- Add a new
dev_pagemap::nr_pagesfield as an input parameter.
- Add a newdev_pagemap::pagesarray to store the device private pages.When using
memremap_device_private_pagemap(), rather then passing in dev_pagemap::ranges[dev_pagemap::nr_ranges] of physical address space to be remapped,dev_pagemap::nr_rangeswill always be 1, and the device private range that is reserved is returned indev_pagemap::range.Forbid calling
memremap_pages()withdev_pagemap::ranges::type=MEMORY_DEVICE_PRIVATE.Represent this device private address space using a new
device_private_pgmap_treemaple tree. This tree maps a given device private address to a structdev_pagemap, where a specific device private page may then be looked up in thatdev_pagemap::pagesarray.Device private address space can be reclaimed and the assoicated device private pages freed using the corresponding new
memunmap_device_private_pagemap()interface.Because the device private pages now live outside the physical address space, they no longer have a normal PFN. This means that
page_to_pfn(), et al. are no longer meaningful.Introduce helpers:
-
device_private_page_to_offset()
-device_private_folio_to_offset()to take a given device private page / folio and return its offset within the device private address space.
Update the places where we previously converted a device private page to a PFN to use these new helpers. When we encounter a device private offset, instead of looking up its page within the pagemap use
device_private_offset_to_page()instead.Update the existing users:
-
lib/test_hmm.c
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
Quoted 4 lines
to use the new
memremap_device_private_pagemap()interface.Signed-off-by Jordan Niethe <[email protected]>Signed-off-by Alistair Popple <[email protected]>
Quoted 1,368 lines
---
v1:
- Include NUMA node paramater formemremap_device_private_pagemap()
- Adddevm_memremap_device_private_pagemap()and friends
- Update existing users ofmemremap_pages():
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
- Update for HMM huge page support
- Guarddevice_private_offset_to_pageand friends withCONFIG_ZONE_DEVICEv2:
- Make sure last member of structdev_pagemapremainsDECLARE_FLEX_ARRAY(struct range, ranges);v3:
- Usenuma_mem_id()ifmemremap_device_private_pagemapis called withNUMA_NO_NODE. This fixes a null pointer deref inlruvec_stat_mod_folio().
- drm/xe: Remove call todevm_release_mem_region()inxe_pagemap_destroy_work()
- s/VM_BUG/VM_WARN/--- Documentation/mm/hmm.rst | 11 +- arch/powerpc/kvm/book3s_hv_uvmem.c | 41 ++--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 23 +-- drivers/gpu/drm/nouveau/nouveau_dmem.c | 35 ++-- drivers/gpu/drm/xe/xe_svm.c | 28 +--- include/linux/hmm.h | 3 + include/linux/leafops.h | 16 +- include/linux/memremap.h | 64 +++++++- include/linux/migrate.h | 6 +- include/linux/mm.h | 2 + include/linux/rmap.h | 5 + include/linux/swapops.h | 10 +- lib/test_hmm.c | 70 ++++---- mm/debug.c | 9 +- mm/memremap.c | 196 ++++++++++++++++++----- mm/mm_init.c | 8 +- mm/page_vma_mapped.c | 22 ++- mm/rmap.c | 43 +++-- mm/util.c | 5 +- 19 files changed, 396 insertions(+), 201 deletions(-)Documentation/mm/hmm.rst +3
-8@@ -276,17 +276,12 @@ These can be allocated and freed with:: struct resource *res; struct dev_pagemap pagemap; - res = request_free_mem_region(&iomem_resource, /* number of bytes */, - "name of driver resource"); pagemap.type = MEMORY_DEVICE_PRIVATE; - pagemap.range.start = res->start; - pagemap.range.end = res->end; - pagemap.nr_range = 1; + pagemap.nr_pages = /* number of pages */; pagemap.ops = &device_devmem_ops; - memremap_pages(&pagemap, numa_node_id()); + memremap_device_private_pagemap(&pagemap, numa_node_id()); - memunmap_pages(&pagemap); - release_mem_region(pagemap.range.start, range_len(&pagemap.range)); + memunmap_device_private_pagemap(&pagemap); There are also devm_request_free_mem_region(), devm_memremap_pages(), devm_memunmap_pages(), and devm_release_mem_region() when the resources canarch/powerpc/kvm/book3s_hv_uvmem.c +13
-28@@ -636,7 +636,7 @@ void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *slot,mutex_lock (&kvm->arch.uvmem_lock);if (kvmppc_gfn_is_uvmem_pfn (gfn, kvm, &uvmem_pfn)) { - uvmem_page =pfn_to_page (uvmem_pfn); + uvmem_page =device_private_offset_to_page (uvmem_pfn); pvt = uvmem_page->zone_device_data; pvt->skip_page_out = skip_page_out; pvt->remove_gfn = true;@@ -721,7 +721,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm) pvt->gpa = gpa; pvt->kvm = kvm; - dpage =pfn_to_page (uvmem_pfn); + dpage =device_private_offset_to_page (uvmem_pfn); dpage->zone_device_data = pvt;zone_device_page_init (dpage,0 );return dpage;@@ -888,7 +888,7 @@ static unsigned long kvmppc_share_page(struct kvm *kvm, unsigned long gpa, srcu_idx =srcu_read_lock (&kvm->srcu);mutex_lock (&kvm->arch.uvmem_lock);if (kvmppc_gfn_is_uvmem_pfn (gfn, kvm, &uvmem_pfn)) { - uvmem_page =pfn_to_page (uvmem_pfn); + uvmem_page =device_private_offset_to_page (uvmem_pfn); pvt = uvmem_page->zone_device_data; pvt->skip_page_out = true;/* @@ -906,7 +906,7 @@ static unsigned long kvmppc_share_page(struct kvm *kvm, unsigned long gpa,mutex_lock (&kvm->arch.uvmem_lock);if (kvmppc_gfn_is_uvmem_pfn (gfn, kvm, &uvmem_pfn)) { - uvmem_page =pfn_to_page (uvmem_pfn); + uvmem_page =device_private_offset_to_page (uvmem_pfn); pvt = uvmem_page->zone_device_data; pvt->skip_page_out = true; pvt->remove_gfn = false;/* it continues to be a valid GFN */ @@ -1017,7 +1017,7 @@ static vm_fault_t kvmppc_uvmem_migrate_to_ram(struct vm_fault *vmf)static void kvmppc_uvmem_folio_free (struct folio *folio) {struct page *page = &folio->page; -unsigned long pfn =page_to_pfn (page) - +unsigned long pfn =device_private_page_to_offset (page) - (kvmppc_uvmem_pgmap.range.start >>PAGE_SHIFT );struct kvmppc_uvmem_page_pvt *pvt;@@ -1159,8 +1159,6 @@ int kvmppc_uvmem_init(void) {int ret =0 ;unsigned long size; -struct resource *res; -void *addr;unsigned long pfn_last, pfn_first; size =kvmppc_get_secmem_size ();@@ -1174,27 +1172,18 @@ int kvmppc_uvmem_init(void) goto out; } - res =request_free_mem_region (&iomem_resource, size,"kvmppc_uvmem" ); -if (IS_ERR (res)) { - ret =PTR_ERR (res); - goto out; - } - kvmppc_uvmem_pgmap.type =MEMORY_DEVICE_PRIVATE ; - kvmppc_uvmem_pgmap.range.start = res->start; - kvmppc_uvmem_pgmap.range.end = res->end; kvmppc_uvmem_pgmap.nr_range =1 ; + kvmppc_uvmem_pgmap.nr_pages = size /PAGE_SIZE ; kvmppc_uvmem_pgmap.ops = &kvmppc_uvmem_ops;/* just one global instance: */ kvmppc_uvmem_pgmap.owner = &kvmppc_uvmem_pgmap; - addr =memremap_pages (&kvmppc_uvmem_pgmap,NUMA_NO_NODE ); -if (IS_ERR (addr)) { - ret =PTR_ERR (addr); - goto out_free_region; - } + ret =memremap_device_private_pagemap (&kvmppc_uvmem_pgmap,NUMA_NO_NODE ); +if (ret) + goto out; - pfn_first = res->start >>PAGE_SHIFT ; - pfn_last = pfn_first + (resource_size (res) >>PAGE_SHIFT ); + pfn_first = kvmppc_uvmem_pgmap.range.start >>PAGE_SHIFT ; + pfn_last = pfn_first + (range_len (&kvmppc_uvmem_pgmap.range) >>PAGE_SHIFT ); kvmppc_uvmem_bitmap =bitmap_zalloc (pfn_last - pfn_first,GFP_KERNEL );if (!kvmppc_uvmem_bitmap) { ret = -ENOMEM ;@@ -1204,9 +1193,7 @@ int kvmppc_uvmem_init(void)pr_info ("KVMPPC-UVMEM: Secure Memory size 0x%lx\n" , size);return ret; out_unmap: -memunmap_pages (&kvmppc_uvmem_pgmap); -out_free_region: -release_mem_region (res->start, size); +memunmap_device_private_pagemap (&kvmppc_uvmem_pgmap); out:return ret; }@@ -1216,8 +1203,6 @@ void kvmppc_uvmem_free(void)if (!kvmppc_uvmem_bitmap)return ; -memunmap_pages (&kvmppc_uvmem_pgmap); -release_mem_region (kvmppc_uvmem_pgmap.range.start, -range_len (&kvmppc_uvmem_pgmap.range)); +memunmap_device_private_pagemap (&kvmppc_uvmem_pgmap);bitmap_free (kvmppc_uvmem_bitmap); }drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +12
-11@@ -1030,9 +1030,9 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) {struct amdgpu_kfd_dev *kfddev = &adev->kfd;struct dev_pagemap *pgmap; -struct resource *res =NULL ;unsigned long size;void *r; +int ret;/* Page migration works on gfx9 or newer */ if (amdgpu_ip_version (adev,GC_HWIP ,0 ) <IP_VERSION (9 ,0 ,1 ))@@ -1053,11 +1053,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size -1 ; pgmap->type =MEMORY_DEVICE_COHERENT ; }else { - res =devm_request_free_mem_region (adev->dev, &iomem_resource, size); -if (IS_ERR (res)) -return PTR_ERR (res); - pgmap->range.start = res->start; - pgmap->range.end = res->end; + pgmap->nr_pages = size /PAGE_SIZE ; pgmap->type =MEMORY_DEVICE_PRIVATE ; }@@ -1068,14 +1064,19 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)/* Device manager releases device-specific resources, memory region and * pgmap when driver disconnects from device. */ - r =devm_memremap_pages (adev->dev, pgmap); -if (IS_ERR (r)) { +if (pgmap->type ==MEMORY_DEVICE_PRIVATE ) { + ret =devm_memremap_device_private_pagemap (adev->dev, pgmap); + }else { + r =devm_memremap_pages (adev->dev, pgmap); +if (IS_ERR (r)) + ret =PTR_ERR (r); + } + +if (ret) {pr_err ("failed to register HMM device memory\n" ); -if (pgmap->type ==MEMORY_DEVICE_PRIVATE ) -devm_release_mem_region (adev->dev, res->start,resource_size (res));/* Disable SVM support capability */ pgmap->type =0 ; -return PTR_ERR (r); +return ret; } pr_debug("reserve %ldMB system memory for VRAM pages struct\n",drivers/gpu/drm/nouveau/nouveau_dmem.c +9
-26@@ -109,7 +109,7 @@ static struct nouveau_drm *page_to_drm(struct page *page)unsigned long nouveau_dmem_page_addr (struct page *page) {struct nouveau_dmem_chunk *chunk =nouveau_page_to_chunk (page); -unsigned long off = (page_to_pfn (page) <<PAGE_SHIFT ) - +unsigned long off = (device_private_page_to_offset (page) <<PAGE_SHIFT ) - chunk->pagemap.range.start;return chunk->bo->offset + off;@@ -297,9 +297,7 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, bool is_large) {struct nouveau_dmem_chunk *chunk; -struct resource *res;struct page *page; -void *ptr;unsigned long i, pfn_first, pfn;int ret;@@ -309,39 +307,28 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, goto out; } -/* Allocate unused physical address space for device private pages. */ - res =request_free_mem_region (&iomem_resource,DMEM_CHUNK_SIZE *NR_CHUNKS , -"nouveau_dmem" ); -if (IS_ERR (res)) { - ret =PTR_ERR (res); - goto out_free; - } - chunk->drm = drm; chunk->pagemap.type =MEMORY_DEVICE_PRIVATE ; - chunk->pagemap.range.start = res->start; - chunk->pagemap.range.end = res->end; chunk->pagemap.nr_range =1 ; + chunk->pagemap.nr_pages =DMEM_CHUNK_SIZE *NR_CHUNKS /PAGE_SIZE ; chunk->pagemap.ops = &nouveau_dmem_pagemap_ops; chunk->pagemap.owner = drm->dev; ret =nouveau_bo_new_pin (&drm->client,NOUVEAU_GEM_DOMAIN_VRAM ,DMEM_CHUNK_SIZE , &chunk->bo);if (ret) - goto out_release; + goto out_free; - ptr =memremap_pages (&chunk->pagemap,numa_node_id ()); -if (IS_ERR (ptr)) { - ret =PTR_ERR (ptr); + ret =memremap_device_private_pagemap (&chunk->pagemap,numa_node_id ()); +if (ret) goto out_bo_free; - }mutex_lock (&drm->dmem->mutex);list_add (&chunk->list, &drm->dmem->chunks);mutex_unlock (&drm->dmem->mutex); pfn_first = chunk->pagemap.range.start >>PAGE_SHIFT ; - page =pfn_to_page (pfn_first); + page =device_private_offset_to_page (pfn_first);spin_lock (&drm->dmem->lock); pfn = pfn_first;@@ -350,12 +337,12 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage,if (!IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE ) || !is_large) {for (j =0 ; j <DMEM_CHUNK_NPAGES -1 ; j++, pfn++) { - page =pfn_to_page (pfn); + page =device_private_offset_to_page (pfn); page->zone_device_data = drm->dmem->free_pages; drm->dmem->free_pages = page; } }else { - page =pfn_to_page (pfn); + page =device_private_offset_to_page (pfn); page->zone_device_data = drm->dmem->free_folios; drm->dmem->free_folios =page_folio (page); pfn +=DMEM_CHUNK_NPAGES ;@@ -382,8 +369,6 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, out_bo_free:nouveau_bo_unpin_del (&chunk->bo); -out_release: -release_mem_region (chunk->pagemap.range.start,range_len (&chunk->pagemap.range)); out_free:kfree (chunk); out:@@ -543,9 +528,7 @@ nouveau_dmem_fini(struct nouveau_drm *drm)nouveau_bo_unpin_del (&chunk->bo);WARN_ON (chunk->callocated);list_del (&chunk->list); -memunmap_pages (&chunk->pagemap); -release_mem_region (chunk->pagemap.range.start, -range_len (&chunk->pagemap.range)); +memunmap_device_private_pagemap (&chunk->pagemap);kfree (chunk); }drivers/gpu/drm/xe/xe_svm.c +6
-22@@ -452,7 +452,7 @@ static u64 xe_page_to_dpa(struct page *page)struct xe_pagemap *xpagemap =xe_page_to_pagemap (page);struct xe_vram_region *vr =xe_pagemap_to_vr (xpagemap);u64 hpa_base = xpagemap->hpa_base; -u64 pfn =page_to_pfn (page); +u64 pfn =device_private_page_to_offset (page);u64 offset;u64 dpa;@@ -1700,8 +1700,6 @@ static void xe_pagemap_destroy_work(struct work_struct *work)*/ if (drm_dev_enter (drm, &idx)) {devm_memunmap_pages (drm->dev, pagemap); -devm_release_mem_region (drm->dev, pagemap->range.start, - pagemap->range.end - pagemap->range.start +1 );drm_dev_exit (idx); }@@ -1745,8 +1743,6 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramstruct xe_pagemap *xpagemap;struct dev_pagemap *pagemap;struct drm_pagemap *dpagemap; -struct resource *res; -void *addr;int err; xpagemap =kzalloc (sizeof (*xpagemap),GFP_KERNEL );@@ -1763,36 +1759,24 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vramif (err) goto out_no_dpagemap; - res =devm_request_free_mem_region (dev, &iomem_resource, - vr->usable_size); -if (IS_ERR (res)) { - err =PTR_ERR (res); - goto out_err; - } - err =drm_pagemap_acquire_owner (&xpagemap->peer, &xe_owner_list, xe_has_interconnect);if (err) - goto out_no_owner; + goto out_err; pagemap->type =MEMORY_DEVICE_PRIVATE ; - pagemap->range.start = res->start; - pagemap->range.end = res->end; pagemap->nr_range =1 ; + pagemap->nr_pages = vr->usable_size /PAGE_SIZE ; pagemap->owner = xpagemap->peer.owner; pagemap->ops =drm_pagemap_pagemap_ops_get (); - addr =devm_memremap_pages (dev, pagemap); -if (IS_ERR (addr)) { - err =PTR_ERR (addr); + err =devm_memremap_device_private_pagemap (dev, pagemap); +if (err) goto out_no_pages; - } - xpagemap->hpa_base = res->start; + xpagemap->hpa_base = pagemap->range.start;return xpagemap; out_no_pages:drm_pagemap_release_owner (&xpagemap->peer); -out_no_owner: -devm_release_mem_region (dev, res->start, res->end - res->start +1 ); out_err:drm_pagemap_put (dpagemap);return ERR_PTR (err);include/linux/hmm.h +3
-0@@ -68,6 +68,9 @@ enum hmm_pfn_flags {*/ static inline struct page *hmm_pfn_to_page (unsigned long hmm_pfn) { +if (hmm_pfn &HMM_PFN_DEVICE_PRIVATE ) +return device_private_offset_to_page (hmm_pfn & ~HMM_PFN_FLAGS ); +return pfn_to_page (hmm_pfn & ~HMM_PFN_FLAGS ); }include/linux/leafops.h +14
-2@@ -455,7 +455,13 @@ static inline unsigned long softleaf_to_flags(softleaf_t entry)*/ static inline struct page *softleaf_to_page (softleaf_t entry) { -struct page *page =pfn_to_page (softleaf_to_pfn (entry)); +struct page *page; + +if (softleaf_is_migration_device_private (entry) || +softleaf_is_device_private (entry)) + page =device_private_entry_to_page (entry); +else + page =pfn_to_page (softleaf_to_pfn (entry));VM_WARN_ON_ONCE (!softleaf_has_pfn (entry));/* @@ -475,7 +481,13 @@ static inline struct page *softleaf_to_page(softleaf_t entry)*/ static inline struct folio *softleaf_to_folio (softleaf_t entry) { -struct folio *folio =pfn_folio (softleaf_to_pfn (entry)); +struct folio *folio; + +if (softleaf_is_migration_device_private (entry) || +softleaf_is_device_private (entry)) + folio =page_folio (device_private_entry_to_page (entry)); +else + folio =pfn_folio (softleaf_to_pfn (entry));VM_WARN_ON_ONCE (!softleaf_has_pfn (entry));/* include/linux/memremap.h +62
-2@@ -37,6 +37,7 @@ struct vmem_altmap {* backing the device memory. Doing so simplifies the implementation, but it is * important to remember that there are certain points at which the struct page * must be treated as an opaque object, rather than a "normal" struct page. +* Unlike "normal" struct pages, the page_to_pfn() is invalid. * * A more complete discussion of unaddressable memory may be found in * include/linux/hmm.h and Documentation/mm/hmm.rst. @@ -126,8 +127,12 @@ struct dev_pagemap_ops {* @owner: an opaque pointer identifying the entity that manages this * instance. Used by various helpers to make sure that no * foreign ZONE_DEVICE memory is accessed. -* @nr_range: number of ranges to be mapped -* @range: range to be mapped when nr_range == 1 +* @nr_pages: number of pages requested to be mapped for MEMORY_DEVICE_PRIVATE. +* @pages: array of nr_pages initialized for MEMORY_DEVICE_PRIVATE. +* @nr_range: number of ranges to be mapped. Always == 1 for +* MEMORY_DEVICE_PRIVATE. +* @range: range to be mapped when nr_range == 1. Used as an output param for +* MEMORY_DEVICE_PRIVATE. * @ranges: array of ranges to be mapped when nr_range > 1 */ struct dev_pagemap {@@ -139,6 +144,8 @@ struct dev_pagemap {unsigned long vmemmap_shift;const struct dev_pagemap_ops *ops;void *owner; +unsigned long nr_pages; +struct page *pages;int nr_range;union {struct range range;@@ -224,7 +231,14 @@ static inline bool is_fsdax_page(const struct page *page) }#ifdef CONFIG_ZONE_DEVICE +void __init_zone_device_page (struct page *page,unsigned long pfn, +unsigned long zone_idx,int nid, +struct dev_pagemap *pgmap);void zone_device_page_init (struct page *page,unsigned int order); +unsigned long memremap_device_private_pagemap (struct dev_pagemap *pgmap,int nid); +void memunmap_device_private_pagemap (struct dev_pagemap *pgmap); +int devm_memremap_device_private_pagemap (struct device *dev,struct dev_pagemap *pgmap); +void devm_memunmap_device_private_pagemap (struct device *dev,struct dev_pagemap *pgmap);void *memremap_pages (struct dev_pagemap *pgmap,int nid);void memunmap_pages (struct dev_pagemap *pgmap);void *devm_memremap_pages (struct device *dev,struct dev_pagemap *pgmap);@@ -234,6 +248,15 @@ bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn);unsigned long memremap_compat_align (void ); +struct page *device_private_offset_to_page (unsigned long offset); +struct page *device_private_entry_to_page (softleaf_t entry); +pgoff_t device_private_page_to_offset (const struct page *page); + +static inline pgoff_t device_private_folio_to_offset (const struct folio *folio) +{ +return device_private_page_to_offset ((const struct page *)&folio->page); +} +static inline void zone_device_folio_init (struct folio *folio,unsigned int order) {zone_device_page_init (&folio->page, order);@@ -276,6 +299,23 @@ static inline void devm_memunmap_pages(struct device *dev, { } +static inline int devm_memremap_device_private_pagemap (struct device *dev, +struct dev_pagemap *pgmap) +{ +/* +* Fail attempts to call devm_memremap_device_private_pagemap() without +* ZONE_DEVICE support enabled, this requires callers to fall +* back to plain devm_memremap() based on config +*/ +WARN_ON_ONCE (1 ); +return -ENXIO ; +} + +static inline void devm_memunmap_device_private_pagemap (struct device *dev, +struct dev_pagemap *pgmap) +{ +} +static inline struct dev_pagemap *get_dev_pagemap (unsigned long pfn) {return NULL ;@@ -296,6 +336,26 @@ static inline void zone_device_private_split_cb(struct folio *original_folio, struct folio *new_folio) { } + +static inline struct page *device_private_offset_to_page (unsigned long offset) +{ +return NULL ; +} + +static inline struct page *device_private_entry_to_page (softleaf_t entry) +{ +return NULL ; +} + +static inline pgoff_t device_private_page_to_offset (const struct page *page) +{ +return 0 ; +} + +static inline pgoff_t device_private_folio_to_offset (const struct folio *folio) +{ +return 0 ; +}#endif /* CONFIG_ZONE_DEVICE */ static inline void put_dev_pagemap (struct dev_pagemap *pgmap)include/linux/migrate.h +5
-1@@ -133,6 +133,10 @@ static inline struct page *migrate_pfn_to_page(unsigned long mpfn) {if (!(mpfn &MIGRATE_PFN_VALID ))return NULL ; + +if (mpfn &MIGRATE_PFN_DEVICE_PRIVATE ) +return device_private_offset_to_page (mpfn >>MIGRATE_PFN_SHIFT ); +return pfn_to_page (mpfn >>MIGRATE_PFN_SHIFT ); }@@ -144,7 +148,7 @@ static inline unsigned long migrate_pfn(unsigned long pfn)static inline unsigned long migrate_pfn_from_page (struct page *page) {if (is_device_private_page (page)) -return migrate_pfn (page_to_pfn (page)) | +return migrate_pfn (device_private_page_to_offset (page)) |MIGRATE_PFN_DEVICE_PRIVATE ;return migrate_pfn (page_to_pfn (page)); }include/linux/mm.h +2
-0@@ -2038,6 +2038,8 @@ static inline unsigned long memdesc_section(memdesc_flags_t mdf)*/ static inline unsigned long folio_pfn (const struct folio *folio) { +VM_WARN_ON (folio_is_device_private (folio)); +return page_to_pfn (&folio->page); }include/linux/rmap.h +5
-0@@ -951,11 +951,16 @@ static inline unsigned long page_vma_walk_flags(const struct folio *folio,static inline unsigned long folio_page_vma_walk_pfn (const struct folio *folio) { +if (folio_is_device_private (folio)) +return device_private_folio_to_offset (folio); +return folio_pfn (folio); }static inline struct folio *page_vma_walk_pfn_to_folio (struct page_vma_mapped_walk *pvmw) { +if (pvmw->flags &PVMW_DEVICE_PRIVATE ) +return page_folio (device_private_offset_to_page (pvmw->pfn));return pfn_folio (pvmw->pfn); }include/linux/swapops.h +5
-5@@ -141,7 +141,7 @@ static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset)static inline swp_entry_t make_readable_device_private_entry_from_page (struct page *page,pgoff_t flags) { -return swp_entry (SWP_DEVICE_READ ,page_to_pfn (page) | flags); +return swp_entry (SWP_DEVICE_READ ,device_private_page_to_offset (page) | flags); }static inline swp_entry_t make_writable_device_private_entry (pgoff_t offset)@@ -152,7 +152,7 @@ static inline swp_entry_t make_writable_device_private_entry(pgoff_t offset)static inline swp_entry_t make_writable_device_private_entry_from_page (struct page *page,pgoff_t flags) { -return swp_entry (SWP_DEVICE_WRITE ,page_to_pfn (page) | flags); +return swp_entry (SWP_DEVICE_WRITE ,device_private_page_to_offset (page) | flags); }static inline swp_entry_t make_device_exclusive_entry (pgoff_t offset)@@ -231,7 +231,7 @@ static inline swp_entry_t make_readable_migration_entry_from_page(struct page *p {if (is_device_private_page (page))return make_readable_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_READ ,page_to_pfn (page) | flags); }@@ -246,7 +246,7 @@ static inline swp_entry_t make_readable_exclusive_migration_entry_from_page(stru {if (is_device_private_page (page))return make_readable_exclusive_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_READ_EXCLUSIVE ,page_to_pfn (page) | flags); }@@ -261,7 +261,7 @@ static inline swp_entry_t make_writable_migration_entry_from_page(struct page *p {if (is_device_private_page (page))return make_writable_migration_device_private_entry ( -page_to_pfn (page) | flags); +device_private_page_to_offset (page) | flags);return swp_entry (SWP_MIGRATION_WRITE ,page_to_pfn (page) | flags); }lib/test_hmm.c +41
-29@@ -497,7 +497,7 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, struct page **ppage, bool is_large) {struct dmirror_chunk *devmem; -struct resource *res =NULL ; +bool device_private = false;unsigned long pfn;unsigned long pfn_first;unsigned long pfn_last;@@ -510,13 +510,9 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice,switch (mdevice->zone_device_type) {case HMM_DMIRROR_MEMORY_DEVICE_PRIVATE : - res =request_free_mem_region (&iomem_resource,DEVMEM_CHUNK_SIZE , -"hmm_dmirror" ); -if (IS_ERR_OR_NULL (res)) - goto err_devmem; - devmem->pagemap.range.start = res->start; - devmem->pagemap.range.end = res->end; + device_private = true; devmem->pagemap.type =MEMORY_DEVICE_PRIVATE ; + devmem->pagemap.nr_pages =DEVMEM_CHUNK_SIZE /PAGE_SIZE ;break ;case HMM_DMIRROR_MEMORY_DEVICE_COHERENT : devmem->pagemap.range.start = (MINOR(mdevice->cdevice.dev) - 2) ?@@ -525,13 +521,13 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, devmem->pagemap.range.end = devmem->pagemap.range.start +DEVMEM_CHUNK_SIZE -1 ; devmem->pagemap.type =MEMORY_DEVICE_COHERENT ; + devmem->pagemap.nr_range =1 ;break ;default : ret = -EINVAL ; goto err_devmem; } - devmem->pagemap.nr_range =1 ; devmem->pagemap.ops = &dmirror_devmem_ops; devmem->pagemap.owner = mdevice;@@ -551,13 +547,20 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, mdevice->devmem_capacity = new_capacity; mdevice->devmem_chunks = new_chunks; } - ptr =memremap_pages (&devmem->pagemap,numa_node_id ()); -if (IS_ERR_OR_NULL (ptr)) { -if (ptr) - ret =PTR_ERR (ptr); -else - ret = -EFAULT ; - goto err_release; + +if (device_private) { + ret =memremap_device_private_pagemap (&devmem->pagemap,numa_node_id ()); +if (ret) + goto err_release; + }else { + ptr =memremap_pages (&devmem->pagemap,numa_node_id ()); +if (IS_ERR_OR_NULL (ptr)) { +if (ptr) + ret =PTR_ERR (ptr); +else + ret = -EFAULT ; + goto err_release; + } } devmem->mdevice = mdevice;@@ -567,15 +570,21 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice,mutex_unlock (&mdevice->devmem_lock); -pr_info ("added new %u MB chunk (total %u chunks, %u MB) PFNs [0x%lx 0x%lx)\n" , +pr_info ("added new %u MB chunk (total %u chunks, %u MB) %sPFNs [0x%lx 0x%lx)\n" ,DEVMEM_CHUNK_SIZE / (1024 *1024 ), mdevice->devmem_count, mdevice->devmem_count * (DEVMEM_CHUNK_SIZE / (1024 *1024 )), + device_private ?"device " :"" , pfn_first, pfn_last);spin_lock (&mdevice->lock);for (pfn = pfn_first; pfn < pfn_last; ) { -struct page *page =pfn_to_page (pfn); +struct page *page; + +if (device_private) + page =device_private_offset_to_page (pfn); +else + page =pfn_to_page (pfn);if (is_large &&IS_ALIGNED (pfn,HPAGE_PMD_NR ) && (pfn +HPAGE_PMD_NR <= pfn_last)) {@@ -616,9 +625,6 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, err_release:mutex_unlock (&mdevice->devmem_lock); -if (res && devmem->pagemap.type ==MEMORY_DEVICE_PRIVATE ) -release_mem_region (devmem->pagemap.range.start, -range_len (&devmem->pagemap.range)); err_devmem:kfree (devmem);@@ -696,8 +702,8 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args,*/ spage =migrate_pfn_to_page (*src);if (WARN (spage &&is_zone_device_page (spage), -"page already in device spage pfn: 0x%lx\n" , -page_to_pfn (spage))) +"page already in device spage mpfn: 0x%lx\n" , +migrate_pfn_from_page (spage))) goto next;if (dmirror->flags &HMM_DMIRROR_FLAG_FAIL_ALLOC ) {@@ -752,8 +758,9 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args,*/ rpage->zone_device_data = dmirror; -pr_debug ("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n" , -page_to_pfn (spage),page_to_pfn (dpage)); +pr_debug ("migrating from sys to mpfn src: 0x%lx pfn dst: 0x%lx\n" , +page_to_pfn (spage), +migrate_pfn_from_page (dpage)); *dst =migrate_pfn_from_page (dpage) | write;@@ -1462,10 +1469,10 @@ static void dmirror_device_remove_chunks(struct dmirror_device *mdevice)spin_unlock (&mdevice->lock);dmirror_device_evict_chunk (devmem); -memunmap_pages (&devmem->pagemap);if (devmem->pagemap.type ==MEMORY_DEVICE_PRIVATE ) -release_mem_region (devmem->pagemap.range.start, -range_len (&devmem->pagemap.range)); +memunmap_device_private_pagemap (&devmem->pagemap); +else +memunmap_pages (&devmem->pagemap);kfree (devmem); } mdevice->devmem_count =0 ;@@ -1710,7 +1717,13 @@ static void dmirror_devmem_folio_split(struct folio *head, struct folio *tail)return ; } - offset =folio_pfn (tail) -folio_pfn (head); + tail->pgmap = head->pgmap; + +if (folio_is_device_private (head)) + offset =device_private_folio_to_offset (tail) - +device_private_folio_to_offset (head); +else + offset =folio_pfn (tail) -folio_pfn (head); rpage_tail =folio_page (rfolio, offset); tail->page.zone_device_data = rpage_tail;@@ -1719,7 +1732,6 @@ static void dmirror_devmem_folio_split(struct folio *head, struct folio *tail) rpage_tail->mapping =NULL ;folio_page (tail,0 )->mapping =folio_page (head,0 )->mapping; - tail->pgmap = head->pgmap;folio_set_count (page_folio (rpage_tail),1 ); }mm/debug.c +6
-3@@ -77,9 +77,11 @@ static void __dump_folio(const struct folio *folio, const struct page *page,if (page_mapcount_is_type (mapcount)) mapcount =0 ; -pr_warn ("page: refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n" , +pr_warn ("page: refcount:%d mapcount:%d mapping:%p index:%#lx %spfn:%#lx\n" ,folio_ref_count (folio), mapcount, mapping, - folio->index + idx, pfn); + folio->index + idx, +folio_is_device_private (folio) ?"device " :"" , + pfn);if (folio_test_large (folio)) {int pincount =0 ;@@ -113,7 +115,8 @@ static void __dump_folio(const struct folio *folio, const struct page *page,* inaccuracy here due to racing. */ pr_warn ("%sflags: %pGp%s\n" , type, &folio->flags, -is_migrate_cma_folio (folio, pfn) ?" CMA" :"" ); + (!folio_is_device_private (folio) && +is_migrate_cma_folio (folio, pfn)) ?" CMA" :"" );if (page_has_type (&folio->page))pr_warn ("page_type: %x(%s)\n" , folio->page.page_type >>24 ,page_type_name (folio->page.page_type));mm/memremap.c +154
-42@@ -12,9 +12,12 @@#include <linux/types.h> #include <linux/wait_bit.h> #include <linux/xarray.h> +#include <linux/maple_tree.h> #include "internal.h" static DEFINE_XARRAY (pgmap_array); +static struct maple_tree device_private_pgmap_tree = +MTREE_INIT (device_private_pgmap_tree,MT_FLAGS_ALLOC_RANGE );/* * The memremap() and memremap_pages() interfaces are alternately used @@ -113,9 +116,10 @@ void memunmap_pages(struct dev_pagemap *pgmap) {int i; +WARN_ONCE (pgmap->type ==MEMORY_DEVICE_PRIVATE ,"Type should not be MEMORY_DEVICE_PRIVATE\n" ); +percpu_ref_kill (&pgmap->ref); -if (pgmap->type !=MEMORY_DEVICE_PRIVATE && - pgmap->type !=MEMORY_DEVICE_COHERENT ) +if (pgmap->type !=MEMORY_DEVICE_COHERENT )for (i =0 ; i < pgmap->nr_range; i++)percpu_ref_put_many (&pgmap->ref,pfn_len (pgmap, i));@@ -144,7 +148,6 @@ static void dev_pagemap_percpu_release(struct percpu_ref *ref)static int pagemap_range (struct dev_pagemap *pgmap,struct mhp_params *params,int range_id,int nid) { -const bool is_private = pgmap->type ==MEMORY_DEVICE_PRIVATE ;struct range *range = &pgmap->ranges[range_id];struct dev_pagemap *conflict_pgmap;int error, is_ram;@@ -190,7 +193,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params,if (error) goto err_pfn_remap; -if (!mhp_range_allowed (range->start,range_len (range), !is_private)) { +if (!mhp_range_allowed (range->start,range_len (range), true)) { error = -EINVAL ; goto err_kasan; }@@ -198,30 +201,19 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params,mem_hotplug_begin ();/* -* For device private memory we call add_pages() as we only need to -* allocate and initialize struct page for the device memory. More- -* over the device memory is un-accessible thus we do not want to -* create a linear mapping for the memory like arch_add_memory() -* would do. -* -* For all other device memory types, which are accessible by -* the CPU, we do want the linear mapping and thus use +* All device memory types except device private memory are accessible +* by the CPU, so we want the linear mapping and thus use * arch_add_memory(). */ -if (is_private) { - error =add_pages (nid,PHYS_PFN (range->start), -PHYS_PFN (range_len (range)), params); - }else { - error =kasan_add_zero_shadow (__va (range->start),range_len (range)); -if (error) { -mem_hotplug_done (); - goto err_kasan; - } - - error =arch_add_memory (nid, range->start,range_len (range), - params); + error =kasan_add_zero_shadow (__va (range->start),range_len (range)); +if (error) { +mem_hotplug_done (); + goto err_kasan; } + error =arch_add_memory (nid, range->start,range_len (range), + params); +if (!error) {struct zone *zone;@@ -248,8 +240,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params,return 0 ; err_add_memory: -if (!is_private) -kasan_remove_zero_shadow (__va (range->start),range_len (range)); +kasan_remove_zero_shadow (__va (range->start),range_len (range)); err_kasan:pfnmap_untrack (PHYS_PFN (range->start),range_len (range)); err_pfn_remap:@@ -281,22 +272,8 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)switch (pgmap->type) {case MEMORY_DEVICE_PRIVATE : -if (!IS_ENABLED (CONFIG_DEVICE_PRIVATE )) { -WARN (1 ,"Device private memory not supported\n" ); -return ERR_PTR (-EINVAL ); - } -if (!pgmap->ops || !pgmap->ops->migrate_to_ram) { -WARN (1 ,"Missing migrate_to_ram method\n" ); -return ERR_PTR (-EINVAL ); - } -if (!pgmap->ops->folio_free) { -WARN (1 ,"Missing folio_free method\n" ); -return ERR_PTR (-EINVAL ); - } -if (!pgmap->owner) { -WARN (1 ,"Missing owner\n" ); -return ERR_PTR (-EINVAL ); - } +WARN (1 ,"Use memremap_device_private_pagemap()\n" ); +return ERR_PTR (-EINVAL );break ;case MEMORY_DEVICE_COHERENT :if (!pgmap->ops->folio_free) {@@ -394,6 +371,31 @@ void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap) }EXPORT_SYMBOL_GPL (devm_memunmap_pages); +static void devm_memremap_device_private_pagemap_release (void *data) +{ +memunmap_device_private_pagemap (data); +} + +int devm_memremap_device_private_pagemap (struct device *dev,struct dev_pagemap *pgmap) +{ +int ret; + + ret =memremap_device_private_pagemap (pgmap,dev_to_node (dev)); +if (ret) +return ret; + + ret =devm_add_action_or_reset (dev, devm_memremap_device_private_pagemap_release, + pgmap); +return ret; +} +EXPORT_SYMBOL_GPL (devm_memremap_device_private_pagemap); + +void devm_memunmap_device_private_pagemap (struct device *dev,struct dev_pagemap *pgmap) +{ +devm_release_action (dev, devm_memremap_device_private_pagemap_release, pgmap); +} +EXPORT_SYMBOL_GPL (devm_memunmap_device_private_pagemap); +/** * get_dev_pagemap() - take a new live reference on the dev_pagemap for @pfn * @pfn: page frame number to lookup page_map @@ -493,3 +495,113 @@ void zone_device_page_init(struct page *page, unsigned int order)prep_compound_page (page, order); }EXPORT_SYMBOL_GPL (zone_device_page_init); + +unsigned long memremap_device_private_pagemap (struct dev_pagemap *pgmap,int nid) +{ +unsigned long dpfn, dpfn_first, dpfn_last =0 ; +unsigned long start; +int rc; + +if (pgmap->type !=MEMORY_DEVICE_PRIVATE ) { +WARN (1 ,"Not device private memory\n" ); +return -EINVAL ; + } +if (!IS_ENABLED (CONFIG_DEVICE_PRIVATE )) { +WARN (1 ,"Device private memory not supported\n" ); +return -EINVAL ; + } +if (!pgmap->ops || !pgmap->ops->migrate_to_ram) { +WARN (1 ,"Missing migrate_to_ram method\n" ); +return -EINVAL ; + } +if (!pgmap->owner) { +WARN (1 ,"Missing owner\n" ); +return -EINVAL ; + } + + pgmap->pages =kvzalloc (sizeof (struct page ) * pgmap->nr_pages, +GFP_KERNEL ); +if (!pgmap->pages) +return -ENOMEM ; + + rc =mtree_alloc_range (&device_private_pgmap_tree, &start, pgmap, + pgmap->nr_pages *PAGE_SIZE ,0 , +1ull <<MAX_PHYSMEM_BITS ,GFP_KERNEL ); +if (rc <0 ) + goto err_mtree_alloc; + + pgmap->range.start = start; + pgmap->range.end = pgmap->range.start + (pgmap->nr_pages *PAGE_SIZE ) -1 ; + pgmap->nr_range =1 ; + +init_completion (&pgmap->done); + rc =percpu_ref_init (&pgmap->ref, dev_pagemap_percpu_release,0 , +GFP_KERNEL ); +if (rc <0 ) + goto err_ref_init; + +if (nid <0 ) + nid =numa_mem_id (); + + dpfn_first = pgmap->range.start >>PAGE_SHIFT ; + dpfn_last = dpfn_first + (range_len (&pgmap->range) >>PAGE_SHIFT ); +for (dpfn = dpfn_first; dpfn < dpfn_last; dpfn++) { +struct page *page =device_private_offset_to_page (dpfn); + +__init_zone_device_page (page, dpfn,ZONE_DEVICE , nid, pgmap); +page_folio (page)->pgmap = (void *) pgmap; + } + +return 0 ; + +err_ref_init: +mtree_erase (&device_private_pgmap_tree, pgmap->range.start); +err_mtree_alloc: +kvfree (pgmap->pages); +return rc; +} +EXPORT_SYMBOL_GPL (memremap_device_private_pagemap); + +void memunmap_device_private_pagemap (struct dev_pagemap *pgmap) +{ +percpu_ref_kill (&pgmap->ref); +wait_for_completion (&pgmap->done); +percpu_ref_exit (&pgmap->ref); +kvfree (pgmap->pages); +mtree_erase (&device_private_pgmap_tree, pgmap->range.start); +} +EXPORT_SYMBOL_GPL (memunmap_device_private_pagemap); + +struct page *device_private_offset_to_page (unsigned long offset) +{ +struct dev_pagemap *pgmap; + + pgmap =mtree_load (&device_private_pgmap_tree, offset <<PAGE_SHIFT ); +if (WARN_ON_ONCE (!pgmap)) +return NULL ; + +return &pgmap->pages[offset - (pgmap->range.start >>PAGE_SHIFT )]; +} +EXPORT_SYMBOL_GPL (device_private_offset_to_page); + +struct page *device_private_entry_to_page (softleaf_t entry) +{ +unsigned long offset; + +if (!((softleaf_is_device_private (entry) || + (softleaf_is_migration_device_private (entry))))) +return NULL ; + + offset =softleaf_to_pfn (entry); +return device_private_offset_to_page (offset); +} + +pgoff_t device_private_page_to_offset (const struct page *page) +{ +struct dev_pagemap *pgmap = (struct dev_pagemap *)page_pgmap (page); + +VM_WARN_ON (!is_device_private_page (page)); + +return (pgmap->range.start >>PAGE_SHIFT ) + ((page - pgmap->pages)); +} +EXPORT_SYMBOL_GPL (device_private_page_to_offset);mm/mm_init.c +4
-4@@ -1004,9 +1004,9 @@ static void __init memmap_init(void) }#ifdef CONFIG_ZONE_DEVICE -static void __ref __init_zone_device_page (struct page *page,unsigned long pfn, -unsigned long zone_idx,int nid, -struct dev_pagemap *pgmap) +void __ref __init_zone_device_page (struct page *page,unsigned long pfn, +unsigned long zone_idx,int nid, +struct dev_pagemap *pgmap) {__init_single_page (page, pfn, zone_idx, nid);@@ -1038,7 +1038,7 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn,* Please note that MEMINIT_HOTPLUG path doesn't clear memmap * because this is done early in section_activate() */ -if (pageblock_aligned (pfn)) { +if (pgmap->type !=MEMORY_DEVICE_PRIVATE &&pageblock_aligned (pfn)) {init_pageblock_migratetype (page,MIGRATE_MOVABLE , false);cond_resched (); }mm/page_vma_mapped.c +19
-3@@ -107,6 +107,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,static bool check_pte (struct page_vma_mapped_walk *pvmw,unsigned long pte_nr) {unsigned long pfn; +bool device_private = false;pte_t ptent =ptep_get (pvmw->pte);if (pvmw->flags &PVMW_MIGRATION ) {@@ -115,6 +116,9 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)if (!softleaf_is_migration (entry))return false; +if (softleaf_is_migration_device_private (entry)) + device_private = true; + pfn =softleaf_to_pfn (entry); }else if (pte_present (ptent)) { pfn =pte_pfn (ptent);@@ -127,8 +131,14 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr)return false; pfn =softleaf_to_pfn (entry); + +if (softleaf_is_device_private (entry)) + device_private = true; } +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE )) +return false; +if ((pfn + pte_nr -1 ) < pvmw->pfn)return false;if (pfn > (pvmw->pfn + pvmw->nr_pages -1 ))@@ -137,8 +147,11 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) }/* Returns true if the two ranges overlap. Careful to not overflow. */ -static bool check_pmd (unsigned long pfn,struct page_vma_mapped_walk *pvmw) +static bool check_pmd (unsigned long pfn,bool device_private,struct page_vma_mapped_walk *pvmw) { +if ((device_private) ^ !!(pvmw->flags &PVMW_DEVICE_PRIVATE )) +return false; +if ((pfn +HPAGE_PMD_NR -1 ) < pvmw->pfn)return false;if (pfn > pvmw->pfn + pvmw->nr_pages -1 )@@ -254,14 +267,17 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) entry =softleaf_from_pmd (pmde);if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw)) + !check_pmd (softleaf_to_pfn (entry), +softleaf_is_device_private (entry) || +softleaf_is_migration_device_private (entry), + pvmw))return not_found (pvmw);return true; }if (likely (pmd_trans_huge (pmde))) {if (pvmw->flags &PVMW_MIGRATION )return not_found (pvmw); -if (!check_pmd (pmd_pfn (pmde), pvmw)) +if (!check_pmd (pmd_pfn (pmde), false, pvmw))return not_found (pvmw);return true; }mm/rmap.c +29
-14@@ -1860,7 +1860,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma,struct mmu_notifier_range range;enum ttu_flags flags = (enum ttu_flags )(long )arg;unsigned long nr_pages =1 , end_addr; -unsigned long pfn; +unsigned long nr;unsigned long hsz =0 ;int ptes =0 ;@@ -1967,15 +1967,20 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma,*/ pteval =ptep_get (pvmw.pte);if (likely (pte_present (pteval))) { - pfn =pte_pfn (pteval); + nr =pte_pfn (pteval) -folio_pfn (folio); }else {const softleaf_t entry =softleaf_from_pte (pteval); - pfn =softleaf_to_pfn (entry); +if (softleaf_is_device_private (entry) || +softleaf_is_migration_device_private (entry)) + nr =softleaf_to_pfn (entry) -device_private_folio_to_offset (folio); +else + nr =softleaf_to_pfn (entry) -folio_pfn (folio); +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio); } - subpage =folio_page (folio, pfn -folio_pfn (folio)); + subpage =folio_page (folio, nr); address = pvmw.address; anon_exclusive =folio_test_anon (folio) &&PageAnonExclusive (subpage);@@ -2289,7 +2294,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,struct page *subpage;struct mmu_notifier_range range;enum ttu_flags flags = (enum ttu_flags )(long )arg; -unsigned long pfn; +unsigned long nr;unsigned long hsz =0 ;/* @@ -2328,7 +2333,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,while (page_vma_mapped_walk (&pvmw)) {/* PMD-mapped THP migration entry */ if (!pvmw.pte) { -__maybe_unused unsigned long pfn; +__maybe_unused softleaf_t entry;__maybe_unused pmd_t pmdval;if (flags &TTU_SPLIT_HUGE_PMD ) {@@ -2340,12 +2345,17 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, }#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION pmdval =pmdp_get (pvmw.pmd); + entry =softleaf_from_pmd (pmdval);if (likely (pmd_present (pmdval))) - pfn =pmd_pfn (pmdval); -else - pfn =softleaf_to_pfn (softleaf_from_pmd (pmdval)); + nr =pmd_pfn (pmdval) -folio_pfn (folio); +else if (softleaf_is_device_private (entry) || +softleaf_is_migration_device_private (entry)) { + nr =softleaf_to_pfn (entry) -device_private_folio_to_offset (folio); + }else { + nr =softleaf_to_pfn (entry) -folio_pfn (folio); + } - subpage =folio_page (folio, pfn -folio_pfn (folio)); + subpage =folio_page (folio, nr);VM_BUG_ON_FOLIO (folio_test_hugetlb (folio) || !folio_test_pmd_mappable (folio), folio);@@ -2368,15 +2378,20 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,*/ pteval =ptep_get (pvmw.pte);if (likely (pte_present (pteval))) { - pfn =pte_pfn (pteval); + nr =pte_pfn (pteval) -folio_pfn (folio); }else {const softleaf_t entry =softleaf_from_pte (pteval); - pfn =softleaf_to_pfn (entry); +if (softleaf_is_device_private (entry) || +softleaf_is_migration_device_private (entry)) + nr =softleaf_to_pfn (entry) -device_private_folio_to_offset (folio); +else + nr =softleaf_to_pfn (entry) -folio_pfn (folio); +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio); } - subpage =folio_page (folio, pfn -folio_pfn (folio)); + subpage =folio_page (folio, nr); address = pvmw.address; anon_exclusive =folio_test_anon (folio) &&PageAnonExclusive (subpage);@@ -2436,7 +2451,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,folio_mark_dirty (folio); writable =pte_write (pteval); }else if (likely (pte_present (pteval))) { -flush_cache_page (vma, address, pfn); +flush_cache_page (vma, address,pte_pfn (pteval));/* Nuke the page table entry. */ if (should_defer_flush (mm, flags)) {/* mm/util.c +4
-1@@ -1244,7 +1244,10 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)struct folio *foliop;int loops =5 ; - ps->pfn =page_to_pfn (page); +if (is_device_private_page (page)) + ps->pfn =device_private_page_to_offset (page); +else + ps->pfn =page_to_pfn (page); ps->flags =PAGE_SNAPSHOT_FAITHFUL ; again:
Patchwork
CI✗ CI.checkpatch: warning for Remove device private pages from physical address space (rev5)
In reply to Jordan Niethe== Series Details ==
== Series Details ==
Series: Remove device private pages from physical address space (rev5)
URL : https://patchwork.freedesktop.org/series/159738/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master 1f57ba1afceae32108bd24770069f764d940a0e4
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 1802d11c036e59160f648898603b993d191deff9
Author: Jordan Niethe <[email protected]> Date: Fri Jan 23 17:23:09 2026 +1100
mm: Remove device private pages from the physical address space
Currently when creating device private struct pages, the first step is to use request_free_mem_region() to get a range of physical address space large enough to represent the devices memory. This allocated physical address range is then remapped as device private memory using memremap_pages().
Needing allocation of physical address space has some problems:
1) There may be insufficient physical address space to represent the device memory. KASLR reducing the physical address space and VM configurations with limited physical address space increase the likelihood of hitting this especially as device memory increases. This has been observed to prevent device private from being initialized.
2) Attempting to add the device private pages to the linear map at addresses beyond the actual physical memory causes issues on architectures like aarch64 meaning the feature does not work there.
Instead of using the physical address space, introduce a device private address space and allocate devices regions from there to represent the device private pages.
Introduce a new interface memremap_device_private_pagemap() that allocates a requested amount of device private address space and creates the necessary device private pages.
To support this new interface, struct dev_pagemap needs some changes:
- Add a new dev_pagemap::nr_pages field as an input parameter.
- Add a new dev_pagemap::pages array to store the device private pages.
When using memremap_device_private_pagemap(), rather then passing in dev_pagemap::ranges[dev_pagemap::nr_ranges] of physical address space to be remapped, dev_pagemap::nr_ranges will always be 1, and the device private range that is reserved is returned in dev_pagemap::range.
Forbid calling memremap_pages() with dev_pagemap::ranges::type = MEMORY_DEVICE_PRIVATE.
Represent this device private address space using a new device_private_pgmap_tree maple tree. This tree maps a given device private address to a struct dev_pagemap, where a specific device private page may then be looked up in that dev_pagemap::pages array.
Device private address space can be reclaimed and the assoicated device private pages freed using the corresponding new memunmap_device_private_pagemap() interface.
Because the device private pages now live outside the physical address space, they no longer have a normal PFN. This means that page_to_pfn(), et al. are no longer meaningful.
Introduce helpers:
- device_private_page_to_offset()
- device_private_folio_to_offset()
to take a given device private page / folio and return its offset within the device private address space.
Update the places where we previously converted a device private page to a PFN to use these new helpers. When we encounter a device private offset, instead of looking up its page within the pagemap use device_private_offset_to_page() instead.
Update the existing users:
- lib/test_hmm.c
- ppc ultravisor
- drm/amd/amdkfd
- gpu/drm/xe
- gpu/drm/nouveau
to use the new memremap_device_private_pagemap() interface.
+ /mt/dim checkpatch 4a255b429d80f8b0800bdef43ba3175b771e77ff drm-intel 194d435cc980 mm/migrate_device: Introduce migrate_pfn_from_page() helper ab50de99e563 drm/amdkfd: Use migrate pfns internally807b654cd212 mm/migrate_device: Make migrate_device_{pfns, range}() take mpfns -:215: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #215: FILE: mm/migrate_device.c:1394:
+int migrate_device_range(unsigned long *src_mpfns, unsigned long start,
unsigned long npages)
-:235: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV) #235: FILE: mm/migrate_device.c:1408:
+ src_mpfns[i+j] = 0;
^
-:279: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV) #279: FILE: mm/migrate_device.c:1444:
+ src_mpfns[i+j] = 0;
^
total: 0 errors, 0 warnings, 3 checks, 220 lines checked317cbbab0ef1 mm/migrate_device: Add migrate PFN flag to track device private pages 8d3f2e81810a mm/page_vma_mapped: Add flag to page_vma_mapped_walk::flags to track device private pages a4f0d38701db mm: Add helpers to create migration entries from struct pages
-:136: CHECK:OPEN_ENDED_LINE: Lines should not end with a '('
#136: FILE: mm/huge_memory.c:2528:
+ entry = make_readable_exclusive_migration_entry_from_page(
-:141: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #141: FILE: mm/huge_memory.c:2532:
+ entry = make_readable_migration_entry_from_page(
-:153: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #153: FILE: mm/huge_memory.c:3191:
+ swp_entry = make_writable_migration_entry_from_page(
-:158: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #158: FILE: mm/huge_memory.c:3194:
+ swp_entry = make_readable_exclusive_migration_entry_from_page(
-:163: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #163: FILE: mm/huge_memory.c:3197:
+ swp_entry = make_readable_migration_entry_from_page(
-:193: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #193: FILE: mm/hugetlb.c:4958:
+ softleaf = make_readable_migration_entry_from_page(
-:205: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #205: FILE: mm/hugetlb.c:6511:
+ entry = make_readable_exclusive_migration_entry_from_page(
-:211: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #211: FILE: mm/hugetlb.c:6515:
+ entry = make_readable_migration_entry_from_page(
-:227: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #227: FILE: mm/memory.c:966:
+ entry = make_readable_migration_entry_from_page(
-:243: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #243: FILE: mm/migrate_device.c:435:
+ entry = make_writable_migration_entry_from_page(
-:248: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #248: FILE: mm/migrate_device.c:438:
+ entry = make_readable_exclusive_migration_entry_from_page(
-:253: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #253: FILE: mm/migrate_device.c:441:
+ entry = make_readable_migration_entry_from_page(
-:268: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #268: FILE: mm/mprotect.c:331:
+ entry = make_readable_exclusive_migration_entry_from_page(
-:273: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #273: FILE: mm/mprotect.c:335:
+ entry = make_readable_migration_entry_from_page(
-:290: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #290: FILE: mm/rmap.c:2542:
+ entry = make_writable_migration_entry_from_page(
-:295: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #295: FILE: mm/rmap.c:2545:
+ entry = make_readable_exclusive_migration_entry_from_page(
-:300: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #300: FILE: mm/rmap.c:2548:
+ entry = make_readable_migration_entry_from_page(
total: 0 errors, 0 warnings, 17 checks, 234 lines checked38619cdddc5a mm: Add a new swap type for migration entries of device private pages -:63: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#63: FILE: include/linux/swap.h:86:
+#define SWP_MIGRATION_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3)
^
-:63: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#63: FILE: include/linux/swap.h:86:
+#define SWP_MIGRATION_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3)
^
-:63: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#63: FILE: include/linux/swap.h:86:
+#define SWP_MIGRATION_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3)
^
-:64: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#64: FILE: include/linux/swap.h:87:
+#define SWP_MIGRATION_DEVICE_READ_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+4)
^
-:64: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#64: FILE: include/linux/swap.h:87:
+#define SWP_MIGRATION_DEVICE_READ_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+4)
^
-:64: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#64: FILE: include/linux/swap.h:87:
+#define SWP_MIGRATION_DEVICE_READ_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+4)
^
-:65: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#65: FILE: include/linux/swap.h:88:
+#define SWP_MIGRATION_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+5)
^
-:65: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#65: FILE: include/linux/swap.h:88:
+#define SWP_MIGRATION_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+5)
^
-:65: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#65: FILE: include/linux/swap.h:88:
+#define SWP_MIGRATION_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+5)
^
total: 0 errors, 0 warnings, 9 checks, 61 lines checkedb4561fd2eece mm: Add softleaf support for device private migration entries
-:11: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line (possible unwrapped commit description?) #11:
- SWP_MIGRATION_DEVICE_READ_EXCLUSIVE -> SOFTLEAF_MIGRATION_DEVICE_PRIVATE_READ_EXCLUSIVE
total: 0 errors, 1 warnings, 0 checks, 139 lines checked 033968b40f43 mm: Begin creating device private migration entries -:23: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #23: FILE: include/linux/swapops.h:209:
+ return make_readable_migration_device_private_entry(
-:34: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #34: FILE: include/linux/swapops.h:224:
+ return make_readable_exclusive_migration_device_private_entry(
-:45: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #45: FILE: include/linux/swapops.h:239:
+ return make_writable_migration_device_private_entry(
total: 0 errors, 0 warnings, 3 checks, 30 lines checked d31f873267a1 mm: Add helpers to create device private entries from struct pages -:88: CHECK:OPEN_ENDED_LINE: Lines should not end with a '('
#88: FILE: mm/huge_memory.c:3222:
+ swp_entry = make_writable_device_private_entry_from_page(
-:93: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #93: FILE: mm/huge_memory.c:3225:
+ swp_entry = make_readable_device_private_entry_from_page(
total: 0 errors, 0 warnings, 2 checks, 113 lines checked
031758330705 mm/util: Add flag to track device private pages in page snapshots -:32: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #32: FILE: fs/proc/page.c:199:
+ } else if (!(ps.flags & PAGE_SNAPSHOT_DEVICE_PRIVATE)
+ && is_zero_pfn(ps.pfn)) {
total: 0 errors, 0 warnings, 1 checks, 36 lines checked a903a479162c mm/hmm: Add flag to track device private pages 1802d11c036e mm: Remove device private pages from the physical address space -:542: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #542: FILE: include/linux/memremap.h:235:
+void __init_zone_device_page(struct page *page, unsigned long pfn,
+ unsigned long zone_idx, int nid,
-:573: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #573: FILE: include/linux/memremap.h:303:
+static inline int devm_memremap_device_private_pagemap(struct device *dev,
+ struct dev_pagemap *pgmap)
-:585: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #585: FILE: include/linux/memremap.h:315:
+static inline void devm_memunmap_device_private_pagemap(struct device *dev,
+ struct dev_pagemap *pgmap)
-:902: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #902: FILE: mm/debug.c:81:
+ pr_warn("page: refcount:%d mapcount:%d mapping:%p index:%#lx %spfn:%#lx\n",
folio_ref_count(folio), mapcount, mapping,
-:1060: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1060: FILE: mm/memremap.c:388:
+ ret = devm_add_action_or_reset(dev, devm_memremap_device_private_pagemap_release,
+ pgmap);
-:1102: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kvzalloc(sizeof(*pgmap->pages)...) over kvzalloc(sizeof(struct page)...) #1102: FILE: mm/memremap.c:522:
+ pgmap->pages = kvzalloc(sizeof(struct page) * pgmap->nr_pages,
-:1103: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1103: FILE: mm/memremap.c:523:
+ pgmap->pages = kvzalloc(sizeof(struct page) * pgmap->nr_pages,
+ GFP_KERNEL);
-:1119: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1119: FILE: mm/memremap.c:539:
+ rc = percpu_ref_init(&pgmap->ref, dev_pagemap_percpu_release, 0,
+ GFP_KERNEL);
-:1132: CHECK:SPACING: No space is necessary after a cast #1132: FILE: mm/memremap.c:552:
+ page_folio(page)->pgmap = (void *) pgmap;
-:1172: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1172: FILE: mm/memremap.c:592:
+ if (!((softleaf_is_device_private(entry) ||
+ (softleaf_is_migration_device_private(entry)))))
-:1181: CHECK:SPACING: No space is necessary after a cast #1181: FILE: mm/memremap.c:601:
+ struct dev_pagemap *pgmap = (struct dev_pagemap *) page_pgmap(page);
total: 0 errors, 0 warnings, 11 checks, 1169 lines checked
Patchwork
CI✓ CI.KUnit: success for Remove device private pages from physical address space (rev5)
In reply to Jordan Niethe== Series Details ==
== Series Details ==
Series: Remove device private pages from physical address space (rev5)
URL : https://patchwork.freedesktop.org/series/159738/
State : success
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig [06:30:12] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [06:30:16] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48 [06:30:48] Starting KUnit Kernel (1/1)... [06:30:48] ============================================================ Running tests with: $ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [06:30:48] ================== guc_buf (11 subtests) =================== [06:30:48] [PASSED] test_smallest [06:30:48] [PASSED] test_largest [06:30:48] [PASSED] test_granular [06:30:48] [PASSED] test_unique [06:30:48] [PASSED] test_overlap [06:30:48] [PASSED] test_reusable [06:30:48] [PASSED] test_too_big [06:30:48] [PASSED] test_flush [06:30:48] [PASSED] test_lookup [06:30:48] [PASSED] test_data [06:30:48] [PASSED] test_class [06:30:48] ===================== [PASSED] guc_buf ===================== [06:30:48] =================== guc_dbm (7 subtests) =================== [06:30:48] [PASSED] test_empty [06:30:48] [PASSED] test_default [06:30:48] ======================== test_size ======================== [06:30:48] [PASSED] 4 [06:30:48] [PASSED] 8 [06:30:48] [PASSED] 32 [06:30:48] [PASSED] 256 [06:30:48] ==================== [PASSED] test_size ==================== [06:30:48] ======================= test_reuse ======================== [06:30:48] [PASSED] 4 [06:30:48] [PASSED] 8 [06:30:48] [PASSED] 32 [06:30:48] [PASSED] 256 [06:30:48] =================== [PASSED] test_reuse ==================== [06:30:48] =================== test_range_overlap ==================== [06:30:48] [PASSED] 4 [06:30:48] [PASSED] 8 [06:30:48] [PASSED] 32 [06:30:48] [PASSED] 256 [06:30:48] =============== [PASSED] test_range_overlap ================ [06:30:48] =================== test_range_compact ==================== [06:30:48] [PASSED] 4 [06:30:48] [PASSED] 8 [06:30:48] [PASSED] 32 [06:30:48] [PASSED] 256 [06:30:48] =============== [PASSED] test_range_compact ================ [06:30:48] ==================== test_range_spare ===================== [06:30:48] [PASSED] 4 [06:30:48] [PASSED] 8 [06:30:48] [PASSED] 32 [06:30:48] [PASSED] 256 [06:30:48] ================ [PASSED] test_range_spare ================= [06:30:48] ===================== [PASSED] guc_dbm ===================== [06:30:48] =================== guc_idm (6 subtests) =================== [06:30:48] [PASSED] bad_init [06:30:48] [PASSED] no_init [06:30:48] [PASSED] init_fini [06:30:48] [PASSED] check_used [06:30:48] [PASSED] check_quota [06:30:48] [PASSED] check_all [06:30:48] ===================== [PASSED] guc_idm ===================== [06:30:48] ================== no_relay (3 subtests) =================== [06:30:48] [PASSED] xe_drops_guc2pf_if_not_ready [06:30:48] [PASSED] xe_drops_guc2vf_if_not_ready [06:30:48] [PASSED] xe_rejects_send_if_not_ready [06:30:48] ==================== [PASSED] no_relay ===================== [06:30:48] ================== pf_relay (14 subtests) ================== [06:30:48] [PASSED] pf_rejects_guc2pf_too_short [06:30:48] [PASSED] pf_rejects_guc2pf_too_long [06:30:48] [PASSED] pf_rejects_guc2pf_no_payload [06:30:48] [PASSED] pf_fails_no_payload [06:30:48] [PASSED] pf_fails_bad_origin [06:30:48] [PASSED] pf_fails_bad_type [06:30:48] [PASSED] pf_txn_reports_error [06:30:48] [PASSED] pf_txn_sends_pf2guc [06:30:48] [PASSED] pf_sends_pf2guc [06:30:48] [SKIPPED] pf_loopback_nop [06:30:48] [SKIPPED] pf_loopback_echo [06:30:48] [SKIPPED] pf_loopback_fail [06:30:48] [SKIPPED] pf_loopback_busy [06:30:48] [SKIPPED] pf_loopback_retry [06:30:48] ==================== [PASSED] pf_relay ===================== [06:30:48] ================== vf_relay (3 subtests) =================== [06:30:48] [PASSED] vf_rejects_guc2vf_too_short [06:30:48] [PASSED] vf_rejects_guc2vf_too_long [06:30:48] [PASSED] vf_rejects_guc2vf_no_payload [06:30:48] ==================== [PASSED] vf_relay ===================== [06:30:48] ================ pf_gt_config (6 subtests) ================= [06:30:48] [PASSED] fair_contexts_1vf [06:30:48] [PASSED] fair_doorbells_1vf [06:30:48] [PASSED] fair_ggtt_1vf [06:30:48] ====================== fair_contexts ====================== [06:30:48] [PASSED] 1 VF [06:30:48] [PASSED] 2 VFs [06:30:48] [PASSED] 3 VFs [06:30:48] [PASSED] 4 VFs [06:30:48] [PASSED] 5 VFs [06:30:48] [PASSED] 6 VFs [06:30:48] [PASSED] 7 VFs [06:30:48] [PASSED] 8 VFs [06:30:48] [PASSED] 9 VFs [06:30:48] [PASSED] 10 VFs [06:30:48] [PASSED] 11 VFs [06:30:48] [PASSED] 12 VFs [06:30:48] [PASSED] 13 VFs [06:30:48] [PASSED] 14 VFs [06:30:48] [PASSED] 15 VFs [06:30:48] [PASSED] 16 VFs [06:30:48] [PASSED] 17 VFs [06:30:48] [PASSED] 18 VFs [06:30:48] [PASSED] 19 VFs [06:30:48] [PASSED] 20 VFs [06:30:48] [PASSED] 21 VFs [06:30:48] [PASSED] 22 VFs [06:30:48] [PASSED] 23 VFs [06:30:48] [PASSED] 24 VFs [06:30:48] [PASSED] 25 VFs [06:30:48] [PASSED] 26 VFs [06:30:48] [PASSED] 27 VFs [06:30:48] [PASSED] 28 VFs [06:30:48] [PASSED] 29 VFs [06:30:48] [PASSED] 30 VFs [06:30:48] [PASSED] 31 VFs [06:30:48] [PASSED] 32 VFs [06:30:48] [PASSED] 33 VFs [06:30:48] [PASSED] 34 VFs [06:30:48] [PASSED] 35 VFs [06:30:48] [PASSED] 36 VFs [06:30:48] [PASSED] 37 VFs [06:30:48] [PASSED] 38 VFs [06:30:48] [PASSED] 39 VFs [06:30:48] [PASSED] 40 VFs [06:30:48] [PASSED] 41 VFs [06:30:48] [PASSED] 42 VFs [06:30:48] [PASSED] 43 VFs [06:30:48] [PASSED] 44 VFs [06:30:48] [PASSED] 45 VFs [06:30:48] [PASSED] 46 VFs [06:30:48] [PASSED] 47 VFs [06:30:48] [PASSED] 48 VFs [06:30:48] [PASSED] 49 VFs [06:30:48] [PASSED] 50 VFs [06:30:48] [PASSED] 51 VFs [06:30:48] [PASSED] 52 VFs [06:30:48] [PASSED] 53 VFs [06:30:48] [PASSED] 54 VFs [06:30:48] [PASSED] 55 VFs [06:30:48] [PASSED] 56 VFs [06:30:48] [PASSED] 57 VFs [06:30:48] [PASSED] 58 VFs [06:30:48] [PASSED] 59 VFs [06:30:48] [PASSED] 60 VFs [06:30:48] [PASSED] 61 VFs [06:30:48] [PASSED] 62 VFs [06:30:48] [PASSED] 63 VFs [06:30:48] ================== [PASSED] fair_contexts ================== [06:30:48] ===================== fair_doorbells ====================== [06:30:48] [PASSED] 1 VF [06:30:48] [PASSED] 2 VFs [06:30:48] [PASSED] 3 VFs [06:30:48] [PASSED] 4 VFs [06:30:48] [PASSED] 5 VFs [06:30:48] [PASSED] 6 VFs [06:30:48] [PASSED] 7 VFs [06:30:48] [PASSED] 8 VFs [06:30:48] [PASSED] 9 VFs [06:30:48] [PASSED] 10 VFs [06:30:48] [PASSED] 11 VFs [06:30:48] [PASSED] 12 VFs [06:30:48] [PASSED] 13 VFs [06:30:48] [PASSED] 14 VFs [06:30:48] [PASSED] 15 VFs [06:30:48] [PASSED] 16 VFs [06:30:48] [PASSED] 17 VFs [06:30:48] [PASSED] 18 VFs [06:30:48] [PASSED] 19 VFs [06:30:48] [PASSED] 20 VFs [06:30:48] [PASSED] 21 VFs [06:30:48] [PASSED] 22 VFs [06:30:48] [PASSED] 23 VFs [06:30:48] [PASSED] 24 VFs [06:30:48] [PASSED] 25 VFs [06:30:48] [PASSED] 26 VFs [06:30:48] [PASSED] 27 VFs [06:30:48] [PASSED] 28 VFs [06:30:48] [PASSED] 29 VFs [06:30:48] [PASSED] 30 VFs [06:30:48] [PASSED] 31 VFs [06:30:48] [PASSED] 32 VFs [06:30:48] [PASSED] 33 VFs [06:30:48] [PASSED] 34 VFs [06:30:48] [PASSED] 35 VFs [06:30:48] [PASSED] 36 VFs [06:30:48] [PASSED] 37 VFs [06:30:48] [PASSED] 38 VFs [06:30:48] [PASSED] 39 VFs [06:30:48] [PASSED] 40 VFs [06:30:48] [PASSED] 41 VFs [06:30:48] [PASSED] 42 VFs [06:30:48] [PASSED] 43 VFs [06:30:48] [PASSED] 44 VFs [06:30:48] [PASSED] 45 VFs [06:30:48] [PASSED] 46 VFs [06:30:48] [PASSED] 47 VFs [06:30:48] [PASSED] 48 VFs [06:30:48] [PASSED] 49 VFs [06:30:48] [PASSED] 50 VFs [06:30:48] [PASSED] 51 VFs [06:30:48] [PASSED] 52 VFs [06:30:48] [PASSED] 53 VFs [06:30:48] [PASSED] 54 VFs [06:30:48] [PASSED] 55 VFs [06:30:48] [PASSED] 56 VFs [06:30:48] [PASSED] 57 VFs [06:30:48] [PASSED] 58 VFs [06:30:48] [PASSED] 59 VFs [06:30:48] [PASSED] 60 VFs [06:30:48] [PASSED] 61 VFs [06:30:48] [PASSED] 62 VFs [06:30:48] [PASSED] 63 VFs [06:30:48] ================= [PASSED] fair_doorbells ================== [06:30:48] ======================== fair_ggtt ======================== [06:30:48] [PASSED] 1 VF [06:30:48] [PASSED] 2 VFs [06:30:48] [PASSED] 3 VFs [06:30:48] [PASSED] 4 VFs [06:30:48] [PASSED] 5 VFs [06:30:48] [PASSED] 6 VFs [06:30:48] [PASSED] 7 VFs [06:30:48] [PASSED] 8 VFs [06:30:48] [PASSED] 9 VFs [06:30:48] [PASSED] 10 VFs [06:30:48] [PASSED] 11 VFs [06:30:48] [PASSED] 12 VFs [06:30:48] [PASSED] 13 VFs [06:30:48] [PASSED] 14 VFs [06:30:48] [PASSED] 15 VFs [06:30:48] [PASSED] 16 VFs [06:30:48] [PASSED] 17 VFs [06:30:48] [PASSED] 18 VFs [06:30:48] [PASSED] 19 VFs [06:30:48] [PASSED] 20 VFs [06:30:48] [PASSED] 21 VFs [06:30:48] [PASSED] 22 VFs [06:30:48] [PASSED] 23 VFs [06:30:48] [PASSED] 24 VFs [06:30:48] [PASSED] 25 VFs [06:30:48] [PASSED] 26 VFs [06:30:48] [PASSED] 27 VFs [06:30:48] [PASSED] 28 VFs [06:30:48] [PASSED] 29 VFs [06:30:48] [PASSED] 30 VFs [06:30:48] [PASSED] 31 VFs [06:30:48] [PASSED] 32 VFs [06:30:48] [PASSED] 33 VFs [06:30:48] [PASSED] 34 VFs [06:30:48] [PASSED] 35 VFs [06:30:48] [PASSED] 36 VFs [06:30:48] [PASSED] 37 VFs [06:30:48] [PASSED] 38 VFs [06:30:48] [PASSED] 39 VFs [06:30:48] [PASSED] 40 VFs [06:30:48] [PASSED] 41 VFs [06:30:48] [PASSED] 42 VFs [06:30:48] [PASSED] 43 VFs [06:30:48] [PASSED] 44 VFs [06:30:48] [PASSED] 45 VFs [06:30:48] [PASSED] 46 VFs [06:30:48] [PASSED] 47 VFs [06:30:48] [PASSED] 48 VFs [06:30:48] [PASSED] 49 VFs [06:30:48] [PASSED] 50 VFs [06:30:48] [PASSED] 51 VFs [06:30:48] [PASSED] 52 VFs [06:30:48] [PASSED] 53 VFs [06:30:48] [PASSED] 54 VFs [06:30:48] [PASSED] 55 VFs [06:30:48] [PASSED] 56 VFs [06:30:48] [PASSED] 57 VFs [06:30:48] [PASSED] 58 VFs [06:30:48] [PASSED] 59 VFs [06:30:48] [PASSED] 60 VFs [06:30:48] [PASSED] 61 VFs [06:30:48] [PASSED] 62 VFs [06:30:48] [PASSED] 63 VFs [06:30:48] ==================== [PASSED] fair_ggtt ==================== [06:30:48] ================== [PASSED] pf_gt_config =================== [06:30:48] ===================== lmtt (1 subtest) ===================== [06:30:48] ======================== test_ops ========================= [06:30:48] [PASSED] 2-level [06:30:48] [PASSED] multi-level [06:30:48] ==================== [PASSED] test_ops ===================== [06:30:48] ====================== [PASSED] lmtt ======================= [06:30:48] ================= pf_service (11 subtests) ================= [06:30:48] [PASSED] pf_negotiate_any [06:30:48] [PASSED] pf_negotiate_base_match [06:30:48] [PASSED] pf_negotiate_base_newer [06:30:48] [PASSED] pf_negotiate_base_next [06:30:48] [SKIPPED] pf_negotiate_base_older [06:30:48] [PASSED] pf_negotiate_base_prev [06:30:48] [PASSED] pf_negotiate_latest_match [06:30:48] [PASSED] pf_negotiate_latest_newer [06:30:48] [PASSED] pf_negotiate_latest_next [06:30:48] [SKIPPED] pf_negotiate_latest_older [06:30:48] [SKIPPED] pf_negotiate_latest_prev [06:30:48] =================== [PASSED] pf_service ==================== [06:30:48] ================= xe_guc_g2g (2 subtests) ================== [06:30:48] ============== xe_live_guc_g2g_kunit_default ============== [06:30:48] ========= [SKIPPED] xe_live_guc_g2g_kunit_default ========== [06:30:48] ============== xe_live_guc_g2g_kunit_allmem =============== [06:30:48] ========== [SKIPPED] xe_live_guc_g2g_kunit_allmem ========== [06:30:48] =================== [SKIPPED] xe_guc_g2g =================== [06:30:48] =================== xe_mocs (2 subtests) =================== [06:30:48] ================ xe_live_mocs_kernel_kunit ================ [06:30:48] =========== [SKIPPED] xe_live_mocs_kernel_kunit ============ [06:30:48] ================ xe_live_mocs_reset_kunit ================= [06:30:48] ============ [SKIPPED] xe_live_mocs_reset_kunit ============ [06:30:48] ==================== [SKIPPED] xe_mocs ===================== [06:30:48] ================= xe_migrate (2 subtests) ================== [06:30:48] ================= xe_migrate_sanity_kunit ================= [06:30:48] ============ [SKIPPED] xe_migrate_sanity_kunit ============= [06:30:48] ================== xe_validate_ccs_kunit ================== [06:30:48] ============= [SKIPPED] xe_validate_ccs_kunit ============== [06:30:48] =================== [SKIPPED] xe_migrate =================== [06:30:48] ================== xe_dma_buf (1 subtest) ================== [06:30:48] ==================== xe_dma_buf_kunit ===================== [06:30:48] ================ [SKIPPED] xe_dma_buf_kunit ================ [06:30:48] =================== [SKIPPED] xe_dma_buf =================== [06:30:48] ================= xe_bo_shrink (1 subtest) ================= [06:30:48] =================== xe_bo_shrink_kunit ==================== [06:30:48] =============== [SKIPPED] xe_bo_shrink_kunit =============== [06:30:48] ================== [SKIPPED] xe_bo_shrink ================== [06:30:48] ==================== xe_bo (2 subtests) ==================== [06:30:48] ================== xe_ccs_migrate_kunit =================== [06:30:48] ============== [SKIPPED] xe_ccs_migrate_kunit ============== [06:30:48] ==================== xe_bo_evict_kunit ==================== [06:30:48] =============== [SKIPPED] xe_bo_evict_kunit ================ [06:30:48] ===================== [SKIPPED] xe_bo ====================== [06:30:48] ==================== args (13 subtests) ==================== [06:30:48] [PASSED] count_args_test [06:30:48] [PASSED] call_args_example [06:30:48] [PASSED] call_args_test [06:30:48] [PASSED] drop_first_arg_example [06:30:48] [PASSED] drop_first_arg_test [06:30:48] [PASSED] first_arg_example [06:30:48] [PASSED] first_arg_test [06:30:48] [PASSED] last_arg_example [06:30:48] [PASSED] last_arg_test [06:30:48] [PASSED] pick_arg_example [06:30:48] [PASSED] if_args_example [06:30:48] [PASSED] if_args_test [06:30:48] [PASSED] sep_comma_example [06:30:48] ====================== [PASSED] args ======================= [06:30:48] =================== xe_pci (3 subtests) ==================== [06:30:48] ==================== check_graphics_ip ==================== [06:30:48] [PASSED] 12.00 Xe_LP [06:30:48] [PASSED] 12.10 Xe_LP+ [06:30:48] [PASSED] 12.55 Xe_HPG [06:30:48] [PASSED] 12.60 Xe_HPC [06:30:48] [PASSED] 12.70 Xe_LPG [06:30:48] [PASSED] 12.71 Xe_LPG [06:30:48] [PASSED] 12.74 Xe_LPG+ [06:30:48] [PASSED] 20.01 Xe2_HPG [06:30:48] [PASSED] 20.02 Xe2_HPG [06:30:48] [PASSED] 20.04 Xe2_LPG [06:30:48] [PASSED] 30.00 Xe3_LPG [06:30:48] [PASSED] 30.01 Xe3_LPG [06:30:48] [PASSED] 30.03 Xe3_LPG [06:30:48] [PASSED] 30.04 Xe3_LPG [06:30:48] [PASSED] 30.05 Xe3_LPG [06:30:48] [PASSED] 35.11 Xe3p_XPC [06:30:48] ================ [PASSED] check_graphics_ip ================ [06:30:48] ===================== check_media_ip ====================== [06:30:48] [PASSED] 12.00 Xe_M [06:30:48] [PASSED] 12.55 Xe_HPM [06:30:48] [PASSED] 13.00 Xe_LPM+ [06:30:48] [PASSED] 13.01 Xe2_HPM [06:30:48] [PASSED] 20.00 Xe2_LPM [06:30:48] [PASSED] 30.00 Xe3_LPM [06:30:48] [PASSED] 30.02 Xe3_LPM [06:30:48] [PASSED] 35.00 Xe3p_LPM [06:30:48] [PASSED] 35.03 Xe3p_HPM [06:30:48] ================= [PASSED] check_media_ip ================== [06:30:48] =================== check_platform_desc =================== [06:30:48] [PASSED] 0x9A60 (TIGERLAKE) [06:30:48] [PASSED] 0x9A68 (TIGERLAKE) [06:30:48] [PASSED] 0x9A70 (TIGERLAKE) [06:30:48] [PASSED] 0x9A40 (TIGERLAKE) [06:30:48] [PASSED] 0x9A49 (TIGERLAKE) [06:30:48] [PASSED] 0x9A59 (TIGERLAKE) [06:30:48] [PASSED] 0x9A78 (TIGERLAKE) [06:30:48] [PASSED] 0x9AC0 (TIGERLAKE) [06:30:48] [PASSED] 0x9AC9 (TIGERLAKE) [06:30:48] [PASSED] 0x9AD9 (TIGERLAKE) [06:30:48] [PASSED] 0x9AF8 (TIGERLAKE) [06:30:48] [PASSED] 0x4C80 (ROCKETLAKE) [06:30:48] [PASSED] 0x4C8A (ROCKETLAKE) [06:30:48] [PASSED] 0x4C8B (ROCKETLAKE) [06:30:48] [PASSED] 0x4C8C (ROCKETLAKE) [06:30:48] [PASSED] 0x4C90 (ROCKETLAKE) [06:30:48] [PASSED] 0x4C9A (ROCKETLAKE) [06:30:48] [PASSED] 0x4680 (ALDERLAKE_S) [06:30:48] [PASSED] 0x4682 (ALDERLAKE_S) [06:30:48] [PASSED] 0x4688 (ALDERLAKE_S) [06:30:48] [PASSED] 0x468A (ALDERLAKE_S) [06:30:48] [PASSED] 0x468B (ALDERLAKE_S) [06:30:48] [PASSED] 0x4690 (ALDERLAKE_S) [06:30:48] [PASSED] 0x4692 (ALDERLAKE_S) [06:30:48] [PASSED] 0x4693 (ALDERLAKE_S) [06:30:48] [PASSED] 0x46A0 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46A1 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46A2 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46A3 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46A6 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46A8 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46AA (ALDERLAKE_P) [06:30:48] [PASSED] 0x462A (ALDERLAKE_P) [06:30:48] [PASSED] 0x4626 (ALDERLAKE_P) [06:30:48] [PASSED] 0x4628 (ALDERLAKE_P) stty: 'standard input': Inappropriate ioctl for device [06:30:48] [PASSED] 0x46B0 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46B1 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46B2 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46B3 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46C0 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46C1 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46C2 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46C3 (ALDERLAKE_P) [06:30:48] [PASSED] 0x46D0 (ALDERLAKE_N) [06:30:48] [PASSED] 0x46D1 (ALDERLAKE_N) [06:30:48] [PASSED] 0x46D2 (ALDERLAKE_N) [06:30:48] [PASSED] 0x46D3 (ALDERLAKE_N) [06:30:48] [PASSED] 0x46D4 (ALDERLAKE_N) [06:30:48] [PASSED] 0xA721 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7A1 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7A9 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7AC (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7AD (ALDERLAKE_P) [06:30:48] [PASSED] 0xA720 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7A0 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7A8 (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7AA (ALDERLAKE_P) [06:30:48] [PASSED] 0xA7AB (ALDERLAKE_P) [06:30:48] [PASSED] 0xA780 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA781 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA782 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA783 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA788 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA789 (ALDERLAKE_S) [06:30:48] [PASSED] 0xA78A (ALDERLAKE_S) [06:30:48] [PASSED] 0xA78B (ALDERLAKE_S) [06:30:48] [PASSED] 0x4905 (DG1) [06:30:48] [PASSED] 0x4906 (DG1) [06:30:48] [PASSED] 0x4907 (DG1) [06:30:48] [PASSED] 0x4908 (DG1) [06:30:48] [PASSED] 0x4909 (DG1) [06:30:48] [PASSED] 0x56C0 (DG2) [06:30:48] [PASSED] 0x56C2 (DG2) [06:30:48] [PASSED] 0x56C1 (DG2) [06:30:48] [PASSED] 0x7D51 (METEORLAKE) [06:30:48] [PASSED] 0x7DD1 (METEORLAKE) [06:30:48] [PASSED] 0x7D41 (METEORLAKE) [06:30:48] [PASSED] 0x7D67 (METEORLAKE) [06:30:48] [PASSED] 0xB640 (METEORLAKE) [06:30:48] [PASSED] 0x56A0 (DG2) [06:30:48] [PASSED] 0x56A1 (DG2) [06:30:48] [PASSED] 0x56A2 (DG2) [06:30:48] [PASSED] 0x56BE (DG2) [06:30:48] [PASSED] 0x56BF (DG2) [06:30:48] [PASSED] 0x5690 (DG2) [06:30:48] [PASSED] 0x5691 (DG2) [06:30:48] [PASSED] 0x5692 (DG2) [06:30:48] [PASSED] 0x56A5 (DG2) [06:30:48] [PASSED] 0x56A6 (DG2) [06:30:48] [PASSED] 0x56B0 (DG2) [06:30:48] [PASSED] 0x56B1 (DG2) [06:30:48] [PASSED] 0x56BA (DG2) [06:30:48] [PASSED] 0x56BB (DG2) [06:30:48] [PASSED] 0x56BC (DG2) [06:30:48] [PASSED] 0x56BD (DG2) [06:30:48] [PASSED] 0x5693 (DG2) [06:30:48] [PASSED] 0x5694 (DG2) [06:30:48] [PASSED] 0x5695 (DG2) [06:30:48] [PASSED] 0x56A3 (DG2) [06:30:48] [PASSED] 0x56A4 (DG2) [06:30:48] [PASSED] 0x56B2 (DG2) [06:30:48] [PASSED] 0x56B3 (DG2) [06:30:48] [PASSED] 0x5696 (DG2) [06:30:48] [PASSED] 0x5697 (DG2) [06:30:48] [PASSED] 0xB69 (PVC) [06:30:48] [PASSED] 0xB6E (PVC) [06:30:48] [PASSED] 0xBD4 (PVC) [06:30:48] [PASSED] 0xBD5 (PVC) [06:30:48] [PASSED] 0xBD6 (PVC) [06:30:48] [PASSED] 0xBD7 (PVC) [06:30:48] [PASSED] 0xBD8 (PVC) [06:30:48] [PASSED] 0xBD9 (PVC) [06:30:48] [PASSED] 0xBDA (PVC) [06:30:48] [PASSED] 0xBDB (PVC) [06:30:48] [PASSED] 0xBE0 (PVC) [06:30:48] [PASSED] 0xBE1 (PVC) [06:30:48] [PASSED] 0xBE5 (PVC) [06:30:48] [PASSED] 0x7D40 (METEORLAKE) [06:30:48] [PASSED] 0x7D45 (METEORLAKE) [06:30:48] [PASSED] 0x7D55 (METEORLAKE) [06:30:48] [PASSED] 0x7D60 (METEORLAKE) [06:30:48] [PASSED] 0x7DD5 (METEORLAKE) [06:30:48] [PASSED] 0x6420 (LUNARLAKE) [06:30:48] [PASSED] 0x64A0 (LUNARLAKE) [06:30:48] [PASSED] 0x64B0 (LUNARLAKE) [06:30:48] [PASSED] 0xE202 (BATTLEMAGE) [06:30:48] [PASSED] 0xE209 (BATTLEMAGE) [06:30:48] [PASSED] 0xE20B (BATTLEMAGE) [06:30:48] [PASSED] 0xE20C (BATTLEMAGE) [06:30:48] [PASSED] 0xE20D (BATTLEMAGE) [06:30:48] [PASSED] 0xE210 (BATTLEMAGE) [06:30:48] [PASSED] 0xE211 (BATTLEMAGE) [06:30:48] [PASSED] 0xE212 (BATTLEMAGE) [06:30:48] [PASSED] 0xE216 (BATTLEMAGE) [06:30:48] [PASSED] 0xE220 (BATTLEMAGE) [06:30:48] [PASSED] 0xE221 (BATTLEMAGE) [06:30:48] [PASSED] 0xE222 (BATTLEMAGE) [06:30:48] [PASSED] 0xE223 (BATTLEMAGE) [06:30:48] [PASSED] 0xB080 (PANTHERLAKE) [06:30:48] [PASSED] 0xB081 (PANTHERLAKE) [06:30:48] [PASSED] 0xB082 (PANTHERLAKE) [06:30:48] [PASSED] 0xB083 (PANTHERLAKE) [06:30:48] [PASSED] 0xB084 (PANTHERLAKE) [06:30:48] [PASSED] 0xB085 (PANTHERLAKE) [06:30:48] [PASSED] 0xB086 (PANTHERLAKE) [06:30:48] [PASSED] 0xB087 (PANTHERLAKE) [06:30:48] [PASSED] 0xB08F (PANTHERLAKE) [06:30:48] [PASSED] 0xB090 (PANTHERLAKE) [06:30:48] [PASSED] 0xB0A0 (PANTHERLAKE) [06:30:48] [PASSED] 0xB0B0 (PANTHERLAKE) [06:30:48] [PASSED] 0xFD80 (PANTHERLAKE) [06:30:48] [PASSED] 0xFD81 (PANTHERLAKE) [06:30:48] [PASSED] 0xD740 (NOVALAKE_S) [06:30:48] [PASSED] 0xD741 (NOVALAKE_S) [06:30:48] [PASSED] 0xD742 (NOVALAKE_S) [06:30:48] [PASSED] 0xD743 (NOVALAKE_S) [06:30:48] [PASSED] 0xD744 (NOVALAKE_S) [06:30:48] [PASSED] 0xD745 (NOVALAKE_S) [06:30:48] [PASSED] 0x674C (CRESCENTISLAND) [06:30:48] =============== [PASSED] check_platform_desc =============== [06:30:48] ===================== [PASSED] xe_pci ====================== [06:30:48] =================== xe_rtp (2 subtests) ==================== [06:30:48] =============== xe_rtp_process_to_sr_tests ================ [06:30:48] [PASSED] coalesce-same-reg [06:30:48] [PASSED] no-match-no-add [06:30:48] [PASSED] match-or [06:30:48] [PASSED] match-or-xfail [06:30:48] [PASSED] no-match-no-add-multiple-rules [06:30:48] [PASSED] two-regs-two-entries [06:30:48] [PASSED] clr-one-set-other [06:30:48] [PASSED] set-field [06:30:48] [PASSED] conflict-duplicate [06:30:48] [PASSED] conflict-not-disjoint [06:30:48] [PASSED] conflict-reg-type [06:30:48] =========== [PASSED] xe_rtp_process_to_sr_tests ============ [06:30:48] ================== xe_rtp_process_tests =================== [06:30:48] [PASSED] active1 [06:30:48] [PASSED] active2 [06:30:48] [PASSED] active-inactive [06:30:48] [PASSED] inactive-active [06:30:48] [PASSED] inactive-1st_or_active-inactive [06:30:48] [PASSED] inactive-2nd_or_active-inactive [06:30:48] [PASSED] inactive-last_or_active-inactive [06:30:48] [PASSED] inactive-no_or_active-inactive [06:30:48] ============== [PASSED] xe_rtp_process_tests =============== [06:30:48] ===================== [PASSED] xe_rtp ====================== [06:30:48] ==================== xe_wa (1 subtest) ===================== [06:30:48] ======================== xe_wa_gt ========================= [06:30:48] [PASSED] TIGERLAKE B0 [06:30:48] [PASSED] DG1 A0 [06:30:48] [PASSED] DG1 B0 [06:30:48] [PASSED] ALDERLAKE_S A0 [06:30:48] [PASSED] ALDERLAKE_S B0 [06:30:48] [PASSED] ALDERLAKE_S C0 [06:30:48] [PASSED] ALDERLAKE_S D0 [06:30:48] [PASSED] ALDERLAKE_P A0 [06:30:48] [PASSED] ALDERLAKE_P B0 [06:30:48] [PASSED] ALDERLAKE_P C0 [06:30:48] [PASSED] ALDERLAKE_S RPLS D0 [06:30:48] [PASSED] ALDERLAKE_P RPLU E0 [06:30:48] [PASSED] DG2 G10 C0 [06:30:48] [PASSED] DG2 G11 B1 [06:30:48] [PASSED] DG2 G12 A1 [06:30:48] [PASSED] METEORLAKE 12.70(Xe_LPG) A0 13.00(Xe_LPM+) A0 [06:30:48] [PASSED] METEORLAKE 12.71(Xe_LPG) A0 13.00(Xe_LPM+) A0 [06:30:48] [PASSED] METEORLAKE 12.74(Xe_LPG+) A0 13.00(Xe_LPM+) A0 [06:30:48] [PASSED] LUNARLAKE 20.04(Xe2_LPG) A0 20.00(Xe2_LPM) A0 [06:30:48] [PASSED] LUNARLAKE 20.04(Xe2_LPG) B0 20.00(Xe2_LPM) A0 [06:30:48] [PASSED] BATTLEMAGE 20.01(Xe2_HPG) A0 13.01(Xe2_HPM) A1 [06:30:48] [PASSED] PANTHERLAKE 30.00(Xe3_LPG) A0 30.00(Xe3_LPM) A0 [06:30:48] ==================== [PASSED] xe_wa_gt ===================== [06:30:48] ====================== [PASSED] xe_wa ====================== [06:30:48] ============================================================ [06:30:48] Testing complete. Ran 512 tests: passed: 494, skipped: 18 [06:30:49] Elapsed time: 36.362s total, 4.253s configuring, 31.635s building, 0.460s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig [06:30:49] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [06:30:50] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48 [06:31:16] Starting KUnit Kernel (1/1)... [06:31:16] ============================================================ Running tests with: $ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [06:31:16] ============ drm_test_pick_cmdline (2 subtests) ============ [06:31:16] [PASSED] drm_test_pick_cmdline_res_1920_1080_60 [06:31:16] =============== drm_test_pick_cmdline_named =============== [06:31:16] [PASSED] NTSC [06:31:16] [PASSED] NTSC-J [06:31:16] [PASSED] PAL [06:31:16] [PASSED] PAL-M [06:31:16] =========== [PASSED] drm_test_pick_cmdline_named =========== [06:31:16] ============== [PASSED] drm_test_pick_cmdline ============== [06:31:16] == drm_test_atomic_get_connector_for_encoder (1 subtest) === [06:31:16] [PASSED] drm_test_drm_atomic_get_connector_for_encoder [06:31:16] ==== [PASSED] drm_test_atomic_get_connector_for_encoder ==== [06:31:16] =========== drm_validate_clone_mode (2 subtests) =========== [06:31:16] ============== drm_test_check_in_clone_mode =============== [06:31:16] [PASSED] in_clone_mode [06:31:16] [PASSED] not_in_clone_mode [06:31:16] ========== [PASSED] drm_test_check_in_clone_mode =========== [06:31:16] =============== drm_test_check_valid_clones =============== [06:31:16] [PASSED] not_in_clone_mode [06:31:16] [PASSED] valid_clone [06:31:16] [PASSED] invalid_clone [06:31:16] =========== [PASSED] drm_test_check_valid_clones =========== [06:31:16] ============= [PASSED] drm_validate_clone_mode ============= [06:31:16] ============= drm_validate_modeset (1 subtest) ============= [06:31:16] [PASSED] drm_test_check_connector_changed_modeset [06:31:16] ============== [PASSED] drm_validate_modeset =============== [06:31:16] ====== drm_test_bridge_get_current_state (2 subtests) ====== [06:31:16] [PASSED] drm_test_drm_bridge_get_current_state_atomic [06:31:16] [PASSED] drm_test_drm_bridge_get_current_state_legacy [06:31:16] ======== [PASSED] drm_test_bridge_get_current_state ======== [06:31:16] ====== drm_test_bridge_helper_reset_crtc (3 subtests) ====== [06:31:16] [PASSED] drm_test_drm_bridge_helper_reset_crtc_atomic [06:31:16] [PASSED] drm_test_drm_bridge_helper_reset_crtc_atomic_disabled [06:31:16] [PASSED] drm_test_drm_bridge_helper_reset_crtc_legacy [06:31:16] ======== [PASSED] drm_test_bridge_helper_reset_crtc ======== [06:31:16] ============== drm_bridge_alloc (2 subtests) =============== [06:31:16] [PASSED] drm_test_drm_bridge_alloc_basic [06:31:16] [PASSED] drm_test_drm_bridge_alloc_get_put [06:31:16] ================ [PASSED] drm_bridge_alloc ================= [06:31:16] ================== drm_buddy (9 subtests) ================== [06:31:16] [PASSED] drm_test_buddy_alloc_limit [06:31:16] [PASSED] drm_test_buddy_alloc_optimistic [06:31:16] [PASSED] drm_test_buddy_alloc_pessimistic [06:31:16] [PASSED] drm_test_buddy_alloc_pathological [06:31:16] [PASSED] drm_test_buddy_alloc_contiguous [06:31:16] [PASSED] drm_test_buddy_alloc_clear [06:31:16] [PASSED] drm_test_buddy_alloc_range_bias [06:31:16] [PASSED] drm_test_buddy_fragmentation_performance [06:31:16] [PASSED] drm_test_buddy_alloc_exceeds_max_order [06:31:16] ==================== [PASSED] drm_buddy ==================== [06:31:16] ============= drm_cmdline_parser (40 subtests) ============= [06:31:16] [PASSED] drm_test_cmdline_force_d_only [06:31:16] [PASSED] drm_test_cmdline_force_D_only_dvi [06:31:16] [PASSED] drm_test_cmdline_force_D_only_hdmi [06:31:16] [PASSED] drm_test_cmdline_force_D_only_not_digital [06:31:16] [PASSED] drm_test_cmdline_force_e_only [06:31:16] [PASSED] drm_test_cmdline_res [06:31:16] [PASSED] drm_test_cmdline_res_vesa [06:31:16] [PASSED] drm_test_cmdline_res_vesa_rblank [06:31:16] [PASSED] drm_test_cmdline_res_rblank [06:31:16] [PASSED] drm_test_cmdline_res_bpp [06:31:16] [PASSED] drm_test_cmdline_res_refresh [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_margins [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_force_off [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_analog [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_digital [06:31:16] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced_margins_force_on [06:31:16] [PASSED] drm_test_cmdline_res_margins_force_on [06:31:16] [PASSED] drm_test_cmdline_res_vesa_margins [06:31:16] [PASSED] drm_test_cmdline_name [06:31:16] [PASSED] drm_test_cmdline_name_bpp [06:31:16] [PASSED] drm_test_cmdline_name_option [06:31:16] [PASSED] drm_test_cmdline_name_bpp_option [06:31:16] [PASSED] drm_test_cmdline_rotate_0 [06:31:16] [PASSED] drm_test_cmdline_rotate_90 [06:31:16] [PASSED] drm_test_cmdline_rotate_180 [06:31:16] [PASSED] drm_test_cmdline_rotate_270 [06:31:16] [PASSED] drm_test_cmdline_hmirror [06:31:16] [PASSED] drm_test_cmdline_vmirror [06:31:16] [PASSED] drm_test_cmdline_margin_options [06:31:16] [PASSED] drm_test_cmdline_multiple_options [06:31:16] [PASSED] drm_test_cmdline_bpp_extra_and_option [06:31:16] [PASSED] drm_test_cmdline_extra_and_option [06:31:16] [PASSED] drm_test_cmdline_freestanding_options [06:31:16] [PASSED] drm_test_cmdline_freestanding_force_e_and_options [06:31:16] [PASSED] drm_test_cmdline_panel_orientation [06:31:16] ================ drm_test_cmdline_invalid ================= [06:31:16] [PASSED] margin_only [06:31:16] [PASSED] interlace_only [06:31:16] [PASSED] res_missing_x [06:31:16] [PASSED] res_missing_y [06:31:16] [PASSED] res_bad_y [06:31:16] [PASSED] res_missing_y_bpp [06:31:16] [PASSED] res_bad_bpp [06:31:16] [PASSED] res_bad_refresh [06:31:16] [PASSED] res_bpp_refresh_force_on_off [06:31:16] [PASSED] res_invalid_mode [06:31:16] [PASSED] res_bpp_wrong_place_mode [06:31:16] [PASSED] name_bpp_refresh [06:31:16] [PASSED] name_refresh [06:31:16] [PASSED] name_refresh_wrong_mode [06:31:16] [PASSED] name_refresh_invalid_mode [06:31:16] [PASSED] rotate_multiple [06:31:16] [PASSED] rotate_invalid_val [06:31:16] [PASSED] rotate_truncated [06:31:16] [PASSED] invalid_option [06:31:16] [PASSED] invalid_tv_option [06:31:16] [PASSED] truncated_tv_option [06:31:16] ============ [PASSED] drm_test_cmdline_invalid ============= [06:31:16] =============== drm_test_cmdline_tv_options =============== [06:31:16] [PASSED] NTSC [06:31:16] [PASSED] NTSC_443 [06:31:16] [PASSED] NTSC_J [06:31:16] [PASSED] PAL [06:31:16] [PASSED] PAL_M [06:31:16] [PASSED] PAL_N [06:31:16] [PASSED] SECAM [06:31:16] [PASSED] MONO_525 [06:31:16] [PASSED] MONO_625 [06:31:16] =========== [PASSED] drm_test_cmdline_tv_options =========== [06:31:16] =============== [PASSED] drm_cmdline_parser ================ [06:31:16] ========== drmm_connector_hdmi_init (20 subtests) ========== [06:31:16] [PASSED] drm_test_connector_hdmi_init_valid [06:31:16] [PASSED] drm_test_connector_hdmi_init_bpc_8 [06:31:16] [PASSED] drm_test_connector_hdmi_init_bpc_10 [06:31:16] [PASSED] drm_test_connector_hdmi_init_bpc_12 [06:31:16] [PASSED] drm_test_connector_hdmi_init_bpc_invalid [06:31:16] [PASSED] drm_test_connector_hdmi_init_bpc_null [06:31:16] [PASSED] drm_test_connector_hdmi_init_formats_empty [06:31:16] [PASSED] drm_test_connector_hdmi_init_formats_no_rgb [06:31:16] === drm_test_connector_hdmi_init_formats_yuv420_allowed === [06:31:16] [PASSED] supported_formats=0x9 yuv420_allowed=1 [06:31:16] [PASSED] supported_formats=0x9 yuv420_allowed=0 [06:31:16] [PASSED] supported_formats=0x3 yuv420_allowed=1 [06:31:16] [PASSED] supported_formats=0x3 yuv420_allowed=0 [06:31:16] === [PASSED] drm_test_connector_hdmi_init_formats_yuv420_allowed === [06:31:16] [PASSED] drm_test_connector_hdmi_init_null_ddc [06:31:16] [PASSED] drm_test_connector_hdmi_init_null_product [06:31:16] [PASSED] drm_test_connector_hdmi_init_null_vendor [06:31:16] [PASSED] drm_test_connector_hdmi_init_product_length_exact [06:31:16] [PASSED] drm_test_connector_hdmi_init_product_length_too_long [06:31:16] [PASSED] drm_test_connector_hdmi_init_product_valid [06:31:16] [PASSED] drm_test_connector_hdmi_init_vendor_length_exact [06:31:16] [PASSED] drm_test_connector_hdmi_init_vendor_length_too_long [06:31:16] [PASSED] drm_test_connector_hdmi_init_vendor_valid [06:31:16] ========= drm_test_connector_hdmi_init_type_valid ========= [06:31:16] [PASSED] HDMI-A [06:31:16] [PASSED] HDMI-B [06:31:16] ===== [PASSED] drm_test_connector_hdmi_init_type_valid ===== [06:31:16] ======== drm_test_connector_hdmi_init_type_invalid ======== [06:31:16] [PASSED] Unknown [06:31:16] [PASSED] VGA [06:31:16] [PASSED] DVI-I [06:31:16] [PASSED] DVI-D [06:31:16] [PASSED] DVI-A [06:31:16] [PASSED] Composite [06:31:16] [PASSED] SVIDEO [06:31:16] [PASSED] LVDS [06:31:16] [PASSED] Component [06:31:16] [PASSED] DIN [06:31:16] [PASSED] DP [06:31:16] [PASSED] TV [06:31:16] [PASSED] eDP [06:31:16] [PASSED] Virtual [06:31:16] [PASSED] DSI [06:31:16] [PASSED] DPI [06:31:16] [PASSED] Writeback [06:31:16] [PASSED] SPI [06:31:16] [PASSED] USB [06:31:16] ==== [PASSED] drm_test_connector_hdmi_init_type_invalid ==== [06:31:16] ============ [PASSED] drmm_connector_hdmi_init ============= [06:31:16] ============= drmm_connector_init (3 subtests) ============= [06:31:16] [PASSED] drm_test_drmm_connector_init [06:31:16] [PASSED] drm_test_drmm_connector_init_null_ddc [06:31:16] ========= drm_test_drmm_connector_init_type_valid ========= [06:31:16] [PASSED] Unknown [06:31:16] [PASSED] VGA [06:31:16] [PASSED] DVI-I [06:31:16] [PASSED] DVI-D [06:31:16] [PASSED] DVI-A [06:31:16] [PASSED] Composite [06:31:16] [PASSED] SVIDEO [06:31:16] [PASSED] LVDS [06:31:16] [PASSED] Component [06:31:16] [PASSED] DIN [06:31:16] [PASSED] DP [06:31:16] [PASSED] HDMI-A [06:31:16] [PASSED] HDMI-B [06:31:16] [PASSED] TV [06:31:16] [PASSED] eDP [06:31:16] [PASSED] Virtual [06:31:16] [PASSED] DSI [06:31:16] [PASSED] DPI [06:31:16] [PASSED] Writeback [06:31:16] [PASSED] SPI [06:31:16] [PASSED] USB [06:31:16] ===== [PASSED] drm_test_drmm_connector_init_type_valid ===== [06:31:16] =============== [PASSED] drmm_connector_init =============== [06:31:16] ========= drm_connector_dynamic_init (6 subtests) ========== [06:31:16] [PASSED] drm_test_drm_connector_dynamic_init [06:31:16] [PASSED] drm_test_drm_connector_dynamic_init_null_ddc [06:31:16] [PASSED] drm_test_drm_connector_dynamic_init_not_added [06:31:16] [PASSED] drm_test_drm_connector_dynamic_init_properties [06:31:16] ===== drm_test_drm_connector_dynamic_init_type_valid ====== [06:31:16] [PASSED] Unknown [06:31:16] [PASSED] VGA [06:31:16] [PASSED] DVI-I [06:31:16] [PASSED] DVI-D [06:31:16] [PASSED] DVI-A [06:31:16] [PASSED] Composite [06:31:16] [PASSED] SVIDEO [06:31:16] [PASSED] LVDS [06:31:16] [PASSED] Component [06:31:16] [PASSED] DIN [06:31:16] [PASSED] DP [06:31:16] [PASSED] HDMI-A [06:31:16] [PASSED] HDMI-B [06:31:16] [PASSED] TV [06:31:16] [PASSED] eDP [06:31:16] [PASSED] Virtual [06:31:16] [PASSED] DSI [06:31:16] [PASSED] DPI [06:31:16] [PASSED] Writeback [06:31:16] [PASSED] SPI [06:31:16] [PASSED] USB [06:31:16] = [PASSED] drm_test_drm_connector_dynamic_init_type_valid == [06:31:16] ======== drm_test_drm_connector_dynamic_init_name ========= [06:31:16] [PASSED] Unknown [06:31:16] [PASSED] VGA [06:31:16] [PASSED] DVI-I [06:31:16] [PASSED] DVI-D [06:31:16] [PASSED] DVI-A [06:31:16] [PASSED] Composite [06:31:16] [PASSED] SVIDEO [06:31:16] [PASSED] LVDS [06:31:16] [PASSED] Component [06:31:16] [PASSED] DIN [06:31:16] [PASSED] DP [06:31:16] [PASSED] HDMI-A [06:31:16] [PASSED] HDMI-B [06:31:16] [PASSED] TV [06:31:16] [PASSED] eDP [06:31:16] [PASSED] Virtual [06:31:16] [PASSED] DSI [06:31:16] [PASSED] DPI [06:31:16] [PASSED] Writeback [06:31:16] [PASSED] SPI [06:31:16] [PASSED] USB [06:31:16] ==== [PASSED] drm_test_drm_connector_dynamic_init_name ===== [06:31:16] =========== [PASSED] drm_connector_dynamic_init ============ [06:31:16] ==== drm_connector_dynamic_register_early (4 subtests) ===== [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_early_on_list [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_early_defer [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_early_no_init [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_early_no_mode_object [06:31:16] ====== [PASSED] drm_connector_dynamic_register_early ======= [06:31:16] ======= drm_connector_dynamic_register (7 subtests) ======== [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_on_list [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_no_defer [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_no_init [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_mode_object [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_sysfs [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_sysfs_name [06:31:16] [PASSED] drm_test_drm_connector_dynamic_register_debugfs [06:31:16] ========= [PASSED] drm_connector_dynamic_register ========== [06:31:16] = drm_connector_attach_broadcast_rgb_property (2 subtests) = [06:31:16] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property [06:31:16] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector [06:31:16] === [PASSED] drm_connector_attach_broadcast_rgb_property === [06:31:16] ========== drm_get_tv_mode_from_name (2 subtests) ========== [06:31:16] ========== drm_test_get_tv_mode_from_name_valid =========== [06:31:16] [PASSED] NTSC [06:31:16] [PASSED] NTSC-443 [06:31:16] [PASSED] NTSC-J [06:31:16] [PASSED] PAL [06:31:16] [PASSED] PAL-M [06:31:16] [PASSED] PAL-N [06:31:16] [PASSED] SECAM [06:31:16] [PASSED] Mono [06:31:16] ====== [PASSED] drm_test_get_tv_mode_from_name_valid ======= [06:31:16] [PASSED] drm_test_get_tv_mode_from_name_truncated [06:31:16] ============ [PASSED] drm_get_tv_mode_from_name ============ [06:31:16] = drm_test_connector_hdmi_compute_mode_clock (12 subtests) = [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc_vic_1 [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc_vic_1 [06:31:16] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_double [06:31:16] = drm_test_connector_hdmi_compute_mode_clock_yuv420_valid = [06:31:16] [PASSED] VIC 96 [06:31:16] [PASSED] VIC 97 [06:31:16] [PASSED] VIC 101 [06:31:16] [PASSED] VIC 102 [06:31:16] [PASSED] VIC 106 [06:31:16] [PASSED] VIC 107 [06:31:16] === [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_valid === [06:31:16] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_10_bpc [06:31:16] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_12_bpc [06:31:16] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_8_bpc [06:31:16] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_10_bpc [06:31:16] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_12_bpc [06:31:16] === [PASSED] drm_test_connector_hdmi_compute_mode_clock ==== [06:31:16] == drm_hdmi_connector_get_broadcast_rgb_name (2 subtests) == [06:31:16] === drm_test_drm_hdmi_connector_get_broadcast_rgb_name ==== [06:31:16] [PASSED] Automatic [06:31:16] [PASSED] Full [06:31:16] [PASSED] Limited 16:235 [06:31:16] === [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name === [06:31:16] [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name_invalid [06:31:16] ==== [PASSED] drm_hdmi_connector_get_broadcast_rgb_name ==== [06:31:16] == drm_hdmi_connector_get_output_format_name (2 subtests) == [06:31:16] === drm_test_drm_hdmi_connector_get_output_format_name ==== [06:31:16] [PASSED] RGB [06:31:16] [PASSED] YUV 4:2:0 [06:31:16] [PASSED] YUV 4:2:2 [06:31:16] [PASSED] YUV 4:4:4 [06:31:16] === [PASSED] drm_test_drm_hdmi_connector_get_output_format_name === [06:31:16] [PASSED] drm_test_drm_hdmi_connector_get_output_format_name_invalid [06:31:16] ==== [PASSED] drm_hdmi_connector_get_output_format_name ==== [06:31:16] ============= drm_damage_helper (21 subtests) ============== [06:31:16] [PASSED] drm_test_damage_iter_no_damage [06:31:16] [PASSED] drm_test_damage_iter_no_damage_fractional_src [06:31:16] [PASSED] drm_test_damage_iter_no_damage_src_moved [06:31:16] [PASSED] drm_test_damage_iter_no_damage_fractional_src_moved [06:31:16] [PASSED] drm_test_damage_iter_no_damage_not_visible [06:31:16] [PASSED] drm_test_damage_iter_no_damage_no_crtc [06:31:16] [PASSED] drm_test_damage_iter_no_damage_no_fb [06:31:16] [PASSED] drm_test_damage_iter_simple_damage [06:31:16] [PASSED] drm_test_damage_iter_single_damage [06:31:16] [PASSED] drm_test_damage_iter_single_damage_intersect_src [06:31:16] [PASSED] drm_test_damage_iter_single_damage_outside_src [06:31:16] [PASSED] drm_test_damage_iter_single_damage_fractional_src [06:31:16] [PASSED] drm_test_damage_iter_single_damage_intersect_fractional_src [06:31:16] [PASSED] drm_test_damage_iter_single_damage_outside_fractional_src [06:31:16] [PASSED] drm_test_damage_iter_single_damage_src_moved [06:31:16] [PASSED] drm_test_damage_iter_single_damage_fractional_src_moved [06:31:16] [PASSED] drm_test_damage_iter_damage [06:31:16] [PASSED] drm_test_damage_iter_damage_one_intersect [06:31:16] [PASSED] drm_test_damage_iter_damage_one_outside [06:31:16] [PASSED] drm_test_damage_iter_damage_src_moved [06:31:16] [PASSED] drm_test_damage_iter_damage_not_visible [06:31:16] ================ [PASSED] drm_damage_helper ================ [06:31:16] ============== drm_dp_mst_helper (3 subtests) ============== [06:31:16] ============== drm_test_dp_mst_calc_pbn_mode ============== [06:31:16] [PASSED] Clock 154000 BPP 30 DSC disabled [06:31:16] [PASSED] Clock 234000 BPP 30 DSC disabled [06:31:16] [PASSED] Clock 297000 BPP 24 DSC disabled [06:31:16] [PASSED] Clock 332880 BPP 24 DSC enabled [06:31:16] [PASSED] Clock 324540 BPP 24 DSC enabled [06:31:16] ========== [PASSED] drm_test_dp_mst_calc_pbn_mode ========== [06:31:16] ============== drm_test_dp_mst_calc_pbn_div =============== [06:31:16] [PASSED] Link rate 2000000 lane count 4 [06:31:16] [PASSED] Link rate 2000000 lane count 2 [06:31:16] [PASSED] Link rate 2000000 lane count 1 [06:31:16] [PASSED] Link rate 1350000 lane count 4 [06:31:16] [PASSED] Link rate 1350000 lane count 2 [06:31:16] [PASSED] Link rate 1350000 lane count 1 [06:31:16] [PASSED] Link rate 1000000 lane count 4 [06:31:16] [PASSED] Link rate 1000000 lane count 2 [06:31:16] [PASSED] Link rate 1000000 lane count 1 [06:31:16] [PASSED] Link rate 810000 lane count 4 [06:31:16] [PASSED] Link rate 810000 lane count 2 [06:31:16] [PASSED] Link rate 810000 lane count 1 [06:31:16] [PASSED] Link rate 540000 lane count 4 [06:31:16] [PASSED] Link rate 540000 lane count 2 [06:31:16] [PASSED] Link rate 540000 lane count 1 [06:31:16] [PASSED] Link rate 270000 lane count 4 [06:31:16] [PASSED] Link rate 270000 lane count 2 [06:31:16] [PASSED] Link rate 270000 lane count 1 [06:31:16] [PASSED] Link rate 162000 lane count 4 [06:31:16] [PASSED] Link rate 162000 lane count 2 [06:31:16] [PASSED] Link rate 162000 lane count 1 [06:31:16] ========== [PASSED] drm_test_dp_mst_calc_pbn_div =========== [06:31:16] ========= drm_test_dp_mst_sideband_msg_req_decode ========= [06:31:16] [PASSED] DP_ENUM_PATH_RESOURCES with port number [06:31:16] [PASSED] DP_POWER_UP_PHY with port number [06:31:16] [PASSED] DP_POWER_DOWN_PHY with port number [06:31:16] [PASSED] DP_ALLOCATE_PAYLOAD with SDP stream sinks [06:31:16] [PASSED] DP_ALLOCATE_PAYLOAD with port number [06:31:16] [PASSED] DP_ALLOCATE_PAYLOAD with VCPI [06:31:16] [PASSED] DP_ALLOCATE_PAYLOAD with PBN [06:31:16] [PASSED] DP_QUERY_PAYLOAD with port number [06:31:16] [PASSED] DP_QUERY_PAYLOAD with VCPI [06:31:16] [PASSED] DP_REMOTE_DPCD_READ with port number [06:31:16] [PASSED] DP_REMOTE_DPCD_READ with DPCD address [06:31:16] [PASSED] DP_REMOTE_DPCD_READ with max number of bytes [06:31:16] [PASSED] DP_REMOTE_DPCD_WRITE with port number [06:31:16] [PASSED] DP_REMOTE_DPCD_WRITE with DPCD address [06:31:16] [PASSED] DP_REMOTE_DPCD_WRITE with data array [06:31:16] [PASSED] DP_REMOTE_I2C_READ with port number [06:31:16] [PASSED] DP_REMOTE_I2C_READ with I2C device ID [06:31:16] [PASSED] DP_REMOTE_I2C_READ with transactions array [06:31:16] [PASSED] DP_REMOTE_I2C_WRITE with port number [06:31:16] [PASSED] DP_REMOTE_I2C_WRITE with I2C device ID [06:31:16] [PASSED] DP_REMOTE_I2C_WRITE with data array [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream ID [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with client ID [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream event [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with valid stream event [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream behavior [06:31:16] [PASSED] DP_QUERY_STREAM_ENC_STATUS with a valid stream behavior [06:31:16] ===== [PASSED] drm_test_dp_mst_sideband_msg_req_decode ===== [06:31:16] ================ [PASSED] drm_dp_mst_helper ================ [06:31:16] ================== drm_exec (7 subtests) =================== [06:31:16] [PASSED] sanitycheck [06:31:16] [PASSED] test_lock [06:31:16] [PASSED] test_lock_unlock [06:31:16] [PASSED] test_duplicates [06:31:16] [PASSED] test_prepare [06:31:16] [PASSED] test_prepare_array [06:31:16] [PASSED] test_multiple_loops [06:31:16] ==================== [PASSED] drm_exec ===================== [06:31:16] =========== drm_format_helper_test (17 subtests) =========== [06:31:16] ============== drm_test_fb_xrgb8888_to_gray8 ============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========== [PASSED] drm_test_fb_xrgb8888_to_gray8 ========== [06:31:16] ============= drm_test_fb_xrgb8888_to_rgb332 ============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb332 ========== [06:31:16] ============= drm_test_fb_xrgb8888_to_rgb565 ============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb565 ========== [06:31:16] ============ drm_test_fb_xrgb8888_to_xrgb1555 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_xrgb1555 ========= [06:31:16] ============ drm_test_fb_xrgb8888_to_argb1555 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_argb1555 ========= [06:31:16] ============ drm_test_fb_xrgb8888_to_rgba5551 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_rgba5551 ========= [06:31:16] ============= drm_test_fb_xrgb8888_to_rgb888 ============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb888 ========== [06:31:16] ============= drm_test_fb_xrgb8888_to_bgr888 ============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========= [PASSED] drm_test_fb_xrgb8888_to_bgr888 ========== [06:31:16] ============ drm_test_fb_xrgb8888_to_argb8888 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_argb8888 ========= [06:31:16] =========== drm_test_fb_xrgb8888_to_xrgb2101010 =========== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======= [PASSED] drm_test_fb_xrgb8888_to_xrgb2101010 ======= [06:31:16] =========== drm_test_fb_xrgb8888_to_argb2101010 =========== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======= [PASSED] drm_test_fb_xrgb8888_to_argb2101010 ======= [06:31:16] ============== drm_test_fb_xrgb8888_to_mono =============== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ========== [PASSED] drm_test_fb_xrgb8888_to_mono =========== [06:31:16] ==================== drm_test_fb_swab ===================== [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ================ [PASSED] drm_test_fb_swab ================= [06:31:16] ============ drm_test_fb_xrgb8888_to_xbgr8888 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_xbgr8888 ========= [06:31:16] ============ drm_test_fb_xrgb8888_to_abgr8888 ============= [06:31:16] [PASSED] single_pixel_source_buffer [06:31:16] [PASSED] single_pixel_clip_rectangle [06:31:16] [PASSED] well_known_colors [06:31:16] [PASSED] destination_pitch [06:31:16] ======== [PASSED] drm_test_fb_xrgb8888_to_abgr8888 ========= [06:31:16] ================= drm_test_fb_clip_offset ================= [06:31:16] [PASSED] pass through [06:31:16] [PASSED] horizontal offset [06:31:16] [PASSED] vertical offset [06:31:16] [PASSED] horizontal and vertical offset [06:31:16] [PASSED] horizontal offset (custom pitch) [06:31:16] [PASSED] vertical offset (custom pitch) [06:31:16] [PASSED] horizontal and vertical offset (custom pitch) [06:31:16] ============= [PASSED] drm_test_fb_clip_offset ============= [06:31:16] =================== drm_test_fb_memcpy ==================== [06:31:16] [PASSED] single_pixel_source_buffer: XR24 little-endian (0x34325258) [06:31:16] [PASSED] single_pixel_source_buffer: XRA8 little-endian (0x38415258) [06:31:16] [PASSED] single_pixel_source_buffer: YU24 little-endian (0x34325559) [06:31:16] [PASSED] single_pixel_clip_rectangle: XB24 little-endian (0x34324258) [06:31:16] [PASSED] single_pixel_clip_rectangle: XRA8 little-endian (0x38415258) [06:31:16] [PASSED] single_pixel_clip_rectangle: YU24 little-endian (0x34325559) [06:31:16] [PASSED] well_known_colors: XB24 little-endian (0x34324258) [06:31:16] [PASSED] well_known_colors: XRA8 little-endian (0x38415258) [06:31:16] [PASSED] well_known_colors: YU24 little-endian (0x34325559) [06:31:16] [PASSED] destination_pitch: XB24 little-endian (0x34324258) [06:31:16] [PASSED] destination_pitch: XRA8 little-endian (0x38415258) [06:31:16] [PASSED] destination_pitch: YU24 little-endian (0x34325559) [06:31:16] =============== [PASSED] drm_test_fb_memcpy ================ [06:31:16] ============= [PASSED] drm_format_helper_test ============== [06:31:16] ================= drm_format (18 subtests) ================= [06:31:16] [PASSED] drm_test_format_block_width_invalid [06:31:16] [PASSED] drm_test_format_block_width_one_plane [06:31:16] [PASSED] drm_test_format_block_width_two_plane [06:31:16] [PASSED] drm_test_format_block_width_three_plane [06:31:16] [PASSED] drm_test_format_block_width_tiled [06:31:16] [PASSED] drm_test_format_block_height_invalid [06:31:16] [PASSED] drm_test_format_block_height_one_plane [06:31:16] [PASSED] drm_test_format_block_height_two_plane [06:31:16] [PASSED] drm_test_format_block_height_three_plane [06:31:16] [PASSED] drm_test_format_block_height_tiled [06:31:16] [PASSED] drm_test_format_min_pitch_invalid [06:31:16] [PASSED] drm_test_format_min_pitch_one_plane_8bpp [06:31:16] [PASSED] drm_test_format_min_pitch_one_plane_16bpp [06:31:16] [PASSED] drm_test_format_min_pitch_one_plane_24bpp [06:31:16] [PASSED] drm_test_format_min_pitch_one_plane_32bpp [06:31:16] [PASSED] drm_test_format_min_pitch_two_plane [06:31:16] [PASSED] drm_test_format_min_pitch_three_plane_8bpp [06:31:16] [PASSED] drm_test_format_min_pitch_tiled [06:31:16] =================== [PASSED] drm_format ==================== [06:31:16] ============== drm_framebuffer (10 subtests) =============== [06:31:16] ========== drm_test_framebuffer_check_src_coords ========== [06:31:16] [PASSED] Success: source fits into fb [06:31:16] [PASSED] Fail: overflowing fb with x-axis coordinate [06:31:16] [PASSED] Fail: overflowing fb with y-axis coordinate [06:31:16] [PASSED] Fail: overflowing fb with source width [06:31:16] [PASSED] Fail: overflowing fb with source height [06:31:16] ====== [PASSED] drm_test_framebuffer_check_src_coords ====== [06:31:16] [PASSED] drm_test_framebuffer_cleanup [06:31:16] =============== drm_test_framebuffer_create =============== [06:31:16] [PASSED] ABGR8888 normal sizes [06:31:16] [PASSED] ABGR8888 max sizes [06:31:16] [PASSED] ABGR8888 pitch greater than min required [06:31:16] [PASSED] ABGR8888 pitch less than min required [06:31:16] [PASSED] ABGR8888 Invalid width [06:31:16] [PASSED] ABGR8888 Invalid buffer handle [06:31:16] [PASSED] No pixel format [06:31:16] [PASSED] ABGR8888 Width 0 [06:31:16] [PASSED] ABGR8888 Height 0 [06:31:16] [PASSED] ABGR8888 Out of bound height * pitch combination [06:31:16] [PASSED] ABGR8888 Large buffer offset [06:31:16] [PASSED] ABGR8888 Buffer offset for inexistent plane [06:31:16] [PASSED] ABGR8888 Invalid flag [06:31:16] [PASSED] ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers [06:31:16] [PASSED] ABGR8888 Valid buffer modifier [06:31:16] [PASSED] ABGR8888 Invalid buffer modifier(DRM_FORMAT_MOD_SAMSUNG_64_32_TILE) [06:31:16] [PASSED] ABGR8888 Extra pitches without DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] ABGR8888 Extra pitches with DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] NV12 Normal sizes [06:31:16] [PASSED] NV12 Max sizes [06:31:16] [PASSED] NV12 Invalid pitch [06:31:16] [PASSED] NV12 Invalid modifier/missing DRM_MODE_FB_MODIFIERS flag [06:31:16] [PASSED] NV12 different modifier per-plane [06:31:16] [PASSED] NV12 with DRM_FORMAT_MOD_SAMSUNG_64_32_TILE [06:31:16] [PASSED] NV12 Valid modifiers without DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] NV12 Modifier for inexistent plane [06:31:16] [PASSED] NV12 Handle for inexistent plane [06:31:16] [PASSED] NV12 Handle for inexistent plane without DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] YVU420 DRM_MODE_FB_MODIFIERS set without modifier [06:31:16] [PASSED] YVU420 Normal sizes [06:31:16] [PASSED] YVU420 Max sizes [06:31:16] [PASSED] YVU420 Invalid pitch [06:31:16] [PASSED] YVU420 Different pitches [06:31:16] [PASSED] YVU420 Different buffer offsets/pitches [06:31:16] [PASSED] YVU420 Modifier set just for plane 0, without DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] YVU420 Modifier set just for planes 0, 1, without DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] YVU420 Modifier set just for plane 0, 1, with DRM_MODE_FB_MODIFIERS [06:31:16] [PASSED] YVU420 Valid modifier [06:31:16] [PASSED] YVU420 Different modifiers per plane [06:31:16] [PASSED] YVU420 Modifier for inexistent plane [06:31:16] [PASSED] YUV420_10BIT Invalid modifier(DRM_FORMAT_MOD_LINEAR) [06:31:16] [PASSED] X0L2 Normal sizes [06:31:16] [PASSED] X0L2 Max sizes [06:31:16] [PASSED] X0L2 Invalid pitch [06:31:16] [PASSED] X0L2 Pitch greater than minimum required [06:31:16] [PASSED] X0L2 Handle for inexistent plane [06:31:16] [PASSED] X0L2 Offset for inexistent plane, without DRM_MODE_FB_MODIFIERS set [06:31:16] [PASSED] X0L2 Modifier without DRM_MODE_FB_MODIFIERS set [06:31:16] [PASSED] X0L2 Valid modifier [06:31:16] [PASSED] X0L2 Modifier for inexistent plane [06:31:16] =========== [PASSED] drm_test_framebuffer_create =========== [06:31:16] [PASSED] drm_test_framebuffer_free [06:31:16] [PASSED] drm_test_framebuffer_init [06:31:16] [PASSED] drm_test_framebuffer_init_bad_format [06:31:16] [PASSED] drm_test_framebuffer_init_dev_mismatch [06:31:16] [PASSED] drm_test_framebuffer_lookup [06:31:16] [PASSED] drm_test_framebuffer_lookup_inexistent [06:31:16] [PASSED] drm_test_framebuffer_modifiers_not_supported [06:31:16] ================= [PASSED] drm_framebuffer ================= [06:31:16] ================ drm_gem_shmem (8 subtests) ================ [06:31:16] [PASSED] drm_gem_shmem_test_obj_create [06:31:16] [PASSED] drm_gem_shmem_test_obj_create_private [06:31:16] [PASSED] drm_gem_shmem_test_pin_pages [06:31:16] [PASSED] drm_gem_shmem_test_vmap [06:31:16] [PASSED] drm_gem_shmem_test_get_sg_table [06:31:16] [PASSED] drm_gem_shmem_test_get_pages_sgt [06:31:16] [PASSED] drm_gem_shmem_test_madvise [06:31:16] [PASSED] drm_gem_shmem_test_purge [06:31:16] ================== [PASSED] drm_gem_shmem ================== [06:31:16] === drm_atomic_helper_connector_hdmi_check (27 subtests) === [06:31:16] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode [06:31:16] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode_vic_1 [06:31:16] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode [06:31:16] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode_vic_1 [06:31:16] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode [06:31:16] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode_vic_1 [06:31:16] ====== drm_test_check_broadcast_rgb_cea_mode_yuv420 ======= [06:31:16] [PASSED] Automatic [06:31:16] [PASSED] Full [06:31:16] [PASSED] Limited 16:235 [06:31:16] == [PASSED] drm_test_check_broadcast_rgb_cea_mode_yuv420 === [06:31:16] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_changed [06:31:16] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_not_changed [06:31:16] [PASSED] drm_test_check_disable_connector [06:31:16] [PASSED] drm_test_check_hdmi_funcs_reject_rate [06:31:16] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_rgb [06:31:16] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_yuv420 [06:31:16] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv422 [06:31:16] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv420 [06:31:16] [PASSED] drm_test_check_driver_unsupported_fallback_yuv420 [06:31:16] [PASSED] drm_test_check_output_bpc_crtc_mode_changed [06:31:16] [PASSED] drm_test_check_output_bpc_crtc_mode_not_changed [06:31:16] [PASSED] drm_test_check_output_bpc_dvi [06:31:16] [PASSED] drm_test_check_output_bpc_format_vic_1 [06:31:16] [PASSED] drm_test_check_output_bpc_format_display_8bpc_only [06:31:16] [PASSED] drm_test_check_output_bpc_format_display_rgb_only [06:31:16] [PASSED] drm_test_check_output_bpc_format_driver_8bpc_only [06:31:16] [PASSED] drm_test_check_output_bpc_format_driver_rgb_only [06:31:16] [PASSED] drm_test_check_tmds_char_rate_rgb_8bpc [06:31:16] [PASSED] drm_test_check_tmds_char_rate_rgb_10bpc [06:31:16] [PASSED] drm_test_check_tmds_char_rate_rgb_12bpc [06:31:16] ===== [PASSED] drm_atomic_helper_connector_hdmi_check ====== [06:31:16] === drm_atomic_helper_connector_hdmi_reset (6 subtests) ==== [06:31:16] [PASSED] drm_test_check_broadcast_rgb_value [06:31:16] [PASSED] drm_test_check_bpc_8_value [06:31:16] [PASSED] drm_test_check_bpc_10_value [06:31:16] [PASSED] drm_test_check_bpc_12_value [06:31:16] [PASSED] drm_test_check_format_value [06:31:16] [PASSED] drm_test_check_tmds_char_value [06:31:16] ===== [PASSED] drm_atomic_helper_connector_hdmi_reset ====== [06:31:16] = drm_atomic_helper_connector_hdmi_mode_valid (4 subtests) = [06:31:16] [PASSED] drm_test_check_mode_valid [06:31:16] [PASSED] drm_test_check_mode_valid_reject [06:31:16] [PASSED] drm_test_check_mode_valid_reject_rate [06:31:16] [PASSED] drm_test_check_mode_valid_reject_max_clock [06:31:16] === [PASSED] drm_atomic_helper_connector_hdmi_mode_valid === [06:31:16] = drm_atomic_helper_connector_hdmi_infoframes (5 subtests) = [06:31:16] [PASSED] drm_test_check_infoframes [06:31:16] [PASSED] drm_test_check_reject_avi_infoframe [06:31:16] [PASSED] drm_test_check_reject_hdr_infoframe_bpc_8 [06:31:16] [PASSED] drm_test_check_reject_hdr_infoframe_bpc_10 [06:31:16] [PASSED] drm_test_check_reject_audio_infoframe [06:31:16] === [PASSED] drm_atomic_helper_connector_hdmi_infoframes === [06:31:16] ================= drm_managed (2 subtests) ================= [06:31:16] [PASSED] drm_test_managed_release_action [06:31:16] [PASSED] drm_test_managed_run_action [06:31:16] =================== [PASSED] drm_managed =================== [06:31:16] =================== drm_mm (6 subtests) ==================== [06:31:16] [PASSED] drm_test_mm_init [06:31:16] [PASSED] drm_test_mm_debug [06:31:16] [PASSED] drm_test_mm_align32 [06:31:16] [PASSED] drm_test_mm_align64 [06:31:16] [PASSED] drm_test_mm_lowest [06:31:16] [PASSED] drm_test_mm_highest [06:31:16] ===================== [PASSED] drm_mm ====================== [06:31:16] ============= drm_modes_analog_tv (5 subtests) ============= [06:31:16] [PASSED] drm_test_modes_analog_tv_mono_576i [06:31:16] [PASSED] drm_test_modes_analog_tv_ntsc_480i [06:31:16] [PASSED] drm_test_modes_analog_tv_ntsc_480i_inlined [06:31:16] [PASSED] drm_test_modes_analog_tv_pal_576i [06:31:16] [PASSED] drm_test_modes_analog_tv_pal_576i_inlined [06:31:16] =============== [PASSED] drm_modes_analog_tv =============== [06:31:16] ============== drm_plane_helper (2 subtests) =============== [06:31:16] =============== drm_test_check_plane_state ================ [06:31:16] [PASSED] clipping_simple [06:31:16] [PASSED] clipping_rotate_reflect [06:31:16] [PASSED] positioning_simple [06:31:16] [PASSED] upscaling [06:31:16] [PASSED] downscaling [06:31:16] [PASSED] rounding1 [06:31:16] [PASSED] rounding2 [06:31:16] [PASSED] rounding3 [06:31:16] [PASSED] rounding4 [06:31:16] =========== [PASSED] drm_test_check_plane_state ============ [06:31:16] =========== drm_test_check_invalid_plane_state ============ [06:31:16] [PASSED] positioning_invalid [06:31:16] [PASSED] upscaling_invalid [06:31:16] [PASSED] downscaling_invalid [06:31:16] ======= [PASSED] drm_test_check_invalid_plane_state ======== [06:31:16] ================ [PASSED] drm_plane_helper ================= [06:31:16] ====== drm_connector_helper_tv_get_modes (1 subtest) ======= [06:31:16] ====== drm_test_connector_helper_tv_get_modes_check ======= [06:31:16] [PASSED] None [06:31:16] [PASSED] PAL [06:31:16] [PASSED] NTSC [06:31:16] [PASSED] Both, NTSC Default [06:31:16] [PASSED] Both, PAL Default [06:31:16] [PASSED] Both, NTSC Default, with PAL on command-line [06:31:16] [PASSED] Both, PAL Default, with NTSC on command-line [06:31:16] == [PASSED] drm_test_connector_helper_tv_get_modes_check === [06:31:16] ======== [PASSED] drm_connector_helper_tv_get_modes ======== [06:31:16] ================== drm_rect (9 subtests) =================== [06:31:16] [PASSED] drm_test_rect_clip_scaled_div_by_zero [06:31:16] [PASSED] drm_test_rect_clip_scaled_not_clipped [06:31:16] [PASSED] drm_test_rect_clip_scaled_clipped [06:31:16] [PASSED] drm_test_rect_clip_scaled_signed_vs_unsigned [06:31:16] ================= drm_test_rect_intersect ================= [06:31:16] [PASSED] top-left x bottom-right: 2x2+1+1 x 2x2+0+0 [06:31:16] [PASSED] top-right x bottom-left: 2x2+0+0 x 2x2+1-1 [06:31:16] [PASSED] bottom-left x top-right: 2x2+1-1 x 2x2+0+0 [06:31:16] [PASSED] bottom-right x top-left: 2x2+0+0 x 2x2+1+1 [06:31:16] [PASSED] right x left: 2x1+0+0 x 3x1+1+0 [06:31:16] [PASSED] left x right: 3x1+1+0 x 2x1+0+0 [06:31:16] [PASSED] up x bottom: 1x2+0+0 x 1x3+0-1 [06:31:16] [PASSED] bottom x up: 1x3+0-1 x 1x2+0+0 [06:31:16] [PASSED] touching corner: 1x1+0+0 x 2x2+1+1 [06:31:16] [PASSED] touching side: 1x1+0+0 x 1x1+1+0 [06:31:16] [PASSED] equal rects: 2x2+0+0 x 2x2+0+0 [06:31:16] [PASSED] inside another: 2x2+0+0 x 1x1+1+1 [06:31:16] [PASSED] far away: 1x1+0+0 x 1x1+3+6 [06:31:16] [PASSED] points intersecting: 0x0+5+10 x 0x0+5+10 [06:31:16] [PASSED] points not intersecting: 0x0+0+0 x 0x0+5+10 stty: 'standard input': Inappropriate ioctl for device [06:31:16] ============= [PASSED] drm_test_rect_intersect ============= [06:31:16] ================ drm_test_rect_calc_hscale ================ [06:31:16] [PASSED] normal use [06:31:16] [PASSED] out of max range [06:31:16] [PASSED] out of min range [06:31:16] [PASSED] zero dst [06:31:16] [PASSED] negative src [06:31:16] [PASSED] negative dst [06:31:16] ============ [PASSED] drm_test_rect_calc_hscale ============ [06:31:16] ================ drm_test_rect_calc_vscale ================ [06:31:16] [PASSED] normal use [06:31:16] [PASSED] out of max range [06:31:16] [PASSED] out of min range [06:31:16] [PASSED] zero dst [06:31:16] [PASSED] negative src [06:31:16] [PASSED] negative dst [06:31:16] ============ [PASSED] drm_test_rect_calc_vscale ============ [06:31:16] ================== drm_test_rect_rotate =================== [06:31:16] [PASSED] reflect-x [06:31:16] [PASSED] reflect-y [06:31:16] [PASSED] rotate-0 [06:31:16] [PASSED] rotate-90 [06:31:16] [PASSED] rotate-180 [06:31:16] [PASSED] rotate-270 [06:31:16] ============== [PASSED] drm_test_rect_rotate =============== [06:31:16] ================ drm_test_rect_rotate_inv ================= [06:31:16] [PASSED] reflect-x [06:31:16] [PASSED] reflect-y [06:31:16] [PASSED] rotate-0 [06:31:16] [PASSED] rotate-90 [06:31:16] [PASSED] rotate-180 [06:31:16] [PASSED] rotate-270 [06:31:16] ============ [PASSED] drm_test_rect_rotate_inv ============= [06:31:16] ==================== [PASSED] drm_rect ===================== [06:31:16] ============ drm_sysfb_modeset_test (1 subtest) ============ [06:31:16] ============ drm_test_sysfb_build_fourcc_list ============= [06:31:16] [PASSED] no native formats [06:31:16] [PASSED] XRGB8888 as native format [06:31:16] [PASSED] remove duplicates [06:31:16] [PASSED] convert alpha formats [06:31:16] [PASSED] random formats [06:31:16] ======== [PASSED] drm_test_sysfb_build_fourcc_list ========= [06:31:16] ============= [PASSED] drm_sysfb_modeset_test ============== [06:31:16] ================== drm_fixp (2 subtests) =================== [06:31:16] [PASSED] drm_test_int2fixp [06:31:16] [PASSED] drm_test_sm2fixp [06:31:16] ==================== [PASSED] drm_fixp ===================== [06:31:16] ============================================================ [06:31:16] Testing complete. Ran 630 tests: passed: 630 [06:31:16] Elapsed time: 27.533s total, 1.680s configuring, 25.437s building, 0.373s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/ttm/tests/.kunitconfig [06:31:16] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [06:31:18] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48 [06:31:27] Starting KUnit Kernel (1/1)... [06:31:27] ============================================================ Running tests with: $ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [06:31:27] ================= ttm_device (5 subtests) ================== [06:31:27] [PASSED] ttm_device_init_basic [06:31:27] [PASSED] ttm_device_init_multiple [06:31:27] [PASSED] ttm_device_fini_basic [06:31:27] [PASSED] ttm_device_init_no_vma_man [06:31:27] ================== ttm_device_init_pools ================== [06:31:27] [PASSED] No DMA allocations, no DMA32 required [06:31:27] [PASSED] DMA allocations, DMA32 required [06:31:27] [PASSED] No DMA allocations, DMA32 required [06:31:27] [PASSED] DMA allocations, no DMA32 required [06:31:27] ============== [PASSED] ttm_device_init_pools ============== [06:31:27] =================== [PASSED] ttm_device ==================== [06:31:27] ================== ttm_pool (8 subtests) =================== [06:31:27] ================== ttm_pool_alloc_basic =================== [06:31:27] [PASSED] One page [06:31:27] [PASSED] More than one page [06:31:27] [PASSED] Above the allocation limit [06:31:27] [PASSED] One page, with coherent DMA mappings enabled [06:31:27] [PASSED] Above the allocation limit, with coherent DMA mappings enabled [06:31:27] ============== [PASSED] ttm_pool_alloc_basic =============== [06:31:27] ============== ttm_pool_alloc_basic_dma_addr ============== [06:31:27] [PASSED] One page [06:31:27] [PASSED] More than one page [06:31:27] [PASSED] Above the allocation limit [06:31:27] [PASSED] One page, with coherent DMA mappings enabled [06:31:27] [PASSED] Above the allocation limit, with coherent DMA mappings enabled [06:31:27] ========== [PASSED] ttm_pool_alloc_basic_dma_addr ========== [06:31:27] [PASSED] ttm_pool_alloc_order_caching_match [06:31:27] [PASSED] ttm_pool_alloc_caching_mismatch [06:31:27] [PASSED] ttm_pool_alloc_order_mismatch [06:31:27] [PASSED] ttm_pool_free_dma_alloc [06:31:27] [PASSED] ttm_pool_free_no_dma_alloc [06:31:27] [PASSED] ttm_pool_fini_basic [06:31:27] ==================== [PASSED] ttm_pool ===================== [06:31:27] ================ ttm_resource (8 subtests) ================= [06:31:27] ================= ttm_resource_init_basic ================= [06:31:27] [PASSED] Init resource in TTM_PL_SYSTEM [06:31:27] [PASSED] Init resource in TTM_PL_VRAM [06:31:27] [PASSED] Init resource in a private placement [06:31:27] [PASSED] Init resource in TTM_PL_SYSTEM, set placement flags [06:31:27] ============= [PASSED] ttm_resource_init_basic ============= [06:31:27] [PASSED] ttm_resource_init_pinned [06:31:27] [PASSED] ttm_resource_fini_basic [06:31:27] [PASSED] ttm_resource_manager_init_basic [06:31:27] [PASSED] ttm_resource_manager_usage_basic [06:31:27] [PASSED] ttm_resource_manager_set_used_basic [06:31:27] [PASSED] ttm_sys_man_alloc_basic [06:31:27] [PASSED] ttm_sys_man_free_basic [06:31:27] ================== [PASSED] ttm_resource =================== [06:31:27] =================== ttm_tt (15 subtests) =================== [06:31:27] ==================== ttm_tt_init_basic ==================== [06:31:27] [PASSED] Page-aligned size [06:31:27] [PASSED] Extra pages requested [06:31:27] ================ [PASSED] ttm_tt_init_basic ================ [06:31:27] [PASSED] ttm_tt_init_misaligned [06:31:27] [PASSED] ttm_tt_fini_basic [06:31:27] [PASSED] ttm_tt_fini_sg [06:31:27] [PASSED] ttm_tt_fini_shmem [06:31:27] [PASSED] ttm_tt_create_basic [06:31:27] [PASSED] ttm_tt_create_invalid_bo_type [06:31:27] [PASSED] ttm_tt_create_ttm_exists [06:31:27] [PASSED] ttm_tt_create_failed [06:31:27] [PASSED] ttm_tt_destroy_basic [06:31:27] [PASSED] ttm_tt_populate_null_ttm [06:31:27] [PASSED] ttm_tt_populate_populated_ttm [06:31:27] [PASSED] ttm_tt_unpopulate_basic [06:31:27] [PASSED] ttm_tt_unpopulate_empty_ttm [06:31:27] [PASSED] ttm_tt_swapin_basic [06:31:27] ===================== [PASSED] ttm_tt ====================== [06:31:27] =================== ttm_bo (14 subtests) =================== [06:31:27] =========== ttm_bo_reserve_optimistic_no_ticket =========== [06:31:27] [PASSED] Cannot be interrupted and sleeps [06:31:27] [PASSED] Cannot be interrupted, locks straight away [06:31:27] [PASSED] Can be interrupted, sleeps [06:31:27] ======= [PASSED] ttm_bo_reserve_optimistic_no_ticket ======= [06:31:27] [PASSED] ttm_bo_reserve_locked_no_sleep [06:31:27] [PASSED] ttm_bo_reserve_no_wait_ticket [06:31:27] [PASSED] ttm_bo_reserve_double_resv [06:31:27] [PASSED] ttm_bo_reserve_interrupted [06:31:27] [PASSED] ttm_bo_reserve_deadlock [06:31:27] [PASSED] ttm_bo_unreserve_basic [06:31:27] [PASSED] ttm_bo_unreserve_pinned [06:31:27] [PASSED] ttm_bo_unreserve_bulk [06:31:27] [PASSED] ttm_bo_fini_basic [06:31:27] [PASSED] ttm_bo_fini_shared_resv [06:31:27] [PASSED] ttm_bo_pin_basic [06:31:27] [PASSED] ttm_bo_pin_unpin_resource [06:31:27] [PASSED] ttm_bo_multiple_pin_one_unpin [06:31:27] ===================== [PASSED] ttm_bo ====================== [06:31:27] ============== ttm_bo_validate (21 subtests) =============== [06:31:27] ============== ttm_bo_init_reserved_sys_man =============== [06:31:27] [PASSED] Buffer object for userspace [06:31:27] [PASSED] Kernel buffer object [06:31:27] [PASSED] Shared buffer object [06:31:27] ========== [PASSED] ttm_bo_init_reserved_sys_man =========== [06:31:27] ============== ttm_bo_init_reserved_mock_man ============== [06:31:27] [PASSED] Buffer object for userspace [06:31:27] [PASSED] Kernel buffer object [06:31:27] [PASSED] Shared buffer object [06:31:27] ========== [PASSED] ttm_bo_init_reserved_mock_man ========== [06:31:27] [PASSED] ttm_bo_init_reserved_resv [06:31:27] ================== ttm_bo_validate_basic ================== [06:31:27] [PASSED] Buffer object for userspace [06:31:27] [PASSED] Kernel buffer object [06:31:27] [PASSED] Shared buffer object [06:31:27] ============== [PASSED] ttm_bo_validate_basic ============== [06:31:27] [PASSED] ttm_bo_validate_invalid_placement [06:31:27] ============= ttm_bo_validate_same_placement ============== [06:31:27] [PASSED] System manager [06:31:27] [PASSED] VRAM manager [06:31:27] ========= [PASSED] ttm_bo_validate_same_placement ========== [06:31:27] [PASSED] ttm_bo_validate_failed_alloc [06:31:27] [PASSED] ttm_bo_validate_pinned [06:31:27] [PASSED] ttm_bo_validate_busy_placement [06:31:27] ================ ttm_bo_validate_multihop ================= [06:31:27] [PASSED] Buffer object for userspace [06:31:27] [PASSED] Kernel buffer object [06:31:27] [PASSED] Shared buffer object [06:31:27] ============ [PASSED] ttm_bo_validate_multihop ============= [06:31:27] ========== ttm_bo_validate_no_placement_signaled ========== [06:31:27] [PASSED] Buffer object in system domain, no page vector [06:31:27] [PASSED] Buffer object in system domain with an existing page vector [06:31:27] ====== [PASSED] ttm_bo_validate_no_placement_signaled ====== [06:31:27] ======== ttm_bo_validate_no_placement_not_signaled ======== [06:31:27] [PASSED] Buffer object for userspace [06:31:27] [PASSED] Kernel buffer object [06:31:27] [PASSED] Shared buffer object [06:31:27] ==== [PASSED] ttm_bo_validate_no_placement_not_signaled ==== [06:31:27] [PASSED] ttm_bo_validate_move_fence_signaled [06:31:27] ========= ttm_bo_validate_move_fence_not_signaled ========= [06:31:27] [PASSED] Waits for GPU [06:31:27] [PASSED] Tries to lock straight away [06:31:27] ===== [PASSED] ttm_bo_validate_move_fence_not_signaled ===== [06:31:27] [PASSED] ttm_bo_validate_happy_evict [06:31:27] [PASSED] ttm_bo_validate_all_pinned_evict [06:31:27] [PASSED] ttm_bo_validate_allowed_only_evict [06:31:27] [PASSED] ttm_bo_validate_deleted_evict [06:31:27] [PASSED] ttm_bo_validate_busy_domain_evict [06:31:27] [PASSED] ttm_bo_validate_evict_gutting [06:31:27] [PASSED] ttm_bo_validate_recrusive_evict stty: 'standard input': Inappropriate ioctl for device [06:31:27] ================= [PASSED] ttm_bo_validate ================= [06:31:27] ============================================================ [06:31:27] Testing complete. Ran 101 tests: passed: 101 [06:31:27] Elapsed time: 11.140s total, 1.672s configuring, 9.252s building, 0.186s running
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
Patchwork
CI✗ Xe.CI.BAT: failure for Remove device private pages from physical address space (rev5)
In reply to Jordan Niethe== Series Details ==
== Series Details ==
Series: Remove device private pages from physical address space (rev5)
URL : https://patchwork.freedesktop.org/series/159738/
State : failure
== Summary ==
CI Bug Log - changes from xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff_BAT -> xe-pw-159738v5_BAT
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with xe-pw-159738v5_BAT absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes
introduced in xe-pw-159738v5_BAT, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (12 -> 12)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in xe-pw-159738v5_BAT:
### IGT changes ###
#### Possible regressions ####
* igt@xe_evict@evict-beng-small:
- bat-bmg-2: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/bat-bmg-2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/bat-bmg-2/igt@[email protected]
- bat-bmg-1: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/bat-bmg-1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/bat-bmg-1/igt@[email protected]
Known issues
------------
Here are the changes found in xe-pw-159738v5_BAT that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@xe_waitfence@engine:
- bat-dg2-oem2: [FAIL][5] ([Intel XE#6519]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/bat-dg2-oem2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/bat-dg2-oem2/igt@[email protected]
[Intel XE#6519]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6519
Build changes
-------------
* Linux: xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff -> xe-pw-159738v5
IGT_8715: 8715
xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff: 4a255b429d80f8b0800bdef43ba3175b771e77ff
xe-pw-159738v5: 159738v5
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/index.html
Patchwork
CI✗ Xe.CI.Full: failure for Remove device private pages from physical address space (rev5)
In reply to Jordan Niethe== Series Details ==
== Series Details ==
Series: Remove device private pages from physical address space (rev5)
URL : https://patchwork.freedesktop.org/series/159738/
State : failure
== Summary ==
CI Bug Log - changes from xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff_FULL -> xe-pw-159738v5_FULL
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with xe-pw-159738v5_FULL absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes
introduced in xe-pw-159738v5_FULL, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (2 -> 2)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in xe-pw-159738v5_FULL:
### IGT changes ###
#### Possible regressions ####
* igt@xe_evict@evict-mixed-many-threads-large:
- shard-bmg: [PASS][1] -> [ABORT][2] +17 other tests abort
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@[email protected]
* igt@xe_evict@evict-small-multi-vm-cm:
- shard-bmg: NOTRUN -> [ABORT][3] +2 other tests abort
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_pmu@engine-activity-accuracy-50:
- shard-bmg: [PASS][4] -> [FAIL][5] +1 other test fail
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
#### Warnings ####
* igt@xe_evict@evict-mixed-many-threads-small:
- shard-bmg: [INCOMPLETE][6] ([Intel XE#6321]) -> [ABORT][7]
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-4/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_evict@evict-small-external-multi-queue:
- shard-bmg: [SKIP][8] ([Intel XE#7140]) -> [ABORT][9]
[8]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
Known issues
------------
Here are the changes found in xe-pw-159738v5_FULL that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- shard-bmg: NOTRUN -> [SKIP][10] ([Intel XE#2233])
[10]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
* igt@kms_big_fb@y-tiled-16bpp-rotate-0:
- shard-bmg: NOTRUN -> [SKIP][11] ([Intel XE#1124])
[11]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_big_fb@yf-tiled-addfb-size-offset-overflow:
- shard-bmg: NOTRUN -> [SKIP][12] ([Intel XE#607])
[12]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
* igt@kms_bw@linear-tiling-4-displays-2160x1440p:
- shard-bmg: NOTRUN -> [SKIP][13] ([Intel XE#367])
[13]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
* igt@kms_ccs@missing-ccs-buffer-4-tiled-mtl-rc-ccs-cc:
- shard-bmg: NOTRUN -> [SKIP][14] ([Intel XE#2887])
[14]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_chamelium_hpd@dp-hpd-for-each-pipe:
- shard-bmg: NOTRUN -> [SKIP][15] ([Intel XE#2252]) +1 other test skip
[15]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_content_protection@dp-mst-lic-type-1:
- shard-bmg: NOTRUN -> [SKIP][16] ([Intel XE#2390] / [Intel XE#6974])
[16]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_cursor_crc@cursor-random-512x512:
- shard-bmg: NOTRUN -> [SKIP][17] ([Intel XE#2321])
[17]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp2:
- shard-bmg: [PASS][18] -> [INCOMPLETE][19] ([Intel XE#2049] / [Intel XE#2597] / [Intel XE#5545] / [Intel XE#6766]) +1 other test incomplete
[18]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-4/igt@kms_flip@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling:
- shard-bmg: NOTRUN -> [SKIP][20] ([Intel XE#2293] / [Intel XE#2380]) +1 other test skip
[20]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-bmg: NOTRUN -> [SKIP][21] ([Intel XE#2293]) +1 other test skip
[21]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@drrs-rgb565-draw-mmap-wc:
- shard-bmg: NOTRUN -> [SKIP][22] ([Intel XE#2311]) +1 other test skip
[22]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt:
- shard-bmg: NOTRUN -> [SKIP][23] ([Intel XE#4141]) +4 other tests skip
[23]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-plflip-blt:
- shard-bmg: NOTRUN -> [SKIP][24] ([Intel XE#2313]) +2 other tests skip
[24]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-plflip-blt.html
* igt@kms_hdr@invalid-hdr:
- shard-bmg: NOTRUN -> [SKIP][25] ([Intel XE#1503])
[25]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_psr@fbc-pr-primary-blt:
- shard-bmg: NOTRUN -> [SKIP][26] ([Intel XE#1406] / [Intel XE#2234] / [Intel XE#2850]) +2 other tests skip
[26]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_rotation_crc@primary-y-tiled-reflect-x-180:
- shard-bmg: NOTRUN -> [SKIP][27] ([Intel XE#2330])
[27]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@kms_vrr@cmrr@pipe-a-edp-1:
- shard-lnl: [PASS][28] -> [FAIL][29] ([Intel XE#4459]) +1 other test fail
[28]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-lnl-5/igt@kms_vrr@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-lnl-7/igt@kms_vrr@[email protected]
* igt@xe_eudebug@vm-bind-clear:
- shard-bmg: NOTRUN -> [SKIP][30] ([Intel XE#4837]) +1 other test skip
[30]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_eudebug_online@single-step-one:
- shard-bmg: NOTRUN -> [SKIP][31] ([Intel XE#4837] / [Intel XE#6665])
[31]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
* igt@xe_exec_fault_mode@many-multi-queue-userptr-invalidate-race-imm:
- shard-bmg: NOTRUN -> [SKIP][32] ([Intel XE#7136]) +1 other test skip
[32]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@xe_exec_fault_mode@many-multi-queue-userptr-invalidate-race-imm.html
* igt@xe_exec_multi_queue@few-execs-preempt-mode-fault-userptr:
- shard-bmg: NOTRUN -> [SKIP][33] ([Intel XE#6874]) +6 other tests skip
[33]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_exec_system_allocator@threads-many-large-mmap-free-huge-nomemset:
- shard-bmg: NOTRUN -> [SKIP][34] ([Intel XE#4943]) +1 other test skip
[34]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@xe_exec_system_allocator@threads-many-large-mmap-free-huge-nomemset.html
* igt@xe_multigpu_svm@mgpu-atomic-op-basic:
- shard-bmg: NOTRUN -> [SKIP][35] ([Intel XE#6964])
[35]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_peer2peer@write:
- shard-bmg: NOTRUN -> [SKIP][36] ([Intel XE#2427] / [Intel XE#6953])
[36]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_pm@vram-d3cold-threshold:
- shard-bmg: NOTRUN -> [SKIP][37] ([Intel XE#579])
[37]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
* igt@xe_pxp@display-black-pxp-fb:
- shard-bmg: NOTRUN -> [SKIP][38] ([Intel XE#4733])
[38]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
#### Possible fixes ####
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-bmg: [FAIL][39] ([Intel XE#5299]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-10/igt@[email protected]
* igt@kms_plane_multiple@2x-tiling-4:
- shard-bmg: [ABORT][41] ([Intel XE#5175]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
* igt@kms_plane_multiple@2x-tiling-4@pipe-c-hdmi-a-3-pipe-a-dp-2:
- shard-bmg: [ABORT][43] ([Intel XE#5545]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@kms_plane_multiple@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@kms_plane_multiple@[email protected]
* igt@kms_plane_multiple@tiling-none:
- shard-bmg: [INCOMPLETE][45] ([Intel XE#5175]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
* igt@kms_plane_multiple@tiling-none@pipe-d-hdmi-a-3:
- shard-bmg: [INCOMPLETE][47] -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@kms_plane_multiple@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@kms_plane_multiple@[email protected]
* igt@xe_module_load@load:
- shard-bmg: ([PASS][49], [PASS][50], [PASS][51], [PASS][52], [PASS][53], [PASS][54], [PASS][55], [PASS][56], [SKIP][57], [PASS][58], [PASS][59], [PASS][60], [PASS][61], [PASS][62], [PASS][63], [PASS][64], [PASS][65], [PASS][66], [PASS][67], [PASS][68], [PASS][69], [PASS][70], [PASS][71], [PASS][72], [PASS][73], [PASS][74]) ([Intel XE#2457]) -> ([PASS][75], [PASS][76], [PASS][77], [PASS][78], [PASS][79], [PASS][80], [PASS][81], [PASS][82], [PASS][83], [PASS][84], [PASS][85], [PASS][86], [PASS][87], [PASS][88], [PASS][89], [PASS][90], [PASS][91], [PASS][92], [PASS][93], [PASS][94], [PASS][95], [PASS][96], [PASS][97], [PASS][98], [PASS][99])
[49]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-3/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-7/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-7/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-10/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-10/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-10/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-10/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-3/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-3/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-4/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-4/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-8/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-1/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-9/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-9/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-9/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-bmg-4/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-10/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-10/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-4/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-4/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-4/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-3/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-3/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-10/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-8/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-9/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-1/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-1/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-2/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-bmg-7/igt@[email protected]
* igt@xe_pmu@engine-activity-accuracy-50:
- shard-lnl: [FAIL][100] ([Intel XE#7072]) -> [PASS][101] +1 other test pass
[100]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-lnl-2/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-lnl-7/igt@[email protected]
#### Warnings ####
* igt@xe_exec_system_allocator@process-many-malloc-prefetch:
- shard-lnl: [DMESG-WARN][102] ([Intel XE#4537] / [Intel XE#7063]) -> [DMESG-WARN][103] ([Intel XE#7063])
[102]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff/shard-lnl-4/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/shard-lnl-8/igt@[email protected]
[Intel XE#1124]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1124
[Intel XE#1406]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1406
[Intel XE#1503]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1503
[Intel XE#2049]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2049
[Intel XE#2233]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2233
[Intel XE#2234]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2234
[Intel XE#2252]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2252
[Intel XE#2293]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2293
[Intel XE#2311]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2311
[Intel XE#2313]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2313
[Intel XE#2321]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2321
[Intel XE#2330]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2330
[Intel XE#2380]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2380
[Intel XE#2390]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2390
[Intel XE#2427]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2427
[Intel XE#2457]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2457
[Intel XE#2597]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2597
[Intel XE#2850]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2850
[Intel XE#2887]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2887
[Intel XE#367]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/367
[Intel XE#4141]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4141
[Intel XE#4459]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4459
[Intel XE#4537]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4537
[Intel XE#4733]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4733
[Intel XE#4837]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4837
[Intel XE#4943]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4943
[Intel XE#5175]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/5175
[Intel XE#5299]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/5299
[Intel XE#5545]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/5545
[Intel XE#579]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/579
[Intel XE#607]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/607
[Intel XE#6321]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6321
[Intel XE#6665]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6665
[Intel XE#6766]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6766
[Intel XE#6874]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6874
[Intel XE#6953]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6953
[Intel XE#6964]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6964
[Intel XE#6974]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6974
[Intel XE#7063]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7063
[Intel XE#7072]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7072
[Intel XE#7136]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7136
[Intel XE#7140]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7140
Build changes
-------------
* Linux: xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff -> xe-pw-159738v5
IGT_8715: 8715
xe-4441-4a255b429d80f8b0800bdef43ba3175b771e77ff: 4a255b429d80f8b0800bdef43ba3175b771e77ff
xe-pw-159738v5: 159738v5
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-159738v5/index.html
Huang, Ying
reviewerHi, Jordan,
Quoted 83 lines · Jordan Niethe
Introduction
------------The existing design of device private memory imposes limitations which render it non functional for certain systems and configurations - this series removes those limitations. These issues are:
1) Limited available physical address space
2) Conflicts with arch64 mm implementationLimited available address space
-------------------------------Device private memory is implemented by first reserving a region of the physical address space. This is a problem. The physical address space is not a resource that is directly under the kernel's control. Availability of suitable physical address space is constrained by the underlying hardware and firmware and may not always be available.
Device private memory assumes that it will be able to reserve a device memory sized chunk of physical address space. However, there is nothing guaranteeing that this will succeed, and there a number of factors that increase the likelihood of failure. We need to consider what else may exist in the physical address space. It is observed that certain VM configurations place very large PCI windows immediately after RAM. Large enough that there is no physical address space available at all for device private memory. This is more likely to occur on 43 bit physical width systems which have less physical address space.
The fundamental issue is the physical address space is not a resource the kernel can rely on being to allocate from at will.
aarch64 issues
--------------The current device private memory implementation has further issues on aarch64. On aarch64, vmemmap is sized to cover the ram only. Adding device private pages to the linear map then means that for device private page,
pfn_to_page()will read beyond the end of vmemmap region leading to potential memory corruption. This means that device private memory does not work reliably on aarch64 [0].New implementation
------------------This series changes device private memory so that it does not require allocation of physical address space and these problems are avoided. Instead of using the physical address space, we introduce a "device private address space" and allocate from there.
A consequence of placing the device private pages outside of the physical address space is that they no longer have a PFN. However, it is still necessary to be able to look up a corresponding device private page from a device private PTE entry, which means that we still require some way to index into this device private address space. Instead of a PFN, device private pages use an offset into this device private address space to look up device private struct pages.
The problem that then needs to be addressed is how to avoid confusing these device private offsets with PFNs. It is the limited usage of the device private pages themselves which make this possible. A device private page is only used for userspace mappings, we do not need to be concerned with them being used within the mm more broadly. This means that the only way that the core kernel looks up these pages is via the page table, where their PTE already indicates if they refer to a device private page via their swap type, e.g.
SWP_DEVICE_WRITE. We can use this information to determine if the PTE contains a PFN which should be looked up in the page map, or a device private offset which should be looked up elsewhere.This applies when we are creating PTE entries for device private pages - because they have their own type there are already must be handled separately, so it is a small step to convert them to a device private PFN now too.
The first part of the series updates callers where device private offsets might now be encountered to track this extra state.
The last patch contains the bulk of the work where we change how we convert between device private pages to device private offsets and then use a new interface for allocating device private pages without the need for reserving physical address space.
Quoted 6 lines
By removing the device private pages from the physical address space, this series also opens up the possibility to moving away from tracking device private memory using struct pages in the future. This is desirable as on systems with large amounts of memory these device private struct pages use a signifiant amount of memory and take a significant amount of time to initialize.
Now device private pages are quite different from other pages, even in a separate address pace. IMHO, it may be better to make that as explicit as possible. For example, is it a good idea to put them in its own zone, like ZONE_DEVICE_PRIVATE? It appears not natural to put pages from different address spaces into one zone. And, this may make them easier to be distinguished from other pages.
[snip]
---
Best Regards,
Huang, Ying
Alistair Popple
reviewerOn 2026-01-30 at 00:49 +1100, "Huang, Ying" <[email protected]> wrote...
Quoted 94 lines
Hi, Jordan,
Quoted 83 lines · Jordan Niethe
Introduction
------------The existing design of device private memory imposes limitations which render it non functional for certain systems and configurations - this series removes those limitations. These issues are:
1) Limited available physical address space
2) Conflicts with arch64 mm implementationLimited available address space
-------------------------------Device private memory is implemented by first reserving a region of the physical address space. This is a problem. The physical address space is not a resource that is directly under the kernel's control. Availability of suitable physical address space is constrained by the underlying hardware and firmware and may not always be available.
Device private memory assumes that it will be able to reserve a device memory sized chunk of physical address space. However, there is nothing guaranteeing that this will succeed, and there a number of factors that increase the likelihood of failure. We need to consider what else may exist in the physical address space. It is observed that certain VM configurations place very large PCI windows immediately after RAM. Large enough that there is no physical address space available at all for device private memory. This is more likely to occur on 43 bit physical width systems which have less physical address space.
The fundamental issue is the physical address space is not a resource the kernel can rely on being to allocate from at will.
aarch64 issues
--------------The current device private memory implementation has further issues on aarch64. On aarch64, vmemmap is sized to cover the ram only. Adding device private pages to the linear map then means that for device private page,
pfn_to_page()will read beyond the end of vmemmap region leading to potential memory corruption. This means that device private memory does not work reliably on aarch64 [0].New implementation
------------------This series changes device private memory so that it does not require allocation of physical address space and these problems are avoided. Instead of using the physical address space, we introduce a "device private address space" and allocate from there.
A consequence of placing the device private pages outside of the physical address space is that they no longer have a PFN. However, it is still necessary to be able to look up a corresponding device private page from a device private PTE entry, which means that we still require some way to index into this device private address space. Instead of a PFN, device private pages use an offset into this device private address space to look up device private struct pages.
The problem that then needs to be addressed is how to avoid confusing these device private offsets with PFNs. It is the limited usage of the device private pages themselves which make this possible. A device private page is only used for userspace mappings, we do not need to be concerned with them being used within the mm more broadly. This means that the only way that the core kernel looks up these pages is via the page table, where their PTE already indicates if they refer to a device private page via their swap type, e.g.
SWP_DEVICE_WRITE. We can use this information to determine if the PTE contains a PFN which should be looked up in the page map, or a device private offset which should be looked up elsewhere.This applies when we are creating PTE entries for device private pages - because they have their own type there are already must be handled separately, so it is a small step to convert them to a device private PFN now too.
The first part of the series updates callers where device private offsets might now be encountered to track this extra state.
The last patch contains the bulk of the work where we change how we convert between device private pages to device private offsets and then use a new interface for allocating device private pages without the need for reserving physical address space.
Quoted 6 lines
By removing the device private pages from the physical address space, this series also opens up the possibility to moving away from tracking device private memory using struct pages in the future. This is desirable as on systems with large amounts of memory these device private struct pages use a signifiant amount of memory and take a significant amount of time to initialize.
Quoted 6 lines
Now device private pages are quite different from other pages, even in a separate address pace. IMHO, it may be better to make that as explicit as possible. For example, is it a good idea to put them in its own zone, like
ZONE_DEVICE_PRIVATE? It appears not natural to put pages from different address spaces into one zone. And, this may make them easier to be distinguished from other pages.
All pages in ZONE_DEVICE are quite different from each other in their various different and type specifc ways and often need to be treated as such. The purpose of ZONE_DEVICE (at least as I understand it) is primarily to isolate these pages from any generic kernel allocators. So it's unclear to me what advantage a new zone would provide - we already have pgmap->type and functions to distinguish different types of zone device page and the existing ZONE_DEVICE assignment already provides the isolation from generic kernel code that we need.
- Alistair
Quoted 3 lines
---
Best Regards,
Huang, Ying