mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-17 08:06:45 +07:00
221bb8a46e
VGIC implementation. - s390: support for trapping software breakpoints, nested virtualization (vSIE), the STHYI opcode, initial extensions for CPU model support. - MIPS: support for MIPS64 hosts (32-bit guests only) and lots of cleanups, preliminary to this and the upcoming support for hardware virtualization extensions. - x86: support for execute-only mappings in nested EPT; reduced vmexit latency for TSC deadline timer (by about 30%) on Intel hosts; support for more than 255 vCPUs. - PPC: bugfixes. The ugly bit is the conflicts. A couple of them are simple conflicts due to 4.7 fixes, but most of them are with other trees. There was definitely too much reliance on Acked-by here. Some conflicts are for KVM patches where _I_ gave my Acked-by, but the worst are for this pull request's patches that touch files outside arch/*/kvm. KVM submaintainers should probably learn to synchronize better with arch maintainers, with the latter providing topic branches whenever possible instead of Acked-by. This is what we do with arch/x86. And I should learn to refuse pull requests when linux-next sends scary signals, even if that means that submaintainers have to rebase their branches. Anyhow, here's the list: - arch/x86/kvm/vmx.c: handle_pcommit and EXIT_REASON_PCOMMIT was removed by the nvdimm tree. This tree adds handle_preemption_timer and EXIT_REASON_PREEMPTION_TIMER at the same place. In general all mentions of pcommit have to go. There is also a conflict between a stable fix and this patch, where the stable fix removed the vmx_create_pml_buffer function and its call. - virt/kvm/kvm_main.c: kvm_cpu_notifier was removed by the hotplug tree. This tree adds kvm_io_bus_get_dev at the same place. - virt/kvm/arm/vgic.c: a few final bugfixes went into 4.7 before the file was completely removed for 4.8. - include/linux/irqchip/arm-gic-v3.h: this one is entirely our fault; this is a change that should have gone in through the irqchip tree and pulled by kvm-arm. I think I would have rejected this kvm-arm pull request. The KVM version is the right one, except that it lacks GITS_BASER_PAGES_SHIFT. - arch/powerpc: what a mess. For the idle_book3s.S conflict, the KVM tree is the right one; everything else is trivial. In this case I am not quite sure what went wrong. The commit that is causing the mess (fd7bacbca4
, "KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt", 2016-05-15) touches both arch/powerpc/kernel/ and arch/powerpc/kvm/. It's large, but at 396 insertions/5 deletions I guessed that it wasn't really possible to split it and that the 5 deletions wouldn't conflict. That wasn't the case. - arch/s390: also messy. First is hypfs_diag.c where the KVM tree moved some code and the s390 tree patched it. You have to reapply the relevant part of commits6c22c98637
, plus all ofe030c1125e
, to arch/s390/kernel/diag.c. Or pick the linux-next conflict resolution from http://marc.info/?l=kvm&m=146717549531603&w=2. Second, there is a conflict in gmap.c between a stable fix and 4.8. The KVM version here is the correct one. I have pushed my resolution at refs/heads/merge-20160802 (commit 3d1f53419842) at git://git.kernel.org/pub/scm/virt/kvm/kvm.git. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJXoGm7AAoJEL/70l94x66DugQIAIj703ePAFepB/fCrKHkZZia SGrsBdvAtNsOhr7FQ5qvvjLxiv/cv7CymeuJivX8H+4kuUHUllDzey+RPHYHD9X7 U6n1PdCH9F15a3IXc8tDjlDdOMNIKJixYuq1UyNZMU6NFwl00+TZf9JF8A2US65b x/41W98ilL6nNBAsoDVmCLtPNWAqQ3lajaZELGfcqRQ9ZGKcAYOaLFXHv2YHf2XC qIDMf+slBGSQ66UoATnYV2gAopNlWbZ7n0vO6tE2KyvhHZ1m399aBX1+k8la/0JI 69r+Tz7ZHUSFtmlmyByi5IAB87myy2WQHyAPwj+4vwJkDGPcl0TrupzbG7+T05Y= =42ti -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Pull KVM updates from Paolo Bonzini: - ARM: GICv3 ITS emulation and various fixes. Removal of the old VGIC implementation. - s390: support for trapping software breakpoints, nested virtualization (vSIE), the STHYI opcode, initial extensions for CPU model support. - MIPS: support for MIPS64 hosts (32-bit guests only) and lots of cleanups, preliminary to this and the upcoming support for hardware virtualization extensions. - x86: support for execute-only mappings in nested EPT; reduced vmexit latency for TSC deadline timer (by about 30%) on Intel hosts; support for more than 255 vCPUs. - PPC: bugfixes. * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (302 commits) KVM: PPC: Introduce KVM_CAP_PPC_HTM MIPS: Select HAVE_KVM for MIPS64_R{2,6} MIPS: KVM: Reset CP0_PageMask during host TLB flush MIPS: KVM: Fix ptr->int cast via KVM_GUEST_KSEGX() MIPS: KVM: Sign extend MFC0/RDHWR results MIPS: KVM: Fix 64-bit big endian dynamic translation MIPS: KVM: Fail if ebase doesn't fit in CP0_EBase MIPS: KVM: Use 64-bit CP0_EBase when appropriate MIPS: KVM: Set CP0_Status.KX on MIPS64 MIPS: KVM: Make entry code MIPS64 friendly MIPS: KVM: Use kmap instead of CKSEG0ADDR() MIPS: KVM: Use virt_to_phys() to get commpage PFN MIPS: Fix definition of KSEGX() for 64-bit KVM: VMX: Add VMCS to CPU's loaded VMCSs before VMPTRLD kvm: x86: nVMX: maintain internal copy of current VMCS KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE KVM: PPC: Book3S HV: Pull out TM state save/restore into separate procedures KVM: arm64: vgic-its: Simplify MAPI error handling KVM: arm64: vgic-its: Make vgic_its_cmd_handle_mapi similar to other handlers KVM: arm64: vgic-its: Turn device_id validation into generic ID validation ...
240 lines
7.4 KiB
C
240 lines
7.4 KiB
C
/*
|
|
* This control block defines the PACA which defines the processor
|
|
* specific data for each logical processor on the system.
|
|
* There are some pointers defined that are utilized by PLIC.
|
|
*
|
|
* C 2001 PPC 64 Team, IBM Corp
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
#ifndef _ASM_POWERPC_PACA_H
|
|
#define _ASM_POWERPC_PACA_H
|
|
#ifdef __KERNEL__
|
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
#include <linux/string.h>
|
|
#include <asm/types.h>
|
|
#include <asm/lppaca.h>
|
|
#include <asm/mmu.h>
|
|
#include <asm/page.h>
|
|
#include <asm/exception-64e.h>
|
|
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
|
|
#include <asm/kvm_book3s_asm.h>
|
|
#endif
|
|
#include <asm/accounting.h>
|
|
#include <asm/hmi.h>
|
|
|
|
register struct paca_struct *local_paca asm("r13");
|
|
|
|
#if defined(CONFIG_DEBUG_PREEMPT) && defined(CONFIG_SMP)
|
|
extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */
|
|
/*
|
|
* Add standard checks that preemption cannot occur when using get_paca():
|
|
* otherwise the paca_struct it points to may be the wrong one just after.
|
|
*/
|
|
#define get_paca() ((void) debug_smp_processor_id(), local_paca)
|
|
#else
|
|
#define get_paca() local_paca
|
|
#endif
|
|
|
|
#define get_lppaca() (get_paca()->lppaca_ptr)
|
|
#define get_slb_shadow() (get_paca()->slb_shadow_ptr)
|
|
|
|
struct task_struct;
|
|
|
|
/*
|
|
* Defines the layout of the paca.
|
|
*
|
|
* This structure is not directly accessed by firmware or the service
|
|
* processor.
|
|
*/
|
|
struct paca_struct {
|
|
#ifdef CONFIG_PPC_BOOK3S
|
|
/*
|
|
* Because hw_cpu_id, unlike other paca fields, is accessed
|
|
* routinely from other CPUs (from the IRQ code), we stick to
|
|
* read-only (after boot) fields in the first cacheline to
|
|
* avoid cacheline bouncing.
|
|
*/
|
|
|
|
struct lppaca *lppaca_ptr; /* Pointer to LpPaca for PLIC */
|
|
#endif /* CONFIG_PPC_BOOK3S */
|
|
/*
|
|
* MAGIC: the spinlock functions in arch/powerpc/lib/locks.c
|
|
* load lock_token and paca_index with a single lwz
|
|
* instruction. They must travel together and be properly
|
|
* aligned.
|
|
*/
|
|
#ifdef __BIG_ENDIAN__
|
|
u16 lock_token; /* Constant 0x8000, used in locks */
|
|
u16 paca_index; /* Logical processor number */
|
|
#else
|
|
u16 paca_index; /* Logical processor number */
|
|
u16 lock_token; /* Constant 0x8000, used in locks */
|
|
#endif
|
|
|
|
u64 kernel_toc; /* Kernel TOC address */
|
|
u64 kernelbase; /* Base address of kernel */
|
|
u64 kernel_msr; /* MSR while running in kernel */
|
|
void *emergency_sp; /* pointer to emergency stack */
|
|
u64 data_offset; /* per cpu data offset */
|
|
s16 hw_cpu_id; /* Physical processor number */
|
|
u8 cpu_start; /* At startup, processor spins until */
|
|
/* this becomes non-zero. */
|
|
u8 kexec_state; /* set when kexec down has irqs off */
|
|
#ifdef CONFIG_PPC_STD_MMU_64
|
|
struct slb_shadow *slb_shadow_ptr;
|
|
struct dtl_entry *dispatch_log;
|
|
struct dtl_entry *dispatch_log_end;
|
|
#endif /* CONFIG_PPC_STD_MMU_64 */
|
|
u64 dscr_default; /* per-CPU default DSCR */
|
|
|
|
#ifdef CONFIG_PPC_STD_MMU_64
|
|
/*
|
|
* Now, starting in cacheline 2, the exception save areas
|
|
*/
|
|
/* used for most interrupts/exceptions */
|
|
u64 exgen[13] __attribute__((aligned(0x80)));
|
|
u64 exmc[13]; /* used for machine checks */
|
|
u64 exslb[13]; /* used for SLB/segment table misses
|
|
* on the linear mapping */
|
|
/* SLB related definitions */
|
|
u16 vmalloc_sllp;
|
|
u16 slb_cache_ptr;
|
|
u32 slb_cache[SLB_CACHE_ENTRIES];
|
|
#endif /* CONFIG_PPC_STD_MMU_64 */
|
|
|
|
#ifdef CONFIG_PPC_BOOK3E
|
|
u64 exgen[8] __aligned(0x40);
|
|
/* Keep pgd in the same cacheline as the start of extlb */
|
|
pgd_t *pgd __aligned(0x40); /* Current PGD */
|
|
pgd_t *kernel_pgd; /* Kernel PGD */
|
|
|
|
/* Shared by all threads of a core -- points to tcd of first thread */
|
|
struct tlb_core_data *tcd_ptr;
|
|
|
|
/*
|
|
* We can have up to 3 levels of reentrancy in the TLB miss handler,
|
|
* in each of four exception levels (normal, crit, mcheck, debug).
|
|
*/
|
|
u64 extlb[12][EX_TLB_SIZE / sizeof(u64)];
|
|
u64 exmc[8]; /* used for machine checks */
|
|
u64 excrit[8]; /* used for crit interrupts */
|
|
u64 exdbg[8]; /* used for debug interrupts */
|
|
|
|
/* Kernel stack pointers for use by special exceptions */
|
|
void *mc_kstack;
|
|
void *crit_kstack;
|
|
void *dbg_kstack;
|
|
|
|
struct tlb_core_data tcd;
|
|
#endif /* CONFIG_PPC_BOOK3E */
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S
|
|
mm_context_id_t mm_ctx_id;
|
|
#ifdef CONFIG_PPC_MM_SLICES
|
|
u64 mm_ctx_low_slices_psize;
|
|
unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE];
|
|
#else
|
|
u16 mm_ctx_user_psize;
|
|
u16 mm_ctx_sllp;
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
* then miscellaneous read-write fields
|
|
*/
|
|
struct task_struct *__current; /* Pointer to current */
|
|
u64 kstack; /* Saved Kernel stack addr */
|
|
u64 stab_rr; /* stab/slb round-robin counter */
|
|
u64 saved_r1; /* r1 save for RTAS calls or PM */
|
|
u64 saved_msr; /* MSR saved here by enter_rtas */
|
|
u16 trap_save; /* Used when bad stack is encountered */
|
|
u8 soft_enabled; /* irq soft-enable flag */
|
|
u8 irq_happened; /* irq happened while soft-disabled */
|
|
u8 io_sync; /* writel() needs spin_unlock sync */
|
|
u8 irq_work_pending; /* IRQ_WORK interrupt while soft-disable */
|
|
u8 nap_state_lost; /* NV GPR values lost in power7_idle */
|
|
u64 sprg_vdso; /* Saved user-visible sprg */
|
|
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
u64 tm_scratch; /* TM scratch area for reclaim */
|
|
#endif
|
|
|
|
#ifdef CONFIG_PPC_POWERNV
|
|
/* Per-core mask tracking idle threads and a lock bit-[L][TTTTTTTT] */
|
|
u32 *core_idle_state_ptr;
|
|
u8 thread_idle_state; /* PNV_THREAD_RUNNING/NAP/SLEEP */
|
|
/* Mask to indicate thread id in core */
|
|
u8 thread_mask;
|
|
/* Mask to denote subcore sibling threads */
|
|
u8 subcore_sibling_mask;
|
|
#endif
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S_64
|
|
/* Exclusive emergency stack pointer for machine check exception. */
|
|
void *mc_emergency_sp;
|
|
/*
|
|
* Flag to check whether we are in machine check early handler
|
|
* and already using emergency stack.
|
|
*/
|
|
u16 in_mce;
|
|
u8 hmi_event_available; /* HMI event is available */
|
|
/*
|
|
* Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for
|
|
* more details
|
|
*/
|
|
struct sibling_subcore_state *sibling_subcore_state;
|
|
#endif
|
|
|
|
/* Stuff for accurate time accounting */
|
|
struct cpu_accounting_data accounting;
|
|
u64 stolen_time; /* TB ticks taken by hypervisor */
|
|
u64 dtl_ridx; /* read index in dispatch log */
|
|
struct dtl_entry *dtl_curr; /* pointer corresponding to dtl_ridx */
|
|
|
|
#ifdef CONFIG_KVM_BOOK3S_HANDLER
|
|
#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
|
|
/* We use this to store guest state in */
|
|
struct kvmppc_book3s_shadow_vcpu shadow_vcpu;
|
|
#endif
|
|
struct kvmppc_host_state kvm_hstate;
|
|
#endif
|
|
};
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S
|
|
static inline void copy_mm_to_paca(mm_context_t *context)
|
|
{
|
|
get_paca()->mm_ctx_id = context->id;
|
|
#ifdef CONFIG_PPC_MM_SLICES
|
|
get_paca()->mm_ctx_low_slices_psize = context->low_slices_psize;
|
|
memcpy(&get_paca()->mm_ctx_high_slices_psize,
|
|
&context->high_slices_psize, SLICE_ARRAY_SIZE);
|
|
#else
|
|
get_paca()->mm_ctx_user_psize = context->user_psize;
|
|
get_paca()->mm_ctx_sllp = context->sllp;
|
|
#endif
|
|
}
|
|
#else
|
|
static inline void copy_mm_to_paca(mm_context_t *context){}
|
|
#endif
|
|
|
|
extern struct paca_struct *paca;
|
|
extern void initialise_paca(struct paca_struct *new_paca, int cpu);
|
|
extern void setup_paca(struct paca_struct *new_paca);
|
|
extern void allocate_pacas(void);
|
|
extern void free_unused_pacas(void);
|
|
|
|
#else /* CONFIG_PPC64 */
|
|
|
|
static inline void allocate_pacas(void) { };
|
|
static inline void free_unused_pacas(void) { };
|
|
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_PACA_H */
|