| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <YxolI46A4Vvh1gW2@google.com>
Date: Thu, 8 Sep 2022 17:23:47 +0000
From: Sean Christopherson <seanjc@...gle.com>
To: Uros Bizjak <ubizjak@...il.com>
Cc: kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
Paolo Bonzini <pbonzini@...hat.com>
Subject: Re: [PATCH] KVM/VMX: Do not declare vmread_error asmlinkage
On Thu, Sep 01, 2022, Uros Bizjak wrote:
> On Thu, Sep 1, 2022 at 5:40 PM Sean Christopherson <seanjc@...gle.com> wrote:
> >
> > On Wed, Aug 17, 2022, Uros Bizjak wrote:
> > > There is no need to declare vmread_error asmlinkage, its arguments
> > > can be passed via registers for both, 32-bit and 64-bit targets.
> > > Function argument registers are considered call-clobbered registers,
> > > they are saved in the trampoline just before the function call and
> > > restored afterwards.
> > >
> > > Note that asmlinkage and __attribute__((regparm(0))) have no effect
> > > on 64-bit targets. The trampoline is called from the assembler glue
> > > code that implements its own stack-passing function calling convention,
> > > so the attribute on the trampoline declaration does not change anything
> > > for 64-bit as well as 32-bit targets. We can declare it asmlinkage for
> > > documentation purposes.
> >
> > ...
> >
> > > diff --git a/arch/x86/kvm/vmx/vmx_ops.h b/arch/x86/kvm/vmx/vmx_ops.h
> > > index 5cfc49ddb1b4..550a89394d9f 100644
> > > --- a/arch/x86/kvm/vmx/vmx_ops.h
> > > +++ b/arch/x86/kvm/vmx/vmx_ops.h
> > > @@ -10,9 +10,9 @@
> > > #include "vmcs.h"
> > > #include "../x86.h"
> > >
> > > -asmlinkage void vmread_error(unsigned long field, bool fault);
> > > -__attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
> > > - bool fault);
> > > +void vmread_error(unsigned long field, bool fault);
> > > +asmlinkage void vmread_error_trampoline(unsigned long field,
> > > + bool fault);
> > > void vmwrite_error(unsigned long field, unsigned long value);
> > > void vmclear_error(struct vmcs *vmcs, u64 phys_addr);
> > > void vmptrld_error(struct vmcs *vmcs, u64 phys_addr);
> >
> > If it's ok with you, I'll split this into two patches. One to drop asmlinkage
> > from vmread_error(), and one to convert the open coded regparm to asmlinkage.
>
> Sure, please go ahead.
On second thought, even though "__attribute__((regparm(0)))" doesn't actually do
anything for 64-bit targets, I'd prefer to keep the open coded weirdness _because_
the whole thing is open coded weirdness. The attribute isn't strictly necessary
for 32-bit targets either since the CALL is emitted from inline assembly.
I now remember that I added the explicit regparm(0) to try and document that
vmread_error_trampoline() _always_ passes params on the stack, even for 64-bit
targets, i.e. even if "asmlinkage" is a nop.
Alternatively, given that the trampoline exists purely to support inline asm, i.e.
should never be called from C code in any circumstance, what about turning the
function declaration into an opaque symbol and then writing a proper comment.
That way, attempting to invoke vmread_error_trampoline() from C yields:
arch/x86/kernel/../kvm/vmx/vmx_ops.h: In function ‘__vmcs_readl’:
arch/x86/kernel/../kvm/vmx/vmx_ops.h:113:2: error: called object ‘vmread_error_trampoline’ is not a function or function pointer
113 | vmread_error_trampoline(field, false);
| ^~~~~~~~~~~~~~~~~~~~~~~
arch/x86/kernel/../kvm/vmx/vmx_ops.h:33:22: note: declared here
33 | extern unsigned long vmread_error_trampoline;
| ^~~~~~~~~~~~~~~~~~~~~~~
---
From: Sean Christopherson <seanjc@...gle.com>
Date: Thu, 8 Sep 2022 10:17:40 -0700
Subject: [PATCH] KVM: VMX: Make vmread_error_trampoline() uncallable from C
code
Declare vmread_error_trampoline() as an opaque symbol so that it cannot
be called from C code, at least not without some serious fudging. The
trampoline always passes parameters on the stack so that the inline
VMREAD sequence doesn't need to clobber registers. regparm(0) was
originally added to document the stack behavior, but it ended up being
confusing because regparm(0) is a nop for 64-bit targets.
Opportunustically wrap the trampoline and its declaration in #ifdeffery
to make it even harder to invoke incorrectly, to document why it exists,
and so that it's not left behind if/when CONFIG_CC_HAS_ASM_GOTO_OUTPUT
is true for all supported toolchains.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@...gle.com>
---
arch/x86/kvm/vmx/vmenter.S | 2 ++
arch/x86/kvm/vmx/vmx_ops.h | 18 ++++++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index 8477d8bdd69c..24c54577ac84 100644
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -269,6 +269,7 @@ SYM_FUNC_END(__vmx_vcpu_run)
.section .text, "ax"
+#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
/**
* vmread_error_trampoline - Trampoline from inline asm to vmread_error()
* @field: VMCS field encoding that failed
@@ -317,6 +318,7 @@ SYM_FUNC_START(vmread_error_trampoline)
RET
SYM_FUNC_END(vmread_error_trampoline)
+#endif
SYM_FUNC_START(vmx_do_interrupt_nmi_irqoff)
/*
diff --git a/arch/x86/kvm/vmx/vmx_ops.h b/arch/x86/kvm/vmx/vmx_ops.h
index ec268df83ed6..7ea99e6b4908 100644
--- a/arch/x86/kvm/vmx/vmx_ops.h
+++ b/arch/x86/kvm/vmx/vmx_ops.h
@@ -11,14 +11,28 @@
#include "../x86.h"
void vmread_error(unsigned long field, bool fault);
-__attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
- bool fault);
void vmwrite_error(unsigned long field, unsigned long value);
void vmclear_error(struct vmcs *vmcs, u64 phys_addr);
void vmptrld_error(struct vmcs *vmcs, u64 phys_addr);
void invvpid_error(unsigned long ext, u16 vpid, gva_t gva);
void invept_error(unsigned long ext, u64 eptp, gpa_t gpa);
+#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
+/*
+ * The VMREAD error trampoline _always_ uses the stack to pass parameters, even
+ * for 64-bit targets. Preserving all registers allows the VMREAD inline asm
+ * blob to avoid clobbering GPRs, which in turn allows the compiler to better
+ * optimize sequences of VMREADs.
+ *
+ * Declare trampoline as an opaque label as it's not safe to call from C code;
+ * there is no way to tell the compiler to pass params on the stack for 64-bit
+ * targets.
+ *
+ * void vmread_error_trampoline(unsigned long field, bool fault);
+ */
+extern unsigned long vmread_error_trampoline;
+#endif
+
static __always_inline void vmcs_check16(unsigned long field)
{
BUILD_BUG_ON_MSG(__builtin_constant_p(field) && ((field) & 0x6001) == 0x2000,
base-commit: d2a22504d86e106c63236e4d6a085c2ac91bfa73
--
Powered by blists - more mailing lists