From patchwork Fri Jul 21 20:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124099 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp468907vqg; Fri, 21 Jul 2023 14:16:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlE1r60K+icZGeFedhdHP7aR0mMPZamS3yjzNUvYEaJuRkUqi0+AnuKCFLa0hepjm0xZTqiJ X-Received: by 2002:a05:6402:3551:b0:51e:85d7:2c79 with SMTP id f17-20020a056402355100b0051e85d72c79mr10551360edd.7.1689974208319; Fri, 21 Jul 2023 14:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689974208; cv=none; d=google.com; s=arc-20160816; b=SZ0vGCAQRZ2mqOLLTdC9hvMaJVjH+HUdtG8IcqQOtSDZAqknJxMGCUp7XaJiyan68S qe+ZavtL2YKP+AvfoVPPItdyHGv7PrH+x27D1NOKTwHUlzknvWFMNZS1aKOWLl8lgtmn fOIm0gndaZyI4keEltP7W+6spfx1Y/ifyUB/+DIJX6sKA9ZhCnMFjAehnR5aXe29CcjF roV7Tb9xfe2APkmDkU2uyrf/XhRJwJY69mKTNrY/ZlGewYTLu2qAflyziKmPu1z7Ptz5 ZmiYjtVcFwmaz9YJgL3C8bwNu7/cBW9JfRE54Pad2u3ARbp6yG7LG02uEDYLzyq2wXc0 vQRQ== 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=0ufOgL/ovXKIGQEYukNshYDCW2QOagoVOtmN2psRo9c=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=ste0jMi6QzmZgk5bCVDEvQJNeRWFi1UUfs+TxIXXI/Ut5HXdVj1rrlpda3pPCeGuMX 0MbmcQ9kcnlRxrqpI3AZXVAv+F+E0eHiQQkJEdAU6mqYo79f9zTPjnSvydqM9rVU8R4P 5vWPRn4q9MgYbuKkEEtW4IIOhw1jcHq++C0mbwpBGgcmNwWDfS/9vNt2d6O8/QhB+NKV WFxGcGw7wpTK8VLKJ3jmAAQIGHtwvo80mPOAWW0uRrKZCkVtxFwH7c+rGfbz504ElUPk IW5jBb88APugwFj3VxvSma4QPW2V7puhvK2g6hFzeL1CUW4q++4Na1iZleYrxZRO8rxM 3kWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="b12Ttu/+"; 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 h14-20020a50ed8e000000b0051e29447e4fsi2639238edr.548.2023.07.21.14.16.23; Fri, 21 Jul 2023 14:16:48 -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="b12Ttu/+"; 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 S231538AbjGUUVB (ORCPT + 99 others); Fri, 21 Jul 2023 16:21:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231503AbjGUUUf (ORCPT ); Fri, 21 Jul 2023 16:20:35 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 488923A8C for ; Fri, 21 Jul 2023 13:19:50 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-c8f360a07a2so2266280276.2 for ; Fri, 21 Jul 2023 13:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970779; x=1690575579; 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=0ufOgL/ovXKIGQEYukNshYDCW2QOagoVOtmN2psRo9c=; b=b12Ttu/+eAKMYYr+ZtWZDhO9f8tIZzhiWDUyfkYKkQAGZ8PdoM7SUfhXHfFjda9SM8 wHTbZcaIxbvpo6ZC55UJc/d6aRulVjhV0CUNJrul/2S2FZZweyArAU2EVJUBrcBBXquN vU05kJwjb1NAJHt3dCz+9FG0HhYvLHlgxT/IyC/seKzCxR/UFSkK+WuX3JN2T1Zjexz/ cn2JU6UHxz3FopptseYCiqsx2AYAfIKAmTFUMY10/d1txCxH5yYIetLq3/s5ohB7VhvC xsH/zGKExBxyiHcmYi130rGplxqvQDFOSlqz2e7jwYp5AIvNTdYLOF8Ndw+tBLCt7PL8 HW5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970779; x=1690575579; 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=0ufOgL/ovXKIGQEYukNshYDCW2QOagoVOtmN2psRo9c=; b=jqmezKvGRiaAfz+LvDoeIAf4E9uHBtMnT/dIotQcBOBA7EZvI0Uuo+T3fdZ9eVApkF 3q60f9tKOK6MbhTC4nwmFFEPx9d1zSAuiYOBEcUTB1fndOLUYluLifeCRqFuVjbIhkyD JL7nnr4eYtBHkcADK1r9Kay4lN0h3IZ14KFjmVJStCbpZ6W6AtQANHn7ONTK8/kV9A26 zWaDCvxKRfidb7CT8LgjTN8FludMiIY4RMMWa14TORgzruUEeCEKbiJPaT1JlX0NDZRj rTW1QOWulVqqd+zj+LTBwBLLg172g5jqHoTisbLLfqD1uLlrIMYt1n533Qr3MRMzGOwK +/Rw== X-Gm-Message-State: ABy/qLZZpcZCKK5bf+nqujVJkS03UwAsReJl/64z+lwMqBtRnlKeY+S/ 0fCjKpYfJNaWaFnNSLhgJ7ICpU+yDeM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:81cf:0:b0:c5d:dac2:cb2a with SMTP id n15-20020a2581cf000000b00c5ddac2cb2amr18048ybm.13.1689970779472; Fri, 21 Jul 2023 13:19:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:57 -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-18-seanjc@google.com> Subject: [PATCH v4 17/19] 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: 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: 1772066395574672275 X-GMAIL-MSGID: 1772066395574672275 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. Reviewed-by: Kai Huang 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 47f9c7156609..8d1b3c801629 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -605,6 +605,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 0e1f3856a9be..5d21931842a5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -771,6 +771,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);