With some KVM exception types, they share the same exception function
handler. To show the difference, exception code is added as new
parameter in exception handler.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
arch/loongarch/include/asm/kvm_vcpu.h | 2 +-
arch/loongarch/kvm/exit.c | 26 ++++++++++++--------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
index 2c349f961bfb..b0a6cac07ed8 100644
--- a/arch/loongarch/include/asm/kvm_vcpu.h
+++ b/arch/loongarch/include/asm/kvm_vcpu.h
@@ -37,7 +37,7 @@
#define KVM_LOONGSON_IRQ_NUM_MASK 0xffff
typedef union loongarch_instruction larch_inst;
-typedef int (*exit_handle_fn)(struct kvm_vcpu *);
+typedef int (*exit_handle_fn)(struct kvm_vcpu *, int ecode);
int kvm_emu_mmio_read(struct kvm_vcpu *vcpu, larch_inst inst);
int kvm_emu_mmio_write(struct kvm_vcpu *vcpu, larch_inst inst);
diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c
index ea321403644a..31b9d5f67e8f 100644
--- a/arch/loongarch/kvm/exit.c
+++ b/arch/loongarch/kvm/exit.c
@@ -341,7 +341,7 @@ static int kvm_trap_handle_gspr(struct kvm_vcpu *vcpu)
* 2) Execute CACOP/IDLE instructions;
* 3) Access to unimplemented CSRs/IOCSRs.
*/
-static int kvm_handle_gspr(struct kvm_vcpu *vcpu)
+static int kvm_handle_gspr(struct kvm_vcpu *vcpu, int ecode)
{
int ret = RESUME_GUEST;
enum emulation_result er = EMULATE_DONE;
@@ -705,12 +705,12 @@ static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcpu, bool write)
return ret;
}
-static int kvm_handle_read_fault(struct kvm_vcpu *vcpu)
+static int kvm_handle_read_fault(struct kvm_vcpu *vcpu, int ecode)
{
return kvm_handle_rdwr_fault(vcpu, false);
}
-static int kvm_handle_write_fault(struct kvm_vcpu *vcpu)
+static int kvm_handle_write_fault(struct kvm_vcpu *vcpu, int ecode)
{
return kvm_handle_rdwr_fault(vcpu, true);
}
@@ -730,7 +730,7 @@ int kvm_complete_user_service(struct kvm_vcpu *vcpu, struct kvm_run *run)
* Handle when the guest attempts to use fpu which hasn't been allowed
* by the root context.
*/
-static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu)
+static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu, int ecode)
{
struct kvm_run *run = vcpu->run;
@@ -787,7 +787,7 @@ static long kvm_save_notify(struct kvm_vcpu *vcpu)
* Handle when the guest attempts to use LSX when it is disabled in the root
* context.
*/
-static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu)
+static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu, int ecode)
{
if (kvm_own_lsx(vcpu))
kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -802,7 +802,7 @@ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu)
* Handle when the guest attempts to use LASX when it is disabled in the root
* context.
*/
-static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu)
+static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu, int ecode)
{
if (kvm_own_lasx(vcpu))
kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -810,7 +810,7 @@ static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu)
return RESUME_GUEST;
}
-static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu)
+static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu, int ecode)
{
if (kvm_own_lbt(vcpu))
kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -872,7 +872,7 @@ static void kvm_handle_service(struct kvm_vcpu *vcpu)
kvm_write_reg(vcpu, LOONGARCH_GPR_A0, ret);
}
-static int kvm_handle_hypercall(struct kvm_vcpu *vcpu)
+static int kvm_handle_hypercall(struct kvm_vcpu *vcpu, int ecode)
{
int ret;
larch_inst inst;
@@ -932,16 +932,14 @@ static int kvm_handle_hypercall(struct kvm_vcpu *vcpu)
/*
* LoongArch KVM callback handling for unimplemented guest exiting
*/
-static int kvm_fault_ni(struct kvm_vcpu *vcpu)
+static int kvm_fault_ni(struct kvm_vcpu *vcpu, int ecode)
{
- unsigned int ecode, inst;
- unsigned long estat, badv;
+ unsigned int inst;
+ unsigned long badv;
/* Fetch the instruction */
inst = vcpu->arch.badi;
badv = vcpu->arch.badv;
- estat = vcpu->arch.host_estat;
- ecode = (estat & CSR_ESTAT_EXC) >> CSR_ESTAT_EXC_SHIFT;
kvm_err("ECode: %d PC=%#lx Inst=0x%08x BadVaddr=%#lx ESTAT=%#lx\n",
ecode, vcpu->arch.pc, inst, badv, read_gcsr_estat());
kvm_arch_vcpu_dump_regs(vcpu);
@@ -966,5 +964,5 @@ static exit_handle_fn kvm_fault_tables[EXCCODE_INT_START] = {
int kvm_handle_fault(struct kvm_vcpu *vcpu, int fault)
{
- return kvm_fault_tables[fault](vcpu);
+ return kvm_fault_tables[fault](vcpu, fault);
}
--
2.39.3Hi Bibo,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 9d7a0577c9db35c4cc52db90bc415ea248446472]
url: https://github.com/intel-lab-lkp/linux/commits/Bibo-Mao/LoongArch-KVM-Add-parameter-exception-code-with-exception-handler/20250424-144905
base: 9d7a0577c9db35c4cc52db90bc415ea248446472
patch link: https://lore.kernel.org/r/20250424064625.3928278-2-maobibo%40loongson.cn
patch subject: [PATCH 1/2] LoongArch: KVM: Add parameter exception code with exception handler
config: loongarch-randconfig-001-20250425 (https://download.01.org/0day-ci/archive/20250425/202504251458.EJKsZMLH-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250425/202504251458.EJKsZMLH-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504251458.EJKsZMLH-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> arch/loongarch/kvm/exit.c:734: warning: Function parameter or struct member 'ecode' not described in 'kvm_handle_fpu_disabled'
vim +734 arch/loongarch/kvm/exit.c
2737dee1067c2f Bibo Mao 2025-01-13 725
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 726 /**
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 727 * kvm_handle_fpu_disabled() - Guest used fpu however it is disabled at host
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 728 * @vcpu: Virtual CPU context.
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 729 *
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 730 * Handle when the guest attempts to use fpu which hasn't been allowed
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 731 * by the root context.
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 732 */
74303fac8d0580 Bibo Mao 2025-04-24 733 static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu, int ecode)
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 @734 {
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 735 struct kvm_run *run = vcpu->run;
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 736
db1ecca22edf27 Tianrui Zhao 2023-12-19 737 if (!kvm_guest_has_fpu(&vcpu->arch)) {
db1ecca22edf27 Tianrui Zhao 2023-12-19 738 kvm_queue_exception(vcpu, EXCCODE_INE, 0);
db1ecca22edf27 Tianrui Zhao 2023-12-19 739 return RESUME_GUEST;
db1ecca22edf27 Tianrui Zhao 2023-12-19 740 }
db1ecca22edf27 Tianrui Zhao 2023-12-19 741
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 742 /*
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 743 * If guest FPU not present, the FPU operation should have been
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 744 * treated as a reserved instruction!
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 745 * If FPU already in use, we shouldn't get this at all.
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 746 */
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 747 if (WARN_ON(vcpu->arch.aux_inuse & KVM_LARCH_FPU)) {
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 748 kvm_err("%s internal error\n", __func__);
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 749 run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 750 return RESUME_HOST;
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 751 }
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 752
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 753 kvm_own_fpu(vcpu);
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 754
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 755 return RESUME_GUEST;
37cdfc6dbf0416 Tianrui Zhao 2023-10-02 756 }
71f4fb845874c3 Tianrui Zhao 2023-10-02 757
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.