Commit b22af904 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

KVM: PPC: Book3s: Remove real mode interrupt controller hcalls handlers 



Currently we have 2 sets of interrupt controller hypercalls handlers
for real and virtual modes, this is from POWER8 times when switching
MMU on was considered an expensive operation.

POWER9 however does not have dependent threads and MMU is enabled for
handling hcalls so the XIVE native or XICS-on-XIVE real mode handlers
never execute on real P9 and later CPUs.

This untemplate the handlers and only keeps the real mode handlers for
XICS native (up to POWER8) and remove the rest of dead code. Changes
in functions are mechanical except few missing empty lines to make
checkpatch.pl happy.

The default implemented hcalls list already contains XICS hcalls so
no change there.

This should not cause any behavioral change.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220509071150.181250-1-aik@ozlabs.ru
parent 29592181

arch/powerpc/include/asm/kvm_ppc.h

+0 −7
Original line number Diff line number Diff line
@@ -787,13 +787,6 @@ long kvmppc_rm_h_page_init(struct kvm_vcpu *vcpu, unsigned long flags, 
			   unsigned long dest, unsigned long src);

long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,

                          unsigned long slb_v, unsigned int status, bool data);

unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);

unsigned long kvmppc_rm_h_xirr_x(struct kvm_vcpu *vcpu);

unsigned long kvmppc_rm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server);

int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,

                    unsigned long mfrr);

int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);

int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);

void kvmppc_guest_entry_inject_int(struct kvm_vcpu *vcpu);



/*

arch/powerpc/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ kvm-hv-$(CONFIG_PPC_TRANSACTIONAL_MEM) += \ 
	book3s_hv_tm.o



kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \

	book3s_hv_rm_xics.o book3s_hv_rm_xive.o

	book3s_hv_rm_xics.o



kvm-book3s_64-builtin-tm-objs-$(CONFIG_PPC_TRANSACTIONAL_MEM) += \

	book3s_hv_tm_builtin.o

arch/powerpc/kvm/book3s_hv_builtin.c

+0 −64
Original line number Diff line number Diff line
@@ -489,70 +489,6 @@ static long kvmppc_read_one_intr(bool *again) 
	return kvmppc_check_passthru(xisr, xirr, again);

}



#ifdef CONFIG_KVM_XICS

unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	if (xics_on_xive())

		return xive_rm_h_xirr(vcpu);

	else

		return xics_rm_h_xirr(vcpu);

}



unsigned long kvmppc_rm_h_xirr_x(struct kvm_vcpu *vcpu)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	vcpu->arch.regs.gpr[5] = get_tb();

	if (xics_on_xive())

		return xive_rm_h_xirr(vcpu);

	else

		return xics_rm_h_xirr(vcpu);

}



unsigned long kvmppc_rm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	if (xics_on_xive())

		return xive_rm_h_ipoll(vcpu, server);

	else

		return H_TOO_HARD;

}



int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,

		    unsigned long mfrr)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	if (xics_on_xive())

		return xive_rm_h_ipi(vcpu, server, mfrr);

	else

		return xics_rm_h_ipi(vcpu, server, mfrr);

}



int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	if (xics_on_xive())

		return xive_rm_h_cppr(vcpu, cppr);

	else

		return xics_rm_h_cppr(vcpu, cppr);

}



int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)

{

	if (!kvmppc_xics_enabled(vcpu))

		return H_TOO_HARD;

	if (xics_on_xive())

		return xive_rm_h_eoi(vcpu, xirr);

	else

		return xics_rm_h_eoi(vcpu, xirr);

}

#endif /* CONFIG_KVM_XICS */



void kvmppc_bad_interrupt(struct pt_regs *regs)

{

	/*

arch/powerpc/kvm/book3s_hv_rm_xics.c

+5 −0
Original line number Diff line number Diff line
@@ -479,6 +479,11 @@ static void icp_rm_down_cppr(struct kvmppc_xics *xics, struct kvmppc_icp *icp, 
	}

}



unsigned long xics_rm_h_xirr_x(struct kvm_vcpu *vcpu)

{

	vcpu->arch.regs.gpr[5] = get_tb();

	return xics_rm_h_xirr(vcpu);

}



unsigned long xics_rm_h_xirr(struct kvm_vcpu *vcpu)

{

arch/powerpc/kvm/book3s_hv_rm_xive.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/kernel.h>

#include <linux/kvm_host.h>

#include <linux/err.h>

#include <linux/kernel_stat.h>

#include <linux/pgtable.h>



#include <asm/kvm_book3s.h>

#include <asm/kvm_ppc.h>

#include <asm/hvcall.h>

#include <asm/xics.h>

#include <asm/debug.h>

#include <asm/synch.h>

#include <asm/cputhreads.h>

#include <asm/ppc-opcode.h>

#include <asm/pnv-pci.h>

#include <asm/opal.h>

#include <asm/smp.h>

#include <asm/xive.h>

#include <asm/xive-regs.h>



#include "book3s_xive.h"



/* XXX */

#include <asm/udbg.h>

//#define DBG(fmt...) udbg_printf(fmt)

#define DBG(fmt...) do { } while(0)



static inline void __iomem *get_tima_phys(void)

{

	return local_paca->kvm_hstate.xive_tima_phys;

}



#undef XIVE_RUNTIME_CHECKS

#define X_PFX xive_rm_

#define X_STATIC

#define X_STAT_PFX stat_rm_

#define __x_tima		get_tima_phys()

#define __x_eoi_page(xd)	((void __iomem *)((xd)->eoi_page))

#define __x_trig_page(xd)	((void __iomem *)((xd)->trig_page))

#define __x_writeb	__raw_rm_writeb

#define __x_readw	__raw_rm_readw

#define __x_readq	__raw_rm_readq

#define __x_writeq	__raw_rm_writeq



#include "book3s_xive_template.c"