| Message ID | 20240226100601.2379693-14-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM/arm64: Add NV support for ERET and PAuth | expand |
On Mon, Feb 26, 2024 at 10:06:01AM +0000, Marc Zyngier wrote: > Now that we (hopefully) correctly handle ERETAx, drop the masking > of the PAuth feature (something that was not even complete, as > APA3 and AGA3 were still exposed). > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > arch/arm64/kvm/nested.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > index ced30c90521a..6813c7c7f00a 100644 > --- a/arch/arm64/kvm/nested.c > +++ b/arch/arm64/kvm/nested.c > @@ -35,13 +35,9 @@ static u64 limit_nv_id_reg(u32 id, u64 val) > break; > > case SYS_ID_AA64ISAR1_EL1: > - /* Support everything but PtrAuth and Spec Invalidation */ > + /* Support everything but Spec Invalidation */ > val &= ~(GENMASK_ULL(63, 56) | > - NV_FTR(ISAR1, SPECRES) | > - NV_FTR(ISAR1, GPI) | > - NV_FTR(ISAR1, GPA) | > - NV_FTR(ISAR1, API) | > - NV_FTR(ISAR1, APA)); > + NV_FTR(ISAR1, SPECRES)); > break; > > case SYS_ID_AA64PFR0_EL1: Reviewed-by: Joey Gouly <joey.gouly@arm.com> Thanks, Joey
diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index ced30c90521a..6813c7c7f00a 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -35,13 +35,9 @@ static u64 limit_nv_id_reg(u32 id, u64 val) break; case SYS_ID_AA64ISAR1_EL1: - /* Support everything but PtrAuth and Spec Invalidation */ + /* Support everything but Spec Invalidation */ val &= ~(GENMASK_ULL(63, 56) | - NV_FTR(ISAR1, SPECRES) | - NV_FTR(ISAR1, GPI) | - NV_FTR(ISAR1, GPA) | - NV_FTR(ISAR1, API) | - NV_FTR(ISAR1, APA)); + NV_FTR(ISAR1, SPECRES)); break; case SYS_ID_AA64PFR0_EL1:
Now that we (hopefully) correctly handle ERETAx, drop the masking of the PAuth feature (something that was not even complete, as APA3 and AGA3 were still exposed). Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kvm/nested.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)