From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 2F93B44A710; Tue, 28 Apr 2026 16:02:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392143; cv=none; b=VutgztMTmVd0gnensC38/jT1tbXX2j/T6QDMzYEJM3sJALYzC+Jv8B8Bz9YLZgTeCSudOy5Yzz5uIjoSPJmrVigFqChVMn8bAQjvc7btl5ae86G8s6PbidYisQfYkVaddg2Z7nQ19Fq9qCx36cVXl7sAj0+bOW8dMnshIRXN9J0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392143; c=relaxed/simple; bh=sLmO43I1fGggXTJc6lDyGm22zjRCnOY5uimqRbSoEyw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAh37Bx87+UuDidX3K2mNCxa1pL+Nh3XSrhY3FOEKicll9Pl6t/IZ4PIEqXb1ynHfPucOQcrN2E09YaIIjiWXFpH8BH6TxuwzyKGdl5rlgTO3RBitJRxK5O/5zeF8QwPZ+wUcqUaNraHWoVVAWHdH8cefSzXnnewruVBHZXvglA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=HTSxiglc; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="HTSxiglc" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63S6lHE73131367; Tue, 28 Apr 2026 15:56:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Qt6ktfrLJePUXMeoV k3l/jfY20rrL/wv5Pu2sFHRLCI=; b=HTSxiglcDuD1/6WU8S9VJp+dqjebUzcGB 0B3Ruquw7eOf5bqVzcCnI/AvBBxANvjwSl0OquBivPlmjzHmOu0DuUyX+tgE5sBG DzkPlEluvZSFy/ouc8U97gFHuTh+re4kLNSNwU0YaigZKUCOXKLOSdUx8DRHMv7D MtlRRG5ZmYPwkPVtuY7RSHe2/Oc22AdLDBd8kFw0xh91VHyGe/MWQmeGQNYjfUk7 ZEdRnjG1wP1dnqi1zG7uTRcqhaWobNnrWa6xqqoWQi++5a4cVBIMUVF8eQVlkuBu AlCzohrf0ND8Ilsebclm+quEl4Kv7i2M2CGGGkL3TlT1IGvma5j5w== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4drk1jnd1h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Apr 2026 15:56:29 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 63SFs0fc027930; Tue, 28 Apr 2026 15:56:28 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dsamya54w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Apr 2026 15:56:28 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63SFuOnP40370630 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Apr 2026 15:56:24 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 401E12004B; Tue, 28 Apr 2026 15:56:24 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E7ADB20043; Tue, 28 Apr 2026 15:56:23 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 28 Apr 2026 15:56:23 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Gautam Gala , Hendrik Brueckner , Janosch Frank , Joey Gouly , Marc Zyngier , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Ulrich Weigand , Will Deacon , Zenghui Yu Subject: [PATCH v2 03/28] KVM, vfio: remove symbol_get(kvm_put_kvm) from vfio Date: Tue, 28 Apr 2026 17:55:55 +0200 Message-ID: <20260428155622.1361364-4-seiden@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260428155622.1361364-1-seiden@linux.ibm.com> References: <20260428155622.1361364-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI4MDE1MSBTYWx0ZWRfX4bBAQDNrd+dl I98o0Vx/YxfzqGJ8qfgJQTQtbi6Qo/B0sK7ml78787/TnerqFpnu3yYNbRDVHwV80oAx+K4tGSv J64LOPl9g3Bl1zvo7qNvo9ss6oNEJfA03i74Ho6HSeED6dfoQqNtz/shLgspJe4XElsNHU+wq1P OcfDRk2bL0PBUmZpCYzccTz2rN/cYFZ2NGi8lw9BXD10dIxi53QvppqEkzkLKcR0lEJOqpJ9lST vq3FQFH6dR7CvEYX4APmyqN3CqKw/9y0sf5RR3CWzcgDGUISTpTjiV4NybJEDLUSt+iwdSH9F0y HZmGkyr9gqHnmfgzkCzG0zP+Me20ksVZrSggfL70HBHS7wyqSrdC/HmKGxQpGh4bURjfSWSUK8N P8YkB8n9rAMLqKGu9YOB0fRVneK60EPFjeEFgkcsWUBKab8xooJLAWwj+IULVTB/TJcVg0s5fM7 zygGABuGZMOFx8cqPUQ== X-Proofpoint-GUID: lxxS2OwZCfiqbs88f_LUn5reQ0xDxprD X-Proofpoint-ORIG-GUID: lxxS2OwZCfiqbs88f_LUn5reQ0xDxprD X-Authority-Analysis: v=2.4 cv=MohiLWae c=1 sm=1 tr=0 ts=69f0d8ad cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=r1p2_3pzAAAA:8 a=Iid1VeoRPhL8jyw1u-UA:9 a=r_pkcD-q9-ctt7trBg_g:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-28_05,2026-04-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 suspectscore=0 bulkscore=0 spamscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604280151 From: Paolo Bonzini Right now, KVM and VFIO are using symbol_get to access each other's symbols because of a circular reference between the modules, as well as to avoid loading them unnecessarily. The remaining use in VFIO is for kvm_put_kvm, which is not inline because it needs to call kvm_destroy_vm. However, storing the address of kvm_destroy_vm in the "struct kvm" is enough to remove the dependency from VFIO. This also makes it possible to direct kvm_put_kvm to either the arm64 or the s390 implementation of kvm_destroy_vm. Signed-off-by: Paolo Bonzini Reviewed-by: Steffen Eiden Acked-by: Alex Williamson --- drivers/vfio/vfio_main.c | 24 +++--------------------- include/linux/kvm_host.h | 1 - include/linux/kvm_types.h | 8 ++++++++ include/linux/vfio.h | 1 - virt/kvm/kvm_main.c | 9 ++------- 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index cb6eaabd64ce..f27a1d00c21e 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -17,7 +17,7 @@ #include #include #if IS_ENABLED(CONFIG_KVM) -#include +#include #endif #include #include @@ -435,9 +435,6 @@ EXPORT_SYMBOL_GPL(vfio_unregister_group_dev); #if IS_ENABLED(CONFIG_KVM) void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm, struct module *kvm_module) { - void (*pfn)(struct kvm *kvm); - bool ret; - lockdep_assert_held(&device->dev_set->lock); if (!kvm) @@ -446,21 +443,13 @@ void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm, struc if (!try_module_get(kvm_module)) return; - pfn = symbol_get(kvm_put_kvm); - if (WARN_ON(!pfn)) + if (!kvm_get_kvm_safe(kvm)) goto out_put_mod; - ret = kvm_get_kvm_safe(kvm); - if (!ret) - goto out_put_sym; - - device->put_kvm = pfn; device->kvm = kvm; device->kvm_module = kvm_module; return; -out_put_sym: - symbol_put(kvm_put_kvm); out_put_mod: module_put(kvm_module); } @@ -472,14 +461,7 @@ void vfio_device_put_kvm(struct vfio_device *device) if (!device->kvm) return; - if (WARN_ON(!device->put_kvm)) - goto clear; - - device->put_kvm(device->kvm); - device->put_kvm = NULL; - symbol_put(kvm_put_kvm); - -clear: + kvm_put_kvm(device->kvm); device->kvm = NULL; module_put(device->kvm_module); device->kvm_module = NULL; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5163b541c82d..ca06f9bda028 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1064,7 +1064,6 @@ static inline void kvm_irqfd_exit(void) int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *module); void kvm_exit(void); -void kvm_put_kvm(struct kvm *kvm); bool file_is_kvm(struct file *file); void kvm_put_kvm_no_destroy(struct kvm *kvm); diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h index 4cb68c71a13c..8a9be07cb8dd 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h @@ -144,6 +144,7 @@ struct kvm_vcpu_stat_generic { struct kvm_refcount { refcount_t users_count; + void (*destroy)(struct kvm *kvm); }; static inline void kvm_get_kvm(struct kvm *kvm) @@ -162,6 +163,13 @@ static inline bool kvm_get_kvm_safe(struct kvm *kvm) return refcount_inc_not_zero(&rc->users_count); } +static inline void kvm_put_kvm(struct kvm *kvm) +{ + struct kvm_refcount *rc = (struct kvm_refcount *)kvm; + if (refcount_dec_and_test(&rc->users_count)) + rc->destroy(kvm); +} + #endif /* !__ASSEMBLER__ */ #endif /* __KVM_TYPES_H__ */ diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 69a8d527b0e8..5c69532d6127 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -65,7 +65,6 @@ struct vfio_device { unsigned int open_count; struct completion comp; struct iommufd_access *iommufd_access; - void (*put_kvm)(struct kvm *kvm); struct inode *inode; #if IS_ENABLED(CONFIG_IOMMUFD) struct iommufd_device *iommufd_device; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6e3796814da7..27a718a0bc01 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -120,6 +120,7 @@ static struct dentry *kvm_debugfs_dir; static const struct file_operations stat_fops_per_vm; +static void kvm_destroy_vm(struct kvm *kvm); static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); #ifdef CONFIG_KVM_COMPAT @@ -1155,6 +1156,7 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) BUILD_BUG_ON(offsetof(struct kvm, rc) != 0); refcount_set(&kvm->rc.users_count, 1); + kvm->rc.destroy = kvm_destroy_vm; for (i = 0; i < kvm_arch_nr_memslot_as_ids(kvm); i++) { for (j = 0; j < 2; j++) { @@ -1317,13 +1319,6 @@ static void kvm_destroy_vm(struct kvm *kvm) mmdrop(mm); } -void kvm_put_kvm(struct kvm *kvm) -{ - if (refcount_dec_and_test(&kvm->rc.users_count)) - kvm_destroy_vm(kvm); -} -EXPORT_SYMBOL_GPL(kvm_put_kvm); - /* * Used to put a reference that was taken on behalf of an object associated * with a user-visible file descriptor, e.g. a vcpu or device, if installation -- 2.51.0