From patchwork Sat May 13 00:35:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5490485vqo; Fri, 12 May 2023 18:06:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Dno2u/uulSCRHS2rxVPqRJPMAx9j+UR+kargmTXHw09TIxnWOx71Em/aTFvxJx1zb7AHj X-Received: by 2002:a05:6a20:8f08:b0:102:472b:424c with SMTP id b8-20020a056a208f0800b00102472b424cmr15300370pzk.22.1683939967795; Fri, 12 May 2023 18:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939967; cv=none; d=google.com; s=arc-20160816; b=Tu9hc+MZ60mqv9bxcsSbfrnAcMSx6qDG2NYfRSRr6V5KhwH6mdTwnZXZ10cZ3OD7NO O2PLDLQR+b7v4GLUU8rGR7v+CqYUDnLmaRfHyIBAZVPtGr5HWk4SH2FZmt6uDwkwNHIh RRrg2hL7PyEwqYICRhb9dvzi1xWTYAAp7yN2k75LIG321p3Tigryyv8j/fBCGSk5jaf/ Dr8vY5fuwBSZu2urSp7XbBWVy5zdzIyH7u2e8kEIssk32rrgNKR7t/LY16sfdhcS+8aL haUDNV40awv6DRDjYioDLCihSJgTB61yFgLb8nNnJLz5fUNwFd69FN5PdyVd1TfVizfV 7KdQ== 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=aMthFZfKChU24b3VOtsPFEPGDJzFR8scEpj8KdiOvI8=; b=Wk4Q4XAgGH8od33UkKr0hJ8LdbDHsdNS6mfPaKPDmLGgum3YlA3UYkdyyJJp4fTQ+9 NoU+kMIcKsj4/M2nDe2Yxmr8EwvYFdWboyDuumXvXhrMG13QLG/EfY3tUS9h/fD64hjp YpC5z2+GCtvKrd9Vxdup/swc/u/3RTp1yu9k2mwgvC3VEo4VOOLFu/Eh1SHouJYcqQSv ecmfVJyOCKVgMZsuW99CDUVO5XVX3wMkNap+ypct4nkd8K6gBTNSZ9Ahq5i07zl0cj85 pRkatYXmiwpqMMMS9B6AXUVvAcQ5s2AIJ23bLXoBakK1cIkULdSXZNIc6+zTfpXW6g6n Ifvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=zbEDkdjm; 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 e9-20020a63aa09000000b0052c68c1d88asi10023169pgf.597.2023.05.12.18.05.55; Fri, 12 May 2023 18:06:07 -0700 (PDT) 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=20221208 header.b=zbEDkdjm; 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 S241446AbjEMAht (ORCPT + 99 others); Fri, 12 May 2023 20:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241623AbjEMAhI (ORCPT ); Fri, 12 May 2023 20:37:08 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1308E2707 for ; Fri, 12 May 2023 17:36:47 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a7e65b34aso18962133276.0 for ; Fri, 12 May 2023 17:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938200; x=1686530200; 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=aMthFZfKChU24b3VOtsPFEPGDJzFR8scEpj8KdiOvI8=; b=zbEDkdjmJSYEa7+2zJhAe0a7HkBu9+tNiGcX0MT4Tal0cts0MOzLKi/QabrNqilpFq sPCRpl3ELRdYwnALKfuWd7zqA+8dYlFnanetule9PDq8aDyPVdPMJER3XnmLii5YTQLf tA5gvnsaDAIlHf7jrAKr8ie2kC57iNFKr75qA19cY61LffWA2EQ0bhCe7sgySld4WMBj Lw5WUKgIAjNdWqZCjJpdll6dtw/eZ8gBdU5C8SI/08mCrL0z9aPXcRHM7a+XYaks6Gdp HH+dfL+CQVXOxC8Ja6k97C+2hQI4MAo+wxW/BqscEvqevBQMqflqcIEnZvQdcAB34TNC b9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938200; x=1686530200; 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=aMthFZfKChU24b3VOtsPFEPGDJzFR8scEpj8KdiOvI8=; b=XG/JN4hd/qeFscF9wd8y1q8Xf5r4sfnfoq8kyzv+JQxLom7GHJOXRwKHsmkKytx1Ck eyyt9hqLOHxFTCJ7NBIFr4wDmqv+pGwkxkDc1TLr/k0+cbrki/8dZhHBRKI7dzR06foP D48uTdpsa9pVys2CjmXCxhiZ/f5y20DVL6QdaRNAQ/SjjShsMyPTPaQM7rSaji0r54g+ y+jqlYimRSP4r+hKA8L0ujP/CAFVwybhbu9nDCIIwJHIDGGl+vVpzUwDKAY1k1trRBuH 4pQpDPIzvTvYskeFrwgf2g4ZSfpUazqCh9MFIG8ePwLDcKujS781jaV05JmguCv6a//z XAcQ== X-Gm-Message-State: AC+VfDyQLy9AWgU+BvA3KY2PD2H9Xxh5OE3GNhC+tMcfSCzEUA7x1oge 4CZyhQbDI22RDgmTu0TNwo8YhlIGEdc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:1c02:0:b0:b8b:f584:6b73 with SMTP id c2-20020a251c02000000b00b8bf5846b73mr11687288ybc.10.1683938199874; Fri, 12 May 2023 17:36:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:50 -0700 In-Reply-To: <20230513003600.818142-1-seanjc@google.com> Mime-Version: 1.0 References: <20230513003600.818142-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-19-seanjc@google.com> Subject: [PATCH v3 18/28] 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,T_SCC_BODY_TEXT_LINE,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?1765739035357183405?= X-GMAIL-MSGID: =?utf-8?q?1765739035357183405?= 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] Tested-by: Yan Zhao Signed-off-by: Sean Christopherson --- 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 c309a77f495f..2e65901270ca 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) { @@ -665,7 +664,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); @@ -1616,22 +1615,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); }