2020-04-15 23:00:13

by Zenghui Yu

[permalink] [raw]
Subject: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

The only user of PTE_S2_MEMATTR_MASK macro had been removed since
commit a501e32430d4 ("arm64: Clean up the default pgprot setting").
It has been about six years and no one has used it again.

Let's drop it.

Signed-off-by: Zenghui Yu <[email protected]>
---
arch/arm64/include/asm/pgtable-hwdef.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 6bf5e650da78..99315bdca0e6 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -190,7 +190,6 @@
* Memory Attribute override for Stage-2 (MemAttr[3:0])
*/
#define PTE_S2_MEMATTR(t) (_AT(pteval_t, (t)) << 2)
-#define PTE_S2_MEMATTR_MASK (_AT(pteval_t, 0xf) << 2)

/*
* EL2/HYP PTE/PMD definitions
--
2.19.1



2020-04-16 15:40:50

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

On Wed, 15 Apr 2020 18:57:46 +0800
Zenghui Yu <[email protected]> wrote:

> The only user of PTE_S2_MEMATTR_MASK macro had been removed since
> commit a501e32430d4 ("arm64: Clean up the default pgprot setting").
> It has been about six years and no one has used it again.
>
> Let's drop it.
>
> Signed-off-by: Zenghui Yu <[email protected]>
> ---
> arch/arm64/include/asm/pgtable-hwdef.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> index 6bf5e650da78..99315bdca0e6 100644
> --- a/arch/arm64/include/asm/pgtable-hwdef.h
> +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> @@ -190,7 +190,6 @@
> * Memory Attribute override for Stage-2 (MemAttr[3:0])
> */
> #define PTE_S2_MEMATTR(t) (_AT(pteval_t, (t)) << 2)
> -#define PTE_S2_MEMATTR_MASK (_AT(pteval_t, 0xf) << 2)
>
> /*
> * EL2/HYP PTE/PMD definitions

Looks good to me. Catalin, Will: do you want to take this directly? If
so please add my:

Acked-by: Marc Zyngier <[email protected]>

Otherwise, I'll route it via the KVM tree.

Thanks,

M.
--
Jazz is not dead. It just smells funny...

2020-04-16 20:41:40

by Will Deacon

[permalink] [raw]
Subject: Re: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

On Thu, Apr 16, 2020 at 04:36:05PM +0100, Marc Zyngier wrote:
> On Wed, 15 Apr 2020 18:57:46 +0800
> Zenghui Yu <[email protected]> wrote:
>
> > The only user of PTE_S2_MEMATTR_MASK macro had been removed since
> > commit a501e32430d4 ("arm64: Clean up the default pgprot setting").
> > It has been about six years and no one has used it again.
> >
> > Let's drop it.
> >
> > Signed-off-by: Zenghui Yu <[email protected]>
> > ---
> > arch/arm64/include/asm/pgtable-hwdef.h | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> > index 6bf5e650da78..99315bdca0e6 100644
> > --- a/arch/arm64/include/asm/pgtable-hwdef.h
> > +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> > @@ -190,7 +190,6 @@
> > * Memory Attribute override for Stage-2 (MemAttr[3:0])
> > */
> > #define PTE_S2_MEMATTR(t) (_AT(pteval_t, (t)) << 2)
> > -#define PTE_S2_MEMATTR_MASK (_AT(pteval_t, 0xf) << 2)
> >
> > /*
> > * EL2/HYP PTE/PMD definitions
>
> Looks good to me. Catalin, Will: do you want to take this directly? If
> so please add my:
>
> Acked-by: Marc Zyngier <[email protected]>
>
> Otherwise, I'll route it via the KVM tree.

I can take it for 5.8 if it's not urgent.

Will

2020-04-16 20:43:19

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

On 2020-04-16 18:05, Will Deacon wrote:
> On Thu, Apr 16, 2020 at 04:36:05PM +0100, Marc Zyngier wrote:
>> On Wed, 15 Apr 2020 18:57:46 +0800
>> Zenghui Yu <[email protected]> wrote:
>>
>> > The only user of PTE_S2_MEMATTR_MASK macro had been removed since
>> > commit a501e32430d4 ("arm64: Clean up the default pgprot setting").
>> > It has been about six years and no one has used it again.
>> >
>> > Let's drop it.
>> >
>> > Signed-off-by: Zenghui Yu <[email protected]>
>> > ---
>> > arch/arm64/include/asm/pgtable-hwdef.h | 1 -
>> > 1 file changed, 1 deletion(-)
>> >
>> > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
>> > index 6bf5e650da78..99315bdca0e6 100644
>> > --- a/arch/arm64/include/asm/pgtable-hwdef.h
>> > +++ b/arch/arm64/include/asm/pgtable-hwdef.h
>> > @@ -190,7 +190,6 @@
>> > * Memory Attribute override for Stage-2 (MemAttr[3:0])
>> > */
>> > #define PTE_S2_MEMATTR(t) (_AT(pteval_t, (t)) << 2)
>> > -#define PTE_S2_MEMATTR_MASK (_AT(pteval_t, 0xf) << 2)
>> >
>> > /*
>> > * EL2/HYP PTE/PMD definitions
>>
>> Looks good to me. Catalin, Will: do you want to take this directly? If
>> so please add my:
>>
>> Acked-by: Marc Zyngier <[email protected]>
>>
>> Otherwise, I'll route it via the KVM tree.
>
> I can take it for 5.8 if it's not urgent.

It has been there 6 years, I think we can cope with another few
months... ;-)

Thanks,

M.
--
Jazz is not dead. It just smells funny...

2020-04-28 14:52:26

by Will Deacon

[permalink] [raw]
Subject: Re: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

On Wed, 15 Apr 2020 18:57:46 +0800, Zenghui Yu wrote:
> The only user of PTE_S2_MEMATTR_MASK macro had been removed since
> commit a501e32430d4 ("arm64: Clean up the default pgprot setting").
> It has been about six years and no one has used it again.
>
> Let's drop it.

Applied to arm64 (for-next/misc), thanks!

[1/1] KVM: arm64: Drop PTE_S2_MEMATTR_MASK
https://git.kernel.org/arm64/c/f4be140fa33f

Cheers,
--
Will

https://fixes.arm64.dev
https://next.arm64.dev