From patchwork Thu Dec 1 23:26:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 28605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp542645wrr; Thu, 1 Dec 2022 15:34:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf5J+4tmdjbhl4NekyS/GjlfegIuYALDVrvuuJ6MKslY4TVB3jdCx7I1Uw0hZewJBysugHxi X-Received: by 2002:aa7:dc19:0:b0:461:f94:913 with SMTP id b25-20020aa7dc19000000b004610f940913mr46668938edu.102.1669937648068; Thu, 01 Dec 2022 15:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669937648; cv=none; d=google.com; s=arc-20160816; b=sTWwpRvV+pXRQujDylzgyO1FYgoIIPi4V8F58UwpfB/uz2noCXd/NGoWUadCP+EG6N mB3LzuoOJHcU2uHA4ia+K1PuRBy+uS3DeVgT/0iiYXNlTBYOOMAAE0K2sByT4G03NMT0 UMo14Nnm+AKXL1k+02J8T98q9S3oECro7uxDEdK/i0TK8+hXMkAP3GPd3tyHdcLHVys0 W/WVLVeo79zKzHUxMPLUgTkcUeJU92UCq7Ty0rGQPGSvU4p9c/ioMeD5MYdI92HZWgFy p4id23/h1yKxy+IKyBw5xBPqU6qsxUAI/GIwKZsDdoNIimC+tOIkIkuouJQvhJ9SEacu 69lA== 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=Sg9CsRxM4jZa0E7/KgshS4sdVS6EzlxV440C3ZXBs0s=; b=w++I86xx8cR0LaXTyU1UgIZ6/znoQblRsauPiLRWjhLe9chkAj7N5VM/4bQUronzAO wHK6y9mMFo4aVDsQ0/AAgf0WYZxBV6uVnf7OjcIXIrHSJFuczukcszSuoNE/P3eLVmcV 2M54mziSbZ3UWEkMR1JsVVFEAeIYxFZ2+6FhnBxenhn5/QrXVn8pY3WLPb6NqDodpuX6 qGLD8hTLsRRPvZ0uSrRyg5y8WcYOlxCQPgnrlnsCrMCpsTSwokYeuXxcORPkYWJH7c5M JgF8o3GzGSukVpXEgTPn4VvKPpwTDZEFxk6gV+7HHKvbHAI3imk/y1Twji0RRppy2nYV kj2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=rYmAuULP; 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 ce12-20020a170906b24c00b007c0ae8c7512si2398621ejb.251.2022.12.01.15.33.44; Thu, 01 Dec 2022 15:34:08 -0800 (PST) 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=20210112 header.b=rYmAuULP; 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 S231873AbiLAX3E (ORCPT + 99 others); Thu, 1 Dec 2022 18:29:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbiLAX2Z (ORCPT ); Thu, 1 Dec 2022 18:28:25 -0500 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 03D9CCF799 for ; Thu, 1 Dec 2022 15:27:28 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a5-20020a25af05000000b006e450a5e507so3339456ybh.22 for ; Thu, 01 Dec 2022 15:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=Sg9CsRxM4jZa0E7/KgshS4sdVS6EzlxV440C3ZXBs0s=; b=rYmAuULP73HrorSXL/MXkPO2BOATv/miT4OfDFVrD8TkA1qSe6/IIl8YrljhxYVpYH YwsWmcYp1eSR4JNDQ2YGoIJdEhu1rDp37/CF+HbhwLUN65HbY0WGBFa5ctKoY79gc0ef JDhgX4BKJI/y7kAOm1tQe0DyfyVKKCc+vwpJktXvrTD9/e7fexqQ258M0oKiEKrWf2e5 kr6+lUd1xeyAEBE/yV2MYvZHUncP1Xp+C4RY9HVn8RnATVHHs9GDjuoxCC1PHFavaKQl glgmwU6SVos0A27SE07k1IR8yDx4s9WboVRX0zWUVbkd4pJs0St7c5abpQqZq3hxqlRU TjmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Sg9CsRxM4jZa0E7/KgshS4sdVS6EzlxV440C3ZXBs0s=; b=o/G1mClCcR91UVrWxJTFw1V8W9/B8JohkPrvD+dbCdXo1yXdMTB8UYi/Kwg8bCZY+y /MnkbuRmyvR13CD6xFzxpNYGzKckwe2r8nW89vgmh7KboZDOfWwQCDE5Af2RW/EE+RRk ePgNyKLoM5OxGUpiDegWDNe7/s1hvkQpWdiaYiOJUmjT68kxEaz1k4HdAdH58P1JITCI Ri83/AYtHnzXt4iSAgVS6mjs8s+XNiqz3SXKIm0CDvFWhuD5NjHk8WLLA47JneZR+oX1 rnM8yJ37JWJPlYOKxI5E2BwdNPLJXX5AMNu9BPRM9hZJBxCG3IHBLJLyKJwjjFvup2UB Gn2g== X-Gm-Message-State: ANoB5plQ5EsFKSezpYF3O/bCzltJOAkiYQD72wVGVo61rfzsKZF2htM0 msFfMk65UGBXj0nKVifeLmht8//d1kU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a5b:c0d:0:b0:6fb:935d:bcc7 with SMTP id f13-20020a5b0c0d000000b006fb935dbcc7mr6530196ybq.130.1669937247256; Thu, 01 Dec 2022 15:27:27 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 1 Dec 2022 23:26:54 +0000 In-Reply-To: <20221201232655.290720-1-seanjc@google.com> Mime-Version: 1.0 References: <20221201232655.290720-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221201232655.290720-16-seanjc@google.com> Subject: [PATCH 15/16] KVM: x86: Force kvm_rebooting=true during emergency reboot/crash From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper 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,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?1751056539006334893?= X-GMAIL-MSGID: =?utf-8?q?1751056539006334893?= Set kvm_rebooting when virtualization is disabled in an emergency so that KVM eats faults on virtualization instructions even if kvm_reboot() isn't reached. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/vmx/vmx.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 2aec27b34487..08ed4679903a 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -592,6 +592,8 @@ static inline void kvm_cpu_svm_disable(void) static void svm_emergency_disable(void) { + kvm_rebooting = true; + kvm_cpu_svm_disable(); } diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 8be99651dcc9..7f8147a7d126 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -770,6 +770,8 @@ static void vmx_emergency_disable(void) int cpu = raw_smp_processor_id(); struct loaded_vmcs *v; + kvm_rebooting = true; + list_for_each_entry(v, &per_cpu(loaded_vmcss_on_cpu, cpu), loaded_vmcss_on_cpu_link) vmcs_clear(v->vmcs);