| Message ID | 20240809160909.1023470-9-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: Support huge pfnmaps | expand |
On Fri, Aug 09, 2024 at 12:08:58PM -0400, Peter Xu wrote: > There're: > > - 8 archs (arc, arm64, include, mips, powerpc, s390, sh, x86) that > support pte_pgprot(). > > - 2 archs (x86, sparc) that support pmd_pgprot(). > > - 1 arch (x86) that support pud_pgprot(). > > Always define them to be used in generic code, and then we don't need to > fiddle with "#ifdef"s when doing so. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > arch/arm64/include/asm/pgtable.h | 1 + > arch/powerpc/include/asm/pgtable.h | 1 + > arch/s390/include/asm/pgtable.h | 1 + > arch/sparc/include/asm/pgtable_64.h | 1 + > include/linux/pgtable.h | 12 ++++++++++++ > 5 files changed, 16 insertions(+) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index 7a4f5604be3f..b78cc4a6758b 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -384,6 +384,7 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) > /* > * Select all bits except the pfn > */ > +#define pte_pgprot pte_pgprot > static inline pgprot_t pte_pgprot(pte_t pte) > { > unsigned long pfn = pte_pfn(pte); Stylistically I've been putting the #defines after the function body, I wonder if there is a common pattern.. Jason
On Wed, Aug 14, 2024 at 10:09:15AM -0300, Jason Gunthorpe wrote: > On Fri, Aug 09, 2024 at 12:08:58PM -0400, Peter Xu wrote: > > There're: > > > > - 8 archs (arc, arm64, include, mips, powerpc, s390, sh, x86) that > > support pte_pgprot(). > > > > - 2 archs (x86, sparc) that support pmd_pgprot(). > > > > - 1 arch (x86) that support pud_pgprot(). > > > > Always define them to be used in generic code, and then we don't need to > > fiddle with "#ifdef"s when doing so. > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > --- > > arch/arm64/include/asm/pgtable.h | 1 + > > arch/powerpc/include/asm/pgtable.h | 1 + > > arch/s390/include/asm/pgtable.h | 1 + > > arch/sparc/include/asm/pgtable_64.h | 1 + > > include/linux/pgtable.h | 12 ++++++++++++ > > 5 files changed, 16 insertions(+) > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > > index 7a4f5604be3f..b78cc4a6758b 100644 > > --- a/arch/arm64/include/asm/pgtable.h > > +++ b/arch/arm64/include/asm/pgtable.h > > @@ -384,6 +384,7 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) > > /* > > * Select all bits except the pfn > > */ > > +#define pte_pgprot pte_pgprot > > static inline pgprot_t pte_pgprot(pte_t pte) > > { > > unsigned long pfn = pte_pfn(pte); > > Stylistically I've been putting the #defines after the function body, > I wonder if there is a common pattern.. Right, I see both happening in tree right now and I don't know which is better. Personally I preferred "before function" as it makes spell checks easy to match macro/func names, and also cscope indexes both macro and func, so a jump to any of them would make me look at the entry of func. I'll keep it as-is for now just to make it easy for me.. but please comment if we do have a preferred pattern the other way round, then I'll follow. Thanks,
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7a4f5604be3f..b78cc4a6758b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -384,6 +384,7 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) /* * Select all bits except the pfn */ +#define pte_pgprot pte_pgprot static inline pgprot_t pte_pgprot(pte_t pte) { unsigned long pfn = pte_pfn(pte); diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index 264a6c09517a..2f72ad885332 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -65,6 +65,7 @@ static inline unsigned long pte_pfn(pte_t pte) /* * Select all bits except the pfn */ +#define pte_pgprot pte_pgprot static inline pgprot_t pte_pgprot(pte_t pte) { unsigned long pte_flags; diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 3fa280d0672a..0ffbaf741955 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -955,6 +955,7 @@ static inline int pte_unused(pte_t pte) * young/old accounting is not supported, i.e _PAGE_PROTECT and _PAGE_INVALID * must not be set. */ +#define pte_pgprot pte_pgprot static inline pgprot_t pte_pgprot(pte_t pte) { unsigned long pte_flags = pte_val(pte) & _PAGE_CHG_MASK; diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 3fe429d73a65..2b7f358762c1 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -783,6 +783,7 @@ static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) return __pmd(pte_val(pte)); } +#define pmd_pgprot pmd_pgprot static inline pgprot_t pmd_pgprot(pmd_t entry) { unsigned long val = pmd_val(entry); diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 780f3b439d98..e8b2ac6bd2ae 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1956,6 +1956,18 @@ typedef unsigned int pgtbl_mod_mask; #define MAX_PTRS_PER_P4D PTRS_PER_P4D #endif +#ifndef pte_pgprot +#define pte_pgprot(x) ((pgprot_t) {0}) +#endif + +#ifndef pmd_pgprot +#define pmd_pgprot(x) ((pgprot_t) {0}) +#endif + +#ifndef pud_pgprot +#define pud_pgprot(x) ((pgprot_t) {0}) +#endif + /* description of effects of mapping type and prot in current implementation. * this is due to the limited x86 page protection hardware. The expected * behavior is in parens:
There're: - 8 archs (arc, arm64, include, mips, powerpc, s390, sh, x86) that support pte_pgprot(). - 2 archs (x86, sparc) that support pmd_pgprot(). - 1 arch (x86) that support pud_pgprot(). Always define them to be used in generic code, and then we don't need to fiddle with "#ifdef"s when doing so. Signed-off-by: Peter Xu <peterx@redhat.com> --- arch/arm64/include/asm/pgtable.h | 1 + arch/powerpc/include/asm/pgtable.h | 1 + arch/s390/include/asm/pgtable.h | 1 + arch/sparc/include/asm/pgtable_64.h | 1 + include/linux/pgtable.h | 12 ++++++++++++ 5 files changed, 16 insertions(+)