From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA010CC6B00 for ; Thu, 2 Apr 2026 04:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=p4Z8YlQ6h3M4VjuQc6XgTzA8aek+fO8tFMkjuzjLYjk=; b=C2gR4ofwFaoTLy0eEGAWtcj1mM jNJaYNBIqrJ+e88snFamTl3rGJPxz0VlLodFuPmxA8X3lm32U2p4c36USlYzlrhQ/VKIqaAEq+WC0 xOpwZyotJYm+8s1f0tp5I4LpJZi78LM/c6r2EahJd0M2wLoxlFRWAyMtq3DKMsac5ye8FT9dlisVg kOoYkhMrDAAmvJA5EMFSLns9GySTvpRze4wlGIlv5xLrWnsl4ik+WZkGflX3gndgJo/cac7+kqsoD uVTUUt6dYc6VYDBBuo+t5sSnFbiKo8ZruX4sf1vuf3Km5a0QvWS6cjPRlr+5vL6tFaEs6cOrOQxCD g5xBKMIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w89Z3-0000000Gilt-0CTP; Thu, 02 Apr 2026 04:21:53 +0000 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w89Yz-0000000Gifd-0Cju for linux-arm-kernel@lists.infradead.org; Thu, 02 Apr 2026 04:21:50 +0000 Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63214m2T446369; Thu, 2 Apr 2026 04:21:37 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=p4Z8YlQ6h3M4VjuQc 6XgTzA8aek+fO8tFMkjuzjLYjk=; b=DME2ModCfS406wlw1EP/Y3v3VJqZFNNR/ lsUZdSUWTeaBu0q8OSHYOR0UKd7UJbEbHMbeP1fSADwn9PrMSa/7iZLAse+XLDwu c9LvPEpixeHj0NDM76ZuqK38pHeME1nFe7/1f5yhB6DIVrFzQHtbBsJsKfFEg7pJ HhlONV0qfMAD5LPLIMBWFOlb422mbeI1o3BkgoPWGGJ7J82D10DKky2Q6JBml/0l NJKkVrEUgdcfLhILEgh11BSf3Yk6Phqx6d00WE1pFkMcQcT6fgUFEfy3FfL+HWkB SphitBBydLR9DhkSJOaf2cWUwIaNj9ufU7KtXdgGYBH64QvkzhXZw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d66msabru-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Apr 2026 04:21:36 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 6320GNpG022271; Thu, 2 Apr 2026 04:21:36 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4d6tan8kb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Apr 2026 04:21:36 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6324LWok44695962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 2 Apr 2026 04:21:32 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 31A8A20043; Thu, 2 Apr 2026 04:21:32 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB6412004F; Thu, 2 Apr 2026 04:21:31 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 2 Apr 2026 04:21:31 +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 v1 16/27] KVM: Make device name configurable Date: Thu, 2 Apr 2026 06:21:12 +0200 Message-ID: <20260402042125.3948963-17-seiden@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260402042125.3948963-1-seiden@linux.ibm.com> References: <20260402042125.3948963-1-seiden@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=J6enLQnS c=1 sm=1 tr=0 ts=69cdeed0 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=YqMzC722GnigpkU_z3QA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDAyMDAzNCBTYWx0ZWRfX8iMNmbESXhM0 gRecpM58TvFFUeD4ZYj0JqZpj341HeJ3ZXOepmQsgEI2sT1lku2JNTUq/zimb3Vy/mzppYuW3t5 QR+Wi/w9xdoSbIRbF0CJakkL6/6TEIqTAyzUowBzDf9xf5ThiwrhSh0hJu59DY30Po7EdUVE0sj tLh+vBKwfwe1KkizOqr8SbZE2u3FIkefG1DznzDCsXF0pRoFN9B57AGyiA7Yix0tqkjpYVdArn3 k320BFFq2NlsrD4fr/2qSzjTGD2eZyH1dXDXQIdv/zuVDJzs591D6mrmKi+HplcDUNjyl0bXL7r 2/r9wpoRUljuSuMP8KlmzW12cHW0ktS+JCibXvRZ7DGzeWR1PKzZaWLS2Y5kjWQrzR21YDuIOHm va+0Z4DBvC647zGJ/s3nP8vK4E9bqswOUa3VqeIVexc2vKIRcZLb8rX1e7dNz5k8C+bQ/zGovIp 3Dp0rpuh/0jFE1R7Q0Q== X-Proofpoint-GUID: upYGnz-oXvGeGqqMRUrc_nd6zQXZRgxC X-Proofpoint-ORIG-GUID: upYGnz-oXvGeGqqMRUrc_nd6zQXZRgxC 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-02_01,2026-04-01_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2604020034 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260401_212149_240397_506F570D X-CRM114-Status: GOOD ( 16.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allow KVM implementations to choose alternative device names. This is especially useful for architectures providing multiple KVM implementations simultaneously. Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- include/linux/kvm_host.h | 4 +++- virt/kvm/kvm_main.c | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ff2aff71e207..d5d9757e40ca 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1062,7 +1062,9 @@ static inline void kvm_irqfd_exit(void) { } #endif -int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *module); +int kvm_init(unsigned int vcpu_size, unsigned int vcpu_align, struct module *module); +int kvm_init_with_dev(unsigned int vcpu_size, unsigned int vcpu_align, + struct module *module, const char *dev_name, int minor); void kvm_exit(void); bool file_is_kvm(struct file *file); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 642f9e9638cc..d05e2c1e6fb0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -5547,9 +5547,7 @@ static struct file_operations kvm_chardev_ops = { }; static struct miscdevice kvm_dev = { - KVM_MINOR, - "kvm", - &kvm_chardev_ops, + .fops = &kvm_chardev_ops, }; #ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING @@ -6321,13 +6319,13 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) kfree(env); } -static void kvm_init_debug(void) +static void kvm_init_debug(const char *dev_name) { const struct file_operations *fops; const struct kvm_stats_desc *pdesc; int i; - kvm_debugfs_dir = debugfs_create_dir("kvm", NULL); + kvm_debugfs_dir = debugfs_create_dir(dev_name, NULL); for (i = 0; i < kvm_vm_stats_header.num_desc; ++i) { pdesc = &kvm_vm_stats_desc[i]; @@ -6463,11 +6461,20 @@ void kvm_unregister_perf_callbacks(void) } #endif -int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *module) +int kvm_init(unsigned int vcpu_size, unsigned int vcpu_align, struct module *module) +{ + return kvm_init_with_dev(vcpu_size, vcpu_align, module, "kvm", KVM_MINOR); +} + +int kvm_init_with_dev(unsigned int vcpu_size, unsigned int vcpu_align, + struct module *module, const char *dev_name, int minor) { int r; int cpu; + kvm_dev.name = dev_name; + kvm_dev.minor = minor; + /* A kmem cache lets us meet the alignment requirements of fx_save. */ if (!vcpu_align) vcpu_align = __alignof__(struct kvm_vcpu); @@ -6505,7 +6512,7 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *module) kvm_preempt_ops.sched_in = kvm_sched_in; kvm_preempt_ops.sched_out = kvm_sched_out; - kvm_init_debug(); + kvm_init_debug(kvm_dev.name); r = kvm_vfio_ops_init(); if (WARN_ON_ONCE(r)) -- 2.51.0