From patchwork Sat Mar 11 00:22:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp48766wrd; Fri, 10 Mar 2023 16:41:59 -0800 (PST) X-Google-Smtp-Source: AK7set/YDpC+PACCFcVi0onlMocn3/h5SmVsJXUpH7xOYCAfujVhBM1e8i2n4HjD0sR+NVAwXF4Q X-Received: by 2002:a17:902:c946:b0:19c:1433:5fba with SMTP id i6-20020a170902c94600b0019c14335fbamr32071783pla.0.1678495319549; Fri, 10 Mar 2023 16:41:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495319; cv=none; d=google.com; s=arc-20160816; b=y8y3gdYwMVd9AutXSADYYabsD6FB251toF3Eh2rioDeEw2ZqpbnzZEZg+5MIEdfD/q nf3gnADUjFtheHCEYV+SEPwvGPsb4ux91auc3wzGiM3oK3mkza7mTIl58q+wZVCZTzNb aZItOJcBibhudfhGVbmpbMTy8kj+Z67ZewsIpWKGHbaprSkXnKcD6AZNCBlTqg3kJJI4 2KH1MMdGK2jKxiUymtKCpMzS6YAbGBQeVY9ZIsjsUxg+zR5UMbm695+cT8b5yXpx0Lwo xzRdtN+P3WwIIK/TkuczvFTv+wmNBBhPBWOQs12VoEWXtMCTGh0EY5tOL8PMvp2l5tjf 4TjQ== 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=OMGdyparKm8+Gefw73vC5jleoqDZScQomW9SzOoSMJg=; b=d/ThPdzxlndzjDlgOmnfDJVAaC4M1cQY7SfA5tDy8153FSwkqKJFqPVY6Kb8CoLOvJ ixLcGgyP4Owchj8Aa5gt4vHIwFN+Km/7M9D9XCWo7jf/U+tM4iBb3WD4raGeS4kgmp+Q URvHXVCA7X/BFMNcLPckUq6wQXz0NEfCA185LLTIdnD4ZNRs5bz26bG6SYlrQuxMGI26 a2mJygBUMoYyCuJIL9k3k9FPRqR5yvFK5CMg7zIzRiLfIpleZLiuCqSg6rG19jxZiTrG Ct/PIc43GR7dbJz/JZQnZBl/g/Rm5d93NRbIMcV5BDzt1eOAetHzfv4+gsPf6NWm3zQn 3etA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="ajb/7CAd"; 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 w1-20020a631601000000b00502d6998a4asi944560pgl.458.2023.03.10.16.41.45; Fri, 10 Mar 2023 16:41:59 -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="ajb/7CAd"; 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 S230513AbjCKAZN (ORCPT + 99 others); Fri, 10 Mar 2023 19:25:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230469AbjCKAYe (ORCPT ); Fri, 10 Mar 2023 19:24:34 -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 23D2C134AEE for ; Fri, 10 Mar 2023 16:23:51 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id q61-20020a17090a1b4300b00237d2fb8400so5067411pjq.0 for ; Fri, 10 Mar 2023 16:23:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494218; 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=OMGdyparKm8+Gefw73vC5jleoqDZScQomW9SzOoSMJg=; b=ajb/7CAdzoT35PUWdYahi131IY8cxIXYUmWbU3wxwnKIBxxsHK89VejSvnX9gPFXKV 8T8M2MQ5qLFEJwFF7065/DtXjrWK5KDid68DBsbQqdbuHpDsBapRoTQnssTg9iU7v9aO W3O661JIaer2LspHtmzrEw/PzdpLM0tWNomDVlVvK3UMOXkliymk4EGDN1m1+ZzJbIjo z0JXfNMR+7wnIFuzi/4ZXa9UxnYm0l+lrGMAJWIXD0F1irQaKal08+zi3JQ1zRDeUz75 gC+HwThfWZZ7qParKjPirjREefLcpYQcsbDTVSHvU3UunCBdpe0aH1RzH5c9Fl9Suirg 0Tjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494218; 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=OMGdyparKm8+Gefw73vC5jleoqDZScQomW9SzOoSMJg=; b=p3fQmHjP74v1CKLwS5Ilsi+zwdtwCt+CBqUQSEg8PPK5EknQNAjobpFmrxbG8haufV BICELa3d+Z3qX1KsiZoaU/7g+Lz3uSf8VPcRrdeaNYPl+G+E0uDvJMeUmE7sUcsxOnjo 46OoKuWuVEML1I4xbLCEvyHs5Xyu8g/OALPwqWr0hHKAFkdPRtcwpomzpEGzIBOLMm+i OR2/XXzLKlzg5wHpvQLMr0iw/ep58AhDylu67eaT4aRd7RLBD6DyfhKPcBq1YRl49y7M R2P4yyFtCw9nvia03S25mCoI+oLqxuLfw+1hjoZY7nwCiW4zyHrClE67Fq46iiglEr1A 3zRw== X-Gm-Message-State: AO0yUKUQA8UAXK46BWv/9My+PyxA4/3wOkRMVFtK3oepgI6yQSztmnXv x5PpWeJgWMkQLbw6JOsL1y9hEeDnoAo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:f543:0:b0:4fb:9902:fc4a with SMTP id e3-20020a63f543000000b004fb9902fc4amr9411181pgk.10.1678494217911; Fri, 10 Mar 2023 16:23:37 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:48 -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-18-seanjc@google.com> Subject: [PATCH v2 17/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=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?1760029908111012746?= X-GMAIL-MSGID: =?utf-8?q?1760029908111012746?= 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 Tested-by: Yan Zhao --- drivers/gpu/drm/i915/gvt/kvmgt.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 577712ea4893..9f188b6c3edf 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) { @@ -680,7 +679,7 @@ static int intel_vgpu_open_device(struct vfio_device *vfio_dev) return -EEXIST; 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); @@ -1631,22 +1630,20 @@ 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->vgpu_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->vgpu_lock); }