From patchwork Sat Mar 11 00:22:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp48601wrd; Fri, 10 Mar 2023 16:41:26 -0800 (PST) X-Google-Smtp-Source: AK7set9wm/bU8MbVF6wL09xYxvqUDqHF8vO5kJudXY/UOLj+3M4QsLqGGGNB/SuHemWBuiHLQxQL X-Received: by 2002:a17:902:e54a:b0:19e:8bfe:7d79 with SMTP id n10-20020a170902e54a00b0019e8bfe7d79mr30567412plf.1.1678495286264; Fri, 10 Mar 2023 16:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495286; cv=none; d=google.com; s=arc-20160816; b=uk2medq6fk+eox1NVdTk4ofgwLTTIhhOF5+FJQqRzTfbMYSY/QiK5Vo9Xtt5za/G1D /ad6tOu1xv/Va2z3DqNSR3zwI+TADwZpfMCqnbzsv0dCI4f9zMyQEF57I5Om95cLNJUZ SnRvxAomTOQM+dJtc939Kb/Ak5hSVRE9FN7SiGIbrxrpiHW0ApV9kmT+N+LYgC0Fw8oQ U7juPQ5kDOJJJZcu+PVAijzGYFLPZ6j6tczrFpF17ECkKGrjxoXboHlnDJ9XBmk412Mc yLIBooQID11FEAsuOX5r2GJf70wbJC5QNLxEUCJLyiFO+rMKr1gxQ5mBjE1PH/CdcOIB xrbg== 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=UJLL0EPUo19me5J0i4EMPHQADwiwXxBwpAy+HnKKqJM=; b=S29TEnNO8sR+ugeZk+aIY1s1Z17cX56bt35iSmNmLtZsWDYE6ZQEyFfmDWbnvBG3B8 /FwqITIaZZo+Ul54YZ8LE1hmcwUCYc0TLH5QNhMqIiPvgXSUg3IAXwxBt2Y8cC/P8Emi Rmc101/yhu1qItnyzdLtP7NWQnYMC9ELeCLkjngo/FHGVW56QeTzhCnB+4XAncN7TV2S lQJM2IljEALHaKi0Xm52g5wmSgV1/oZ9hMqVOyGbX9+uFqozA//4OAqn0XJ44wIevpk7 27Dps7ODsHivtqjItVnO1oJGK+utrTZR+i5qiMRF2zOnB2xHg5EoNWjwN4jT0NUFFEUK wPQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ezz+fnDW; 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 r7-20020a170902be0700b0019ab692fc8fsi1046309pls.612.2023.03.10.16.41.11; Fri, 10 Mar 2023 16:41:26 -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=Ezz+fnDW; 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 S231584AbjCKAZU (ORCPT + 99 others); Fri, 10 Mar 2023 19:25:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231166AbjCKAYk (ORCPT ); Fri, 10 Mar 2023 19:24:40 -0500 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 43A4713EBAB for ; Fri, 10 Mar 2023 16:23:54 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id t24-20020a1709028c9800b0019eaa064a51so3640654plo.10 for ; Fri, 10 Mar 2023 16:23:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494220; 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=UJLL0EPUo19me5J0i4EMPHQADwiwXxBwpAy+HnKKqJM=; b=Ezz+fnDWWlBK70CA+7XZnivF8Z50Oo2xZVtUDsT+vPhVst1blCQstri3YU291MrGCd /gIJe4EdZVS2uXwFfhgIdnLH81FvnSdDh9ZOO2wwTY94LJfODrVCfdn5tHlyoc3wozDg DEMhqXCb5vWfrRk8d+aiFLTFqnF64CWPV/X9jcMymnFIgXu/w+WhD9iUivEV5M8xAwDJ WB2G3R1UU7dqnh10DoPBAm5TruGVVgEhIWo5jhXguMT++g5lloBe+oip6RCzH6WDEEva eaaN+vYVq0x2mhYositDUR3O8N2/sjmHQuoCbcFN6jMXtHvoYYojB7nK7rAoEpe7EL5C 8JMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494220; 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=UJLL0EPUo19me5J0i4EMPHQADwiwXxBwpAy+HnKKqJM=; b=B+SE3RLwHtO/ZTd8ZTVzCxZpe0A3vtuQeXM0W0MdfIFLySjBqNwg/GQd4yRwJeaaT5 T5ZO+wzj0o6jr0aRpvgzb8QNiL8a9dAGfELV2WsFqX2bWsSEmB8wHvBWe4V+rySMWeMJ 6ffYz3JVCeRILmpNRwNvVJEwaKjeChN/ypM8MqlIqxKpJaaAn+lGDISbupulddJxp73y qWwEsQTXgdcIv72vJ5zw8X1fuYcG8Qa8vg1wLgGpInOh5c60XPSVkKbPC7z/qXAoKXC2 ETUXdseCGBx8QYrZvQLA/ZC7rzMY9nIpI+eBHsh7mRoDNysq5geJHMOiw4xp3sm2ZtuA 3btg== X-Gm-Message-State: AO0yUKWa8Aqah+QY5GJ6SlTKQ6MTg8eb2hOU0JfgD9PdzukZ7TKVaIpY yQ0s3S9mFLm48SRDlmplQgjMDhd3FVc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:3889:b0:233:c921:ab7e with SMTP id mu9-20020a17090b388900b00233c921ab7emr1601258pjb.4.1678494219865; Fri, 10 Mar 2023 16:23:39 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:49 -0800 In-Reply-To: <20230311002258.852397-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311002258.852397-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311002258.852397-19-seanjc@google.com> Subject: [PATCH v2 18/27] KVM: x86: Remove the unused page-track hook track_flush_slot() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon 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=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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760029872828517002?= X-GMAIL-MSGID: =?utf-8?q?1760029872828517002?= From: Yan Zhao Remove ->track_remove_slot(), there are no longer any users and it's unlikely a "flush" hook will ever be the correct API to provide to an external page-track user. Cc: Zhenyu Wang Suggested-by: Sean Christopherson Signed-off-by: Yan Zhao Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_page_track.h | 11 ----------- arch/x86/kvm/mmu/page_track.c | 26 -------------------------- arch/x86/kvm/x86.c | 2 -- 3 files changed, 39 deletions(-) diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h index 152c5e7d7868..e5eb98ca4fce 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -33,16 +33,6 @@ struct kvm_page_track_notifier_node { */ void (*track_write)(gpa_t gpa, const u8 *new, int bytes, struct kvm_page_track_notifier_node *node); - /* - * It is called when memory slot is being moved or removed - * users can drop write-protection for the pages in that memory slot - * - * @kvm: the kvm where memory slot being moved or removed - * @slot: the memory slot being moved or removed - * @node: this node - */ - void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot, - struct kvm_page_track_notifier_node *node); /* * Invoked when a memory region is removed from the guest. Or in KVM @@ -87,7 +77,6 @@ kvm_page_track_unregister_notifier(struct kvm *kvm, struct kvm_page_track_notifier_node *n); void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, int bytes); -void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot); void kvm_page_track_delete_slot(struct kvm *kvm, struct kvm_memory_slot *slot); bool kvm_page_track_has_external_user(struct kvm *kvm); diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index d4a8a995276a..907ab8abb452 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -278,32 +278,6 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, kvm_mmu_track_write(vcpu, gpa, new, bytes); } -/* - * Notify the node that memory slot is being removed or moved so that it can - * drop write-protection for the pages in the memory slot. - * - * The node should figure out it has any write-protected pages in this slot - * by itself. - */ -void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot) -{ - struct kvm_page_track_notifier_head *head; - struct kvm_page_track_notifier_node *n; - int idx; - - head = &kvm->arch.track_notifier_head; - - if (hlist_empty(&head->track_notifier_list)) - return; - - idx = srcu_read_lock(&head->track_srcu); - hlist_for_each_entry_srcu(n, &head->track_notifier_list, node, - srcu_read_lock_held(&head->track_srcu)) - if (n->track_flush_slot) - n->track_flush_slot(kvm, slot, n); - srcu_read_unlock(&head->track_srcu, idx); -} - /* * Notify external page track nodes that a memory region is being removed from * the VM, e.g. so that users can free any associated metadata. diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0da5ff007d20..59b02650cefc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12673,8 +12673,6 @@ 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); } static inline bool kvm_guest_apic_has_interrupt(struct kvm_vcpu *vcpu)