From patchwork Sat May 13 00:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5490639vqo; Fri, 12 May 2023 18:06:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Q8SP6jqZ43FNaUf3VCEWLw8HtQ4r5gFbeSytl5OkFWBXLWNgk/t24zHUVqOI5haYbNk5W X-Received: by 2002:a05:6a21:6da1:b0:101:62c7:9db1 with SMTP id wl33-20020a056a216da100b0010162c79db1mr20428425pzb.55.1683939990616; Fri, 12 May 2023 18:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939990; cv=none; d=google.com; s=arc-20160816; b=nrKd/Dt1lyoFcIXDl/En1u1Zkv0fJBYiKrFAMLlb5oQqBT5HWKavulmRbSYF9RN+29 8DcHaOM4wKYf7t1bLGav8dhi4P6GBXNETyPKPZcKcgF6mmsN7ucs9EJs4/8Gg0WGGf3l GrV0iBFwSpGgr0tY3INHmX4GrbdQxEcLBxEvzzOBKiWpuvjpEWU/qg7OA5Wm4uJQFRWP JRZxl6QFnnbFrjh8ML5PySXxmraTn4QypHBW9UmLvIimJ4NXAapEbjcAchx+qXMlc+pr 2TSbGJPcSPRMHOjsK5BB5r4uVv4xzEyPiDTFVeF6plJl4mJ92jhDcW/55fk4UXmePuSb A6Vw== 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=OZEggBbNblRsi2erSP3Gdfhqb5e/8lV2CB/rQrFchS8=; b=WlOvjELj3kArBU5vwemj5+TwFbT49dEZDeLVcZGcPaomzsRCE5IkccD9QjWripLQ55 /oYkyLv0CFzN2s1c0EyoMBzZrbvyCzcK8eOtHhdbwiUN8ks8JuA2Y2pLBzr9rQX2gAYi WdhBBsjifxzDFqdla3ASQXxdPnCdLAIkbuE7K3G2Om6dIx+0cJU4le3JYy+IkUOgIdXL L6yB4iW3U6oQhSjA76G6401K0F5g9jamkiXRKL77TpW3/8vi6HZrsUvfa05iiLxrgauZ PaCnwi31n64Y+CLANv02qZJpfHsFGqydvHbXs9Y11THk/J8r5A7o7Yk+xKLft4FzLg90 Fq2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=4Igpt6TW; 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.06.18; Fri, 12 May 2023 18:06:30 -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=4Igpt6TW; 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 S241829AbjEMAhT (ORCPT + 99 others); Fri, 12 May 2023 20:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241685AbjEMAgy (ORCPT ); Fri, 12 May 2023 20:36:54 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 916EC6199 for ; Fri, 12 May 2023 17:36:32 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-55d9a9d19c9so154150937b3.1 for ; Fri, 12 May 2023 17:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938192; x=1686530192; 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=OZEggBbNblRsi2erSP3Gdfhqb5e/8lV2CB/rQrFchS8=; b=4Igpt6TW9x4CyyUHgTyI0EJQh8OQLuCfDSzR+F/zcP5RMAUiMHo/cBjjxlYPZiOvhM l6EastCXgINOTBF6qg6msAVseFMbGgaxTzYYNK8z3nnqlGpxKRNNrk4f0un4E0WTW0k/ bXYje+HsRbWsfEdjspnxU/HKpZR4p+S7IRQ+7gy2T3MFPfs/ZPE3HR0ZMCR0ZFyLdY34 lziPt3Vo9sPl9mzf5Gcri32A+lbht/j8S27dICw2kk9xXd1S4hCNxcqRnoY84+22qeR8 qu/bW0EoI5luvX0Jd6iL5ZfGf8LYhK6TeBzFNxYPHaHOZEzfX8sggfZxSyGzwDpOfArT 7TPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938192; x=1686530192; 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=OZEggBbNblRsi2erSP3Gdfhqb5e/8lV2CB/rQrFchS8=; b=W+OUpngK9mM3KzYo6RmBw1aJUI0Y82I962rz9M3QdNEbqPHSR19WbQF294J6n6BA+n 4DsPKUisIR1ZaBb/zy8rGy87fQHL1DcgoLqsoo16gIBZ9ZVnG3nHt/gVa+3TFHoal3Y0 tHTqzfcQqCFL+GZXX/1v5CCOFFgr69TUrTlrqP146GVOYgVreLPUGPi1gYQPsScEszKQ OAFpMKJBpwfRHE1KPONKna9r+/fcZoTK8CYANe5zj6ZbP3rNSleYYB5hHAtP8qCIlWpf IZ2r/rHA2cBM01mXR+hRGa+jKE0Q4vZVk9zBrZI6o3/CrKY+9BCuzWIPUJ3atSeuNHAi MKxw== X-Gm-Message-State: AC+VfDyktPe0cBttGME6Yu6tQJIqojLOFCIKcS3FZ/bfVvfoJb/RFU+j +qgzKWIPchpbfnQj1XiroqtCFAjW6oA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ae65:0:b0:55d:f921:6bfa with SMTP id g37-20020a81ae65000000b0055df9216bfamr11964813ywk.5.1683938192252; Fri, 12 May 2023 17:36:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:46 -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-15-seanjc@google.com> Subject: [PATCH v3 14/28] KVM: drm/i915/gvt: Drop @vcpu from KVM's ->track_write() hook 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?1765739059730335082?= X-GMAIL-MSGID: =?utf-8?q?1765739059730335082?= Drop @vcpu from KVM's ->track_write() hook provided for external users of the page-track APIs now that KVM itself doesn't use the page-track mechanism. Reviewed-by: Yan Zhao Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_page_track.h | 5 ++--- arch/x86/kvm/mmu/page_track.c | 2 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 10 ++++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h index eb186bc57f6a..8c4d216e3b2b 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -26,14 +26,13 @@ struct kvm_page_track_notifier_node { * It is called when guest is writing the write-tracked page * and write emulation is finished at that time. * - * @vcpu: the vcpu where the write access happened. * @gpa: the physical address written by guest. * @new: the data was written to the address. * @bytes: the written length. * @node: this node */ - void (*track_write)(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, - int bytes, struct kvm_page_track_notifier_node *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 diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 23088c90d2fd..891e5cc52b45 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -272,7 +272,7 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, hlist_for_each_entry_srcu(n, &head->track_notifier_list, node, srcu_read_lock_held(&head->track_srcu)) if (n->track_write) - n->track_write(vcpu, gpa, new, bytes, n); + n->track_write(gpa, new, bytes, n); srcu_read_unlock(&head->track_srcu, idx); kvm_mmu_track_write(vcpu, gpa, new, bytes); diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 0785f9cb2c20..aaebb44c139f 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -106,9 +106,8 @@ struct gvt_dma { #define vfio_dev_to_vgpu(vfio_dev) \ container_of((vfio_dev), struct intel_vgpu, vfio_device) -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_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); @@ -1602,9 +1601,8 @@ int intel_gvt_page_track_remove(struct intel_vgpu *info, u64 gfn) return 0; } -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_write(gpa_t gpa, const u8 *val, int len, + struct kvm_page_track_notifier_node *node) { struct intel_vgpu *info = container_of(node, struct intel_vgpu, track_node);