From patchwork Fri Dec 23 00:57:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 36044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp70248wrn; Thu, 22 Dec 2022 17:01:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXtKGiz4u3AknDf/w86J9NXPKWg86UWismzKwf+S7NMQy6JjBw54zt244OFqCtIrp5m70Bf3 X-Received: by 2002:a17:906:7fc3:b0:7c1:10b8:e6a4 with SMTP id r3-20020a1709067fc300b007c110b8e6a4mr5649887ejs.19.1671757276518; Thu, 22 Dec 2022 17:01:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671757276; cv=none; d=google.com; s=arc-20160816; b=MKEZZGfTX0lKG68TNUGYRcyxT1E66Vza0ZrQ7fKc09XRZtJosO6OFdoSu61JFbadR2 hpKIAcuCl9j7h360uZknc1TU8/4YCCEE3BzwBtTroTxC6n4cauY7g2Wey6TlRVns8hkg nRLltdAbuWyq1BNIDNQJZZiBiWxUQomoCBGP/r/iA5Tb7/KIDWcXrqYp8VJ3Hy8K3+po sKLmOOptN9ZQ5LgsUo0GRxY9LeECaUENx+5yOyALtYkbyARJ/FfJwXSSeZp01xDG33qt 5bYpbNJcuOh4C4OzFSpkKfmphJC4LbvCXzVGqrjQ6mPYKwYKGc2utIIo0qcZgj78mPDq 8IAg== 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=rKCW8m8IAHoIRlubB2TYcWLgdcBH42t3bfi5TuBdz08=; b=P+PkVTNZK/JYvW1lEjXZ5Gec2QMhBBQzP1WN0vJkLksHzl+K9vOPfBj08vEUUbKSl1 3rQYj08AwYuQ98f2SLTb/us094J5Df2Cu9ZZQCIwM3ySv048Pjp2ZDtWhqk9/3/tIGir gobbv4rOKAWCI1SQKMOAi0GtnOQlslz1JC8FVOUFAWnMdXWWiUjIgSf9xHyZtWAl4y6g Mc0eb4N5J2xQx1O/+93BbNGnXSx9yCr7ikd5qy+AmYHY3yUTpYQTGwrfVzkK8ToaF6ED 7kLAhbmaa1Ahhy3zzvmDh82Jz5lt5moE7j4D/ip+VD7DGf08m4rf6vC/Hp1p3XN69Mwx avwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=h9aMawpy; 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 di10-20020a170906730a00b007ae1874c142si1674489ejc.446.2022.12.22.17.00.52; Thu, 22 Dec 2022 17:01:16 -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=h9aMawpy; 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 S235983AbiLWBAQ (ORCPT + 99 others); Thu, 22 Dec 2022 20:00:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235722AbiLWA70 (ORCPT ); Thu, 22 Dec 2022 19:59:26 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44EFF30F6D for ; Thu, 22 Dec 2022 16:58:21 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id y186-20020a638ac3000000b004932d1b6885so1905543pgd.3 for ; Thu, 22 Dec 2022 16:58:21 -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=rKCW8m8IAHoIRlubB2TYcWLgdcBH42t3bfi5TuBdz08=; b=h9aMawpy9BBBaLOtJV17IMJCudTgWyQsradbxq24d9j0tXeeNHTbfFvAizPtxlAKK2 yzYhnZ7sAPDfr8hApkk5FKvdqiYvRbqI4EPACiWF3Lthmi9fcUsINEAgR5NE2Rn0UYot mcq8G+GbgcpUH1mH0yBxHISJ5hAemaGExIUWBy0+CPIi8IY9jnx1RgyPZ4AKL3V1k6Ej A/a1i1OR1h52x76FPdDPGFrashJy4LswSqDS53/YkQYWeyfsP9V/DyQBaIVlXq7VrR0l Od0sRkGnnafTiHbuZVFzL8KNNmnOwIdnbxzZMw6TufSAI3L0VUideimQ2i5jjuUNPoU1 zu8w== 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=rKCW8m8IAHoIRlubB2TYcWLgdcBH42t3bfi5TuBdz08=; b=Qc14lHc+v9QC+P8A/CfZG4BDW2yrXLhMMM+xtHeBU2SxPliIui7AKoP/Nonxk0YKpP SHv/Zsb4l6sTbCng8IZcpqABUuJTExd2Typd7h9wNN+8FeX7sNhyMJneUDnHPCztLlJl nfeeh8j1bTsvQkrk7jSpJTC8HKNFO6kGFSsCV3ufXJjxIDpgV7depdSUriu6a2N5YxoI 92VerCYfEiWgGVY2eA005Y/1mkr3oxekKyY6W34eq3RmdGoTHaIiseuPbB8+/hxQpBxl 1Ml9phx6bXMpj2oIJLyvLaXyteUiTOvf/qMdtzRAtLQcF1vbV1sggW+rETU8nGerQhJO hNFg== X-Gm-Message-State: AFqh2koPpGPMfK2JetCB9wHmJr0w9mKOk9x6dfWZt2hFHSCvBLruPWTe VV1UHo7gnHVhk4ACb73wORtZERxz7m0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:a006:b0:21d:203f:a306 with SMTP id q6-20020a17090aa00600b0021d203fa306mr598567pjp.148.1671757092679; Thu, 22 Dec 2022 16:58:12 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 23 Dec 2022 00:57:28 +0000 In-Reply-To: <20221223005739.1295925-1-seanjc@google.com> Mime-Version: 1.0 References: <20221223005739.1295925-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221223005739.1295925-17-seanjc@google.com> Subject: [PATCH 16/27] drm/i915/gvt: switch from ->track_flush_slot() to ->track_remove_region() 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?1752964557692874579?= X-GMAIL-MSGID: =?utf-8?q?1752964557692874579?= From: Yan Zhao Switch from the poorly named and flawed ->track_flush_slot() to the newly introduced ->track_remove_region(). From KVMGT's perspective, the two hooks are functionally equivalent, the only difference being that ->track_remove_region() is called only when KVM is 100% certain the memory region will be removed, i.e. is invoked slightly later in KVM's memslot modification flow. Cc: Zhenyu Wang Suggested-by: Sean Christopherson Signed-off-by: Yan Zhao [sean: handle name change, massage changelog, rebase] Signed-off-by: Sean Christopherson --- drivers/gpu/drm/i915/gvt/kvmgt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 3c59e7cd75d9..9f251bc00a7e 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -108,9 +108,8 @@ struct gvt_dma { static void kvmgt_page_track_write(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, - struct kvm_memory_slot *slot, - struct kvm_page_track_notifier_node *node); +static void kvmgt_page_track_remove_region(gfn_t gfn, unsigned long nr_pages, + struct kvm_page_track_notifier_node *node); static ssize_t intel_vgpu_show_description(struct mdev_type *mtype, char *buf) { @@ -690,7 +689,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_region = kvmgt_page_track_remove_region; kvm_get_kvm(vgpu->vfio_device.kvm); kvm_page_track_register_notifier(vgpu->vfio_device.kvm, &vgpu->track_node); @@ -1647,20 +1646,17 @@ static void kvmgt_page_track_write(gpa_t gpa, const u8 *val, int len, mutex_unlock(&info->vgpu_lock); } -static void kvmgt_page_track_flush_slot(struct kvm *kvm, - struct kvm_memory_slot *slot, - struct kvm_page_track_notifier_node *node) +static void kvmgt_page_track_remove_region(gfn_t gfn, unsigned long nr_pages, + struct kvm_page_track_notifier_node *node) { unsigned long i; - gfn_t gfn; struct intel_vgpu *info = container_of(node, struct intel_vgpu, track_node); mutex_lock(&info->gfn_lock); - for (i = 0; i < slot->npages; i++) { - gfn = slot->base_gfn + i; - if (kvmgt_gfn_is_write_protected(info, gfn)) - kvmgt_protect_table_del(info, gfn); + for (i = 0; i < nr_pages; i++) { + if (kvmgt_gfn_is_write_protected(info, gfn + i)) + kvmgt_protect_table_del(info, gfn + i); } mutex_unlock(&info->gfn_lock); }