From patchwork Fri Jul 21 20:18:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124084 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp453434vqg; Fri, 21 Jul 2023 13:41:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlFfZU4zLiMIRDMrLMLbJt6okRmFA3NQKLq/YA7M+VyQxdUbwZYxrqbB5GPgymO6nnZ8pkB4 X-Received: by 2002:a17:907:a043:b0:977:befe:d888 with SMTP id gz3-20020a170907a04300b00977befed888mr2487397ejc.13.1689972075655; Fri, 21 Jul 2023 13:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689972075; cv=none; d=google.com; s=arc-20160816; b=SHrEemjjbySKzfUisOBAsA3i8pBQms7z29plVHVxpVijm1aUGFOYergGW3cKSpXDN3 jPzFKBtE1XWF6E9PAW+W6zTW+JrfYErtzMSBBYaZ7jzqHhZI1fCss+qVQl2vL5sTJQqj A+BuvcaAxNUo3KmaxIdXYreDQ0pRCrYwHUQcOKuPFhc8xWi01PNKCR2TnR6mcZF6ayZA VUeWI7wOTvQjcIOvCiEtDMkvlucu1wZdN9NdH8C+YlUPbbgL9UABkjwhF8vJhHdKEK4Q pE9dnXLYu9EC/TbAvVQSIJk6f9Z7y0hBPijqTG2I/Fn0G9ZoM6uSdA3Am1nIECS0/FBb C/4A== 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=8mt2rx9ZLjLB1KoF/SJo016XQ9rXRtE6G9Sw+PvIk2E=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=G1SUT25+kbA7jbcKvLE/GU/Aa1jNxPWcudLPG2UpYU2NJCyGSHXcgYKkO/HCQ0x3vk u9Yw1StqpGQNSu84EeZDMoBoy6XhyNwcAyHKscbuSejFFcOpCOKdrh+2Ud/61o4Fy9IR GHsaWC6fKbkUmr7rW/NnEpVd4JRIcUK1zJMPzNdQrHgio5rXlgvPNCdrQYcDPe4DkByC mYsQIviEwocyJiqww1cIscuQvzybki9OK4Eoddg7InODfbORIUIpD82vASyetamCOiqP 2UgpKXODkZdFDEOtgamTLRrb1eZP7tMXD4D/jV6Jh44j6UDvt4j38tPVx5FveLEmMF77 xqJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=46uRXOuI; 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 w25-20020a1709064a1900b009933309250bsi2589622eju.64.2023.07.21.13.40.51; Fri, 21 Jul 2023 13:41:15 -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=46uRXOuI; 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 S230194AbjGUUT2 (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjGUUTS (ORCPT ); Fri, 21 Jul 2023 16:19:18 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 811B835AC for ; Fri, 21 Jul 2023 13:19:08 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d061f324d64so526865276.1 for ; Fri, 21 Jul 2023 13:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970748; x=1690575548; 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=8mt2rx9ZLjLB1KoF/SJo016XQ9rXRtE6G9Sw+PvIk2E=; b=46uRXOuIfr0DhaSfjJ1gilpLeWI3SkY0gBhy4/JE8Ffy8aB+wmHHv0eZLbPKwxGf1W zRibu2Q+TOMsOsJJb4OHXHOPphrSRQVtzF5JSYhNBOCF7LUJtPtEWSRYc2JzZ4acAnor /zmJ7rgJese6SY0MTnK9LF9xzGYySIQj6WHl2lAxP+dEQMc/jN7H8FWycEgSVz1jPhiN kHTFjuNTxv4dt/QE31tPp7lm/S5hHzAiuf3QYbCoqwzmHIbVLyemLu2fOiOfokkTKl20 itFUL9M3X8lEkW6ABJkQLWfuSKa41xBM+UYU6HXoNTkiMFGmgDhcqWF7uCFWGdPxsAIv jV9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970748; x=1690575548; 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=8mt2rx9ZLjLB1KoF/SJo016XQ9rXRtE6G9Sw+PvIk2E=; b=b376PQm6Xfdpm85rM0cqRpxcPkOJPQzw52zmr1Kc7Y1WdecvnFUKYEpf8mlHAbYrwI S2dv/RjwXTyTQJwDOeMaZDqQ/yuSiWyTVwzPYpz6ctKb426wcgBHD4IkFTtEDfQY9UDC +iwxBAxyiUoZobjlkl9keUrq+M8Og7qyXBC5GW/lXrKI/2VhgO1ITjKFFPeTbJYeK8R4 J8rfMy2N+a0ekC4ls3FWou8ct2pFrzfCCG/hHSmLsJxwLEa8eDJodde+/QLepM43eSq3 BT7RxHFb6B8rR21iogIVMw3KIvy2K+lXoxiFnePxwHA+GQZcPMbuU8EDJZCzdhwnhFO8 nXyg== X-Gm-Message-State: ABy/qLaqVcKgRXWgrV6tT4f3IFeDzBQbr9JOmBfa0Eyl9UsL+/Qnexf8 BCg0tG20scFroqpav7sX1erzIZwh2Do= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:8208:0:b0:cf2:9e82:a5b5 with SMTP id q8-20020a258208000000b00cf29e82a5b5mr18342ybk.8.1689970747834; Fri, 21 Jul 2023 13:19:07 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:42 -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-3-seanjc@google.com> Subject: [PATCH v4 02/19] x86/reboot: Harden virtualization hooks for emergency reboot 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: 1772064159177137069 X-GMAIL-MSGID: 1772064159177137069 Provide dedicated helpers to (un)register virt hooks used during an emergency crash/reboot, and WARN if there is an attempt to overwrite the registered callback, or an attempt to do an unpaired unregister. Opportunsitically use rcu_assign_pointer() instead of RCU_INIT_POINTER(), mainly so that the set/unset paths are more symmetrical, but also because any performance gains from using RCU_INIT_POINTER() are meaningless for this code. Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/reboot.h | 5 +++-- arch/x86/kernel/reboot.c | 30 ++++++++++++++++++++++++------ arch/x86/kvm/vmx/vmx.c | 6 ++---- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index dc201724a643..74c6a624d166 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,8 +25,9 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 -typedef void crash_vmclear_fn(void); -extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; +typedef void (cpu_emergency_virt_cb)(void); +void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback); +void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback); void cpu_emergency_disable_virtualization(void); typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 3fa4c6717a1d..62ccedeb5e2b 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -794,17 +794,35 @@ void machine_crash_shutdown(struct pt_regs *regs) * * protected by rcu. */ -crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; -EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); +static cpu_emergency_virt_cb __rcu *cpu_emergency_virt_callback; + +void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) +{ + if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback))) + return; + + rcu_assign_pointer(cpu_emergency_virt_callback, callback); +} +EXPORT_SYMBOL_GPL(cpu_emergency_register_virt_callback); + +void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) +{ + if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback) != callback)) + return; + + rcu_assign_pointer(cpu_emergency_virt_callback, NULL); + synchronize_rcu(); +} +EXPORT_SYMBOL_GPL(cpu_emergency_unregister_virt_callback); static inline void cpu_crash_vmclear_loaded_vmcss(void) { - crash_vmclear_fn *do_vmclear_operation = NULL; + cpu_emergency_virt_cb *callback; rcu_read_lock(); - do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); - if (do_vmclear_operation) - do_vmclear_operation(); + callback = rcu_dereference(cpu_emergency_virt_callback); + if (callback) + callback(); rcu_read_unlock(); } diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 7f692d97a821..019cefc65142 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8590,8 +8590,7 @@ static void __vmx_exit(void) { allow_smaller_maxphyaddr = false; - RCU_INIT_POINTER(crash_vmclear_loaded_vmcss, NULL); - synchronize_rcu(); + cpu_emergency_unregister_virt_callback(crash_vmclear_local_loaded_vmcss); vmx_cleanup_l1d_flush(); } @@ -8641,8 +8640,7 @@ static int __init vmx_init(void) pi_init_cpu(cpu); } - rcu_assign_pointer(crash_vmclear_loaded_vmcss, - crash_vmclear_local_loaded_vmcss); + cpu_emergency_register_virt_callback(crash_vmclear_local_loaded_vmcss); vmx_check_vmcs12_offsets();