From patchwork Fri Jul 21 20:18:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124097 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp467836vqg; Fri, 21 Jul 2023 14:14:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlHW2qjdc3Te9vUPHAPeaYASklLfYCbddUrQfgnFgScoQKq7hVL2t3eiKhv+SlVNq+C+Fcew X-Received: by 2002:aa7:c749:0:b0:521:aa75:46c4 with SMTP id c9-20020aa7c749000000b00521aa7546c4mr2530811eds.1.1689974053268; Fri, 21 Jul 2023 14:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689974053; cv=none; d=google.com; s=arc-20160816; b=mGGodDrURoavL+XS21t4aOANmslip3LB5etDY8eBvwZRVtldRmZeeXoSO6N5Ql2BxY N6G0sLlU6PKPJhJ4TJuPsHTosUmIgUKRSpryG5dtxN7hQeHIfSCh8Wl6I/UHv9vqCIQw CLelH8Svtm6rypEUYnNtbxCbEsmK8dxo3bAU1BRyHB1MbbCcL7FXapkSpyRXIq41ld77 d9JX+cmS3qHhxROEl1vOtJAFgQiHsH+GfYxzOGOPoUeKQeE+AqnYzm/BvBYn/u7GwI/K mGo9LndTuja4O3xka4zMXw8gXAq2urobf2dOkG82xba3FIYhmGNHU86UPEuaaoBEaQTB efQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=IIqhdp8WqL0kWTvtPZo4YKSDQAXM01F7uHc3z46B11M=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=nk/TbuKTOlEKtA/Q55BOFDzTQtCOCMrtBjiMBkdoVewSJMK1b9HvLn25onvLfJNzRN 46Eo8EvdLblgCNbhc5jeQeQq95NiW85y2obngu72KPRDZimrPEvROOhxJlGxLw8UCHo4 loekv/UihjcCJOQlSEH1yP4GuzmQ9e3hdAbBfWTw/glwvm647dU9qwBdi6Gfr7PmvV/F XpaYbGOob9cE/i6WwzS3ttUbuiMz4I1xOTk6XhoPDT6NY322W6T85UP1mVDeg6N+92kZ eMamt5uWBy8WzGytcsK/c1wSHnAwK+v+0iPgK3gtm5951hiY+AhDkmcMxcHu0ZHKBbs0 lzUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=N6+HAnOl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m16-20020a50ef10000000b0051fde3f49cdsi2804714eds.531.2023.07.21.14.13.49; Fri, 21 Jul 2023 14:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=N6+HAnOl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231234AbjGUUTb (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbjGUUTT (ORCPT ); Fri, 21 Jul 2023 16:19:19 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 101EB30CB for ; Fri, 21 Jul 2023 13:19:11 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1b9de7951easo13877795ad.0 for ; Fri, 21 Jul 2023 13:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970750; x=1690575550; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=IIqhdp8WqL0kWTvtPZo4YKSDQAXM01F7uHc3z46B11M=; b=N6+HAnOlKDhLqVNY9edBHUTpkSa+XY7oBMtLhV0W+2bPtkJJTDUxW1hvkMsrnQHj98 oiQUl+6svRNCcwf0uFTQJMji4LvzrNr2XGACfpM6JfC8YBqlliASriW/eTzwiz4Cj+qw Q7/LFi0tCAvBmJlOSW1stt1jDJo1Q/5KJupzQaFRZ4qAZtYc4HevNfBNLG3CVgQQlkBK bL97aMTEWyf0Y5VvSMMlEKaugqItpB+/9EF1SUMbEX1j6K5nBib+wPVofkxxhooK+5V1 rq7l+I5yiOcLjTL43F7br+tt0K4eb8nGYIQxsVTwHV54sBhWTWHF8rKe2hB8x2y2ZwjI A0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970750; x=1690575550; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IIqhdp8WqL0kWTvtPZo4YKSDQAXM01F7uHc3z46B11M=; b=agctSLOvUP/67+A8uWmWhor/2LrzwObkf/q5QkFG/1zPQ22RrIlwkDYW798FVe3t9i MuiB5RT5uKJBqFsijszvmYM/HXBVOCPPaYZIc5CrWHWeJ22nO/oTqFqLA3L1Y1XbsvIS WuT0Q69LH6DPz2/hfbKd7N3j8dwSOQhxk02IHXmcjK/68YyZJMZd7cM4MROMYVmoMedl 9Zn0qMwjXzRtnI5gLg3gMBV7tuPsoDSldIV2tFKBuKoSvK+OCDnxk6DmHnnHkW6y07hX tiihyoef3Akoy7aVNJmg5E+xDt1NFmpmCFjoqApHIMPHFogYir2zcePL7vBGbA3/gTmp 9QAA== X-Gm-Message-State: ABy/qLZwVD8+7ibW8P0q3WcgQdUa2lqCZwy5FFZVD9YmFriHBwfo6HQg upf7wXiQ1ed0CTkRNkbw598Q+1/Mw3U= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:2291:b0:1b8:866f:6fc1 with SMTP id b17-20020a170903229100b001b8866f6fc1mr11914plh.0.1689970750480; Fri, 21 Jul 2023 13:19:10 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:43 -0700 In-Reply-To: <20230721201859.2307736-1-seanjc@google.com> Mime-Version: 1.0 References: <20230721201859.2307736-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230721201859.2307736-4-seanjc@google.com> Subject: [PATCH v4 03/19] x86/reboot: KVM: Handle VMXOFF in KVM's reboot callback From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper , Kai Huang , Chao Gao X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772066232875854871 X-GMAIL-MSGID: 1772066232875854871 Use KVM VMX's reboot/crash callback to do VMXOFF in an emergency instead of manually and blindly doing VMXOFF. There's no need to attempt VMXOFF if a hypervisor, i.e. KVM, isn't loaded/active, i.e. if the CPU can't possibly be post-VMXON. Signed-off-by: Sean Christopherson Reviewed-by: Kai Huang --- arch/x86/include/asm/virtext.h | 10 ---------- arch/x86/kernel/reboot.c | 29 +++++++++-------------------- arch/x86/kvm/vmx/vmx.c | 8 +++++--- 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 3b12e6b99412..5bc29fab15da 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -70,16 +70,6 @@ static inline void __cpu_emergency_vmxoff(void) cpu_vmxoff(); } -/** Disable VMX if it is supported and enabled on the current CPU - */ -static inline void cpu_emergency_vmxoff(void) -{ - if (cpu_has_vmx()) - __cpu_emergency_vmxoff(); -} - - - /* * SVM functions: diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 62ccedeb5e2b..d2d0f2672a64 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -787,13 +787,7 @@ void machine_crash_shutdown(struct pt_regs *regs) } #endif -/* - * This is used to VMCLEAR all VMCSs loaded on the - * processor. And when loading kvm_intel module, the - * callback function pointer will be assigned. - * - * protected by rcu. - */ +/* RCU-protected callback to disable virtualization prior to reboot. */ static cpu_emergency_virt_cb __rcu *cpu_emergency_virt_callback; void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) @@ -815,17 +809,6 @@ void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) } EXPORT_SYMBOL_GPL(cpu_emergency_unregister_virt_callback); -static inline void cpu_crash_vmclear_loaded_vmcss(void) -{ - cpu_emergency_virt_cb *callback; - - rcu_read_lock(); - callback = rcu_dereference(cpu_emergency_virt_callback); - if (callback) - callback(); - rcu_read_unlock(); -} - /* This is the CPU performing the emergency shutdown work. */ int crashing_cpu = -1; @@ -836,9 +819,15 @@ int crashing_cpu = -1; */ void cpu_emergency_disable_virtualization(void) { - cpu_crash_vmclear_loaded_vmcss(); + cpu_emergency_virt_cb *callback; - cpu_emergency_vmxoff(); + rcu_read_lock(); + callback = rcu_dereference(cpu_emergency_virt_callback); + if (callback) + callback(); + rcu_read_unlock(); + + /* KVM_AMD doesn't yet utilize the common callback. */ cpu_emergency_svm_disable(); } diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 019cefc65142..682c20b33a96 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -744,7 +744,7 @@ static int vmx_set_guest_uret_msr(struct vcpu_vmx *vmx, return ret; } -static void crash_vmclear_local_loaded_vmcss(void) +static void vmx_emergency_disable(void) { int cpu = raw_smp_processor_id(); struct loaded_vmcs *v; @@ -752,6 +752,8 @@ static void crash_vmclear_local_loaded_vmcss(void) list_for_each_entry(v, &per_cpu(loaded_vmcss_on_cpu, cpu), loaded_vmcss_on_cpu_link) vmcs_clear(v->vmcs); + + __cpu_emergency_vmxoff(); } static void __loaded_vmcs_clear(void *arg) @@ -8590,7 +8592,7 @@ static void __vmx_exit(void) { allow_smaller_maxphyaddr = false; - cpu_emergency_unregister_virt_callback(crash_vmclear_local_loaded_vmcss); + cpu_emergency_unregister_virt_callback(vmx_emergency_disable); vmx_cleanup_l1d_flush(); } @@ -8640,7 +8642,7 @@ static int __init vmx_init(void) pi_init_cpu(cpu); } - cpu_emergency_register_virt_callback(crash_vmclear_local_loaded_vmcss); + cpu_emergency_register_virt_callback(vmx_emergency_disable); vmx_check_vmcs12_offsets();