From patchwork Sat Jul 29 00:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp810296vqg; Fri, 28 Jul 2023 19:41:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlFOORnhlf019cpvFvMkXGfc/VlK9jBcuxIQq1QDmtLrtRUvI36X5zx/KnmkInaj+Me8hYuW X-Received: by 2002:a05:6a21:6d9a:b0:137:68c3:c86f with SMTP id wl26-20020a056a216d9a00b0013768c3c86fmr3590407pzb.55.1690598480014; Fri, 28 Jul 2023 19:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690598479; cv=none; d=google.com; s=arc-20160816; b=w+b2JCJumjSJ1YZiTC8qqB8psldeNgcvvCeYiEsCBq9gTOegS/fhur+wCgVUUTQuEM l7/93FR69KvjiCW+kn1UuOT9ZvITiMF8mzE5cB6KS1dQVRAbiYUbW+5Mq8kYSs7ePnFp tQXrOJAILUdSysqCs8dFWds3BTuAu7c7Y6NtlH5CBdSRC7zSWa+TYH0waeZusoHl4tUh B9WVEXfyNxxE1CMMqHfYpxnsXsQ+DRRuDOyhZLuHqHaSX72q0I+QF/cnrg06S4FvCPZu +tFcCwE+TI1pqFKBY//+UY5hQiG925uERYltjy6rB6mGShZMHvn6zw6zA4jPAXYKT+md zydQ== 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=h4cdHm0BhlnhwQewWFd9AhJ9S+836DEvk/nuWuA0UMI=; fh=sOnAx2GuCQaI5IJu7Mo1xgLCDrPH4l5HM1pSkvn/pIo=; b=wzMsy6/p4AqlE9UaHO3xg1scoIppq6dQmQCvMIiOXLUp3RlB8DgVNNnHpAenYhaaL1 v2oS1MgOAYLHl0oZDhiKL7jY/RQLt6DDCGGkD7/aCKt3R2kEohDUCBMr3xgM7/TzanSc NBVmr6gWiPBOLp44Slzd/BW0rTc7ekVYTr6yZ+PASNxP4X1Fpau3vH46R/R8DaCni6io BtYyipAYhUvQ2OzNt/NjEf26QMm8NTg83/TqsitkoihxRyqy12NKincdiCVKzRRbxwIM Xri2sBRLd/2fEqsJvOo1Cby6BxPoxaphHBkYhisy8/K1NYUOX2Fgnoel6xG43hmDJThS 1Zfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=t+btc92z; 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 p35-20020a056a000a2300b006863085981esi2381488pfh.68.2023.07.28.19.41.07; Fri, 28 Jul 2023 19:41:19 -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=t+btc92z; 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 S236939AbjG2AtU (ORCPT + 99 others); Fri, 28 Jul 2023 20:49:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236871AbjG2AtD (ORCPT ); Fri, 28 Jul 2023 20:49:03 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0050A26B8 for ; Fri, 28 Jul 2023 17:48:28 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-1bb8f751372so24475735ad.0 for ; Fri, 28 Jul 2023 17:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591653; x=1691196453; 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=h4cdHm0BhlnhwQewWFd9AhJ9S+836DEvk/nuWuA0UMI=; b=t+btc92z8/DgzpdYkrs7sL1HZgj054O/l9y6BIeMTFTnjcyb2xDE7SFYpIeFpg+xlN C/3BOBrWT5egYwIZR9MXt8xNNFX7+v101a9eFqBI1WBjAUuML2fS6kB76znkNwLDcoIv ddQc5eUlZ4cL3Bdsi3q2vxX241inLoXN0JvkRCKhKb+OaSN1uEkQm6cAnXqBwsV4rnsd ZeBVeqftNSU+rx346x1Fo74hTJU6SM68raImqyNpTMu+g9ZHeczC3Fk73kh4nV1E9Y62 Nl1gbd5iCoIUGOnZhJc3SChBuzlHu0VSY7s/BuenjEWokbMbwgUNSDzl9iKHGGNa1rDL Ew1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591653; x=1691196453; 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=h4cdHm0BhlnhwQewWFd9AhJ9S+836DEvk/nuWuA0UMI=; b=fUiWaiabVYGTjWSYZXEf9aTkLAujH6LB91VCVNsUYZOKJzpa3Z0zD1voUnxhGq+wSE xfh1ppZCU3ZFbea2a6sFl3Lqef730G7lHHBhTt8HfAT5yHnR+LPct5SodghK4uFhIptk YJkpt4bD9p1bhK3AQIG/JpEa+bvCNYJ68MU89pYbCB2pIsMlZFmqSOPyXC2ZhZck9dkt mf5kgak8J2UDQIGDodFp6kHovE9jC3LN3W8uWG5pUO77mh2bpDek3QDNHP/7Scep3KuF 4xFwXlKF2tYibMeTjkFIype529Fb4tSFe8/Q50PMR9KXE/3fRZgeO6JSMShLTWSKpSQz rCYA== X-Gm-Message-State: ABy/qLZv9lbT+3hsRiSzPDKr9PBCId28bEvrp39pDT6+l+5ONHDK9jdt cW1jfd4tT5d4a/c0HcPBaCUx184cBvU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ce84:b0:1b8:2cee:946b with SMTP id f4-20020a170902ce8400b001b82cee946bmr14762plg.11.1690591653584; Fri, 28 Jul 2023 17:47:33 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:47:15 -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-6-seanjc@google.com> Subject: [PATCH v3 05/12] KVM: x86/mmu: Cleanup sanity check of SPTEs at SP free 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=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: 1772720991788070218 X-GMAIL-MSGID: 1772720991788070218 Massage the error message for the sanity check on SPTEs when freeing a shadow page to be more verbose, and to print out all shadow-present SPTEs, not just the first SPTE encountered. Printing all SPTEs can be quite valuable for debug, e.g. highlights whether the leak is a one-off or widepsread, or possibly the result of memory corruption (something else in the kernel stomping on KVM's SPTEs). Opportunistically move the MMU_WARN_ON() into the helper itself, which will allow a future cleanup to use BUILD_BUG_ON_INVALID() as the stub for MMU_WARN_ON(). BUILD_BUG_ON_INVALID() works as intended and results in the compiler complaining about is_empty_shadow_page() not being declared. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 08d08f34e6a3..8a21b06a9646 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1693,21 +1693,19 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) return young; } +static void kvm_mmu_check_sptes_at_free(struct kvm_mmu_page *sp) +{ #ifdef MMU_DEBUG -static int is_empty_shadow_page(u64 *spt) -{ int i; for (i = 0; i < SPTE_ENT_PER_PAGE; i++) { - if (is_shadow_present_pte(spt[i])) { - printk(KERN_ERR "%s: %p %llx\n", __func__, - &spt[i], spt[i]); - return 0; - } + if (MMU_WARN_ON(is_shadow_present_pte(sp->spt[i]))) + pr_err_ratelimited("SPTE %llx (@ %p) for gfn %llx shadow-present at free", + sp->spt[i], &sp->spt[i], + kvm_mmu_page_get_gfn(sp, i)); } - return 1; -} #endif +} /* * This value is the sum of all of the kvm instances's @@ -1735,7 +1733,8 @@ static void kvm_unaccount_mmu_page(struct kvm *kvm, struct kvm_mmu_page *sp) static void kvm_mmu_free_shadow_page(struct kvm_mmu_page *sp) { - MMU_WARN_ON(!is_empty_shadow_page(sp->spt)); + kvm_mmu_check_sptes_at_free(sp); + hlist_del(&sp->hash_link); list_del(&sp->link); free_page((unsigned long)sp->spt);