The PFN_MAP flag is no longer used for anything, so remove it. The
PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so
also remove them.
Signed-off-by: Alistair Popple <apopple@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/linux/pfn_t.h | 31 +++----------------------------
mm/memory.c | 2 --
tools/testing/nvdimm/test/iomap.c | 4 ----
3 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
index 2d91482..46afa12 100644
--- a/include/linux/pfn_t.h
+++ b/include/linux/pfn_t.h
@@ -5,26 +5,13 @@
/*
* PFN_FLAGS_MASK - mask of all the possible valid pfn_t flags
- * PFN_SG_CHAIN - pfn is a pointer to the next scatterlist entry
- * PFN_SG_LAST - pfn references a page and is the last scatterlist entry
* PFN_DEV - pfn is not covered by system memmap by default
- * PFN_MAP - pfn has a dynamic page mapping established by a device driver
- * PFN_SPECIAL - for CONFIG_FS_DAX_LIMITED builds to allow XIP, but not
- * get_user_pages
*/
#define PFN_FLAGS_MASK (((u64) (~PAGE_MASK)) << (BITS_PER_LONG_LONG - PAGE_SHIFT))
-#define PFN_SG_CHAIN (1ULL << (BITS_PER_LONG_LONG - 1))
-#define PFN_SG_LAST (1ULL << (BITS_PER_LONG_LONG - 2))
#define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3))
-#define PFN_MAP (1ULL << (BITS_PER_LONG_LONG - 4))
-#define PFN_SPECIAL (1ULL << (BITS_PER_LONG_LONG - 5))
#define PFN_FLAGS_TRACE \
- { PFN_SPECIAL, "SPECIAL" }, \
- { PFN_SG_CHAIN, "SG_CHAIN" }, \
- { PFN_SG_LAST, "SG_LAST" }, \
- { PFN_DEV, "DEV" }, \
- { PFN_MAP, "MAP" }
+ { PFN_DEV, "DEV" }
static inline pfn_t __pfn_to_pfn_t(unsigned long pfn, u64 flags)
{
@@ -46,7 +33,7 @@ static inline pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags)
static inline bool pfn_t_has_page(pfn_t pfn)
{
- return (pfn.val & PFN_MAP) == PFN_MAP || (pfn.val & PFN_DEV) == 0;
+ return (pfn.val & PFN_DEV) == 0;
}
static inline unsigned long pfn_t_to_pfn(pfn_t pfn)
@@ -100,7 +87,7 @@ static inline pud_t pfn_t_pud(pfn_t pfn, pgprot_t pgprot)
#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP
static inline bool pfn_t_devmap(pfn_t pfn)
{
- const u64 flags = PFN_DEV|PFN_MAP;
+ const u64 flags = PFN_DEV;
return (pfn.val & flags) == flags;
}
@@ -116,16 +103,4 @@ pmd_t pmd_mkdevmap(pmd_t pmd);
pud_t pud_mkdevmap(pud_t pud);
#endif
#endif /* CONFIG_ARCH_HAS_PTE_DEVMAP */
-
-#ifdef CONFIG_ARCH_HAS_PTE_SPECIAL
-static inline bool pfn_t_special(pfn_t pfn)
-{
- return (pfn.val & PFN_SPECIAL) == PFN_SPECIAL;
-}
-#else
-static inline bool pfn_t_special(pfn_t pfn)
-{
- return false;
-}
-#endif /* CONFIG_ARCH_HAS_PTE_SPECIAL */
#endif /* _LINUX_PFN_T_H_ */
diff --git a/mm/memory.c b/mm/memory.c
index 4919941..cc85f81 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2569,8 +2569,6 @@ static bool vm_mixed_ok(struct vm_area_struct *vma, pfn_t pfn, bool mkwrite)
return true;
if (pfn_t_devmap(pfn))
return true;
- if (pfn_t_special(pfn))
- return true;
if (is_zero_pfn(pfn_t_to_pfn(pfn)))
return true;
return false;
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index e431372..ddceb04 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -137,10 +137,6 @@ EXPORT_SYMBOL_GPL(__wrap_devm_memremap_pages);
pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
{
- struct nfit_test_resource *nfit_res = get_nfit_res(addr);
-
- if (nfit_res)
- flags &= ~PFN_MAP;
return phys_to_pfn_t(addr, flags);
}
EXPORT_SYMBOL(__wrap_phys_to_pfn_t);
--
git-series 0.9.1Alistair Popple wrote: > The PFN_MAP flag is no longer used for anything, so remove it. The > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so > also remove them. > > Signed-off-by: Alistair Popple <apopple@nvidia.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> Looks good and I see PFN_DEV goes later in the series: Reviewed-by: Dan Williams <dan.j.williams@intel.com>
On Thu, May 29, 2025 at 04:32:02PM +1000, Alistair Popple wrote: > The PFN_MAP flag is no longer used for anything, so remove it. The > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so > also remove them. > > Signed-off-by: Alistair Popple <apopple@nvidia.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > --- > include/linux/pfn_t.h | 31 +++---------------------------- > mm/memory.c | 2 -- > tools/testing/nvdimm/test/iomap.c | 4 ---- > 3 files changed, 3 insertions(+), 34 deletions(-) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason
On Thu, May 29, 2025 at 04:32:02PM +1000, Alistair Popple wrote: > The PFN_MAP flag is no longer used for anything, so remove it. The > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so > also remove them. > > Signed-off-by: Alistair Popple <apopple@nvidia.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> FYI, unlike the rest of the series that has some non-trivial work this feels like a 6.16-rc candidate as it just removes dead code and we'd better get that in before a new user or even just a conflict sneaks in.
On Mon, Jun 02, 2025 at 06:54:27AM +0200, Christoph Hellwig wrote: > On Thu, May 29, 2025 at 04:32:02PM +1000, Alistair Popple wrote: > > The PFN_MAP flag is no longer used for anything, so remove it. The > > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so > > also remove them. > > > > Signed-off-by: Alistair Popple <apopple@nvidia.com> > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > FYI, unlike the rest of the series that has some non-trivial work > this feels like a 6.16-rc candidate as it just removes dead code > and we'd better get that in before a new user or even just a conflict > sneaks in. Good idea. I have just sent it as a stand-alone patch.
On 29.05.25 08:32, Alistair Popple wrote: > The PFN_MAP flag is no longer used for anything, so remove it. The > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so > also remove them. > > Signed-off-by: Alistair Popple <apopple@nvidia.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > --- With SPECIAL mentioned as well Acked-by: David Hildenbrand <david@redhat.com> -- Cheers, David / dhildenb
On Thu, 29 May 2025 16:32:02 +1000
Alistair Popple <apopple@nvidia.com> wrote:
> The PFN_MAP flag is no longer used for anything, so remove it. The
> PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so
> also remove them.
Superficial thing but you seem to be be removing PFN_SPECIAL as well and
this description and patche description don't mention that.
>
> Signed-off-by: Alistair Popple <apopple@nvidia.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
On superficial comment inline.
> ---
> include/linux/pfn_t.h | 31 +++----------------------------
> mm/memory.c | 2 --
> tools/testing/nvdimm/test/iomap.c | 4 ----
> 3 files changed, 3 insertions(+), 34 deletions(-)
>
> diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
> index 2d91482..46afa12 100644
> --- a/include/linux/pfn_t.h
> +++ b/include/linux/pfn_t.h
> @@ -5,26 +5,13 @@
> diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
> index e431372..ddceb04 100644
> --- a/tools/testing/nvdimm/test/iomap.c
> +++ b/tools/testing/nvdimm/test/iomap.c
> @@ -137,10 +137,6 @@ EXPORT_SYMBOL_GPL(__wrap_devm_memremap_pages);
>
> pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
> {
> - struct nfit_test_resource *nfit_res = get_nfit_res(addr);
> -
> - if (nfit_res)
> - flags &= ~PFN_MAP;
> return phys_to_pfn_t(addr, flags);
Maybe not the time to point it out, but what is going on with indent here?
Looks like some spaces snuck in for that last line.
> }
> EXPORT_SYMBOL(__wrap_phys_to_pfn_t);
On Thu, May 29, 2025 at 12:46:20PM +0100, Jonathan Cameron wrote:
> On Thu, 29 May 2025 16:32:02 +1000
> Alistair Popple <apopple@nvidia.com> wrote:
>
> > The PFN_MAP flag is no longer used for anything, so remove it. The
> > PFN_SG_CHAIN and PFN_SG_LAST flags never appear to have been used so
> > also remove them.
>
> Superficial thing but you seem to be be removing PFN_SPECIAL as well and
> this description and patche description don't mention that.
>
> >
> > Signed-off-by: Alistair Popple <apopple@nvidia.com>
> > Reviewed-by: Christoph Hellwig <hch@lst.de>
>
> On superficial comment inline.
>
> > ---
> > include/linux/pfn_t.h | 31 +++----------------------------
> > mm/memory.c | 2 --
> > tools/testing/nvdimm/test/iomap.c | 4 ----
> > 3 files changed, 3 insertions(+), 34 deletions(-)
> >
> > diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
> > index 2d91482..46afa12 100644
> > --- a/include/linux/pfn_t.h
> > +++ b/include/linux/pfn_t.h
> > @@ -5,26 +5,13 @@
>
>
>
> > diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
> > index e431372..ddceb04 100644
> > --- a/tools/testing/nvdimm/test/iomap.c
> > +++ b/tools/testing/nvdimm/test/iomap.c
> > @@ -137,10 +137,6 @@ EXPORT_SYMBOL_GPL(__wrap_devm_memremap_pages);
> >
> > pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
> > {
> > - struct nfit_test_resource *nfit_res = get_nfit_res(addr);
> > -
> > - if (nfit_res)
> > - flags &= ~PFN_MAP;
> > return phys_to_pfn_t(addr, flags);
>
> Maybe not the time to point it out, but what is going on with indent here?
> Looks like some spaces snuck in for that last line.
Yeah weird. I don't think that was me. In any case this gets deleted entirely
later in the series so won't bother to fix it here.
> > }
> > EXPORT_SYMBOL(__wrap_phys_to_pfn_t);
>
© 2016 - 2025 Red Hat, Inc.