From patchwork Fri Jul 21 20:18:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp456035vqg; Fri, 21 Jul 2023 13:47:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlHiNKopt4IFma0zjZ+hJOSUGuN3IDY5ou2Rd/gp8+R960osUbZPKYzFwVxspPN09c37FoVh X-Received: by 2002:a17:902:a609:b0:1b9:de75:d5bb with SMTP id u9-20020a170902a60900b001b9de75d5bbmr3047935plq.7.1689972425837; Fri, 21 Jul 2023 13:47:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689972425; cv=none; d=google.com; s=arc-20160816; b=kX5xR3Aq7cZgUFFiGQi+d7XZbgSaxMAxyMMk/GXrcaJAfQvLmU0hJDcTMR7t6QXGhs cBZBv62rtQQhS1P2/8n3xo/SpWoeGeGAPf+zvg3dcgl0L5t84ftDi04wxtbYBAtQJP8Z b/wa/INSe2u5NZzjdZ1CMUR8mQS+egORIFZu/O5GCWBIhZAxzDLqVIeaKDBKllIP+FGo wGCk795Btu3wUDAj8kUdyrBwJsMtMv0Fb7prtz8m2X7MmSiWaB10fN34cn5mpLy9V0Wk wECcR4bkmfDDDwY1iUt5D4vdlCElGxLSOqulEXLVS1nO36iyvAXyWuWrNeXMemcJxC6Q qb6A== 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=RNIzxG+DyKxhv7/WUhcg42RyR1LzF+A7NEJm4Wy1bYU=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=kHX10zKKQiASEIRkETvJGcneYnAp7h5otkLfrjiZgNxTrPn8gNCICCvM/LfrPFXmLb pB0XfB1cpOcez7YGfnRRZaro1w7piOqBlLH+OKy5m/o9ruZveLeQQb7treH8GDdw32jl uQGDYN61rINHFyeRjg2veflrctYX7uvLb++z6NZT3zf4ikT2FbUcPEHBNluxceApn4OL gCHUBoeXuWK1EnSGD/IEcMh7vdcg51kZKGQzKfAXsI0En/+FFYo7oELg/X6dmyw0V0R0 r1amxo4AN39kYZ88hNrcfW7v0IMOoER6VcQ1eWtqAOkAjmETK3v4e1HhQc39EXtuMfby MsIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=VLZQUdsQ; 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 q8-20020a170902a3c800b001b222cd9826si3628842plb.349.2023.07.21.13.46.52; Fri, 21 Jul 2023 13:47:05 -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=VLZQUdsQ; 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 S231297AbjGUUTo (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230291AbjGUUTT (ORCPT ); Fri, 21 Jul 2023 16:19:19 -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 064CD12F for ; Fri, 21 Jul 2023 13:19:15 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-bd69bb4507eso2275796276.2 for ; Fri, 21 Jul 2023 13:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970754; x=1690575554; 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=RNIzxG+DyKxhv7/WUhcg42RyR1LzF+A7NEJm4Wy1bYU=; b=VLZQUdsQavq82AMjpjS9rdHI6jO9sP6xssXKUkaB7U/GQwL8nid7eG6wVk1JwgqkoT FFTkgw45ADeMUlu5ALDnr115Ixck3boFbgPyZpQreyFzl6yJ+S/V+dJuYxQ5XWvOE/eI 4kkQnZ9H9c5aWJmAayTqrjC0yCMJ1b22MPWz1FBwlIMfjWdFE90FsWNd70jKxCl95sG3 QXIGYOX/P4AermBbmroCFajzBcZIR2L3b4+vbW3tHy384n+r5uiD9o4Vvd532w5CUlex ObV2LDr84QRbQEztcWeYQ+Dwl6PU4ML/7junWpBh6RsYoPWUnLQw+9OhPN5uWwkg48ZQ mHIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970754; x=1690575554; 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=RNIzxG+DyKxhv7/WUhcg42RyR1LzF+A7NEJm4Wy1bYU=; b=PRrY6mNAS1gij1NGKky9Fj3nfv0PIAejt7v+69kZOqNJdmdc2XyVU8MIr2HkxrGr/y A9KIUkvPeEwrEBnPqHq+ZmiGDgjomXF9xNtPRbaVWWBTnI5YQE//2ZWQ1xPjc+BzVqei ei6BnsgiLE6Ky5ZxA8SvP0omUd5UJ9Z6nHCOvH1v+MH0fVlzU4kf6UGMGu2JAx4BmzWa HgDYMXUOX3Hvg1l2QDSNBPdYWSuHThH13MoAvCpNhb/WhbuPdigmuxq0kWG/bxTG0Xk4 j5ym3y4WfSD9rKhAhJ699KfrsZznr0C44cLOQLLymwWZQ0/AbLzpKwm9XQtsSr4cONzP E9hA== X-Gm-Message-State: ABy/qLZYKzdUVBbCCgZtYnEvW0YrOpOXuimsnIdieeRatSxOz2yZ30jt 47iTK2ETIdAjMu254WnBo0tVjpKNxx0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:b310:0:b0:cfd:d50f:df5b with SMTP id l16-20020a25b310000000b00cfdd50fdf5bmr17452ybj.13.1689970754335; Fri, 21 Jul 2023 13:19:14 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:45 -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-6-seanjc@google.com> Subject: [PATCH v4 05/19] x86/reboot: Assert that IRQs are disabled when turning off virtualization 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=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: INBOX X-GMAIL-THRID: 1772064526405937392 X-GMAIL-MSGID: 1772064526405937392 Assert that IRQs are disabled when turning off virtualization in an emergency. KVM enables hardware via on_each_cpu(), i.e. could re-enable hardware if a pending IPI were delivered after disabling virtualization. Remove a misleading comment from emergency_reboot_disable_virtualization() about "just" needing to guarantee the CPU is stable (see above). Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/kernel/reboot.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 48ad2d1ff83d..4cad7183b89e 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -532,7 +532,6 @@ static inline void nmi_shootdown_cpus_on_restart(void); static void emergency_reboot_disable_virtualization(void) { - /* Just make sure we won't change CPUs while doing this */ local_irq_disable(); /* @@ -821,6 +820,13 @@ void cpu_emergency_disable_virtualization(void) { cpu_emergency_virt_cb *callback; + /* + * IRQs must be disabled as KVM enables virtualization in hardware via + * function call IPIs, i.e. IRQs need to be disabled to guarantee + * virtualization stays disabled. + */ + lockdep_assert_irqs_disabled(); + rcu_read_lock(); callback = rcu_dereference(cpu_emergency_virt_callback); if (callback)