| Message ID | 20210729132818.4091769-8-qperret@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Track shared pages at EL2 in protected mode | expand |
Hi Quentin, On Thu, Jul 29, 2021 at 3:28 PM Quentin Perret <qperret@google.com> wrote: > > The ignored bits for both stage-1 and stage-2 page and block > descriptors are in [55:58], so rename KVM_PTE_LEAF_ATTR_S2_IGNORED to > make it applicable to both. And while at it, since these bits are more > commonly known as 'software' bits, rename accordingly. As in the Armv8-A Address Translation spec. Reviewed-by: Fuad Tabba <tabba@google.com> Thanks, /fuad > Signed-off-by: Quentin Perret <qperret@google.com> > --- > arch/arm64/kvm/hyp/pgtable.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 4dff2ad39ee4..59a394d82de3 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -36,6 +36,8 @@ > > #define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 51) > > +#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) > + > #define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) > > #define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) > @@ -44,8 +46,6 @@ > KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ > KVM_PTE_LEAF_ATTR_HI_S2_XN) > > -#define KVM_PTE_LEAF_ATTR_S2_IGNORED GENMASK(58, 55) > - > #define KVM_INVALID_PTE_OWNER_MASK GENMASK(63, 56) > #define KVM_MAX_OWNER_ID 1 > > -- > 2.32.0.432.gabb21c7263-goog >
diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 4dff2ad39ee4..59a394d82de3 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -36,6 +36,8 @@ #define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 51) +#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) + #define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) #define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) @@ -44,8 +46,6 @@ KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ KVM_PTE_LEAF_ATTR_HI_S2_XN) -#define KVM_PTE_LEAF_ATTR_S2_IGNORED GENMASK(58, 55) - #define KVM_INVALID_PTE_OWNER_MASK GENMASK(63, 56) #define KVM_MAX_OWNER_ID 1
The ignored bits for both stage-1 and stage-2 page and block descriptors are in [55:58], so rename KVM_PTE_LEAF_ATTR_S2_IGNORED to make it applicable to both. And while at it, since these bits are more commonly known as 'software' bits, rename accordingly. Signed-off-by: Quentin Perret <qperret@google.com> --- arch/arm64/kvm/hyp/pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)