From patchwork Thu Nov 10 01:48:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 17902 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp670085wru; Wed, 9 Nov 2022 17:54:45 -0800 (PST) X-Google-Smtp-Source: AMsMyM72uHLxZ8ftIk0mV9KpsIioD5dGcV1DkihlKqzM4tmvlV83mGm9HjULWp/qpMX6B6FcztTk X-Received: by 2002:a17:90a:e81:b0:213:d1ce:2580 with SMTP id 1-20020a17090a0e8100b00213d1ce2580mr58749578pjx.162.1668045284824; Wed, 09 Nov 2022 17:54:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668045284; cv=none; d=google.com; s=arc-20160816; b=eeRef3XvvAnWAvOUjRNe5xri/6iNOxqParsWKCOE0DvhvyafXooId+48rCAgoLGkjW gWE7wFhSAkqvXZkBJeCrPiSC0PEREHUYo19cgYHhNug95EW1acdGJe6JgoB947CPGerm NmveyEAa7mM0Bh1t/u/QXGbUyblq1a2U5RRem4DyN0v7zppfT3PzouRL7a0xEvAYlr5/ AKuN1mNHN87Dkp0pHb8NKxNq0Cd2s4zA4KhIdbLTw78IGzGg3cCArNaTYhuQzmzyJrw4 r+AQZexzbBoCtTuNfyQJwrDi/FbKklZGYX0PodVbnc3r3bkMrU9g9pSywz7Hn/REf04n nrnA== 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=daDWJEg62ng3VYHUROoCBAV65+QlkqFHNrop2NyZODI=; b=swCy+meWT0KAd1O8PHYHmmc3mkcs4VlxjTsV9pvQGJE+4DffS7lOO2/66oXorJ5+52 yriqJc2SpRm579syUYdONatNNYm9iDGK1Y5pujViX90/nAzA8npsygNhpZJ/XxEzBOuh 9r0FH8Cf9+99SZjgEcCC6pZvMnDdL9yvMgqxaeXC2zAwU5WT7LRHlkJLsH/CGfrKy7B7 OGuNF+u7W6MH0xeBARPPd1BiPND9kLiZWTbqsWSp3f6cpHGr8+J4oQCPYkb5HOkhgbhH 97adsrmFDfKdLyRJmKmT1x2brH1UZw4OvIwRnmqLejm9K9g9zW7leTGYaKurcnSWtoTr oteA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=np3hHMwF; 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 m18-20020a170902f65200b0017edeec4716si19391781plg.34.2022.11.09.17.54.31; Wed, 09 Nov 2022 17:54:44 -0800 (PST) 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=20210112 header.b=np3hHMwF; 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 S232250AbiKJBsb (ORCPT + 99 others); Wed, 9 Nov 2022 20:48:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbiKJBs1 (ORCPT ); Wed, 9 Nov 2022 20:48:27 -0500 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 4BFB11165 for ; Wed, 9 Nov 2022 17:48:26 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id b1-20020a17090a10c100b0020da29fa5e5so276277pje.2 for ; Wed, 09 Nov 2022 17:48:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=daDWJEg62ng3VYHUROoCBAV65+QlkqFHNrop2NyZODI=; b=np3hHMwFmg3zyf+XIJlCgqYHS/rYTVi1+gp/E7D0SV7NRd3OEG0uJFYn+JGp7+NA2x 8wLSk9lG8xLFuHh0sUwa4rGkXLwT4Ppez7wxW3la/WPVK1Gpy/iHDkWwn9yCQZlafh6+ YYmrQDLM4cjdzPTjVqiwBNbWaZJBcA0FD3CiTp8EnEgtcbw7FkeKGynIFl2ukCaEVZ/5 uatpTZF3YJMFldetRARaUekEgmzA9MF+sWAXpOm0pHAiOxPzoR7e3BczA5kjSzDl6ARv 3IQL5Ug7l+byTMc5JOMQrIT9s/7PtYKD88z/864Ww9XFdJQgg2ZHlRTGixc8osKu/vpZ suow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=daDWJEg62ng3VYHUROoCBAV65+QlkqFHNrop2NyZODI=; b=HLY/+gLoQ6SoB64f6Zw9k4pqo09RGjIjPbK95A3sLrgmwobeK7nQ9RQdrQdsnljoXB UOtcfdzeQmxZegFbtOLlrjcemNKj90yNWAiUojt2i1VieGFvp2D0S1EQ4jjcuXoD/hbn KBkbDYk49bGTSpiG3wYksYyjy7e81eU+bAK6nu6SYl8vU/DzSHRxj3k+Z4XQg4g6HHWe 5v8ptWTUJeb//SH1w6uTlI2nGcEeoyGJzTUTK12GmNc7OS9b6ssTVTYr32UKOpz1aevW gcYiKnjmOxYbDet4K5pmpRhNoK0jP3nqm2dy8MsfqpyqzW0yYceIlqoyJNwLjWZS7un1 NCwg== X-Gm-Message-State: ACrzQf1WVz/mOw0lKUELipkWx/cspBzyhXeABXtlxtuCuXSvPj7DX5dc l/y4odZdQANuW6QvKa5gaT/ILYXmOPk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:7249:b0:188:5391:cec2 with SMTP id c9-20020a170902724900b001885391cec2mr1098435pll.78.1668044905785; Wed, 09 Nov 2022 17:48:25 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 10 Nov 2022 01:48:20 +0000 In-Reply-To: <20221110014821.1548347-1-seanjc@google.com> Mime-Version: 1.0 References: <20221110014821.1548347-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221110014821.1548347-2-seanjc@google.com> Subject: [PATCH 1/2] KVM: x86/mmu: Don't rely on page-track mechanism to flush on memslot change From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yan Zhao 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,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?1749072252242218189?= X-GMAIL-MSGID: =?utf-8?q?1749072252242218189?= Call kvm_mmu_zap_all_fast() directly when flushing a memslot instead of bounding through the page-track mechanism. KVM (unfortunately) needs to zap and flush all page tables on memslot DELETE/MOVE irrespective of whether KVM is shadowing guest page tables. This will allow changing KVM to register a page-track notifier on the first shadow root allocation, and will also allow deleting the misguided kvm_page_track_flush_slot() hook itself once KVM-GT also moves to a different method for reacting to memslot changes. No functional change intended. Cc: Yan Zhao Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/mmu/mmu.c | 10 +--------- arch/x86/kvm/x86.c | 2 ++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 81114a376c4e..382cfffb7e6c 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1765,6 +1765,7 @@ void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, void kvm_mmu_slot_leaf_clear_dirty(struct kvm *kvm, const struct kvm_memory_slot *memslot); void kvm_mmu_zap_all(struct kvm *kvm); +void kvm_mmu_zap_all_fast(struct kvm *kvm); void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen); void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned long kvm_nr_mmu_pages); diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 93c389eaf471..0a5ae07a190e 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5943,7 +5943,7 @@ static void kvm_zap_obsolete_pages(struct kvm *kvm) * not use any resource of the being-deleted slot or all slots * after calling the function. */ -static void kvm_mmu_zap_all_fast(struct kvm *kvm) +void kvm_mmu_zap_all_fast(struct kvm *kvm) { lockdep_assert_held(&kvm->slots_lock); @@ -5999,13 +5999,6 @@ static bool kvm_has_zapped_obsolete_pages(struct kvm *kvm) return unlikely(!list_empty_careful(&kvm->arch.zapped_obsolete_pages)); } -static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm, - struct kvm_memory_slot *slot, - struct kvm_page_track_notifier_node *node) -{ - kvm_mmu_zap_all_fast(kvm); -} - int kvm_mmu_init_vm(struct kvm *kvm) { struct kvm_page_track_notifier_node *node = &kvm->arch.mmu_sp_tracker; @@ -6021,7 +6014,6 @@ int kvm_mmu_init_vm(struct kvm *kvm) return r; node->track_write = kvm_mmu_pte_write; - node->track_flush_slot = kvm_mmu_invalidate_zap_pages_in_memslot; kvm_page_track_register_notifier(kvm, node); kvm->arch.split_page_header_cache.kmem_cache = mmu_page_header_cache; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e46e458c5b08..5da86fe3c113 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12550,6 +12550,8 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm) void kvm_arch_flush_shadow_memslot(struct kvm *kvm, struct kvm_memory_slot *slot) { + kvm_mmu_zap_all_fast(kvm); + kvm_page_track_flush_slot(kvm, slot); }