On Mon, Jun 22, 2020 at 11:25:41AM +0100, Marc Zyngier wrote: > On 2020-06-22 10:15, Mark Rutland wrote: > > On Mon, Jun 22, 2020 at 09:06:43AM +0100, Marc Zyngier wrote: > I have folded in the following patch: > > diff --git a/arch/arm64/include/asm/kvm_ptrauth.h > b/arch/arm64/include/asm/kvm_ptrauth.h > index 7a72508a841b..0ddf98c3ba9f 100644 > --- a/arch/arm64/include/asm/kvm_ptrauth.h > +++ b/arch/arm64/include/asm/kvm_ptrauth.h > @@ -68,29 +68,29 @@ > */ > .macro ptrauth_switch_to_guest g_ctxt, reg1, reg2, reg3 > alternative_if_not ARM64_HAS_ADDRESS_AUTH > - b 1000f > + b .L__skip_switch\@ > alternative_else_nop_endif > mrs \reg1, hcr_el2 > and \reg1, \reg1, #(HCR_API | HCR_APK) > - cbz \reg1, 1000f > + cbz \reg1, .L__skip_switch\@ > add \reg1, \g_ctxt, #CPU_APIAKEYLO_EL1 > ptrauth_restore_state \reg1, \reg2, \reg3 > -1000: > +.L__skip_switch\@: > .endm > > .macro ptrauth_switch_to_host g_ctxt, h_ctxt, reg1, reg2, reg3 > alternative_if_not ARM64_HAS_ADDRESS_AUTH > - b 2000f > + b .L__skip_switch\@ > alternative_else_nop_endif > mrs \reg1, hcr_el2 > and \reg1, \reg1, #(HCR_API | HCR_APK) > - cbz \reg1, 2000f > + cbz \reg1, .L__skip_switch\@ > add \reg1, \g_ctxt, #CPU_APIAKEYLO_EL1 > ptrauth_save_state \reg1, \reg2, \reg3 > add \reg1, \h_ctxt, #CPU_APIAKEYLO_EL1 > ptrauth_restore_state \reg1, \reg2, \reg3 > isb > -2000: > +.L__skip_switch\@: > .endm
Looks good to me; thanks! Mark. _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
