diff mbox series

[kvm-unit-tests,v2,3/5] s390x: lib: improve pgtable.h

Message ID 20210223140759.255670-4-imbrenda@linux.ibm.com (mailing list archive)
State New, archived
Headers show
Series s390: Add support for large pages | expand

Commit Message

Claudio Imbrenda Feb. 23, 2021, 2:07 p.m. UTC 
Improve pgtable.h:

* add macros to check whether a pmd or a pud are large / huge
* add idte functions for pmd, pud, p4d and pgd

Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 lib/s390x/asm/pgtable.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

Comments

Janosch Frank Feb. 23, 2021, 2:35 p.m. UTC | #1 
On 2/23/21 3:07 PM, Claudio Imbrenda wrote:
> Improve pgtable.h:
> 
> * add macros to check whether a pmd or a pud are large / huge
> * add idte functions for pmd, pud, p4d and pgd
> 
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

Could you please make the subject more specific?
"s390x: lib: Add idte and huge entry check functions"

Acked-by: Janosch Frank <frankja@linux.ibm.com>

> ---
>  lib/s390x/asm/pgtable.h | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/lib/s390x/asm/pgtable.h b/lib/s390x/asm/pgtable.h
> index a2ff2d4e..70d4afde 100644
> --- a/lib/s390x/asm/pgtable.h
> +++ b/lib/s390x/asm/pgtable.h
> @@ -100,6 +100,9 @@
>  #define pmd_none(entry) (pmd_val(entry) & SEGMENT_ENTRY_I)
>  #define pte_none(entry) (pte_val(entry) & PAGE_ENTRY_I)
>  
> +#define pud_huge(entry)  (pud_val(entry) & REGION3_ENTRY_FC)
> +#define pmd_large(entry) (pmd_val(entry) & SEGMENT_ENTRY_FC)
> +
>  #define pgd_addr(entry) __va(pgd_val(entry) & REGION_ENTRY_ORIGIN)
>  #define p4d_addr(entry) __va(p4d_val(entry) & REGION_ENTRY_ORIGIN)
>  #define pud_addr(entry) __va(pud_val(entry) & REGION_ENTRY_ORIGIN)
> @@ -216,6 +219,34 @@ static inline void ipte(unsigned long vaddr, pteval_t *p_pte)
>  		: : "a" (table_origin), "a" (vaddr) : "memory");
>  }
>  
> +static inline void idte(unsigned long table_origin, unsigned long vaddr)
> +{
> +	vaddr &= SEGMENT_ENTRY_SFAA;
> +	asm volatile(
> +		"	idte %0,0,%1\n"
> +		: : "a" (table_origin), "a" (vaddr) : "memory");
> +}
> +
> +static inline void idte_pmdp(unsigned long vaddr, pmdval_t *pmdp)
> +{
> +	idte((unsigned long)(pmdp - pmd_index(vaddr)) | ASCE_DT_SEGMENT, vaddr);
> +}
> +
> +static inline void idte_pudp(unsigned long vaddr, pudval_t *pudp)
> +{
> +	idte((unsigned long)(pudp - pud_index(vaddr)) | ASCE_DT_REGION3, vaddr);
> +}
> +
> +static inline void idte_p4dp(unsigned long vaddr, p4dval_t *p4dp)
> +{
> +	idte((unsigned long)(p4dp - p4d_index(vaddr)) | ASCE_DT_REGION2, vaddr);
> +}
> +
> +static inline void idte_pgdp(unsigned long vaddr, pgdval_t *pgdp)
> +{
> +	idte((unsigned long)(pgdp - pgd_index(vaddr)) | ASCE_DT_REGION1, vaddr);
> +}
> +
>  void configure_dat(int enable);
>  
>  #endif /* _ASMS390X_PGTABLE_H_ */
>
Claudio Imbrenda Feb. 23, 2021, 3:21 p.m. UTC | #2 
On Tue, 23 Feb 2021 15:35:28 +0100
Janosch Frank <frankja@linux.ibm.com> wrote:

> On 2/23/21 3:07 PM, Claudio Imbrenda wrote:
> > Improve pgtable.h:
> > 
> > * add macros to check whether a pmd or a pud are large / huge
> > * add idte functions for pmd, pud, p4d and pgd
> > 
> > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>  
> 
> Could you please make the subject more specific?
> "s390x: lib: Add idte and huge entry check functions"

will do

> Acked-by: Janosch Frank <frankja@linux.ibm.com>
> 
> > ---
> >  lib/s390x/asm/pgtable.h | 31 +++++++++++++++++++++++++++++++
> >  1 file changed, 31 insertions(+)
> > 
> > diff --git a/lib/s390x/asm/pgtable.h b/lib/s390x/asm/pgtable.h
> > index a2ff2d4e..70d4afde 100644
> > --- a/lib/s390x/asm/pgtable.h
> > +++ b/lib/s390x/asm/pgtable.h
> > @@ -100,6 +100,9 @@
> >  #define pmd_none(entry) (pmd_val(entry) & SEGMENT_ENTRY_I)
> >  #define pte_none(entry) (pte_val(entry) & PAGE_ENTRY_I)
> >  
> > +#define pud_huge(entry)  (pud_val(entry) & REGION3_ENTRY_FC)
> > +#define pmd_large(entry) (pmd_val(entry) & SEGMENT_ENTRY_FC)
> > +
> >  #define pgd_addr(entry) __va(pgd_val(entry) & REGION_ENTRY_ORIGIN)
> >  #define p4d_addr(entry) __va(p4d_val(entry) & REGION_ENTRY_ORIGIN)
> >  #define pud_addr(entry) __va(pud_val(entry) & REGION_ENTRY_ORIGIN)
> > @@ -216,6 +219,34 @@ static inline void ipte(unsigned long vaddr,
> > pteval_t *p_pte) : : "a" (table_origin), "a" (vaddr) : "memory");
> >  }
> >  
> > +static inline void idte(unsigned long table_origin, unsigned long
> > vaddr) +{
> > +	vaddr &= SEGMENT_ENTRY_SFAA;
> > +	asm volatile(
> > +		"	idte %0,0,%1\n"
> > +		: : "a" (table_origin), "a" (vaddr) : "memory");
> > +}
> > +
> > +static inline void idte_pmdp(unsigned long vaddr, pmdval_t *pmdp)
> > +{
> > +	idte((unsigned long)(pmdp - pmd_index(vaddr)) |
> > ASCE_DT_SEGMENT, vaddr); +}
> > +
> > +static inline void idte_pudp(unsigned long vaddr, pudval_t *pudp)
> > +{
> > +	idte((unsigned long)(pudp - pud_index(vaddr)) |
> > ASCE_DT_REGION3, vaddr); +}
> > +
> > +static inline void idte_p4dp(unsigned long vaddr, p4dval_t *p4dp)
> > +{
> > +	idte((unsigned long)(p4dp - p4d_index(vaddr)) |
> > ASCE_DT_REGION2, vaddr); +}
> > +
> > +static inline void idte_pgdp(unsigned long vaddr, pgdval_t *pgdp)
> > +{
> > +	idte((unsigned long)(pgdp - pgd_index(vaddr)) |
> > ASCE_DT_REGION1, vaddr); +}
> > +
> >  void configure_dat(int enable);
> >  
> >  #endif /* _ASMS390X_PGTABLE_H_ */
> >   
>
diff mbox series

Patch

diff --git a/lib/s390x/asm/pgtable.h b/lib/s390x/asm/pgtable.h
index a2ff2d4e..70d4afde 100644
--- a/lib/s390x/asm/pgtable.h
+++ b/lib/s390x/asm/pgtable.h
@@ -100,6 +100,9 @@ 
 #define pmd_none(entry) (pmd_val(entry) & SEGMENT_ENTRY_I)
 #define pte_none(entry) (pte_val(entry) & PAGE_ENTRY_I)
 
+#define pud_huge(entry)  (pud_val(entry) & REGION3_ENTRY_FC)
+#define pmd_large(entry) (pmd_val(entry) & SEGMENT_ENTRY_FC)
+
 #define pgd_addr(entry) __va(pgd_val(entry) & REGION_ENTRY_ORIGIN)
 #define p4d_addr(entry) __va(p4d_val(entry) & REGION_ENTRY_ORIGIN)
 #define pud_addr(entry) __va(pud_val(entry) & REGION_ENTRY_ORIGIN)
@@ -216,6 +219,34 @@  static inline void ipte(unsigned long vaddr, pteval_t *p_pte)
 		: : "a" (table_origin), "a" (vaddr) : "memory");
 }
 
+static inline void idte(unsigned long table_origin, unsigned long vaddr)
+{
+	vaddr &= SEGMENT_ENTRY_SFAA;
+	asm volatile(
+		"	idte %0,0,%1\n"
+		: : "a" (table_origin), "a" (vaddr) : "memory");
+}
+
+static inline void idte_pmdp(unsigned long vaddr, pmdval_t *pmdp)
+{
+	idte((unsigned long)(pmdp - pmd_index(vaddr)) | ASCE_DT_SEGMENT, vaddr);
+}
+
+static inline void idte_pudp(unsigned long vaddr, pudval_t *pudp)
+{
+	idte((unsigned long)(pudp - pud_index(vaddr)) | ASCE_DT_REGION3, vaddr);
+}
+
+static inline void idte_p4dp(unsigned long vaddr, p4dval_t *p4dp)
+{
+	idte((unsigned long)(p4dp - p4d_index(vaddr)) | ASCE_DT_REGION2, vaddr);
+}
+
+static inline void idte_pgdp(unsigned long vaddr, pgdval_t *pgdp)
+{
+	idte((unsigned long)(pgdp - pgd_index(vaddr)) | ASCE_DT_REGION1, vaddr);
+}
+
 void configure_dat(int enable);
 
 #endif /* _ASMS390X_PGTABLE_H_ */