Skip to content

Commit 21aa65b

Browse files
apopple-nvidiaakpm00
apopple-nvidia
authored and
akpm00
committed
mm: remove callers of pfn_t functionality
All PFN_* pfn_t flags have been removed. Therefore there is no longer a need for the pfn_t type and all uses can be replaced with normal pfns. Link: https://lkml.kernel.org/r/bbedfa576c9822f8032494efbe43544628698b1f.1750323463.git-series.apopple@nvidia.com Signed-off-by: Alistair Popple <apopple@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Acked-by: David Hildenbrand <david@redhat.com> Cc: Balbir Singh <balbirs@nvidia.com> Cc: Björn Töpel <bjorn@kernel.org> Cc: Björn Töpel <bjorn@rivosinc.com> Cc: Chunyan Zhang <zhang.lyra@gmail.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Deepak Gupta <debug@rivosinc.com> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: Inki Dae <m.szyprowski@samsung.com> Cc: John Groves <john@groves.net> Cc: John Hubbard <jhubbard@nvidia.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 984921e commit 21aa65b

File tree

43 files changed

+109
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+109
-235
lines changed

‎arch/x86/mm/pat/memtype.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <linux/debugfs.h>
3737
#include <linux/ioport.h>
3838
#include <linux/kernel.h>
39-
#include <linux/pfn_t.h>
4039
#include <linux/slab.h>
4140
#include <linux/io.h>
4241
#include <linux/mm.h>

‎drivers/dax/device.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <linux/pagemap.h>
55
#include <linux/module.h>
66
#include <linux/device.h>
7-
#include <linux/pfn_t.h>
87
#include <linux/cdev.h>
98
#include <linux/slab.h>
109
#include <linux/dax.h>
@@ -73,7 +72,7 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff,
7372
return -1;
7473
}
7574

76-
static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn,
75+
static void dax_set_mapping(struct vm_fault *vmf, unsigned long pfn,
7776
unsigned long fault_size)
7877
{
7978
unsigned long i, nr_pages = fault_size / PAGE_SIZE;
@@ -89,7 +88,7 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn,
8988
ALIGN_DOWN(vmf->address, fault_size));
9089

9190
for (i = 0; i < nr_pages; i++) {
92-
struct folio *folio = pfn_folio(pfn_t_to_pfn(pfn) + i);
91+
struct folio *folio = pfn_folio(pfn + i);
9392

9493
if (folio->mapping)
9594
continue;
@@ -104,7 +103,7 @@ static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax,
104103
{
105104
struct device *dev = &dev_dax->dev;
106105
phys_addr_t phys;
107-
pfn_t pfn;
106+
unsigned long pfn;
108107
unsigned int fault_size = PAGE_SIZE;
109108

110109
if (check_vma(dev_dax, vmf->vma, __func__))
@@ -125,11 +124,11 @@ static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax,
125124
return VM_FAULT_SIGBUS;
126125
}
127126

128-
pfn = phys_to_pfn_t(phys, 0);
127+
pfn = PHYS_PFN(phys);
129128

130129
dax_set_mapping(vmf, pfn, fault_size);
131130

132-
return vmf_insert_page_mkwrite(vmf, pfn_t_to_page(pfn),
131+
return vmf_insert_page_mkwrite(vmf, pfn_to_page(pfn),
133132
vmf->flags & FAULT_FLAG_WRITE);
134133
}
135134

@@ -140,7 +139,7 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax,
140139
struct device *dev = &dev_dax->dev;
141140
phys_addr_t phys;
142141
pgoff_t pgoff;
143-
pfn_t pfn;
142+
unsigned long pfn;
144143
unsigned int fault_size = PMD_SIZE;
145144

146145
if (check_vma(dev_dax, vmf->vma, __func__))
@@ -169,11 +168,11 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax,
169168
return VM_FAULT_SIGBUS;
170169
}
171170

172-
pfn = phys_to_pfn_t(phys, 0);
171+
pfn = PHYS_PFN(phys);
173172

174173
dax_set_mapping(vmf, pfn, fault_size);
175174

176-
return vmf_insert_folio_pmd(vmf, page_folio(pfn_t_to_page(pfn)),
175+
return vmf_insert_folio_pmd(vmf, page_folio(pfn_to_page(pfn)),
177176
vmf->flags & FAULT_FLAG_WRITE);
178177
}
179178

@@ -185,7 +184,7 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax,
185184
struct device *dev = &dev_dax->dev;
186185
phys_addr_t phys;
187186
pgoff_t pgoff;
188-
pfn_t pfn;
187+
unsigned long pfn;
189188
unsigned int fault_size = PUD_SIZE;
190189

191190

@@ -215,11 +214,11 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax,
215214
return VM_FAULT_SIGBUS;
216215
}
217216

218-
pfn = phys_to_pfn_t(phys, 0);
217+
pfn = PHYS_PFN(phys);
219218

220219
dax_set_mapping(vmf, pfn, fault_size);
221220

222-
return vmf_insert_folio_pud(vmf, page_folio(pfn_t_to_page(pfn)),
221+
return vmf_insert_folio_pud(vmf, page_folio(pfn_to_page(pfn)),
223222
vmf->flags & FAULT_FLAG_WRITE);
224223
}
225224
#else

‎drivers/dax/hmem/hmem.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include <linux/platform_device.h>
33
#include <linux/memregion.h>
44
#include <linux/module.h>
5-
#include <linux/pfn_t.h>
65
#include <linux/dax.h>
76
#include "../bus.h"
87

‎drivers/dax/kmem.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <linux/memory.h>
66
#include <linux/module.h>
77
#include <linux/device.h>
8-
#include <linux/pfn_t.h>
98
#include <linux/slab.h>
109
#include <linux/dax.h>
1110
#include <linux/fs.h>

‎drivers/dax/pmem.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/* Copyright(c) 2016 - 2018 Intel Corporation. All rights reserved. */
33
#include <linux/memremap.h>
44
#include <linux/module.h>
5-
#include <linux/pfn_t.h>
65
#include "../nvdimm/pfn.h"
76
#include "../nvdimm/nd.h"
87
#include "bus.h"

‎drivers/dax/super.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/mount.h>
88
#include <linux/pseudo_fs.h>
99
#include <linux/magic.h>
10-
#include <linux/pfn_t.h>
1110
#include <linux/cdev.h>
1211
#include <linux/slab.h>
1312
#include <linux/uio.h>
@@ -148,7 +147,7 @@ enum dax_device_flags {
148147
* pages accessible at the device relative @pgoff.
149148
*/
150149
long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages,
151-
enum dax_access_mode mode, void **kaddr, pfn_t *pfn)
150+
enum dax_access_mode mode, void **kaddr, unsigned long *pfn)
152151
{
153152
long avail;
154153

‎drivers/gpu/drm/exynos/exynos_drm_gem.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88

99
#include <linux/dma-buf.h>
10-
#include <linux/pfn_t.h>
1110
#include <linux/shmem_fs.h>
1211
#include <linux/module.h>
1312

‎drivers/gpu/drm/gma500/fbdev.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
**************************************************************************/
77

88
#include <linux/fb.h>
9-
#include <linux/pfn_t.h>
109

1110
#include <drm/drm_crtc_helper.h>
1211
#include <drm/drm_drv.h>
@@ -33,7 +32,7 @@ static vm_fault_t psb_fbdev_vm_fault(struct vm_fault *vmf)
3332
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
3433

3534
for (i = 0; i < page_num; ++i) {
36-
err = vmf_insert_mixed(vma, address, __pfn_to_pfn_t(pfn, 0));
35+
err = vmf_insert_mixed(vma, address, pfn);
3736
if (unlikely(err & VM_FAULT_ERROR))
3837
break;
3938
address += PAGE_SIZE;

‎drivers/gpu/drm/i915/gem/i915_gem_mman.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <linux/anon_inodes.h>
77
#include <linux/mman.h>
8-
#include <linux/pfn_t.h>
98
#include <linux/sizes.h>
109

1110
#include <drm/drm_cache.h>

‎drivers/gpu/drm/msm/msm_gem.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/spinlock.h>
1010
#include <linux/shmem_fs.h>
1111
#include <linux/dma-buf.h>
12-
#include <linux/pfn_t.h>
1312

1413
#include <drm/drm_prime.h>
1514
#include <drm/drm_file.h>

0 commit comments

Comments
 (0)