From: Sean Christopherson <seanjc@google.com>
To: Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
Tianrui Zhao <zhaotianrui@loongson.cn>,
Bibo Mao <maobibo@loongson.cn>,
Huacai Chen <chenhuacai@kernel.org>,
Madhavan Srinivasan <maddy@linux.ibm.com>,
Anup Patel <anup@brainfault.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
kvm@vger.kernel.org, loongarch@lists.linux.dev,
linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org,
Anish Ghulati <aghulati@google.com>,
Colton Lewis <coltonlewis@google.com>,
Thomas Huth <thuth@redhat.com>
Subject: [PATCH 1/8] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path
Date: Tue, 10 Jun 2025 17:10:35 -0700 [thread overview]
Message-ID: <20250611001042.170501-2-seanjc@google.com> (raw)
In-Reply-To: <20250611001042.170501-1-seanjc@google.com>
From: Anish Ghulati <aghulati@google.com>
Move arm_hypercalls.h and arm_psci.h into arch/arm64/kvm now that KVM
no longer supports 32-bit ARM, i.e. now that there's no reason to make
the hypercall and PSCI APIs "public".
Signed-off-by: Anish Ghulati <aghulati@google.com>
[sean: squash into one patch, write changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/arm64/kvm/arm.c | 5 +++--
{include => arch/arm64}/kvm/arm_hypercalls.h | 0
{include => arch/arm64}/kvm/arm_psci.h | 0
arch/arm64/kvm/guest.c | 2 +-
arch/arm64/kvm/handle_exit.c | 2 +-
arch/arm64/kvm/hyp/Makefile | 6 +++---
arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++--
arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++--
arch/arm64/kvm/hyp/vhe/switch.c | 4 ++--
arch/arm64/kvm/hypercalls.c | 4 ++--
arch/arm64/kvm/psci.c | 4 ++--
arch/arm64/kvm/pvtime.c | 2 +-
arch/arm64/kvm/trng.c | 2 +-
13 files changed, 20 insertions(+), 19 deletions(-)
rename {include => arch/arm64}/kvm/arm_hypercalls.h (100%)
rename {include => arch/arm64}/kvm/arm_psci.h (100%)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index de2b4e9c9f9f..017c95c7bd03 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -42,9 +42,10 @@
#include <asm/kvm_ptrauth.h>
#include <asm/sections.h>
-#include <kvm/arm_hypercalls.h>
#include <kvm/arm_pmu.h>
-#include <kvm/arm_psci.h>
+
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
#include "sys_regs.h"
diff --git a/include/kvm/arm_hypercalls.h b/arch/arm64/kvm/arm_hypercalls.h
similarity index 100%
rename from include/kvm/arm_hypercalls.h
rename to arch/arm64/kvm/arm_hypercalls.h
diff --git a/include/kvm/arm_psci.h b/arch/arm64/kvm/arm_psci.h
similarity index 100%
rename from include/kvm/arm_psci.h
rename to arch/arm64/kvm/arm_psci.h
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 2196979a24a3..699a2f975350 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -18,7 +18,6 @@
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
-#include <kvm/arm_hypercalls.h>
#include <asm/cputype.h>
#include <linux/uaccess.h>
#include <asm/fpsimd.h>
@@ -27,6 +26,7 @@
#include <asm/kvm_nested.h>
#include <asm/sigcontext.h>
+#include "arm_hypercalls.h"
#include "trace.h"
const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 453266c96481..32a7b7c22924 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -22,7 +22,7 @@
#include <asm/stacktrace/nvhe.h>
#include <asm/traps.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define CREATE_TRACE_POINTS
#include "trace_handle_exit.h"
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index d61e44642f98..b1a4884446c6 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -3,8 +3,8 @@
# Makefile for Kernel-based Virtual Machine module, HYP part
#
-incdir := $(src)/include
-subdir-asflags-y := -I$(incdir)
-subdir-ccflags-y := -I$(incdir)
+hyp_includes := -I$(src)/include -I$(srctree)/arch/arm64/kvm
+subdir-asflags-y := $(hyp_includes)
+subdir-ccflags-y := $(hyp_includes)
obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index bb9f2eecfb67..340a57e0ed7c 100644
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -16,8 +16,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/extable.h>
@@ -32,6 +30,8 @@
#include <asm/processor.h>
#include <asm/traps.h>
+#include "arm_psci.h"
+
struct kvm_exception_table_entry {
int insn, fixup;
};
diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c
index 73affe1333a4..e0610cf683ab 100644
--- a/arch/arm64/kvm/hyp/nvhe/switch.c
+++ b/arch/arm64/kvm/hyp/nvhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -28,6 +26,8 @@
#include <nvhe/mem_protect.h>
+#include "arm_psci.h"
+
/* Non-VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index c9b330dc2066..96be652caf3a 100644
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/percpu.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -28,6 +26,8 @@
#include <asm/thread_info.h>
#include <asm/vectors.h>
+#include "arm_psci.h"
+
/* VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 569941eeb3fe..002f4c593e90 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -6,8 +6,8 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
-#include <kvm/arm_psci.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
#define KVM_ARM_SMCCC_STD_FEATURES \
GENMASK(KVM_REG_ARM_STD_BMAP_BIT_COUNT - 1, 0)
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index 3b5dbe9a0a0e..0566b5907497 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -13,8 +13,8 @@
#include <asm/cputype.h>
#include <asm/kvm_emulate.h>
-#include <kvm/arm_psci.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
/*
* This is an implementation of the Power State Coordination Interface
diff --git a/arch/arm64/kvm/pvtime.c b/arch/arm64/kvm/pvtime.c
index 4ceabaa4c30b..b07d250d223c 100644
--- a/arch/arm64/kvm/pvtime.c
+++ b/arch/arm64/kvm/pvtime.c
@@ -8,7 +8,7 @@
#include <asm/kvm_mmu.h>
#include <asm/pvclock-abi.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
void kvm_update_stolen_time(struct kvm_vcpu *vcpu)
{
diff --git a/arch/arm64/kvm/trng.c b/arch/arm64/kvm/trng.c
index 99bdd7103c9c..b5dc0f09797a 100644
--- a/arch/arm64/kvm/trng.c
+++ b/arch/arm64/kvm/trng.c
@@ -6,7 +6,7 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define ARM_SMCCC_TRNG_VERSION_1_0 0x10000UL
--
2.50.0.rc0.642.g800a2b2222-goog
next prev parent reply other threads:[~2025-06-11 0:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
2025-06-11 0:10 ` Sean Christopherson [this message]
2025-06-11 0:10 ` [PATCH 2/8] KVM: arm64: Include KVM headers to get forward declarations Sean Christopherson
2025-06-11 0:10 ` [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory Sean Christopherson
2025-06-16 11:10 ` Zenghui Yu
2025-06-11 0:10 ` [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h Sean Christopherson
2025-06-16 1:13 ` Bibo Mao
2025-06-11 0:10 ` [PATCH 5/8] KVM: MIPS: Stop adding virt/kvm to the arch include path Sean Christopherson
2025-06-11 0:10 ` [PATCH 6/8] KVM: PPC: " Sean Christopherson
2025-06-16 7:15 ` Gautam Menghani
2025-06-11 0:10 ` [PATCH 7/8] KVM: s390: " Sean Christopherson
2025-06-12 13:01 ` Janosch Frank
2025-06-11 0:10 ` [PATCH 8/8] KVM: Standardize include paths across all architectures Sean Christopherson
2025-06-12 4:56 ` [PATCH 0/8] KVM: Remove include/kvm, standardize includes Paolo Bonzini
2025-06-13 21:02 ` Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250611001042.170501-2-seanjc@google.com \
--to=seanjc@google.com \
--cc=aghulati@google.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=borntraeger@linux.ibm.com \
--cc=chenhuacai@kernel.org \
--cc=coltonlewis@google.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=maddy@linux.ibm.com \
--cc=maobibo@loongson.cn \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
--cc=zhaotianrui@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).