From patchwork Sat May 13 00:35: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: 93462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5486970vqo; Fri, 12 May 2023 17:57:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5JqdyGsyMHpPS6m6mxeNYBUFfpYWKtM3FAM0JDYXVKPIQeWsZgy3UXMPnVtkLgrydvY3o4 X-Received: by 2002:a17:903:22c7:b0:1a6:71b1:a0b9 with SMTP id y7-20020a17090322c700b001a671b1a0b9mr33354857plg.47.1683939476562; Fri, 12 May 2023 17:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939476; cv=none; d=google.com; s=arc-20160816; b=cLcWxeSFjWbECdWEwvgKEw+UGhv/R1kI2gmD5yasWZdgD7tKj9owMFw+NwDEgm9UJp LeRudtvCqSyuYwcB8YfJK6lKo0PoVZd35XdqK2bBFzB4oL/w7mw4VAnkDn2SeQnu956d 0znjSy+EBvk7vu6kAezHxtYgjkdcoD+FEaN5Yl90N/mwyEqIH9Hpd081BhSKjy31jP5h uPOU7H9/OnVCl1rbOZnNJBq1cM/wqThN9XvUBH62GhNvahoLI67iON5CJS5LHoWhJ2Ek KQC6wm08S/M5yINNjXByBM4p5CEPwfKoxBDGcRdpZhoTjsghPbg2G6UwnEbWB3iSltw1 or/A== 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=txxFy4l/0CjWXE2Lls1C8TlXhZ8gDD/lHA0CcUxieGg=; b=CMNu2/YvjZ3fz5fBjr4gxc+UuB1O4WMVpYLwrUbQj4DKWRqMLxgBeYXguXUkT6xiVf l8bERYrjwtWW7W+eaTLzNZqP5W+fm3yCEt2dRuu9n23RX/mhN4dsnnHqQqrtkwrAwM++ A+blhDFMI8DEd74mO1iC+/FcAsEVutYScKZn6cqSfjwnA417CLkGZPtnxDyfFfBxexFd 15Ak8d13vekNTGwC7A4scr7Mo6gcj+GjhNQ4bzrsWEDvLb+B5DwrVps9GcdUo6JtFLfa WQDLx7xJfIKFLPKwylIXm2Wjiw5qTvKJF4eXmJC3uJ9ji5uJhkTeNytJpWjQCxL6UvAW q/Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1haVJ2yf; 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 x2-20020a1709028ec200b001add3e4ee84si4301967plo.132.2023.05.12.17.57.41; Fri, 12 May 2023 17:57:56 -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=1haVJ2yf; 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 S242027AbjEMAjE (ORCPT + 99 others); Fri, 12 May 2023 20:39:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241835AbjEMAiZ (ORCPT ); Fri, 12 May 2023 20:38:25 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F3BEE71A for ; Fri, 12 May 2023 17:37:16 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-5308f5d8ac9so1121426a12.0 for ; Fri, 12 May 2023 17:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938213; x=1686530213; 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=txxFy4l/0CjWXE2Lls1C8TlXhZ8gDD/lHA0CcUxieGg=; b=1haVJ2yfzvTDJ7OWiHD70BYBmN550CeOMY4hpPZ+nSFvEJEzGlp9zifp2JC9DTsBnT RJZuYPoZBC56u7q5NVSap0DjOvLwxYApwLH9hRiHGYxDoZJvwxzHUiwRC9eia+w/uZP7 EBybQwdiAWLVgS8BlsYrTOIiunclWLH+LI0gc9Tnj4BM3xt3lZRaMifAigMxY42RgfDp cwJG3qN9EWZwmkGrQazhnNhAbchLqLap871kMkvWtbxo/QXAGrSEZskw2tAXxrat7ud/ D5ZrbarX8RzkvaRosayYzhljq+hKPOqhGf/8xnjwY+T70UILI2/0G0yJJiJRMoQtMPm0 3+WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938213; x=1686530213; 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=txxFy4l/0CjWXE2Lls1C8TlXhZ8gDD/lHA0CcUxieGg=; b=arQ4RyV6qvGXYTUsSP1QTIoSxaAVOm4zmP8YPJuycuk+zSDgdy+832a9iKHVT4zStN 1BSKkJW5FEKENoFP5QD/1yLdMVo/ah3D5aJIUOjXH4Jxbh/UVcDEbCsk7zVjGK0gn/kx kPSM/yb5vQQphFSSCHk13sVJdRRKqWy97OXHsJbv5xH/gHmhewvI3dEM1QEfHSSn5qLL NCo3Cl35G91a3DGOL80CXBnHWoOkz/gt3CclX5kPQAKcCxUSP8RK+aItYkD89lmJD1iv /zb6S9M+pYXECrgXW9Z65lC/21R4jfXAGROIu486FQYZcP1rMkxsKzByn82RnBtJqAUR msjw== X-Gm-Message-State: AC+VfDzc0+/1pNNAuYn0sLWNvLmPzJ2dRI/WfHyO+HYA5TEZbny4htzM XnrvvBlz+kTnyoscWAp7jEVaHpk1qtk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:148:b0:246:f99b:fd65 with SMTP id em8-20020a17090b014800b00246f99bfd65mr8121515pjb.5.1683938212995; Fri, 12 May 2023 17:36:52 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:57 -0700 In-Reply-To: <20230513003600.818142-1-seanjc@google.com> Mime-Version: 1.0 References: <20230513003600.818142-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-26-seanjc@google.com> Subject: [PATCH v3 25/28] KVM: x86/mmu: Bug the VM if write-tracking is used but not enabled From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon 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?1765738520989066770?= X-GMAIL-MSGID: =?utf-8?q?1765738520989066770?= Bug the VM if something attempts to write-track a gfn, but write-tracking isn't enabled. The VM is doomed (and KVM has an egregious bug) if KVM or KVMGT wants to shadow guest page tables but can't because write-tracking isn't enabled. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/page_track.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 29ae61f1e303..eedb5889d73e 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -90,7 +90,7 @@ void kvm_write_track_add_gfn(struct kvm *kvm, struct kvm_memory_slot *slot, lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) || srcu_read_lock_held(&kvm->srcu)); - if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm))) + if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm)) return; update_gfn_write_track(slot, gfn, 1); @@ -122,7 +122,7 @@ void kvm_write_track_remove_gfn(struct kvm *kvm, lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) || srcu_read_lock_held(&kvm->srcu)); - if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm))) + if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm)) return; update_gfn_write_track(slot, gfn, -1);