From patchwork Thu May 11 23:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 92890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4746116vqo; Thu, 11 May 2023 17:02:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4u5ufmXGC+pMlP567X3t5IY5xleB5O7rxHISvo/Ngi1bGOUpbuYY55dmj1o00xdWOdmCy/ X-Received: by 2002:a17:902:f54c:b0:1ac:3b69:bb9c with SMTP id h12-20020a170902f54c00b001ac3b69bb9cmr29594300plf.28.1683849779282; Thu, 11 May 2023 17:02:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683849779; cv=none; d=google.com; s=arc-20160816; b=LTYWYcFf3Kph9YPjBZUKmKqIAmkoHeMtJ4yF3dwfM6zdbgRts/nADTJ1TsGWHF+34V 6HepPWVRY9a5A4LQnYQ+1sGDjioqDxZjSDwbKYfwtbQqHvly+7HBfemJThFe5KryKTS7 rFr0zVDtxnlbbydLb2gFoOcLBwPqob8cxcMHLGXLBCx+3bAy0TVV0Sb+EVy038zbmRRy Z4iBkNNaAVuxmd3AhGa6tXnPOZOzZcUfORwd+Vn9ODC64Q0/bQatuz4nwDdUwrlBg+d3 EY9I/S5Dt+fsyyZWbT62i4pnupi9OV8Bp+5WUbFWTERyjegZoI3swihuVJ9cufQidtJJ YYgA== 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=dN6VmGM2zS2bKeFyzPEe5BkbZy3+Yl9CkJ/vyhAlFJE=; b=aMWiMGUI1IRgJOtu7gzeqY+C/G3S7rIaFE4X3NPB8ayf5Tc1z8LrgkColL8xqXksEe fT1y762Dh3IHawdParYrBWD+S+sUf5jCr/ukXKIfpsFnEa9xujjPlrJL+hl4eManX6pH FpankZ1FjjJVuuSuDdC2GoCx6L2HZKW8mq6lCqLDqr0z/1CkwXfnOEnDNLD9HB0qGumS TTNcdOe57u4ViHsbOhU97bFeiBOgLjee6wKa6HNZnVh35Ik3wAVMPSSeobcD80gzfjXf GtJUFGsOKWBexRxYu07y40CLxppmQQQBJZvaRxPH2tsmnDdBqBEg4tcQiJV2je4K9thr js4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1HHzzZml; 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 u15-20020a170902e5cf00b001a99b965c47si8872444plf.411.2023.05.11.17.02.44; Thu, 11 May 2023 17:02:59 -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=1HHzzZml; 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 S239748AbjELAAF (ORCPT + 99 others); Thu, 11 May 2023 20:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239702AbjEKX7u (ORCPT ); Thu, 11 May 2023 19:59:50 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AE7A93C1 for ; Thu, 11 May 2023 16:59:34 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-250109c729eso5070678a91.3 for ; Thu, 11 May 2023 16:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683849573; x=1686441573; 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=dN6VmGM2zS2bKeFyzPEe5BkbZy3+Yl9CkJ/vyhAlFJE=; b=1HHzzZmlSWuBI2Il2a5v5W8oLlA5YWunYryBelZHRr4cU7Xy72WnhQAKYwNrSranEd rWz3WOmczD4xBiW66jWliz5GmMUf9GRJZnsvJYHMTWzGUnV5huLtOf2UuZlTST6inmcn nqJbvU+9L4QzoWmO2TsFqBrwSvmH5cW0HcrcOJ9zbQ0U/sXLOR++nPUNK4aVKbB6tmpf AO2bjqXGaYvxT6lLtpYOmnWp5gkF/iR4OuI04enrwbWGcDeU82+p+xZp3KkEC2bgXB2D xQy33HL1cFoxFibtrMxmbbEz5gi5Z8ZarJQOCdwnT8hLURkG+PmufoLjF33JMYwJtx1l 0plA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683849573; x=1686441573; 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=dN6VmGM2zS2bKeFyzPEe5BkbZy3+Yl9CkJ/vyhAlFJE=; b=WveSWy9YNx2oVon6Da1QxmIlssc0LzsqqeSix1ESUJ+cMv4tWFr2kkcFaYgi8DUgqQ sCzt9KubHdXWPv4ttViXgn/o/afXnDYG2nN2YitxTEHTRVnAnxV2UWWsz1qjlbR8UvXj VtkjuIGw9xDKZttEUiyiWK0iJCQbUbqaW19GSwHC6jH2+eJak5JTx+vMUSJe1KxDKvm2 k/UUA6CxkFjr7ndEouNhLYWULKfvjusF3CcCPBNDZyt93Yih4sKQ1D9mRNyFo+ebB9Sq pNboWJd40LwnddJfAnls0l3OcH1QrdRptQ5uzBV3aoE9fmNt57rSbs7K7Wl158HaqMIk nwuQ== X-Gm-Message-State: AC+VfDwc5MJi/lANwhs7yikrSU4XCUeCY+A0uWbrOKaA9TkrCVr6C96E Bf9i6Tb4LCy+wn26IC2cNK4ifOoRGaA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:230a:b0:1ac:8cd4:741a with SMTP id d10-20020a170903230a00b001ac8cd4741amr4891193plh.6.1683849573449; Thu, 11 May 2023 16:59:33 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 11 May 2023 16:59:16 -0700 In-Reply-To: <20230511235917.639770-1-seanjc@google.com> Mime-Version: 1.0 References: <20230511235917.639770-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230511235917.639770-9-seanjc@google.com> Subject: [PATCH 8/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765644466203069486?= X-GMAIL-MSGID: =?utf-8?q?1765644466203069486?= 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 d209d466d58f..8a8adeaa7dd7 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -962,7 +962,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); @@ -998,7 +999,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; @@ -1017,7 +1019,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; } } @@ -1032,7 +1035,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 */ @@ -1107,7 +1110,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); } /* @@ -1751,16 +1754,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); } @@ -2475,7 +2478,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); } } @@ -2493,7 +2496,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 @@ -2524,13 +2527,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, @@ -2569,7 +2572,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; @@ -2927,7 +2930,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);