From patchwork Fri Nov 11 10:33:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 18680 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp670535wru; Fri, 11 Nov 2022 02:58:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NAag8LMvCagU0jU0mP2ibZKm0mptE6Gza+0ANLY+jdvoiVzW4OllvJ+D1uIrL/Q8IOD0e X-Received: by 2002:a17:90a:a67:b0:200:8f06:e9cc with SMTP id o94-20020a17090a0a6700b002008f06e9ccmr1414998pjo.7.1668164304173; Fri, 11 Nov 2022 02:58:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668164304; cv=none; d=google.com; s=arc-20160816; b=oUJezSlGR/M2ZYLFQ57HHcJvDHYMJ4+Tw0o4Bvm6cVCWY9yYk3vgQ/5aqieDAonV0L MM/7R+rmVLzbZr0pNW2mmYc8dKL8lSqMg/yup0B7CFSwgZa/cpnZ7/Q0uAwmCVNbSUAR b+y5IgIBiSzkMy4LQ/0Ncnlzq0geRJyXAtHQLUnpQgDkS7Kv5fSdwOAX5vIvIPLdkH1c 1E+tfgdLEEmW55PmWwCI3GxFRc8QTruJepR2kz/yR3ipWbWFjlbGQuPvm9ZMR3a3xo0W aoz358UYeJCaj3/AxdR5yRlyzQJ/po3Gnsa1hgnpHfs9mh0Sl8zFVXAR5gTu1LxcAd0i NBGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=VGnoHidjSpZ3XGViwkGRwGXjZvXF+2V32wDbmRfdZWY=; b=L7xMoqtNQPsNtU5U1F7t4e6XHxLvQ0hUMOCFCKY4ivX4x7/GIBnJ9St3tcoQiq54LA TLSlJGOpZAJOm0qQNvzb0inxe4MWKBmm3OthYIjCRgIcCglJS0sa4bQke6vlVskjKV9o VSNOChXolYV6RCS9X9Mlpb5heZNSVbUvV/mv6iYogDHFf7Mz3GK94ZVNX/oXVOi6LO2d tWvPS8suWPegmVWgYFkWXIStZP/JAUlHDwdNl5ilNbkIVxuhWdH4Zuj9Gww6fecwv2Ho R4p9LQ2yxX3k5I90LskCo8ZJ1QKyLZuCDR5JHkxLP/AS4ZcbXTuwhEu1EBv63IRJO8yz 1rFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IbNuZXiG; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a14-20020a056a000c8e00b0054114c6685asi2206101pfv.129.2022.11.11.02.58.10; Fri, 11 Nov 2022 02:58:24 -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=@intel.com header.s=Intel header.b=IbNuZXiG; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233317AbiKKK4p (ORCPT + 99 others); Fri, 11 Nov 2022 05:56:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232918AbiKKK4n (ORCPT ); Fri, 11 Nov 2022 05:56:43 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10A8CC6A; Fri, 11 Nov 2022 02:56:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668164203; x=1699700203; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=u7QIWUi0C6/FBWEuiDhVYicRF9D5dHYcVP0Zb/o5lgM=; b=IbNuZXiGuAg/xzRtMi5TEzGdW564+9OE8b1PXsFm3EGMGDev7jKgq2h8 VZTbsxJXwd3wyrCIWHACvhZ+xeD1CQ/CVvhXjeITLnSZ2E072s9/N/mOT KDI728URM/67mTm0A722SCJR1aPNBkc6Ux/zo9GdXv2c8VkpSkjHaqtsk +k7xKzfQYSe7JVAnAtsxxdzX3te75pkT6Da2JhEVJrYs7pa1rfCngkZW/ rIhWgQ7dUfbtFXC3opl0i+drO5QzyFLw4mq0XlqeL4gor222TFTQYehQU DMH14nrcErxFAmJe/fyq8FYGZgW+ECneC5/fLklIhpS5KE4wd19JyP287 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="313364622" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="313364622" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:56:42 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637549316" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="637549316" Received: from yzhao56-desk.sh.intel.com ([10.238.200.254]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:56:40 -0800 From: Yan Zhao To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, zhenyuw@linux.intel.com, Yan Zhao Subject: [PATCH v2 1/3] KVM: x86: add a new page track hook track_remove_slot Date: Fri, 11 Nov 2022 18:33:50 +0800 Message-Id: <20221111103350.22326-1-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221111103247.22275-1-yan.y.zhao@intel.com> References: <20221111103247.22275-1-yan.y.zhao@intel.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1749197053278972828?= X-GMAIL-MSGID: =?utf-8?q?1749197053278972828?= Page track hook track_remove_slot is used to notify users that a slot has been removed and is called when a slot DELETE/MOVE is about to be completed. Users of this hook can drop write protections in the removed slot. Note: Since KVM_MR_MOVE currently never actually happens in KVM/QEMU, and has never been properly supported in the external page track user, we just use the hook track_remove_slot to notify users of the old slot being removed. Cc: Zhenyu Wang Suggested-by: Sean Christopherson Signed-off-by: Sean Christopherson Signed-off-by: Yan Zhao --- arch/x86/include/asm/kvm_page_track.h | 11 +++++++++++ arch/x86/kvm/mmu/page_track.c | 26 ++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 3 +++ 3 files changed, 40 insertions(+) diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h index eb186bc57f6a..046b024d1813 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -44,6 +44,16 @@ struct kvm_page_track_notifier_node { */ void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot, struct kvm_page_track_notifier_node *node); + /* + * It is called when memory slot is 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_remove_slot)(struct kvm *kvm, struct kvm_memory_slot *slot, + struct kvm_page_track_notifier_node *node); }; int kvm_page_track_init(struct kvm *kvm); @@ -76,4 +86,5 @@ kvm_page_track_unregister_notifier(struct kvm *kvm, 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_remove_slot(struct kvm *kvm, struct kvm_memory_slot *slot); #endif diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 2e09d1b6249f..4d6bab1d61c9 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -300,3 +300,29 @@ void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot) n->track_flush_slot(kvm, slot, n); srcu_read_unlock(&head->track_srcu, idx); } + +/* + * Notify the node that memory slot is 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_remove_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_remove_slot) + n->track_remove_slot(kvm, slot, n); + srcu_read_unlock(&head->track_srcu, idx); +} diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 916ebbc81e52..a24a4a2ad1a0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12844,6 +12844,9 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, const struct kvm_memory_slot *new, enum kvm_mr_change change) { + if (change == KVM_MR_DELETE || change == KVM_MR_MOVE) + kvm_page_track_remove_slot(kvm, old); + if (!kvm->arch.n_requested_mmu_pages && (change == KVM_MR_CREATE || change == KVM_MR_DELETE)) { unsigned long nr_mmu_pages; From patchwork Fri Nov 11 10:34:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 18681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp670640wru; Fri, 11 Nov 2022 02:58:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf6EvGyNwsju1X14jNNGfLHgj4tzUgVpGbDjBA5DUA26ThV0J21K1uVnHEX2OTu/bSKMmLIV X-Received: by 2002:a17:906:ae52:b0:7ad:4a55:5e19 with SMTP id lf18-20020a170906ae5200b007ad4a555e19mr1481518ejb.65.1668164319234; Fri, 11 Nov 2022 02:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668164319; cv=none; d=google.com; s=arc-20160816; b=NjMsja2HbnmQiRW98e/yK+NOFichqmvSd6672w3TkhFw9vOdJcwcdpZN6W61OdYgbi zgeiqWjsxbwZsBjyksoAy1xLH5pghQ/CRgKS4oLUAc1krr4eZl2Hv3s/SbKbB3l/R9fK ETidla4JU2l4EAHS07GjdVhIKqg0WWwYf8G3yKScw11XaZaiZMRJV9YS2RA25YEgExa2 kloaffL923MxCayNSHFLwiPenmBKmBA4Gi/roHO565JFC5r23SbmSZq7pxihHeMXsK1K +/UYTZ/WQVt6NhL52Lpcf1ECY6kTe90/1F4EMtGsYjEASk7np8IylmNj0PRLGZHSB1+b 2zuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=KHNnIWLOJ5c92hllMayLCA/448sB2q7QXJfJdZ2lFxE=; b=hsEKoDLsOP7Ng19PB+fxF8O48iQ3WP/wwLZ69xXQaGdKPxKhBcOYativIpG4JEtbOh 5FFu6uYYsqn5q3ogmnajB7oxF72jVgr3gAvmlB5K+yLpfvXQbKVOOjqEAI5JFhDNhmTV nh1aLNcSF81clCP3mnxnQP/CR+eOjJq93vktJccohrLnqGruSTxAW2dwN2Vl4cb1zGEF qbHj/JJU2QSCAx1Ilq6waKcqYGvVChma/cRY15I5Qs0Zj5KWSgXwOUaZNi/jEUGeEsUD 0UqUfBsot/7cvbJPJND0mSY0N8ctdu5b2+2g+Cs0rWiLx+cmzfzLgefl36Ix3XSsgHR2 v9wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YaHkUB+N; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh36-20020a1709076ea400b007ade82b9333si1996853ejc.43.2022.11.11.02.58.16; Fri, 11 Nov 2022 02:58:39 -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=@intel.com header.s=Intel header.b=YaHkUB+N; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233448AbiKKK5b (ORCPT + 99 others); Fri, 11 Nov 2022 05:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231167AbiKKK53 (ORCPT ); Fri, 11 Nov 2022 05:57:29 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8457AC6A; Fri, 11 Nov 2022 02:57:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668164248; x=1699700248; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=z+C69Y9MYwYBkL7n0zgCNzMBgSh88lPHbyHq9bc80sM=; b=YaHkUB+NCBfiFB9pJaXnrj/VgwPSsKNfVdU8kb1n6D1r7lrrNTL0Pnh7 YdTBXYbRBgy3TuFCdwxZIHo3rSLOlt7sr8BSeGxvkCVHqKJ/l6sRroehD 36Uel2pD2PsXMdJGViD1kHRDUDdcttxjiVwfEJE56VViweYbgFqcAfMOa Mi0hLHa8YCDqMgcrT9Van6SRneMCKzz1QwM9olNGA00TE9r+MXhp2gwY0 02qkwRbsc/mnLgDRk+0crvDWGbvMLTDoyIiejQzXzQmTymqT6RdwPW8JX EtPEL9jsIPuEjQCHsY1OSapkqmLvORx+CHt05SZPgRC3/JGDBUlPfiNcq Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="291980534" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="291980534" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:57:28 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="631998597" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="631998597" Received: from yzhao56-desk.sh.intel.com ([10.238.200.254]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:57:25 -0800 From: Yan Zhao To: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org Cc: zhenyuw@linux.intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, seanjc@google.com, Yan Zhao Subject: [PATCH v2 2/3] drm/i915/gvt: switch from track_flush_slot to track_remove_slot Date: Fri, 11 Nov 2022 18:34:36 +0800 Message-Id: <20221111103436.22381-1-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221111103247.22275-1-yan.y.zhao@intel.com> References: <20221111103247.22275-1-yan.y.zhao@intel.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1749197069098298911?= X-GMAIL-MSGID: =?utf-8?q?1749197069098298911?= KVMGT only cares about when a slot is indeed removed. So switch to use track_remove_slot which is called when a slot is removed. Cc: Zhenyu Wang Suggested-by: Sean Christopherson Signed-off-by: Yan Zhao --- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 714221f9a131..9582d047471f 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -109,7 +109,7 @@ struct gvt_dma { static void kvmgt_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *val, int len, struct kvm_page_track_notifier_node *node); -static void kvmgt_page_track_flush_slot(struct kvm *kvm, +static void kvmgt_page_track_remove_slot(struct kvm *kvm, struct kvm_memory_slot *slot, struct kvm_page_track_notifier_node *node); @@ -673,7 +673,7 @@ static int intel_vgpu_open_device(struct vfio_device *vfio_dev) gvt_cache_init(vgpu); vgpu->track_node.track_write = kvmgt_page_track_write; - vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot; + vgpu->track_node.track_remove_slot = kvmgt_page_track_remove_slot; kvm_get_kvm(vgpu->vfio_device.kvm); kvm_page_track_register_notifier(vgpu->vfio_device.kvm, &vgpu->track_node); @@ -1617,7 +1617,7 @@ static void kvmgt_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, (void *)val, len); } -static void kvmgt_page_track_flush_slot(struct kvm *kvm, +static void kvmgt_page_track_remove_slot(struct kvm *kvm, struct kvm_memory_slot *slot, struct kvm_page_track_notifier_node *node) { From patchwork Fri Nov 11 10:35:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 18682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp670851wru; Fri, 11 Nov 2022 02:59:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf7x0K3JOwIeE8Ma41pQZjL0hpAcrLSppAISPRm52BDAmujKdT4MLc4X5Hnotb1q6Xx9ynhO X-Received: by 2002:a63:4750:0:b0:457:f4bb:513 with SMTP id w16-20020a634750000000b00457f4bb0513mr1151070pgk.331.1668164362256; Fri, 11 Nov 2022 02:59:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668164362; cv=none; d=google.com; s=arc-20160816; b=JupM+WEX8EvNdIHsZTnTXpJgIISAdth0XGTqVDzEYLE+gx9I+UfbRIUf2fwHz/FM82 w7T8/g88Og1ThNYqgR2ZfjGIq2UCaRWoCTYMgGYEp1nE2eSZyBnlo0hWMu5mB32adD2m rgzVAuIFtTkat/+7AIBh+Tdc/BzYz1WCDuX9kmbicm104b2BSslgK0IfZ4yW8DHTLZAE eLeiJWvWHYw+AcxxyL1j95EeW+8ZD26Ek/q72UNDq+PJH1VCmvq/pxMSwS/4GiiERr1n utRowCr+bR3mD+hsQoXleyW/NTeiLnXg7VHxJnLpbqV7czu8Ck42qNv/jW9CqJlARI8s ri+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=tU9R+7wHd4HTx2dBc4+of8Lv3esfQ5GQKGNuWzcAXRs=; b=E93WgSwotPfClOpsYPUSmPElD+QkBIlt39dOeHoyIGUJVVSoa9VL2laWRPibphKR+p EzQaX5j+aQ5Xc5aXaMT3sRZMegzn8m+ClXS4+u58Kk5ImkByT0LAPynb7n6bOC78IHsx 3or+qheSVzfW4vFvTdVe16wf9cib+qv+xG/C4pEDYx9kYaqw/grv+48illwXQcguhtVt cm1g3A9T6CFlg9VZgRQIXGeRky1hwb51AyGbXFtKlpP2lO+XZ5uWU9E6Ot3SBhfu/Njy XIBHZnPq3HDGu+OLQbw6fVR2iKOg3FfBwI8HCd2+j+Dm8276B3gKwcil51LFz1GJvVjP DKbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VeYzLMhP; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b21-20020a056a000a9500b0056e3400fddfsi2312605pfl.195.2022.11.11.02.59.08; Fri, 11 Nov 2022 02:59:22 -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=@intel.com header.s=Intel header.b=VeYzLMhP; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231167AbiKKK6K (ORCPT + 99 others); Fri, 11 Nov 2022 05:58:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230270AbiKKK6C (ORCPT ); Fri, 11 Nov 2022 05:58:02 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B3E7C6A; Fri, 11 Nov 2022 02:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668164281; x=1699700281; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=rdP472iIcXARHSPftEHD7qv99p1yFZZR6gsVvb/7Mfg=; b=VeYzLMhPeciTSVrNZEzuxmDkClIfd6yT1liO6FOPLuQkSgdb2gHwrQfl H7X4aJsBM4A0ZRr72wIeSPELppPT0yOOl9+wb5ahVQRzwGzmlEtJfUqCf Tz1IkcJbqoUPSUrwMDiM/9XPwwDvBat5J2VKDXsmPtBW+BcpcBM/3nabA H5kHBxvJztwwJG4Len2X+l79rPKRVZUkDfztJjo/WaLuiYX7gNKqGdSE1 QV2lx83Ftw178z41MG100PQrw9FwgLaPcRwD15l0V+DInis+DC13N8k8R 330Ni4Bj1Wy+AoQ7Hr4Y7jTrcmivcWmx6FFUS1Iyuf4QK7NvnPinxdcwj A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="309202929" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="309202929" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:58:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706509732" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="706509732" Received: from yzhao56-desk.sh.intel.com ([10.238.200.254]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 02:57:59 -0800 From: Yan Zhao To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, zhenyuw@linux.intel.com, Yan Zhao Subject: [PATCH v2 3/3] KVM: x86: Remove the unused page track hook track_flush_slot Date: Fri, 11 Nov 2022 18:35:04 +0800 Message-Id: <20221111103504.22431-1-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221111103247.22275-1-yan.y.zhao@intel.com> References: <20221111103247.22275-1-yan.y.zhao@intel.com> X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE 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?1749197114313827610?= X-GMAIL-MSGID: =?utf-8?q?1749197114313827610?= There's no users of hook track_remove_slot any more and no external page tracker user cares about slot flush. So remove this hook. Cc: Zhenyu Wang Suggested-by: Sean Christopherson Signed-off-by: Yan Zhao --- 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 046b024d1813..4f1d3c91fdc7 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -34,16 +34,6 @@ struct kvm_page_track_notifier_node { */ void (*track_write)(struct kvm_vcpu *vcpu, 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); /* * It is called when memory slot is moved or removed * users can drop write-protection for the pages in that memory slot @@ -85,6 +75,5 @@ 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_remove_slot(struct kvm *kvm, struct kvm_memory_slot *slot); #endif diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 4d6bab1d61c9..f783aea618f8 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -275,32 +275,6 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, srcu_read_unlock(&head->track_srcu, idx); } -/* - * 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 the node that memory slot is removed or moved so that it can * drop write-protection for the pages in the memory slot. diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a24a4a2ad1a0..260288f4d741 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12872,8 +12872,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)