The patch titled
Subject: mm/memremap_pages: replace zone_device_page_init() with pgmap_request_folios()
has been added to the -mm mm-unstable branch. Its filename is
mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Dan Williams <dan.j.williams@xxxxxxxxx>
Subject: mm/memremap_pages: replace zone_device_page_init() with pgmap_request_folios()
Date: Fri, 14 Oct 2022 16:59:06 -0700
Switch to the common method, shared across all MEMORY_DEVICE_* types, for
requesting access to a ZONE_DEVICE page. The
MEMORY_DEVICE_{PRIVATE,COHERENT} specific expectation that newly requested
pages are locked is moved to the callers.
Link: https://lkml.kernel.org/r/166579194621.2236710.8168919102434295671.stgit@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: John Hubbard <jhubbard@xxxxxxxxxx>
Cc: Alistair Popple <apopple@xxxxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxxxx>
Cc: Felix Kuehling <Felix.Kuehling@xxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: "Christian König" <christian.koenig@xxxxxxx>
Cc: "Pan, Xinhui" <Xinhui.Pan@xxxxxxx>
Cc: David Airlie <airlied@xxxxxxxx>
Cc: Daniel Vetter <daniel@xxxxxxxx>
Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
Cc: Karol Herbst <kherbst@xxxxxxxxxx>
Cc: Lyude Paul <lyude@xxxxxxxxxx>
Cc: "Jérôme Glisse" <jglisse@xxxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kvm/book3s_hv_uvmem.c | 3 ++-
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 ++-
drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 ++-
include/linux/memremap.h | 1 -
lib/test_hmm.c | 3 ++-
mm/memremap.c | 13 +------------
6 files changed, 9 insertions(+), 17 deletions(-)
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -718,7 +718,8 @@ static struct page *kvmppc_uvmem_get_pag
dpage = pfn_to_page(uvmem_pfn);
dpage->zone_device_data = pvt;
- zone_device_page_init(dpage);
+ pgmap_request_folios(dpage->pgmap, page_folio(dpage), 1);
+ lock_page(dpage);
return dpage;
out_clear:
spin_lock(&kvmppc_uvmem_bitmap_lock);
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@ -223,7 +223,8 @@ svm_migrate_get_vram_page(struct svm_ran
page = pfn_to_page(pfn);
svm_range_bo_ref(prange->svm_bo);
page->zone_device_data = prange->svm_bo;
- zone_device_page_init(page);
+ pgmap_request_folios(page->pgmap, page_folio(page), 1);
+ lock_page(page);
}
static void
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -324,7 +324,8 @@ nouveau_dmem_page_alloc_locked(struct no
return NULL;
}
- zone_device_page_init(page);
+ pgmap_request_folios(page->pgmap, page_folio(page), 1);
+ lock_page(page);
return page;
}
--- a/include/linux/memremap.h~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/include/linux/memremap.h
@@ -187,7 +187,6 @@ static inline bool folio_is_device_coher
}
#ifdef CONFIG_ZONE_DEVICE
-void zone_device_page_init(struct page *page);
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);
--- a/lib/test_hmm.c~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/lib/test_hmm.c
@@ -632,7 +632,8 @@ static struct page *dmirror_devmem_alloc
goto error;
}
- zone_device_page_init(dpage);
+ pgmap_request_folios(dpage->pgmap, page_folio(dpage), 1);
+ lock_page(dpage);
dpage->zone_device_data = rpage;
return dpage;
--- a/mm/memremap.c~mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios
+++ a/mm/memremap.c
@@ -518,18 +518,6 @@ void free_zone_device_page(struct page *
put_dev_pagemap(page->pgmap);
}
-void zone_device_page_init(struct page *page)
-{
- /*
- * Drivers shouldn't be allocating pages after calling
- * memunmap_pages().
- */
- WARN_ON_ONCE(!percpu_ref_tryget_live(&page->pgmap->ref));
- set_page_count(page, 1);
- lock_page(page);
-}
-EXPORT_SYMBOL_GPL(zone_device_page_init);
-
static bool folio_span_valid(struct dev_pagemap *pgmap, struct folio *folio,
int nr_folios)
{
@@ -586,6 +574,7 @@ bool pgmap_request_folios(struct dev_pag
return true;
}
+EXPORT_SYMBOL_GPL(pgmap_request_folios);
void pgmap_release_folios(struct dev_pagemap *pgmap, struct folio *folio, int nr_folios)
{
_
Patches currently in -mm which might be from dan.j.williams@xxxxxxxxx are
fsdax-wait-on-page-not-page-_refcount.patch
fsdax-use-dax_page_idle-to-document-dax-busy-page-checking.patch
fsdax-include-unmapped-inodes-for-page-idle-detection.patch
fsdax-introduce-dax_zap_mappings.patch
fsdax-wait-for-pinned-pages-during-truncate_inode_pages_final.patch
fsdax-validate-dax-layouts-broken-before-truncate.patch
fsdax-hold-dax-lock-over-mapping-insertion.patch
fsdax-update-dax_insert_entry-calling-convention-to-return-an-error.patch
fsdax-rework-for_each_mapped_pfn-to-dax_for_each_folio.patch
fsdax-introduce-pgmap_request_folios.patch
fsdax-rework-dax_insert_entry-calling-convention.patch
fsdax-cleanup-dax_associate_entry.patch
devdax-minor-warning-fixups.patch
devdax-fix-sparse-lock-imbalance-warning.patch
libnvdimm-pmem-support-pmem-block-devices-without-dax.patch
devdax-move-address_space-helpers-to-the-dax-core.patch
devdax-sparse-fixes-for-xarray-locking.patch
devdax-sparse-fixes-for-vmfault_t-dax-entry-conversions.patch
devdax-sparse-fixes-for-vm_fault_t-in-tracepoints.patch
devdax-add-pud-support-to-the-dax-mapping-infrastructure.patch
devdax-use-dax_insert_entry-dax_delete_mapping_entry.patch
mm-memremap_pages-replace-zone_device_page_init-with-pgmap_request_folios.patch
mm-memremap_pages-initialize-all-zone_device-pages-to-start-at-refcount-0.patch
mm-meremap_pages-delete-put_devmap_managed_page_refs.patch
mm-gup-drop-dax-pgmap-accounting.patch
