From patchwork Sat Jul 29 00:47:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127976 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp814482vqg; Fri, 28 Jul 2023 19:56:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHQHREtTPfVvC9nXAN0LJBC3LkFaFuEySbHwmPlO/4AbODAC29v/9IaJW7nZ+T1mDctXBXW X-Received: by 2002:a17:90b:4c89:b0:268:3582:a6be with SMTP id my9-20020a17090b4c8900b002683582a6bemr3447345pjb.33.1690599377725; Fri, 28 Jul 2023 19:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690599377; cv=none; d=google.com; s=arc-20160816; b=HpwgcLai7Df3KBVn6n6UfKeQBi5c23beDjBYkKEC9sjm+LUwdUifiSIIsWVtonGAEM wx39BmteNMJWRkjMWWqqj8bBwyCarQDs6pFfa4/g8wAlEcMOxqYo53NI56H95HOHNMUl hqrK5GEHa4iMEkAIUeUI0sD+QhTjzNx+3Jszh1qw9LcMU8h8Y82DNR606Ar9SSGa6UlC Pd1TnUeMBHmYG51Mnd/hcYecinW3Kia1SP3WEQO0bRCSjgghUsXXR4OfFAsm/76TP4Uc OmkMa6BFLpyCVMLvuPcxxip5p2GiDtnrRVBSNzyOQc13kRXMDr6I6W3tp+qsw6BxGgMa iYtA== 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=wQPXzO6Hsu0iSJF0dOCAsCOFxRTne/hu/L+54JaWJC0=; fh=sOnAx2GuCQaI5IJu7Mo1xgLCDrPH4l5HM1pSkvn/pIo=; b=Q0plgIayvu/grWe7di4bvLSfEef9etJa1qtPCBl5/W3gjCot/G/2tdozcc/bAaARcd ZXS2OdgfnDxMcl6JjzCSP0qEUp1wYTW2+W3hrlBC7JSM1esP8De329eWJF4UBabCC/3v dVHYP96ZvrzyJvQ+YTEKLN2a2DyIW1cxdNvPDtO0iWMPef1Bf9wnb3fPaG1zfAln4mmY J1ZVe+pexxzvV9fu9kfPKDRZ2qJILyl2mOQY7sB6Ml1YV4SCqeDs1eUu20LDDnOrUkcY 4B/a6p4wBAEO2KzCo8eovP6Be8FdHes12AC234d6/Np2GSFuYgTT8K18a43Ypu55bdms uDrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=xk+sw9iH; 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 n3-20020a170903404300b001b9ea40d26fsi3757124pla.295.2023.07.28.19.56.04; Fri, 28 Jul 2023 19:56:17 -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=xk+sw9iH; 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 S237112AbjG2At7 (ORCPT + 99 others); Fri, 28 Jul 2023 20:49:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236579AbjG2At3 (ORCPT ); Fri, 28 Jul 2023 20:49:29 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CC1544B2 for ; Fri, 28 Jul 2023 17:48:50 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1bb98659f3cso18237405ad.3 for ; Fri, 28 Jul 2023 17:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591664; x=1691196464; 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=wQPXzO6Hsu0iSJF0dOCAsCOFxRTne/hu/L+54JaWJC0=; b=xk+sw9iHBzeSkdbItPNiudL91ectUHw+VPj43a93ptNlkiVnFBWSaIzTGo+pBOZrVB ZMZwVCYflhDXeIrkHf6UKFSk7SIyUbjztsAG4Mw4KJRCYnGySF3Nt3HKUeKczPqEU4zG SslR1c0snG5jb8rT1lS2+NufHyLHp+wt0HthtHJpu1qRkzc6nMkJKDnij6sEUAbjCtEF xE35oyH827tgDTbyWBzgzeJAkn0BQPrkDeAgl61AfpacjncbL2Nm7WLmKYPYqFiDjg9q xz3BLkHqH3lpajail7UUUR1jWV+XCNuYepHBeCKE68teAVQAlpsg/L+kiDJJmlR5RdJi 2sMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591664; x=1691196464; 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=wQPXzO6Hsu0iSJF0dOCAsCOFxRTne/hu/L+54JaWJC0=; b=apQBx61i2+MqrsBKJqGf8Ju1GycCJRARt98ZtKz9d1i3WKn+70YT4KGr/qUdCUvc7m gGqPf5KgM7c/O2gAO4FMip6Wq6plXvEYZPE9VOB7bqsn0Mlb7YXXXppD0hVG/68cvKVr ScH00Bn55s1mR9asnhkvu3xCR0QKGkjJkwg6E88oQZvJ2bxERvYZAPK12pndlL0vCTTp VkvqurFSElilSg23O8hV1fZmdINTc9cTGtiMtQLcyM5LjyIpTnJ8/TD9NTpbUTApIGjN /9M67r84f8cCp/7/oBOwA0cLrgXRY0SkqHT6xpLIOxWtCtHJfWHL6VjIKsZn8eeeqlEn r44w== X-Gm-Message-State: ABy/qLakMAsYLmpOtAaFOfnp8NKZmMyJt+omkFlG3mgfRMvSuAqTx66A QusSfnf8xtISB9ssffK+wkK0p68WM1M= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:d4c9:b0:1bb:8c42:79f4 with SMTP id o9-20020a170902d4c900b001bb8c4279f4mr11219plg.2.1690591664685; Fri, 28 Jul 2023 17:47:44 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:47:21 -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-12-seanjc@google.com> Subject: [PATCH v3 11/12] KVM: x86/mmu: Plumb "struct kvm" all the way to pte_list_remove() 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: 1772721933050180611 X-GMAIL-MSGID: 1772721933050180611 From: Mingwei Zhang Plumb "struct kvm" all the way to pte_list_remove() to allow the usage of KVM_BUG() and/or KVM_BUG_ON(). This will allow killing only the offending VM instead of doing BUG() if the kernel is built with CONFIG_BUG_ON_DATA_CORRUPTION=n, i.e. does NOT want to BUG() if KVM's data structures (rmaps) appear to be corrupted. Signed-off-by: Mingwei Zhang [sean: tweak changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 21ced900c3e9..67a25c957a16 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -965,7 +965,8 @@ static int pte_list_add(struct kvm_mmu_memory_cache *cache, u64 *spte, return count; } -static void pte_list_desc_remove_entry(struct kvm_rmap_head *rmap_head, +static void pte_list_desc_remove_entry(struct kvm *kvm, + struct kvm_rmap_head *rmap_head, struct pte_list_desc *desc, int i) { struct pte_list_desc *head_desc = (struct pte_list_desc *)(rmap_head->val & ~1ul); @@ -1001,7 +1002,8 @@ static void pte_list_desc_remove_entry(struct kvm_rmap_head *rmap_head, mmu_free_pte_list_desc(head_desc); } -static void pte_list_remove(u64 *spte, struct kvm_rmap_head *rmap_head) +static void pte_list_remove(struct kvm *kvm, u64 *spte, + struct kvm_rmap_head *rmap_head) { struct pte_list_desc *desc; int i; @@ -1020,7 +1022,8 @@ static void pte_list_remove(u64 *spte, struct kvm_rmap_head *rmap_head) while (desc) { for (i = 0; i < desc->spte_count; ++i) { if (desc->sptes[i] == spte) { - pte_list_desc_remove_entry(rmap_head, desc, i); + pte_list_desc_remove_entry(kvm, rmap_head, + desc, i); return; } } @@ -1035,7 +1038,7 @@ static void kvm_zap_one_rmap_spte(struct kvm *kvm, struct kvm_rmap_head *rmap_head, u64 *sptep) { mmu_spte_clear_track_bits(kvm, sptep); - pte_list_remove(sptep, rmap_head); + pte_list_remove(kvm, sptep, rmap_head); } /* Return true if at least one SPTE was zapped, false otherwise */ @@ -1110,7 +1113,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) slot = __gfn_to_memslot(slots, gfn); rmap_head = gfn_to_rmap(gfn, sp->role.level, slot); - pte_list_remove(spte, rmap_head); + pte_list_remove(kvm, spte, rmap_head); } /* @@ -1757,16 +1760,16 @@ static void mmu_page_add_parent_pte(struct kvm_mmu_memory_cache *cache, pte_list_add(cache, parent_pte, &sp->parent_ptes); } -static void mmu_page_remove_parent_pte(struct kvm_mmu_page *sp, +static void mmu_page_remove_parent_pte(struct kvm *kvm, struct kvm_mmu_page *sp, u64 *parent_pte) { - pte_list_remove(parent_pte, &sp->parent_ptes); + pte_list_remove(kvm, parent_pte, &sp->parent_ptes); } -static void drop_parent_pte(struct kvm_mmu_page *sp, +static void drop_parent_pte(struct kvm *kvm, struct kvm_mmu_page *sp, u64 *parent_pte) { - mmu_page_remove_parent_pte(sp, parent_pte); + mmu_page_remove_parent_pte(kvm, sp, parent_pte); mmu_spte_clear_no_track(parent_pte); } @@ -2481,7 +2484,7 @@ static void validate_direct_spte(struct kvm_vcpu *vcpu, u64 *sptep, if (child->role.access == direct_access) return; - drop_parent_pte(child, sptep); + drop_parent_pte(vcpu->kvm, child, sptep); kvm_flush_remote_tlbs_sptep(vcpu->kvm, sptep); } } @@ -2499,7 +2502,7 @@ static int mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp, drop_spte(kvm, spte); } else { child = spte_to_child_sp(pte); - drop_parent_pte(child, spte); + drop_parent_pte(kvm, child, spte); /* * Recursively zap nested TDP SPs, parentless SPs are @@ -2530,13 +2533,13 @@ static int kvm_mmu_page_unlink_children(struct kvm *kvm, return zapped; } -static void kvm_mmu_unlink_parents(struct kvm_mmu_page *sp) +static void kvm_mmu_unlink_parents(struct kvm *kvm, struct kvm_mmu_page *sp) { u64 *sptep; struct rmap_iterator iter; while ((sptep = rmap_get_first(&sp->parent_ptes, &iter))) - drop_parent_pte(sp, sptep); + drop_parent_pte(kvm, sp, sptep); } static int mmu_zap_unsync_children(struct kvm *kvm, @@ -2575,7 +2578,7 @@ static bool __kvm_mmu_prepare_zap_page(struct kvm *kvm, ++kvm->stat.mmu_shadow_zapped; *nr_zapped = mmu_zap_unsync_children(kvm, sp, invalid_list); *nr_zapped += kvm_mmu_page_unlink_children(kvm, sp, invalid_list); - kvm_mmu_unlink_parents(sp); + kvm_mmu_unlink_parents(kvm, sp); /* Zapping children means active_mmu_pages has become unstable. */ list_unstable = *nr_zapped; @@ -2933,7 +2936,7 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot, u64 pte = *sptep; child = spte_to_child_sp(pte); - drop_parent_pte(child, sptep); + drop_parent_pte(vcpu->kvm, child, sptep); flush = true; } else if (pfn != spte_to_pfn(*sptep)) { drop_spte(vcpu->kvm, sptep);