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 42A38466B71; Tue, 28 Apr 2026 15:57:18 +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=1777391842; cv=none; b=WPWO4o8gMfTV1rDTENtzd6YXof6CijwHy64McwGaqtW+eI01L04KyA/KHT2LX6F4kZnK4XAzP4ArgEXWfwN40tZKo72r6MErF9k/hDJPix1Fwbu42JF5PvoSchA1hoUnZATcLSi9d+PEEPHBeY3C1DUma0D7dSuPiaoh6jgMZQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777391842; c=relaxed/simple; bh=gJ50aN2aHsnqyzzecYooom9Y4sYzshztAEvY3ZxQOJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mAdS2FxrbGA7G59J9C+xSmHlpdBJAJa0mj+q40zOA7St/SF7Mnmkfv1sLjzVok5U6I4STmzNO+XPVaw85kEFzzffWVTv4gnR6LaDZWh8ZLvdhQo9d4xcJQa1/Dy5GSXYz4iig/ac8qElZ6E3ndsOJTZ8AJDGNnp1AmRtM6A+bw0= 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=ThGx/RMx; 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="ThGx/RMx" 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 63SE4jbx1559961; Tue, 28 Apr 2026 15:56:38 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=uTgzHy3m98P55yjTh PJgJScPlT/2lMhPDUIfJDMciRc=; b=ThGx/RMxKA/yxPgb7t+goHot/W0F1ZVkB NlrA4MzzgEWWJp9JqK3b+5hxSwM0VK0y8KP7J14C3qqY0wuZ1G5bR8wzdtF9qWyb XRlOrWQVA3PhZINkhoX6KzrZL4KnKZmJbpSlbU1/6KlrrNMCR5AZbTFTDKphwdW9 fSfZWZ3w8RTCeMH7MqQpRLt4UE0+lA+1XtxCoixuCf2JiP94gPupQItZFGiGbQMb /oCktGBzURw+zdTBaiMtrYLXuJB8Eo3OY2glwHfGdfsFkIl+SLM91tGzpocXbO+l 2GDUO4gKlBBzbS5U7dauYR09lttBzKc+Vj3ad68N3/6pg2P4tvx+g== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4drn8vd4qy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Apr 2026 15:56:38 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 63SFrrZ2015596; Tue, 28 Apr 2026 15:56:37 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ds8avtg25-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Apr 2026 15:56:37 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63SFuX1F36897270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Apr 2026 15:56:33 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 716A020040; Tue, 28 Apr 2026 15:56:33 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FEFC20043; Tue, 28 Apr 2026 15:56:33 +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:33 +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 28/28] KVM: s390: arm64: Enable KVM_ARM64 config and Kbuild Date: Tue, 28 Apr 2026 17:56:20 +0200 Message-ID: <20260428155622.1361364-29-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-Authority-Analysis: v=2.4 cv=CIIamxrD c=1 sm=1 tr=0 ts=69f0d8b6 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=kekBd6hy71sv0FWHAtgA:9 X-Proofpoint-ORIG-GUID: FSC4cfCeN7y2rr5uyQrHzwDhO9AqAeBY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI4MDE1MSBTYWx0ZWRfXxPrOBHw7SYl7 n3RGL17Hg8JmEUn51tOt3QpbIA+RPqFM8zxMQz3rzEwSto2rznAW0edbCUXJKfjugenpKPFqkbn TG8qBDO5nAeIJz4V91u/4PjxDeVIBXFwK+62wB/JHUCfBPx9sXZz0QH8BEVkJUZSgUvX30lhZKb sjJ/U/TfV18zRFX+uO3F0yZBE0tjhebg/XYGrU/gK8caedlFzrBHZPwuhWQYukUorbKjG+Ve7kd YpVpQqb2LZdPDNIeAQQhODkSOcyycG/edgHb5BsvGpFNJY6DXBL4H59ljiBVQcBkWFYV3zHa1No yAHqUUt9ZadO0LwNblJTeB6MUgaY5Am+hBOia+5eoLeIaCRLcgPQD/P4SvyCFpSOYrGM6ntCx44 bKQBxeajwIUZUrtuaiHfdsJLUBJgFT26J8Zz+Adhbdsw1D/cAJRKNnKuSoODitJ1INrkQOa7VRc vC/owHejOjGIOYzjCpg== X-Proofpoint-GUID: FSC4cfCeN7y2rr5uyQrHzwDhO9AqAeBY 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 spamscore=0 phishscore=0 malwarescore=0 suspectscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604280151 Add all Kbuild/Makefile configurations to build a second KVM module on s390 implementing the arm64-KVM API. To prevent symbol conflicts with kvm-s390 all internal symbols in kvm-arm64 are mangled if compiled as built-in. The new module ins named kvm-arm64. As in this case the build does not go through the normal build process the module parameter handling would be messed up. By forcing KBUILD_MODNAME to kvm-arm64 all parameters are at the same location and not at object/basename of the object file the parameter is introduced. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Co-developed-by: Gautam Gala Signed-off-by: Gautam Gala Signed-off-by: Steffen Eiden --- arch/s390/configs/defconfig | 1 + arch/s390/include/asm/Kbuild | 3 + arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/Makefile | 1 + arch/s390/kvm/arm64/Kconfig | 21 +++++++ arch/s390/kvm/arm64/Makefile | 108 +++++++++++++++++++++++++++++++++++ arch/s390/kvm/s390/Kconfig | 1 - arch/s390/tools/Makefile | 2 + 8 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 arch/s390/kvm/arm64/Kconfig create mode 100644 arch/s390/kvm/arm64/Makefile diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index bbbb4d0df9dd..e10e9e1ad94d 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -58,6 +58,7 @@ CONFIG_CMM=m CONFIG_APPLDATA_BASE=y CONFIG_S390_HYPFS_FS=y CONFIG_KVM_S390=m +CONFIG_KVM_ARM64=m CONFIG_S390_UNWIND_SELFTEST=m CONFIG_S390_KPROBES_SANITY_TEST=m CONFIG_S390_MODULES_SANITY_TEST=m diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 80bad7de7a04..c2c238f418c6 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -7,3 +7,6 @@ generated-y += unistd_nr.h generic-y += asm-offsets.h generic-y += mcs_spinlock.h generic-y += mmzone.h + +generated-y += sysreg-gen-defs.h +generated-y += kvm_arm64_modname.h diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index f8d4a9a38dae..bbae58aa8bc4 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -20,5 +20,6 @@ config KVM tristate source "arch/s390/kvm/s390/Kconfig" +source "arch/s390/kvm/arm64/Kconfig" endif # VIRTUALIZATION diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index c43d7dffca13..38bdd7c9b42d 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -4,3 +4,4 @@ # Copyright IBM Corp. 2008 obj-$(CONFIG_KVM_S390) += s390/ +obj-$(CONFIG_KVM_ARM64) += arm64/ diff --git a/arch/s390/kvm/arm64/Kconfig b/arch/s390/kvm/arm64/Kconfig new file mode 100644 index 000000000000..42a1be50f6e1 --- /dev/null +++ b/arch/s390/kvm/arm64/Kconfig @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0 + +config KVM_ARM64 + def_tristate y + prompt "Kernel-based Virtual Machine (KVM) support for arm64 guests" + select KVM + select KVM_VFIO + select IRQ_BYPASS_MANAGER + select SCHED_INFO + select XARRAY_MULTI + select KVM_COMMON + select HAVE_KVM_CPU_RELAX_INTERCEPT + select HAVE_KVM_MSI + select HAVE_KVM_IRQCHIP + select HAVE_KVM_IRQ_ROUTING + select HAVE_KVM_VCPU_RUN_PID_CHANGE + select GUEST_PERF_EVENTS if PERF_EVENTS + help + Support hosting virtualized arm64 guest machines on s390 host machines. + + If unsure, say N. diff --git a/arch/s390/kvm/arm64/Makefile b/arch/s390/kvm/arm64/Makefile new file mode 100644 index 000000000000..d0aac34b8d2f --- /dev/null +++ b/arch/s390/kvm/arm64/Makefile @@ -0,0 +1,108 @@ +# SPDX-License-Identifier: GPL-2.0 + +KVM := ../../../../virt/kvm +include $(srctree)/virt/kvm/Makefile.kvm +include $(srctree)/virt/kvm/arm64/Makefile.kvm +include $(srctree)/arch/s390/kvm/gmap/Makefile + +ccflags-y += -I $(src) -I$(srctree)/arch/s390/kvm/gmap -DKVM_S390_ARM64 + +kvm-arm64-obj := \ + arm.o \ + guest.o \ + handle_exit.o \ + inject_fault.o \ + mmu.o \ + reset.o \ + +kvm-arm64-obj += $(patsubst %.o,%-arm64.o,$(shared-arm64-obj)) +kvm-arm64-obj += $(patsubst %.o,%-arm64.o,$(kvm-y)) + +targets += $(kvm-arm64-obj) + +$(obj)/%-arm64.o: $(src)/%.c FORCE + @mkdir -p $(dir $@) + $(call if_changed_rule,cc_o_c) + +ifeq ($(CONFIG_KVM_ARM64),m) + +kvm-arm64-y = $(kvm-arm64-obj) + +else ifeq ($(CONFIG_KVM_ARM64),y) + +KVM_ARM64_GEN_DIR :=$(objtree)/arch/${SRCARCH}/include/generated/asm +KVM_ARM64_MODNAME_H := $(KVM_ARM64_GEN_DIR)/kvm_arm64_modname.h +ccflags-y += -include $(KVM_ARM64_MODNAME_H) + +targets += $(KVM_ARM64_MODNAME_H) + +quiet_cmd_kvm_arm64_modname_h = GEN $@ + cmd_kvm_arm64_modname_h = { \ + echo '/* Automatically generated; do not edit. */'; \ + echo '\#ifndef _KVM_ARM64_MODNAME_H'; \ + echo '\#define _KVM_ARM64_MODNAME_H'; \ + echo '\#undef KBUILD_MODNAME'; \ + echo '\#define KBUILD_MODNAME "kvm_arm64"'; \ + echo '\#endif /* _KVM_ARM64_MODNAME_H */'; \ + } > $@ + +$(addprefix $(obj)/,$(kvm-arm64-obj)): $(KVM_ARM64_MODNAME_H) + +$(KVM_ARM64_MODNAME_H): + @mkdir -p $(KVM_ARM64_GEN_DIR) + $(call cmd,kvm_arm64_modname_h) + +prereq-o-cmd = $(foreach o, $(filter %.o, $^), $(dir $(o)).$(notdir $(o)).cmd) +cmd_gen_symversions_o = \ + grep --no-filename "^\#SYMVER" $(prereq-o-cmd) >> $(dot-target).cmd || true + +define rule_ld_o_o + $(call cmd_and_savecmd,ld) + $(call cmd,gen_symversions_o) +endef + +LDFLAGS_kvm-unnamespaced.o := -r +$(obj)/kvm-unnamespaced.o: $(addprefix $(obj)/,$(kvm-arm64-obj)) FORCE + $(call if_changed_rule,ld_o_o) + +# Make list of symbols to localize. +# Collect normal/exported symbols. Use dict as set for deduplication. +quiet_cmd_nm_filter = NMFLTR $@ + cmd_nm_filter = \ +$(NM) -jU $< | awk ' \ +{ if (match($$0, /^__export_symbol_(.*)$$/, exp_sym)) { \ + exp_syms[exp_sym[1]] = 1; \ + } else { \ + normal_syms[$$0] = 1; \ + } \ +} \ +END { \ + for (sym in normal_syms) { \ + if (!(sym in exp_syms)) { \ + print sym; \ + } \ + } \ +}' > $@ + +$(obj)/kvm_symbol_list: $(obj)/kvm-unnamespaced.o FORCE + $(call if_changed,nm_filter) + +define rule_oc_o_o + $(call cmd_and_savecmd,objcopy) + $(call cmd,gen_objtooldep) + $(call cmd,gen_symversions_o) +endef + +OBJCOPYFLAGS_kvm-namespaced.o := -O default --localize-symbols=$(obj)/kvm_symbol_list +$(obj)/kvm-namespaced.o: $(obj)/kvm-unnamespaced.o $(obj)/kvm_symbol_list FORCE + $(call if_changed_rule,oc_o_o) + +kvm-arm64-y = kvm-namespaced.o + +targets += kvm-unnamespaced.o kvm_symbol_list kvm-namespaced.o + +endif + +obj-$(CONFIG_KVM_ARM64) += kvm-arm64.o + +LINUXINCLUDE := -I$(srctree)/include/arch/arm64/ $(LINUXINCLUDE) diff --git a/arch/s390/kvm/s390/Kconfig b/arch/s390/kvm/s390/Kconfig index f9853e61fd58..263ff29b9c9c 100644 --- a/arch/s390/kvm/s390/Kconfig +++ b/arch/s390/kvm/s390/Kconfig @@ -2,7 +2,6 @@ # # KVM_S390 configuration # -source "virt/kvm/Kconfig" config KVM_S390 def_tristate y diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile index f2862364fb42..921261dcde28 100644 --- a/arch/s390/tools/Makefile +++ b/arch/s390/tools/Makefile @@ -6,6 +6,8 @@ kapi := arch/$(ARCH)/include/generated/asm kapi-hdrs-y := $(kapi)/facility-defs.h $(kapi)/dis-defs.h +include $(srctree)/arch/arm64/tools/Makefile.sysreg + PHONY += kapi kapi: $(kapi-hdrs-y) -- 2.51.0