From patchwork Wed Jan 31 07:21:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 194543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1722143dyb; Tue, 30 Jan 2024 23:22:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IF074y4fGllTsPgBw/a3x0jmL8iWaWbTQxbMQP9QBV1czri9zIzBBoMg/3jT9svzV3Jxwot X-Received: by 2002:a05:651c:204b:b0:2cd:8138:428d with SMTP id t11-20020a05651c204b00b002cd8138428dmr424164ljo.6.1706685755746; Tue, 30 Jan 2024 23:22:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706685755; cv=pass; d=google.com; s=arc-20160816; b=Ls0goD1yBeI2bzSTYA1HwIJxyZMZpjNJdRWSLZMAdqjgV1n6PG8+ocZ09NXDaJwZ4j fZjNKkztimi3V5sSX3qqzfoTnGkh+DR9mfDIIhrrChTQzcdMBYlls8Mq6cuj1Aae/XXW qCk7X5N3M5BMzAy3S5r5qGcJ+fSOBbvAIaMU16eXQybYs/bQT3B0pI+52m3Cb3AbGM+e UF+IMuP5El8Otmh9VnrSHq4E+MDPMCVuBYHmkMOMXARZviRZN011yWpadB6bjttIxviC TTOBd07VU6XPk/KWTMkQdnthtn9jsNwhfsQ812yfSH5giW6f5B6bOZEczqcQI47jGG8c nD1w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=Vyf3hcn5Wgnk5EUDc5hh91EyiFPXSnUN4AZSsaZGgKw=; fh=3i803X3E7CJJ4e92PWbs+nZz4JjU6DF/mW6RNfXE9Uk=; b=DTEk/1GDSShw2guCesRlyRXX5gLESq6BWa6N1bfIF6zw9mQRwy0++vuML/PCfHIIcs kZqC1XGKqd2ltKyDNASuHTtEIxiaPBaRHpmI/VrbQL/XWHL6iNrDpXQ2Ugn0WXoRN+mh mXIoDTmNxUGYWxrgn0Xwwatky+aaTLvKLSekH7xlm6OCKX0v1Pj5JjVQnwg8b6V90HuA 2CiPB969oXrisdI+4taguXj4hhsffeea4ZltgU7ybgl8xacD8QLWoYQJYxM7cIFYCrh4 tqFjnsnC9ohk1MVSyOEhkDjj/GyXleeka1/T8gn5B63aesRA7T/ePeAKQ3VZXUy+M60K MAgg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uvF5nP4R; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-45894-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45894-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=1; AJvYcCU2xb6GJowoY85o9lUoYlhx6FKhFqwCgmSWx+J4z6extpkUGxp5Xl26O4+IkLE2LDCB9QO9RfhPhse9kTBd6HZUFHwtXw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id q25-20020aa7d459000000b0055ef9f8b135si2968074edr.404.2024.01.30.23.22.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 23:22:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45894-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uvF5nP4R; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-45894-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45894-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 266931F21E3D for ; Wed, 31 Jan 2024 07:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5E363605CC; Wed, 31 Jan 2024 07:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="uvF5nP4R"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tEOBLFOF" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A65285102E; Wed, 31 Jan 2024 07:21:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706685673; cv=none; b=EMVSAJ7PaXr17rvjcgbJ/7+X6Mv0nilx3hHFdq24t5pGRCy4a/8XwquyYh9OInR60v04A3c4Zl21Uy0WSbgJuwr3ZoWk9Ln2Xltw1YRSJMXV1EqllvG+x4tXUhNdnN+rXCZ39TNSyAg6zPKZLeD8D8F4HU2XQzzI43A6A0BYK/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706685673; c=relaxed/simple; bh=hf9pbzNZeFw25GMMm+9ePfR8ku7a5Y8PHXU9ri/2vjE=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=HsmKVvYRho/YQB1axk6y8tPeuxZCPhRr3ppnTVwkWjY6/CIQ95Q+CnQF9/3OeGr8o9zl1ytKWKf9+VuRiaX63BYpsJ3M1yb7BSzeGII+G7oWFCatkQq+pakLr323Inlhnwf/OGXGLw+sHfYIVujQF4lFE+t5N+JXXcNx5oEnUKk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=uvF5nP4R; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=tEOBLFOF; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Wed, 31 Jan 2024 07:21:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706685670; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vyf3hcn5Wgnk5EUDc5hh91EyiFPXSnUN4AZSsaZGgKw=; b=uvF5nP4RDd3AjsSzCXXYIPjm2+82gOsCXUh+pmo+ersxAS7FVyYsgIavJ0AMQvBFRzTdKp mrCSbNR2c7OOliGIB4F1nn+KQWo/6NTIl/m07O64NX2LtySfyf2mF/JQfu8ocKl9ZuIWAL 0SdM/ulas5LIrM/PF07ov9e9u8w3mgQYhr9BTk9ULOFPGLctZpRhOckV+kHlOeWnn50e1y MOcKQ3VLd+AQiLc12engc6P24fbF9gMbOAJZxwwUxRNdrV7TfirE2DRXuyPj11+S3gxxOU 67NgfOwRvzG2bTKKVKXDbDWh2PHHplHqYIKjkFi0kAclsLiF+CwLNN6eMtCrdA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706685670; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vyf3hcn5Wgnk5EUDc5hh91EyiFPXSnUN4AZSsaZGgKw=; b=tEOBLFOFr3JG6HB5WaRO6BK1zQwiBwmsFyXH6r93X7tO4DrjKQX50vFzDbMubZuS6d3vkO p1dBxo/dsEgXGXBA== From: "tip-bot2 for Xin Li" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/fred] x86/entry: Add fred_entry_from_kvm() for VMX to handle IRQ/NMI Cc: Sean Christopherson , Thomas Gleixner , Xin Li , Shan Kang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231205105030.8698-32-xin3.li@intel.com> References: <20231205105030.8698-32-xin3.li@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170668566924.398.1397327132983908290.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784440865694565817 X-GMAIL-MSGID: 1789589722965123687 The following commit has been merged into the x86/fred branch of tip: Commit-ID: d8fbd04962865730bb67106e862bfbe363a9c284 Gitweb: https://git.kernel.org/tip/d8fbd04962865730bb67106e862bfbe363a9c284 Author: Xin Li AuthorDate: Tue, 05 Dec 2023 02:50:20 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 30 Jan 2024 18:20:36 +01:00 x86/entry: Add fred_entry_from_kvm() for VMX to handle IRQ/NMI In IRQ/NMI induced VM exits, KVM VMX needs to execute the respective handlers, which requires the software to create a FRED stack frame, and use it to invoke the handlers. Add fred_irq_entry_from_kvm() for this job. Export fred_entry_from_kvm() because VMX can be compiled as a module. Suggested-by: Sean Christopherson Suggested-by: Thomas Gleixner Signed-off-by: Xin Li Signed-off-by: Thomas Gleixner Tested-by: Shan Kang Link: https://lore.kernel.org/r/20231205105030.8698-32-xin3.li@intel.com --- arch/x86/entry/entry_64_fred.S | 77 +++++++++++++++++++++++++++++++++- arch/x86/entry/entry_fred.c | 14 ++++++- arch/x86/include/asm/fred.h | 18 ++++++++- 3 files changed, 109 insertions(+) diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S index 7fe2722..a02bc6f 100644 --- a/arch/x86/entry/entry_64_fred.S +++ b/arch/x86/entry/entry_64_fred.S @@ -3,8 +3,11 @@ * The actual FRED entry points. */ +#include + #include #include +#include #include "calling.h" @@ -52,3 +55,77 @@ SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel) FRED_EXIT ERETS SYM_CODE_END(asm_fred_entrypoint_kernel) + +#if IS_ENABLED(CONFIG_KVM_INTEL) +SYM_FUNC_START(asm_fred_entry_from_kvm) + push %rbp + mov %rsp, %rbp + + UNWIND_HINT_SAVE + + /* + * Both IRQ and NMI from VMX can be handled on current task stack + * because there is no need to protect from reentrancy and the call + * stack leading to this helper is effectively constant and shallow + * (relatively speaking). Do the same when FRED is active, i.e., no + * need to check current stack level for a stack switch. + * + * Emulate the FRED-defined redzone and stack alignment. + */ + sub $(FRED_CONFIG_REDZONE_AMOUNT << 6), %rsp + and $FRED_STACK_FRAME_RSP_MASK, %rsp + + /* + * Start to push a FRED stack frame, which is always 64 bytes: + * + * +--------+-----------------+ + * | Bytes | Usage | + * +--------+-----------------+ + * | 63:56 | Reserved | + * | 55:48 | Event Data | + * | 47:40 | SS + Event Info | + * | 39:32 | RSP | + * | 31:24 | RFLAGS | + * | 23:16 | CS + Aux Info | + * | 15:8 | RIP | + * | 7:0 | Error Code | + * +--------+-----------------+ + */ + push $0 /* Reserved, must be 0 */ + push $0 /* Event data, 0 for IRQ/NMI */ + push %rdi /* fred_ss handed in by the caller */ + push %rbp + pushf + mov $__KERNEL_CS, %rax + push %rax + + /* + * Unlike the IDT event delivery, FRED _always_ pushes an error code + * after pushing the return RIP, thus the CALL instruction CANNOT be + * used here to push the return RIP, otherwise there is no chance to + * push an error code before invoking the IRQ/NMI handler. + * + * Use LEA to get the return RIP and push it, then push an error code. + */ + lea 1f(%rip), %rax + push %rax /* Return RIP */ + push $0 /* Error code, 0 for IRQ/NMI */ + + PUSH_AND_CLEAR_REGS clear_bp=0 unwind_hint=0 + movq %rsp, %rdi /* %rdi -> pt_regs */ + call __fred_entry_from_kvm /* Call the C entry point */ + POP_REGS + ERETS +1: + /* + * Objtool doesn't understand what ERETS does, this hint tells it that + * yes, we'll reach here and with what stack state. A save/restore pair + * isn't strictly needed, but it's the simplest form. + */ + UNWIND_HINT_RESTORE + pop %rbp + RET + +SYM_FUNC_END(asm_fred_entry_from_kvm) +EXPORT_SYMBOL_GPL(asm_fred_entry_from_kvm); +#endif diff --git a/arch/x86/entry/entry_fred.c b/arch/x86/entry/entry_fred.c index 3be0269..6ecc08b 100644 --- a/arch/x86/entry/entry_fred.c +++ b/arch/x86/entry/entry_fred.c @@ -257,3 +257,17 @@ __visible noinstr void fred_entry_from_kernel(struct pt_regs *regs) return fred_bad_type(regs, error_code); } + +#if IS_ENABLED(CONFIG_KVM_INTEL) +__visible noinstr void __fred_entry_from_kvm(struct pt_regs *regs) +{ + switch (regs->fred_ss.type) { + case EVENT_TYPE_EXTINT: + return fred_extint(regs); + case EVENT_TYPE_NMI: + return fred_exc_nmi(regs); + default: + WARN_ON_ONCE(1); + } +} +#endif diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index 16a64ff..2fa9f34 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -9,6 +9,7 @@ #include #include +#include /* * FRED event return instruction opcodes for ERET{S,U}; supported in @@ -62,12 +63,29 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs) void asm_fred_entrypoint_user(void); void asm_fred_entrypoint_kernel(void); +void asm_fred_entry_from_kvm(struct fred_ss); __visible void fred_entry_from_user(struct pt_regs *regs); __visible void fred_entry_from_kernel(struct pt_regs *regs); +__visible void __fred_entry_from_kvm(struct pt_regs *regs); + +/* Can be called from noinstr code, thus __always_inline */ +static __always_inline void fred_entry_from_kvm(unsigned int type, unsigned int vector) +{ + struct fred_ss ss = { + .ss =__KERNEL_DS, + .type = type, + .vector = vector, + .nmi = type == EVENT_TYPE_NMI, + .lm = 1, + }; + + asm_fred_entry_from_kvm(ss); +} #else /* CONFIG_X86_FRED */ static __always_inline unsigned long fred_event_data(struct pt_regs *regs) { return 0; } +static __always_inline void fred_entry_from_kvm(unsigned int type, unsigned int vector) { } #endif /* CONFIG_X86_FRED */ #endif /* !__ASSEMBLY__ */