From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC0334C7E for ; Thu, 28 Sep 2023 22:21:36 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF8461A2 for ; Thu, 28 Sep 2023 15:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695939693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/l7DOL4i9eWpBdCSwTRJyugH/jLo/b6g4jXHDN7U+14=; b=TReJVHr7yKYtPFr4fcOVdPHQE2V1AczSv89K3NkcBS9sx4uy6tM9sPBNRw8u8eflRkOwEe plNtFt3mj+4rQsINyVR9P9O5jsG0q0TE64dekKjKeJJrP+6oXvvRO5c4tA13M0qCGb0Qno EoP+YMlBMHtDh+0E/49ze7sl7DRD0cQ= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39-GjgoHcUHOf-BNLS4yMpmGg-1; Thu, 28 Sep 2023 18:21:31 -0400 X-MC-Unique: GjgoHcUHOf-BNLS4yMpmGg-1 Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3516579e7f7so29990995ab.3 for ; Thu, 28 Sep 2023 15:21:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695939690; x=1696544490; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/l7DOL4i9eWpBdCSwTRJyugH/jLo/b6g4jXHDN7U+14=; b=tto2Iu+IlZGZL7F72pD3JsjWfdWSwb6slEw4A9vXYULml9ygl4nGnct6/lVXpoIwIy 5M/SZfKNrlmWKcWpKReovmDIppsxL4cB78tI/1Xk5LvmoPG+6HmzNNI5XA4A3boglcxR 7G9hzGGyiHqtjvDF77TAffvPnBCitBN9oBeb4fTG+ivsvgohfn5lDFpP/B4FrI8QrYGc DLxsZET4UmwkcP0gCrudqc+VGrP7I0hr4vabKT2giROb1tp+b8Wmgs4/HaPQrCpBUe3r VCqJ19HGEPa6Tzj5xCXaFmiqkpXk8pcDOJ/egNBN/VmXLD2DN8z/y7avMYvj9C2Z37qI 7j9g== X-Gm-Message-State: AOJu0Yx0uWTurLbbNE4hNahQ/9etOtekN94++KFa1FlIyqD+IbYKfejk 5rHpj8beQJYOy7LHgDkGYLSrcOSjSxJAk2Y1hweT+jgtNj+Z8XfFsUBHdcHTDPx2h+dLHdqPRu5 8/6LRaeilh/FZxSxNK5+5CRdvMZ4dTA== X-Received: by 2002:a05:6e02:1809:b0:34f:ed76:7db8 with SMTP id a9-20020a056e02180900b0034fed767db8mr3391339ilv.26.1695939690615; Thu, 28 Sep 2023 15:21:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOH5tZZiZuKh+d30ZefE58SY4OZ2k4eRgPtsp2uogyFxnPRFAQcoCds5f0KJfUDnAzkmiCTw== X-Received: by 2002:a05:6e02:1809:b0:34f:ed76:7db8 with SMTP id a9-20020a056e02180900b0034fed767db8mr3391301ilv.26.1695939690276; Thu, 28 Sep 2023 15:21:30 -0700 (PDT) Received: from redhat.com ([38.15.60.12]) by smtp.gmail.com with ESMTPSA id t23-20020a02c497000000b0042b10d42c90sm4610172jam.113.2023.09.28.15.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 15:21:28 -0700 (PDT) Date: Thu, 28 Sep 2023 16:21:08 -0600 From: Alex Williamson To: Sean Christopherson Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Paolo Bonzini , Tony Krowiak , Halil Pasic , Jason Herne , Harald Freudenberger , Andy Lutomirski , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Anish Ghulati , Venkatesh Srinivas , Andrew Thornton Subject: Re: [PATCH 04/26] vfio: Add struct to hold KVM assets and dedup group vs. iommufd code Message-ID: <20230928162108.3fdd73bf.alex.williamson@redhat.com> In-Reply-To: <20230916003118.2540661-5-seanjc@google.com> References: <20230916003118.2540661-1-seanjc@google.com> <20230916003118.2540661-5-seanjc@google.com> Organization: Red Hat Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On Fri, 15 Sep 2023 17:30:56 -0700 Sean Christopherson wrote: > Add a struct to hold the KVM assets need to manage and pass along KVM > references to VFIO devices. Providing a common struct deduplicates the > group vs. iommufd code, and will make it easier to rework the attachment > logic so that VFIO doesn't have to do a symbol lookup to retrieve the > get/put helpers from KVM. > > Signed-off-by: Sean Christopherson > --- > drivers/vfio/device_cdev.c | 9 +------- > drivers/vfio/group.c | 18 ++-------------- > drivers/vfio/vfio.h | 22 +++++++++---------- > drivers/vfio/vfio_main.c | 43 +++++++++++++++++++++++++++----------- > 4 files changed, 45 insertions(+), 47 deletions(-) Reviewed-by: Alex Williamson > diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c > index e75da0a70d1f..e484d6d6400a 100644 > --- a/drivers/vfio/device_cdev.c > +++ b/drivers/vfio/device_cdev.c > @@ -46,13 +46,6 @@ int vfio_device_fops_cdev_open(struct inode *inode, struct file *filep) > return ret; > } > > -static void vfio_df_get_kvm_safe(struct vfio_device_file *df) > -{ > - spin_lock(&df->kvm_ref_lock); > - vfio_device_get_kvm_safe(df->device, df->kvm); > - spin_unlock(&df->kvm_ref_lock); > -} > - > long vfio_df_ioctl_bind_iommufd(struct vfio_device_file *df, > struct vfio_device_bind_iommufd __user *arg) > { > @@ -99,7 +92,7 @@ long vfio_df_ioctl_bind_iommufd(struct vfio_device_file *df, > * a reference. This reference is held until device closed. > * Save the pointer in the device for use by drivers. > */ > - vfio_df_get_kvm_safe(df); > + vfio_device_get_kvm_safe(df->device, &df->kvm_ref); > > ret = vfio_df_open(df); > if (ret) > diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c > index 610a429c6191..756e47ff4cf0 100644 > --- a/drivers/vfio/group.c > +++ b/drivers/vfio/group.c > @@ -157,13 +157,6 @@ static int vfio_group_ioctl_set_container(struct vfio_group *group, > return ret; > } > > -static void vfio_device_group_get_kvm_safe(struct vfio_device *device) > -{ > - spin_lock(&device->group->kvm_ref_lock); > - vfio_device_get_kvm_safe(device, device->group->kvm); > - spin_unlock(&device->group->kvm_ref_lock); > -} > - > static int vfio_df_group_open(struct vfio_device_file *df) > { > struct vfio_device *device = df->device; > @@ -184,7 +177,7 @@ static int vfio_df_group_open(struct vfio_device_file *df) > * the pointer in the device for use by drivers. > */ > if (device->open_count == 0) > - vfio_device_group_get_kvm_safe(device); > + vfio_device_get_kvm_safe(device, &device->group->kvm_ref); > > df->iommufd = device->group->iommufd; > if (df->iommufd && vfio_device_is_noiommu(device) && device->open_count == 0) { > @@ -560,7 +553,7 @@ static struct vfio_group *vfio_group_alloc(struct iommu_group *iommu_group, > > refcount_set(&group->drivers, 1); > mutex_init(&group->group_lock); > - spin_lock_init(&group->kvm_ref_lock); > + spin_lock_init(&group->kvm_ref.lock); > INIT_LIST_HEAD(&group->device_list); > mutex_init(&group->device_lock); > group->iommu_group = iommu_group; > @@ -884,13 +877,6 @@ bool vfio_group_enforced_coherent(struct vfio_group *group) > return ret; > } > > -void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm) > -{ > - spin_lock(&group->kvm_ref_lock); > - group->kvm = kvm; > - spin_unlock(&group->kvm_ref_lock); > -} > - > /** > * vfio_file_has_dev - True if the VFIO file is a handle for device > * @file: VFIO file to check > diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h > index c26d1ad68105..a1f741365075 100644 > --- a/drivers/vfio/vfio.h > +++ b/drivers/vfio/vfio.h > @@ -12,18 +12,23 @@ > #include > #include > > +struct kvm; > struct iommufd_ctx; > struct iommu_group; > struct vfio_container; > > +struct vfio_kvm_reference { > + struct kvm *kvm; > + spinlock_t lock; > +}; > + > struct vfio_device_file { > struct vfio_device *device; > struct vfio_group *group; > > u8 access_granted; > u32 devid; /* only valid when iommufd is valid */ > - spinlock_t kvm_ref_lock; /* protect kvm field */ > - struct kvm *kvm; > + struct vfio_kvm_reference kvm_ref; > struct iommufd_ctx *iommufd; /* protected by struct vfio_device_set::lock */ > }; > > @@ -88,11 +93,10 @@ struct vfio_group { > #endif > enum vfio_group_type type; > struct mutex group_lock; > - struct kvm *kvm; > + struct vfio_kvm_reference kvm_ref; > struct file *opened_file; > struct blocking_notifier_head notifier; > struct iommufd_ctx *iommufd; > - spinlock_t kvm_ref_lock; > unsigned int cdev_device_open_cnt; > }; > > @@ -108,7 +112,6 @@ void vfio_device_group_unuse_iommu(struct vfio_device *device); > void vfio_df_group_close(struct vfio_device_file *df); > struct vfio_group *vfio_group_from_file(struct file *file); > bool vfio_group_enforced_coherent(struct vfio_group *group); > -void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm); > bool vfio_device_has_container(struct vfio_device *device); > int __init vfio_group_init(void); > void vfio_group_cleanup(void); > @@ -171,10 +174,6 @@ static inline bool vfio_group_enforced_coherent(struct vfio_group *group) > return true; > } > > -static inline void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm) > -{ > -} > - > static inline bool vfio_device_has_container(struct vfio_device *device) > { > return false; > @@ -435,11 +434,12 @@ static inline void vfio_virqfd_exit(void) > #endif > > #if IS_ENABLED(CONFIG_KVM) > -void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm); > +void vfio_device_get_kvm_safe(struct vfio_device *device, > + struct vfio_kvm_reference *ref); > void vfio_device_put_kvm(struct vfio_device *device); > #else > static inline void vfio_device_get_kvm_safe(struct vfio_device *device, > - struct kvm *kvm) > + struct vfio_kvm_reference *ref) > { > } > > diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c > index 124cc88966a7..e77e8c6aae2f 100644 > --- a/drivers/vfio/vfio_main.c > +++ b/drivers/vfio/vfio_main.c > @@ -397,7 +397,7 @@ vfio_allocate_device_file(struct vfio_device *device) > return ERR_PTR(-ENOMEM); > > df->device = device; > - spin_lock_init(&df->kvm_ref_lock); > + spin_lock_init(&df->kvm_ref.lock); > > return df; > } > @@ -1303,7 +1303,8 @@ bool vfio_file_enforced_coherent(struct file *file) > EXPORT_SYMBOL_GPL(vfio_file_enforced_coherent); > > #if IS_ENABLED(CONFIG_KVM) > -void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm) > +void vfio_device_get_kvm_safe(struct vfio_device *device, > + struct vfio_kvm_reference *ref) > { > void (*pfn)(struct kvm *kvm); > bool (*fn)(struct kvm *kvm); > @@ -1311,28 +1312,33 @@ void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm) > > lockdep_assert_held(&device->dev_set->lock); > > - if (!kvm) > - return; > + spin_lock(&ref->lock); > + > + if (!ref->kvm) > + goto out; > > pfn = symbol_get(kvm_put_kvm); > if (WARN_ON(!pfn)) > - return; > + goto out; > > fn = symbol_get(kvm_get_kvm_safe); > if (WARN_ON(!fn)) { > symbol_put(kvm_put_kvm); > - return; > + goto out; > } > > - ret = fn(kvm); > + ret = fn(ref->kvm); > symbol_put(kvm_get_kvm_safe); > if (!ret) { > symbol_put(kvm_put_kvm); > - return; > + goto out; > } > > device->put_kvm = pfn; > - device->kvm = kvm; > + device->kvm = ref->kvm; > + > +out: > + spin_unlock(&ref->lock); > } > > void vfio_device_put_kvm(struct vfio_device *device) > @@ -1353,6 +1359,21 @@ void vfio_device_put_kvm(struct vfio_device *device) > device->kvm = NULL; > } > > +static void vfio_device_set_kvm(struct vfio_kvm_reference *ref, > + struct kvm *kvm) > +{ > + spin_lock(&ref->lock); > + ref->kvm = kvm; > + spin_unlock(&ref->lock); > +} > + > +static void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm) > +{ > +#if IS_ENABLED(CONFIG_VFIO_GROUP) > + vfio_device_set_kvm(&group->kvm_ref, kvm); > +#endif > +} > + > static void vfio_device_file_set_kvm(struct file *file, struct kvm *kvm) > { > struct vfio_device_file *df = file->private_data; > @@ -1362,9 +1383,7 @@ static void vfio_device_file_set_kvm(struct file *file, struct kvm *kvm) > * be propagated to vfio_device::kvm when the file is bound to > * iommufd successfully in the vfio device cdev path. > */ > - spin_lock(&df->kvm_ref_lock); > - df->kvm = kvm; > - spin_unlock(&df->kvm_ref_lock); > + vfio_device_set_kvm(&df->kvm_ref, kvm); > } > > /**