From patchwork Fri May 12 23:50:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5464725vqo; Fri, 12 May 2023 16:59:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mcBLoPhwWdhZGrb2Uiifdhe6Vzq6YeA2y7YpC4ZXPJmqzFGKLS8J03o0P4gHVOvtPm2IB X-Received: by 2002:a05:6a00:1507:b0:647:3de:c0ff with SMTP id q7-20020a056a00150700b0064703dec0ffmr22004428pfu.30.1683935957898; Fri, 12 May 2023 16:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683935957; cv=none; d=google.com; s=arc-20160816; b=DKm/kUsJqeyvz4TmyZzQ85zNI0by5E0/vdPffl7n1UO2CurAFrai1tHYw61+pm44mN eNLm/Jib19xJ817I810Og+HGFAK+8dbKNVZBdUi+8oGdG6hmmKi6fEArEC6QV/qML4D4 bANAn+PBI09cgAH3McnGzakbXaleF16aLQERpw0lQ4uhO0KfrRxHXJytHZXpaOjxHOOE lvuZo0jLENvqvdNxbJJY8YwjO9LI9YD+LHrFwQZrusySKw5yoBWVcHYdBIeyGFXYh/K6 m6L3quQiI91rHFdOocG8ERq65SiCHXJw6KnctbJYEF5/9yjGI6iFL7pWH10fkalGSllZ 67cw== 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=nr0/2P0PrhPVltPxqFEO8yZGlq+w0+NW5S2btIKs8As=; b=aOVEmxThE5yxeigDG+KQAjjThc28Rl/WAqz0k9RImTsJKj/VQR5lpNHHEVpUCZ2lWP RV/kp34lYyTo7j+rz6+6hYK2Eor1cHtvJpvgbwDUfcSRwR8dQtNhaSIebsuGDpC8uXwm F+j/OD9qkOZBHeqgZxHklD+NY+35vkfkuC3i6PPb8n+aMUTx93xg+EbGQTVWwpqF2C1w qrUmQHCZ8Qgo4PFLPk8IdysMGEwxFCZI+vc6M7XXq9a2vugtMtrfwHeVk2t1gSCI4bWu W9LTPV5BQwsEg4Lj7gJ4S1TroIl2C8y+xZ5ob6KjuLAYYx/AmdwdTd82Etnjxt4byjau CiSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=WnOy9eWY; 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 a24-20020aa794b8000000b006431b0bfa2asi11501347pfl.288.2023.05.12.16.59.05; Fri, 12 May 2023 16:59:17 -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=WnOy9eWY; 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 S240929AbjELXun (ORCPT + 99 others); Fri, 12 May 2023 19:50:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240881AbjELXug (ORCPT ); Fri, 12 May 2023 19:50:36 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE049269E for ; Fri, 12 May 2023 16:50:34 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-559d8e22306so189775167b3.1 for ; Fri, 12 May 2023 16:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683935434; x=1686527434; 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=nr0/2P0PrhPVltPxqFEO8yZGlq+w0+NW5S2btIKs8As=; b=WnOy9eWYFT1JeIO58JaMN1jZcMhT11BdOKPnALDAvrjMuhmZH42P9YhiZa/7JYaYGY ZpHrwciGnurOfJK9oBMXECwzcbEmpZfTWoGPFiZvJ8gE7xDpEIqA+FoxYyfH6y7DyEbJ +lNK1HZAQoGu6aWxcQqJxEpOkzAtMrWoFOh0Eelr1BaB+ZGd4k5UOiGGNYp9UpCi9D+z K5up0w1/ftbLw4OwW15WahGKHXE4yaa6gTWI6h7md8aEWjTJaNNiXhCLCQ9EeQlXZjhk M+9AdiXDgGvYOgot5GgzVAVDi+/PP32mF4DqfsRGOyX3UZkUQ2COmITahoXI/TtRngN+ mU6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683935434; x=1686527434; 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=nr0/2P0PrhPVltPxqFEO8yZGlq+w0+NW5S2btIKs8As=; b=UnTt5ePcBdS9r3T3SyJ5vA4UMdA0oeOMagL7775fBqP5m3yMac1t5kqBn7HPEb0aku l8N8vq6lC2od77aNUp0bTSuvdY2DID/RT2Id94mHdQHjAz871yKYlozB/F+6D/iX5Rlp +Fvbl/Il1KDmo4bOMw/Ox0vDVi8psVGXUuhf+/Oxf6clMf+uzCVrD42CP92X8XYVt9c/ 7P0BHE4btYFsJgzZVWn0BDoL5KiNOSthuWY7knatFbmmvievx8dxLsS0wX+SI0sYWHO+ 7UgaMIrDUPBWMO87469iToQBRmlPaFORuzpZw2JAjAT+8+yGcVHO/vlTaGaXNuddQ+Nc ULxQ== X-Gm-Message-State: AC+VfDwHiQjKgpfUtgEADnWx3/g8BI2Yo1xMlWlpNSeH02d/6OUstHxB wU81hvJbN9JLH1OCY05+AZY0mq3AL8g= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ca49:0:b0:55d:9484:f153 with SMTP id y9-20020a81ca49000000b0055d9484f153mr16043474ywk.7.1683935434025; Fri, 12 May 2023 16:50:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 16:50:10 -0700 In-Reply-To: <20230512235026.808058-1-seanjc@google.com> Mime-Version: 1.0 References: <20230512235026.808058-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230512235026.808058-3-seanjc@google.com> Subject: [PATCH v3 02/18] x86/reboot: Harden virtualization hooks for emergency reboot From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@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_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765734831011998954?= X-GMAIL-MSGID: =?utf-8?q?1765734831011998954?= 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. Signed-off-by: Sean Christopherson Reviewed-by: Kai Huang --- 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 2551baec927d..d9a38d379d18 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 299b970e5f82..739e09527dbb 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 317f72baf0c3..fc9cdb4114cc 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8547,8 +8547,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(); } @@ -8598,8 +8597,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();