From patchwork Sat Jul 29 00:47:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp792818vqg; Fri, 28 Jul 2023 18:41:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2Ew5T/eyz7999fWx7wcRU0yIjinUmctRF8ZzYzUODiilrLOnu3KMJXJ/Caw1okA8DGZ8H X-Received: by 2002:a17:907:a0c6:b0:96f:8666:5fc4 with SMTP id hw6-20020a170907a0c600b0096f86665fc4mr799350ejc.50.1690594910573; Fri, 28 Jul 2023 18:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690594910; cv=none; d=google.com; s=arc-20160816; b=oxFcpuTuOZOVRHUqauVx4StTG3SIwedhHWAGlQ+OnT03ojkEzA7ZWwIhBU/NAA1g4J 0ddkyHQ+cXo31ppp96NDBjglCmE2aoRVCJ7ZG4Z3Q10ktvnUAxeAXYDv2E9QTK9OXCXI Wi+49ikjgcB+tJ46X+m0D0iZEdqWgGDHbY7Bu+uri20N3DybBDDhW2+6myZ2xvw/N+HO 7ZIyeVlnAqn4OLVtxrwI2chi/io0H/X33wReIqbDPDuMejkwrA+WJJESG52UZ0ac0TWF l5QoZEAGQJYtDofg65i7nfGQdUcV3KBS7fqljgtjzwStViAxg2JadTQ6EbvO85/KsCj8 H8lg== 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=RfXXcqZt8v+vEMviQaB4ha8ro96aOmyFYUDExhL33FE=; fh=sOnAx2GuCQaI5IJu7Mo1xgLCDrPH4l5HM1pSkvn/pIo=; b=lV1kO/04iSIcbn5Z1g3Z6eGOvSdp9Vb6RcoM+GR4ce0FdUEML+HYJvg22z+KuN7Tzm nIpUeSwL0+YvFaPfmoL6DlY4SLhCXv9VcLzZMvEyIy1sfCnFSnVkELpvaMityr1F3pEB ckW4MF3ScXukwF3nJC5URMZLt+bpsGmhDOGpz4qavHnOQDK/gBhCrJxDHy/zS0YmD8iN AvLsA1BWIK4UgOEMx3GGnjQkDqv9zi5VJ6IkAFfKdHle7gNUpyzchy//UdmFZX3gf3Jb wehnQVh8ZGPLcBbREWRyScFCks119wAPFGa+9QnFGd7UOO+cVg72Zq4zhU/5IDcLBS7G Bg7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=D+29wkyj; 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 jx14-20020a170906ca4e00b0099363f18293si3565849ejb.124.2023.07.28.18.41.27; Fri, 28 Jul 2023 18:41:50 -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=D+29wkyj; 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 S229665AbjG2Atj (ORCPT + 99 others); Fri, 28 Jul 2023 20:49:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236991AbjG2AtX (ORCPT ); Fri, 28 Jul 2023 20:49:23 -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 35D75421D for ; Fri, 28 Jul 2023 17:48:45 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d1851c52f3dso2422799276.1 for ; Fri, 28 Jul 2023 17:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591661; x=1691196461; 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=RfXXcqZt8v+vEMviQaB4ha8ro96aOmyFYUDExhL33FE=; b=D+29wkyjLypapSHoJge1mpaMfPBHgyoydIEBosT6gdt3ZIvLSr9lW379+2twDS+9NN x8d9jNCpmbUF5qFqVmqFdk+q9BOi6GRROVAhUNufVZHuH6xCedDb3S1GXzaf2+a6ZkYX WcXffBZ+IgjsHuqASHKxYMFPAvTTogbstpNmvwdmcZfL5QGGqsYFEVkYc1tStEL2L7sv dyx2fHZlILnrsMXJcxTxFXr21doH+/dcswCPHamiZcg0CTfh3gRu70ahmuRwaMmXANTi 8kjx7ldkDSK4tsFuKQyxCI2MgK/iVhypCHeoILCPx/DAHwGdTB54OBNagVdOVid8O9KI lAUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591661; x=1691196461; 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=RfXXcqZt8v+vEMviQaB4ha8ro96aOmyFYUDExhL33FE=; b=T46VBhX77jS4T8hsNiWk9kDgrO4axsDjtGLSmTaHvksmnEsp+tYIqhKkytG7vTzabx sG8pq/cKEnhRbrxDQjZzYBBhLzAQ9RqklMNFUPIqD38hVVomoXMLtLC0cL0HG1Nu5Cdn CYPJIFr6Pd+Ar7hWKv2gqDF9X5K125zz6/kEQeNXHntTlkDmfKS7/TOP7h7M0ChXMnoS EKwGKkjEFi3IIixHNtiyoUoSXBmp+WNsiEN3mwCSqWstKL6KGt2DFHMk9paJq7yWCrkV ZMwFcUxkGLJQrMfvn/XkbM3eR3aHB7uipZkdGdGhjC1RystKKVi5ltAo4fcKM0T7UVj2 59Rw== X-Gm-Message-State: ABy/qLYZqKvWTDndV5p91Y7HsCj6HHY/sq3QoF/HJMwGR+t45sDrdCTm Lzi++58WxucNrIIMSkJ4uVhQXEcywJs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:100f:b0:cf9:3564:33cc with SMTP id w15-20020a056902100f00b00cf9356433ccmr24322ybt.13.1690591660993; Fri, 28 Jul 2023 17:47:40 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:47:19 -0700 In-Reply-To: <20230729004722.1056172-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729004722.1056172-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729004722.1056172-10-seanjc@google.com> Subject: [PATCH v3 09/12] KVM: x86/mmu: Replace MMU_DEBUG with proper KVM_PROVE_MMU Kconfig From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , David Matlack , Jim Mattson 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=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: 1772717248567640251 X-GMAIL-MSGID: 1772717248567640251 Replace MMU_DEBUG, which requires manually modifying KVM to enable the macro, with a proper Kconfig, KVM_PROVE_MMU. Now that pgprintk() and rmap_printk() are gone, i.e. the macro guards only KVM_MMU_WARN_ON() and won't flood the kernel logs, enabling the option for debug kernels is both desirable and feasible. Signed-off-by: Sean Christopherson Reviewed-by: Philippe Mathieu-Daudé --- arch/x86/kvm/Kconfig | 13 +++++++++++++ arch/x86/kvm/mmu/mmu.c | 2 +- arch/x86/kvm/mmu/mmu_internal.h | 4 +--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 89ca7f4c1464..4e5a282cc518 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -138,6 +138,19 @@ config KVM_XEN If in doubt, say "N". +config KVM_PROVE_MMU + bool "Prove KVM MMU correctness" + depends on DEBUG_KERNEL + depends on KVM + depends on EXPERT + help + Enables runtime assertions in KVM's MMU that are too costly to enable + in anything remotely resembling a production environment, e.g. this + gates code that verifies a to-be-freed page table doesn't have any + present SPTEs. + + If in doubt, say "N". + config KVM_EXTERNAL_WRITE_TRACKING bool diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index d46f77734f30..21ced900c3e9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1695,7 +1695,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) static void kvm_mmu_check_sptes_at_free(struct kvm_mmu_page *sp) { -#ifdef MMU_DEBUG +#ifdef CONFIG_KVM_PROVE_MMU int i; for (i = 0; i < SPTE_ENT_PER_PAGE; i++) { diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index cfe925fefa68..40e74db6a7d5 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -6,9 +6,7 @@ #include #include -#undef MMU_DEBUG - -#ifdef MMU_DEBUG +#ifdef CONFIG_KVM_PROVE_MMU #define KVM_MMU_WARN_ON(x) WARN_ON_ONCE(x) #else #define KVM_MMU_WARN_ON(x) do { } while (0)