| Message ID | 1388852843-30986-1-git-send-email-christoffer.dall@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: > The stage-2 memory attributes are distinct from the Hyp memory > attributes and the Stage-1 memory attributes. We were using the stage-1 > memory attributes for stage-2 mappings causing device mappings to be > mapped as normal memory. Add the S2 equivalent defines for memory > attributes and fix the comments explaining the defines while at it. > > Add a prot_pte_s2 field to the mem_type struct and fill out the field > for device mappings accordingly. > > Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> > --- > Changelog[v2]: > - Guard the use of L_PTE_S2 defines with s2_policy to allow non-LPAE compiles. > > arch/arm/include/asm/pgtable-3level.h | 20 +++++++++++++------- > arch/arm/mm/mm.h | 1 + > arch/arm/mm/mmu.c | 15 ++++++++++++++- > 3 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h > index 4f95039..d5e04d6 100644 > --- a/arch/arm/include/asm/pgtable-3level.h > +++ b/arch/arm/include/asm/pgtable-3level.h > @@ -120,13 +120,19 @@ > /* > * 2nd stage PTE definitions for LPAE. > */ > -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ > -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ > -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ > -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > - > -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ > +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ > +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ > +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ > +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ > +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) > + > +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > + > +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > > /* > * Hyp-mode PL2 PTE definitions for LPAE. > diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h > index d5a982d..7ea641b 100644 > --- a/arch/arm/mm/mm.h > +++ b/arch/arm/mm/mm.h > @@ -38,6 +38,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) > > struct mem_type { > pteval_t prot_pte; > + pteval_t prot_pte_s2; > pmdval_t prot_l1; > pmdval_t prot_sect; > unsigned int domain; > diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c > index 580ef2d..44d571f 100644 > --- a/arch/arm/mm/mmu.c > +++ b/arch/arm/mm/mmu.c > @@ -231,36 +231,48 @@ __setup("noalign", noalign_setup); > #endif /* ifdef CONFIG_CPU_CP15 / else */ > > #define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN > +#define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE > #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE > > static struct mem_type mem_types[] = { > [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */ > .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED | > L_PTE_SHARED, > + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | > + s2_policy(L_PTE_S2_MT_DEV_SHARED) | > + L_PTE_SHARED, > .prot_l1 = PMD_TYPE_TABLE, > .prot_sect = PROT_SECT_DEVICE | PMD_SECT_S, > .domain = DOMAIN_IO, > }, > [MT_DEVICE_NONSHARED] = { /* ARMv6 non-shared device */ > .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_NONSHARED, > + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | > + s2_policy(L_PTE_S2_MT_DEV_NONSHARED), > .prot_l1 = PMD_TYPE_TABLE, > .prot_sect = PROT_SECT_DEVICE, > .domain = DOMAIN_IO, > }, > [MT_DEVICE_CACHED] = { /* ioremap_cached */ > .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED, > + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | > + s2_policy(L_PTE_S2_MT_DEV_CACHED), > .prot_l1 = PMD_TYPE_TABLE, > .prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB, > .domain = DOMAIN_IO, > }, > [MT_DEVICE_WC] = { /* ioremap_wc */ > .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC, > + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | > + s2_policy(L_PTE_S2_MT_DEV_WC), > .prot_l1 = PMD_TYPE_TABLE, > .prot_sect = PROT_SECT_DEVICE, > .domain = DOMAIN_IO, > }, > [MT_UNCACHED] = { > .prot_pte = PROT_PTE_DEVICE, > + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | > + s2_policy(L_PTE_S2_MT_UNCACHED), > .prot_l1 = PMD_TYPE_TABLE, > .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, > .domain = DOMAIN_IO, > @@ -458,7 +470,8 @@ static void __init build_mem_type_table(void) > cp = &cache_policies[cachepolicy]; > vecs_pgprot = kern_pgprot = user_pgprot = cp->pte; > s2_pgprot = cp->pte_s2; > - hyp_device_pgprot = s2_device_pgprot = mem_types[MT_DEVICE].prot_pte; > + hyp_device_pgprot = mem_types[MT_DEVICE].prot_pte; > + s2_device_pgprot = mem_types[MT_DEVICE].prot_pte_s2; > > /* > * ARMv6 and above have extended page tables. > -- > 1.8.5 > Ping?
On 24/01/14 23:37, Christoffer Dall wrote: > On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: >> The stage-2 memory attributes are distinct from the Hyp memory >> attributes and the Stage-1 memory attributes. We were using the stage-1 >> memory attributes for stage-2 mappings causing device mappings to be >> mapped as normal memory. Add the S2 equivalent defines for memory >> attributes and fix the comments explaining the defines while at it. >> >> Add a prot_pte_s2 field to the mem_type struct and fill out the field >> for device mappings accordingly. >> >> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> >> --- >> Changelog[v2]: >> - Guard the use of L_PTE_S2 defines with s2_policy to allow non-LPAE compiles. >> >> arch/arm/include/asm/pgtable-3level.h | 20 +++++++++++++------- >> arch/arm/mm/mm.h | 1 + >> arch/arm/mm/mmu.c | 15 ++++++++++++++- >> 3 files changed, 28 insertions(+), 8 deletions(-) >> >> diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h >> index 4f95039..d5e04d6 100644 >> --- a/arch/arm/include/asm/pgtable-3level.h >> +++ b/arch/arm/include/asm/pgtable-3level.h >> @@ -120,13 +120,19 @@ >> /* >> * 2nd stage PTE definitions for LPAE. >> */ >> -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ >> -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ >> -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ >> -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ >> -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ >> - >> -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ >> +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ >> +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ >> +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ >> +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ >> +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ >> +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ >> +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ >> +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) >> + >> +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ >> +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ >> + >> +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ >> >> /* >> * Hyp-mode PL2 PTE definitions for LPAE. >> diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h >> index d5a982d..7ea641b 100644 >> --- a/arch/arm/mm/mm.h >> +++ b/arch/arm/mm/mm.h >> @@ -38,6 +38,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) >> >> struct mem_type { >> pteval_t prot_pte; >> + pteval_t prot_pte_s2; >> pmdval_t prot_l1; >> pmdval_t prot_sect; >> unsigned int domain; >> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c >> index 580ef2d..44d571f 100644 >> --- a/arch/arm/mm/mmu.c >> +++ b/arch/arm/mm/mmu.c >> @@ -231,36 +231,48 @@ __setup("noalign", noalign_setup); >> #endif /* ifdef CONFIG_CPU_CP15 / else */ >> >> #define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN >> +#define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE >> #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE >> >> static struct mem_type mem_types[] = { >> [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */ >> .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED | >> L_PTE_SHARED, >> + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | >> + s2_policy(L_PTE_S2_MT_DEV_SHARED) | >> + L_PTE_SHARED, >> .prot_l1 = PMD_TYPE_TABLE, >> .prot_sect = PROT_SECT_DEVICE | PMD_SECT_S, >> .domain = DOMAIN_IO, >> }, >> [MT_DEVICE_NONSHARED] = { /* ARMv6 non-shared device */ >> .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_NONSHARED, >> + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | >> + s2_policy(L_PTE_S2_MT_DEV_NONSHARED), >> .prot_l1 = PMD_TYPE_TABLE, >> .prot_sect = PROT_SECT_DEVICE, >> .domain = DOMAIN_IO, >> }, >> [MT_DEVICE_CACHED] = { /* ioremap_cached */ >> .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED, >> + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | >> + s2_policy(L_PTE_S2_MT_DEV_CACHED), >> .prot_l1 = PMD_TYPE_TABLE, >> .prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB, >> .domain = DOMAIN_IO, >> }, >> [MT_DEVICE_WC] = { /* ioremap_wc */ >> .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC, >> + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | >> + s2_policy(L_PTE_S2_MT_DEV_WC), >> .prot_l1 = PMD_TYPE_TABLE, >> .prot_sect = PROT_SECT_DEVICE, >> .domain = DOMAIN_IO, >> }, >> [MT_UNCACHED] = { >> .prot_pte = PROT_PTE_DEVICE, >> + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | >> + s2_policy(L_PTE_S2_MT_UNCACHED), >> .prot_l1 = PMD_TYPE_TABLE, >> .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, >> .domain = DOMAIN_IO, >> @@ -458,7 +470,8 @@ static void __init build_mem_type_table(void) >> cp = &cache_policies[cachepolicy]; >> vecs_pgprot = kern_pgprot = user_pgprot = cp->pte; >> s2_pgprot = cp->pte_s2; >> - hyp_device_pgprot = s2_device_pgprot = mem_types[MT_DEVICE].prot_pte; >> + hyp_device_pgprot = mem_types[MT_DEVICE].prot_pte; >> + s2_device_pgprot = mem_types[MT_DEVICE].prot_pte_s2; >> >> /* >> * ARMv6 and above have extended page tables. >> -- >> 1.8.5 >> > > Ping? Lost that one in the flurry of endianness bike shedding messages. The change makes sense to me. arm64 uses a slightly different approach, by using a PTE_S2_MEMATTR macro, but I'm not sure that would work for ARM. Russell, Catalin: could you please have a look at this? Thanks, M.
On Mon, Jan 27, 2014 at 11:16:57AM +0000, Marc Zyngier wrote: > On 24/01/14 23:37, Christoffer Dall wrote: > > On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: > >> --- a/arch/arm/include/asm/pgtable-3level.h > >> +++ b/arch/arm/include/asm/pgtable-3level.h > >> @@ -120,13 +120,19 @@ > >> /* > >> * 2nd stage PTE definitions for LPAE. > >> */ > >> -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ > >> -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ > >> -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ > >> -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > >> -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > >> - > >> -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > >> +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ > >> +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ > >> +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > >> +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ > >> +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ > >> +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ > >> +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > >> +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) > >> + > >> +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > >> +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > >> + > >> +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > >> > >> /* > >> * Hyp-mode PL2 PTE definitions for LPAE. > > The change makes sense to me. arm64 uses a slightly different approach, > by using a PTE_S2_MEMATTR macro, but I'm not sure that would work for ARM. > > Russell, Catalin: could you please have a look at this? Do we actually need more than Normal Cacheable and Device for stage 2?
On 27/01/14 16:57, Catalin Marinas wrote: > On Mon, Jan 27, 2014 at 11:16:57AM +0000, Marc Zyngier wrote: >> On 24/01/14 23:37, Christoffer Dall wrote: >>> On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: >>>> --- a/arch/arm/include/asm/pgtable-3level.h >>>> +++ b/arch/arm/include/asm/pgtable-3level.h >>>> @@ -120,13 +120,19 @@ >>>> /* >>>> * 2nd stage PTE definitions for LPAE. >>>> */ >>>> -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ >>>> -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ >>>> -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ >>>> -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ >>>> -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ >>>> - >>>> -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ >>>> +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ >>>> +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ >>>> +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ >>>> +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ >>>> +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ >>>> +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ >>>> +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ >>>> +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) >>>> + >>>> +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ >>>> +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ >>>> + >>>> +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ >>>> >>>> /* >>>> * Hyp-mode PL2 PTE definitions for LPAE. >> >> The change makes sense to me. arm64 uses a slightly different approach, >> by using a PTE_S2_MEMATTR macro, but I'm not sure that would work for ARM. >> >> Russell, Catalin: could you please have a look at this? > > Do we actually need more than Normal Cacheable and Device for stage 2? Not so far. As long as these two memory types are enforced as a minimum, we're quite happy to let the guest use whatever it decides. I suppose Christoffer introduces them all here as a matter of completeness, but I don't see them as being useful anytime soon. M.
On Mon, Jan 27, 2014 at 05:02:25PM +0000, Marc Zyngier wrote: > On 27/01/14 16:57, Catalin Marinas wrote: > > On Mon, Jan 27, 2014 at 11:16:57AM +0000, Marc Zyngier wrote: > >> On 24/01/14 23:37, Christoffer Dall wrote: > >>> On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: > >>>> --- a/arch/arm/include/asm/pgtable-3level.h > >>>> +++ b/arch/arm/include/asm/pgtable-3level.h > >>>> @@ -120,13 +120,19 @@ > >>>> /* > >>>> * 2nd stage PTE definitions for LPAE. > >>>> */ > >>>> -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ > >>>> -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ > >>>> -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ > >>>> -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > >>>> -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > >>>> - > >>>> -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > >>>> +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ > >>>> +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ > >>>> +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > >>>> +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ > >>>> +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ > >>>> +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ > >>>> +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > >>>> +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) > >>>> + > >>>> +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > >>>> +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > >>>> + > >>>> +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > >>>> > >>>> /* > >>>> * Hyp-mode PL2 PTE definitions for LPAE. > >> > >> The change makes sense to me. arm64 uses a slightly different approach, > >> by using a PTE_S2_MEMATTR macro, but I'm not sure that would work for ARM. > >> > >> Russell, Catalin: could you please have a look at this? > > > > Do we actually need more than Normal Cacheable and Device for stage 2? > > Not so far. As long as these two memory types are enforced as a minimum, > we're quite happy to let the guest use whatever it decides. > > I suppose Christoffer introduces them all here as a matter of > completeness, but I don't see them as being useful anytime soon. That would be useful on arm if you want cachepolicy= argument to force the cacheability of guest Normal memory type. On arm64, the stage 1 memory type is decided via MAIR and that's how we handle cachepolicy for Normal memory. But for stage 2 this won't work, the type is explicitly set in the MemAttr encoding. But I don't think we need host cachepolicy enforced onto guest.
On Mon, Jan 27, 2014 at 05:21:16PM +0000, Catalin Marinas wrote: > On Mon, Jan 27, 2014 at 05:02:25PM +0000, Marc Zyngier wrote: > > On 27/01/14 16:57, Catalin Marinas wrote: > > > On Mon, Jan 27, 2014 at 11:16:57AM +0000, Marc Zyngier wrote: > > >> On 24/01/14 23:37, Christoffer Dall wrote: > > >>> On Sat, Jan 04, 2014 at 08:27:23AM -0800, Christoffer Dall wrote: > > >>>> --- a/arch/arm/include/asm/pgtable-3level.h > > >>>> +++ b/arch/arm/include/asm/pgtable-3level.h > > >>>> @@ -120,13 +120,19 @@ > > >>>> /* > > >>>> * 2nd stage PTE definitions for LPAE. > > >>>> */ > > >>>> -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ > > >>>> -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ > > >>>> -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ > > >>>> -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > > >>>> -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > > >>>> - > > >>>> -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > > >>>> +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ > > >>>> +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ > > >>>> +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > > >>>> +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ > > >>>> +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ > > >>>> +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ > > >>>> +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ > > >>>> +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) > > >>>> + > > >>>> +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ > > >>>> +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > > >>>> + > > >>>> +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > > >>>> > > >>>> /* > > >>>> * Hyp-mode PL2 PTE definitions for LPAE. > > >> > > >> The change makes sense to me. arm64 uses a slightly different approach, > > >> by using a PTE_S2_MEMATTR macro, but I'm not sure that would work for ARM. > > >> > > >> Russell, Catalin: could you please have a look at this? > > > > > > Do we actually need more than Normal Cacheable and Device for stage 2? > > > > Not so far. As long as these two memory types are enforced as a minimum, > > we're quite happy to let the guest use whatever it decides. > > > > I suppose Christoffer introduces them all here as a matter of > > completeness, but I don't see them as being useful anytime soon. > > That would be useful on arm if you want cachepolicy= argument to force > the cacheability of guest Normal memory type. > > On arm64, the stage 1 memory type is decided via MAIR and that's how we > handle cachepolicy for Normal memory. But for stage 2 this won't work, > the type is explicitly set in the MemAttr encoding. But I don't think we > need host cachepolicy enforced onto guest. > ok, sent out a V2. Thanks for the comments. -Christoffer
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index 4f95039..d5e04d6 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -120,13 +120,19 @@ /* * 2nd stage PTE definitions for LPAE. */ -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */ -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */ -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */ -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ - -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ +#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2) /* strongly ordered */ +#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* normal inner write-through */ +#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ +#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2) /* device */ +#define L_PTE_S2_MT_DEV_NONSHARED (_AT(pteval_t, 0x1) << 2) /* device */ +#define L_PTE_S2_MT_DEV_WC (_AT(pteval_t, 0x5) << 2) /* normal non-cacheable */ +#define L_PTE_S2_MT_DEV_CACHED (_AT(pteval_t, 0xf) << 2) /* normal inner write-back */ +#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) + +#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[1] */ +#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ + +#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ /* * Hyp-mode PL2 PTE definitions for LPAE. diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index d5a982d..7ea641b 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h @@ -38,6 +38,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) struct mem_type { pteval_t prot_pte; + pteval_t prot_pte_s2; pmdval_t prot_l1; pmdval_t prot_sect; unsigned int domain; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 580ef2d..44d571f 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -231,36 +231,48 @@ __setup("noalign", noalign_setup); #endif /* ifdef CONFIG_CPU_CP15 / else */ #define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN +#define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE static struct mem_type mem_types[] = { [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */ .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED | L_PTE_SHARED, + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | + s2_policy(L_PTE_S2_MT_DEV_SHARED) | + L_PTE_SHARED, .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PROT_SECT_DEVICE | PMD_SECT_S, .domain = DOMAIN_IO, }, [MT_DEVICE_NONSHARED] = { /* ARMv6 non-shared device */ .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_NONSHARED, + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | + s2_policy(L_PTE_S2_MT_DEV_NONSHARED), .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PROT_SECT_DEVICE, .domain = DOMAIN_IO, }, [MT_DEVICE_CACHED] = { /* ioremap_cached */ .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED, + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | + s2_policy(L_PTE_S2_MT_DEV_CACHED), .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB, .domain = DOMAIN_IO, }, [MT_DEVICE_WC] = { /* ioremap_wc */ .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC, + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | + s2_policy(L_PTE_S2_MT_DEV_WC), .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PROT_SECT_DEVICE, .domain = DOMAIN_IO, }, [MT_UNCACHED] = { .prot_pte = PROT_PTE_DEVICE, + .prot_pte_s2 = s2_policy(PROT_PTE_S2_DEVICE) | + s2_policy(L_PTE_S2_MT_UNCACHED), .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, .domain = DOMAIN_IO, @@ -458,7 +470,8 @@ static void __init build_mem_type_table(void) cp = &cache_policies[cachepolicy]; vecs_pgprot = kern_pgprot = user_pgprot = cp->pte; s2_pgprot = cp->pte_s2; - hyp_device_pgprot = s2_device_pgprot = mem_types[MT_DEVICE].prot_pte; + hyp_device_pgprot = mem_types[MT_DEVICE].prot_pte; + s2_device_pgprot = mem_types[MT_DEVICE].prot_pte_s2; /* * ARMv6 and above have extended page tables.
The stage-2 memory attributes are distinct from the Hyp memory attributes and the Stage-1 memory attributes. We were using the stage-1 memory attributes for stage-2 mappings causing device mappings to be mapped as normal memory. Add the S2 equivalent defines for memory attributes and fix the comments explaining the defines while at it. Add a prot_pte_s2 field to the mem_type struct and fill out the field for device mappings accordingly. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- Changelog[v2]: - Guard the use of L_PTE_S2 defines with s2_policy to allow non-LPAE compiles. arch/arm/include/asm/pgtable-3level.h | 20 +++++++++++++------- arch/arm/mm/mm.h | 1 + arch/arm/mm/mmu.c | 15 ++++++++++++++- 3 files changed, 28 insertions(+), 8 deletions(-)