mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18: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 ...
364 lines
9.1 KiB
C
364 lines
9.1 KiB
C
/*
|
|
* S390 version
|
|
* Copyright IBM Corp. 1999
|
|
* Author(s): Hartmut Penner (hp@de.ibm.com),
|
|
* Martin Schwidefsky (schwidefsky@de.ibm.com)
|
|
*
|
|
* Derived from "include/asm-i386/processor.h"
|
|
* Copyright (C) 1994, Linus Torvalds
|
|
*/
|
|
|
|
#ifndef __ASM_S390_PROCESSOR_H
|
|
#define __ASM_S390_PROCESSOR_H
|
|
|
|
#include <linux/const.h>
|
|
|
|
#define CIF_MCCK_PENDING 0 /* machine check handling is pending */
|
|
#define CIF_ASCE 1 /* user asce needs fixup / uaccess */
|
|
#define CIF_NOHZ_DELAY 2 /* delay HZ disable for a tick */
|
|
#define CIF_FPU 3 /* restore FPU registers */
|
|
#define CIF_IGNORE_IRQ 4 /* ignore interrupt (for udelay) */
|
|
#define CIF_ENABLED_WAIT 5 /* in enabled wait state */
|
|
|
|
#define _CIF_MCCK_PENDING _BITUL(CIF_MCCK_PENDING)
|
|
#define _CIF_ASCE _BITUL(CIF_ASCE)
|
|
#define _CIF_NOHZ_DELAY _BITUL(CIF_NOHZ_DELAY)
|
|
#define _CIF_FPU _BITUL(CIF_FPU)
|
|
#define _CIF_IGNORE_IRQ _BITUL(CIF_IGNORE_IRQ)
|
|
#define _CIF_ENABLED_WAIT _BITUL(CIF_ENABLED_WAIT)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/irqflags.h>
|
|
#include <asm/cpu.h>
|
|
#include <asm/page.h>
|
|
#include <asm/ptrace.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/runtime_instr.h>
|
|
#include <asm/fpu/types.h>
|
|
#include <asm/fpu/internal.h>
|
|
|
|
static inline void set_cpu_flag(int flag)
|
|
{
|
|
S390_lowcore.cpu_flags |= (1UL << flag);
|
|
}
|
|
|
|
static inline void clear_cpu_flag(int flag)
|
|
{
|
|
S390_lowcore.cpu_flags &= ~(1UL << flag);
|
|
}
|
|
|
|
static inline int test_cpu_flag(int flag)
|
|
{
|
|
return !!(S390_lowcore.cpu_flags & (1UL << flag));
|
|
}
|
|
|
|
/*
|
|
* Test CIF flag of another CPU. The caller needs to ensure that
|
|
* CPU hotplug can not happen, e.g. by disabling preemption.
|
|
*/
|
|
static inline int test_cpu_flag_of(int flag, int cpu)
|
|
{
|
|
struct lowcore *lc = lowcore_ptr[cpu];
|
|
return !!(lc->cpu_flags & (1UL << flag));
|
|
}
|
|
|
|
#define arch_needs_cpu() test_cpu_flag(CIF_NOHZ_DELAY)
|
|
|
|
/*
|
|
* Default implementation of macro that returns current
|
|
* instruction pointer ("program counter").
|
|
*/
|
|
#define current_text_addr() ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; })
|
|
|
|
static inline void get_cpu_id(struct cpuid *ptr)
|
|
{
|
|
asm volatile("stidp %0" : "=Q" (*ptr));
|
|
}
|
|
|
|
void s390_adjust_jiffies(void);
|
|
void s390_update_cpu_mhz(void);
|
|
void cpu_detect_mhz_feature(void);
|
|
|
|
extern const struct seq_operations cpuinfo_op;
|
|
extern int sysctl_ieee_emulation_warnings;
|
|
extern void execve_tail(void);
|
|
|
|
/*
|
|
* User space process size: 2GB for 31 bit, 4TB or 8PT for 64 bit.
|
|
*/
|
|
|
|
#define TASK_SIZE_OF(tsk) ((tsk)->mm->context.asce_limit)
|
|
#define TASK_UNMAPPED_BASE (test_thread_flag(TIF_31BIT) ? \
|
|
(1UL << 30) : (1UL << 41))
|
|
#define TASK_SIZE TASK_SIZE_OF(current)
|
|
#define TASK_MAX_SIZE (1UL << 53)
|
|
|
|
#define STACK_TOP (1UL << (test_thread_flag(TIF_31BIT) ? 31:42))
|
|
#define STACK_TOP_MAX (1UL << 42)
|
|
|
|
#define HAVE_ARCH_PICK_MMAP_LAYOUT
|
|
|
|
typedef struct {
|
|
__u32 ar4;
|
|
} mm_segment_t;
|
|
|
|
/*
|
|
* Thread structure
|
|
*/
|
|
struct thread_struct {
|
|
unsigned int acrs[NUM_ACRS];
|
|
unsigned long ksp; /* kernel stack pointer */
|
|
mm_segment_t mm_segment;
|
|
unsigned long gmap_addr; /* address of last gmap fault. */
|
|
unsigned int gmap_write_flag; /* gmap fault write indication */
|
|
unsigned int gmap_int_code; /* int code of last gmap fault */
|
|
unsigned int gmap_pfault; /* signal of a pending guest pfault */
|
|
struct per_regs per_user; /* User specified PER registers */
|
|
struct per_event per_event; /* Cause of the last PER trap */
|
|
unsigned long per_flags; /* Flags to control debug behavior */
|
|
/* pfault_wait is used to block the process on a pfault event */
|
|
unsigned long pfault_wait;
|
|
struct list_head list;
|
|
/* cpu runtime instrumentation */
|
|
struct runtime_instr_cb *ri_cb;
|
|
unsigned char trap_tdb[256]; /* Transaction abort diagnose block */
|
|
/*
|
|
* Warning: 'fpu' is dynamically-sized. It *MUST* be at
|
|
* the end.
|
|
*/
|
|
struct fpu fpu; /* FP and VX register save area */
|
|
};
|
|
|
|
/* Flag to disable transactions. */
|
|
#define PER_FLAG_NO_TE 1UL
|
|
/* Flag to enable random transaction aborts. */
|
|
#define PER_FLAG_TE_ABORT_RAND 2UL
|
|
/* Flag to specify random transaction abort mode:
|
|
* - abort each transaction at a random instruction before TEND if set.
|
|
* - abort random transactions at a random instruction if cleared.
|
|
*/
|
|
#define PER_FLAG_TE_ABORT_RAND_TEND 4UL
|
|
|
|
typedef struct thread_struct thread_struct;
|
|
|
|
/*
|
|
* Stack layout of a C stack frame.
|
|
*/
|
|
#ifndef __PACK_STACK
|
|
struct stack_frame {
|
|
unsigned long back_chain;
|
|
unsigned long empty1[5];
|
|
unsigned long gprs[10];
|
|
unsigned int empty2[8];
|
|
};
|
|
#else
|
|
struct stack_frame {
|
|
unsigned long empty1[5];
|
|
unsigned int empty2[8];
|
|
unsigned long gprs[10];
|
|
unsigned long back_chain;
|
|
};
|
|
#endif
|
|
|
|
#define ARCH_MIN_TASKALIGN 8
|
|
|
|
#define INIT_THREAD { \
|
|
.ksp = sizeof(init_stack) + (unsigned long) &init_stack, \
|
|
.fpu.regs = (void *) init_task.thread.fpu.fprs, \
|
|
}
|
|
|
|
/*
|
|
* Do necessary setup to start up a new thread.
|
|
*/
|
|
#define start_thread(regs, new_psw, new_stackp) do { \
|
|
regs->psw.mask = PSW_USER_BITS | PSW_MASK_EA | PSW_MASK_BA; \
|
|
regs->psw.addr = new_psw; \
|
|
regs->gprs[15] = new_stackp; \
|
|
execve_tail(); \
|
|
} while (0)
|
|
|
|
#define start_thread31(regs, new_psw, new_stackp) do { \
|
|
regs->psw.mask = PSW_USER_BITS | PSW_MASK_BA; \
|
|
regs->psw.addr = new_psw; \
|
|
regs->gprs[15] = new_stackp; \
|
|
crst_table_downgrade(current->mm); \
|
|
execve_tail(); \
|
|
} while (0)
|
|
|
|
/* Forward declaration, a strange C thing */
|
|
struct task_struct;
|
|
struct mm_struct;
|
|
struct seq_file;
|
|
|
|
typedef int (*dump_trace_func_t)(void *data, unsigned long address);
|
|
void dump_trace(dump_trace_func_t func, void *data,
|
|
struct task_struct *task, unsigned long sp);
|
|
|
|
void show_cacheinfo(struct seq_file *m);
|
|
|
|
/* Free all resources held by a thread. */
|
|
extern void release_thread(struct task_struct *);
|
|
|
|
/*
|
|
* Return saved PC of a blocked thread.
|
|
*/
|
|
extern unsigned long thread_saved_pc(struct task_struct *t);
|
|
|
|
unsigned long get_wchan(struct task_struct *p);
|
|
#define task_pt_regs(tsk) ((struct pt_regs *) \
|
|
(task_stack_page(tsk) + THREAD_SIZE) - 1)
|
|
#define KSTK_EIP(tsk) (task_pt_regs(tsk)->psw.addr)
|
|
#define KSTK_ESP(tsk) (task_pt_regs(tsk)->gprs[15])
|
|
|
|
/* Has task runtime instrumentation enabled ? */
|
|
#define is_ri_task(tsk) (!!(tsk)->thread.ri_cb)
|
|
|
|
static inline unsigned long current_stack_pointer(void)
|
|
{
|
|
unsigned long sp;
|
|
|
|
asm volatile("la %0,0(15)" : "=a" (sp));
|
|
return sp;
|
|
}
|
|
|
|
static inline unsigned short stap(void)
|
|
{
|
|
unsigned short cpu_address;
|
|
|
|
asm volatile("stap %0" : "=m" (cpu_address));
|
|
return cpu_address;
|
|
}
|
|
|
|
/*
|
|
* Give up the time slice of the virtual PU.
|
|
*/
|
|
void cpu_relax(void);
|
|
|
|
#define cpu_relax_lowlatency() barrier()
|
|
|
|
#define ECAG_CACHE_ATTRIBUTE 0
|
|
#define ECAG_CPU_ATTRIBUTE 1
|
|
|
|
static inline unsigned long __ecag(unsigned int asi, unsigned char parm)
|
|
{
|
|
unsigned long val;
|
|
|
|
asm volatile(".insn rsy,0xeb000000004c,%0,0,0(%1)" /* ecag */
|
|
: "=d" (val) : "a" (asi << 8 | parm));
|
|
return val;
|
|
}
|
|
|
|
static inline void psw_set_key(unsigned int key)
|
|
{
|
|
asm volatile("spka 0(%0)" : : "d" (key));
|
|
}
|
|
|
|
/*
|
|
* Set PSW to specified value.
|
|
*/
|
|
static inline void __load_psw(psw_t psw)
|
|
{
|
|
asm volatile("lpswe %0" : : "Q" (psw) : "cc");
|
|
}
|
|
|
|
/*
|
|
* Set PSW mask to specified value, while leaving the
|
|
* PSW addr pointing to the next instruction.
|
|
*/
|
|
static inline void __load_psw_mask(unsigned long mask)
|
|
{
|
|
unsigned long addr;
|
|
psw_t psw;
|
|
|
|
psw.mask = mask;
|
|
|
|
asm volatile(
|
|
" larl %0,1f\n"
|
|
" stg %0,%O1+8(%R1)\n"
|
|
" lpswe %1\n"
|
|
"1:"
|
|
: "=&d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");
|
|
}
|
|
|
|
/*
|
|
* Extract current PSW mask
|
|
*/
|
|
static inline unsigned long __extract_psw(void)
|
|
{
|
|
unsigned int reg1, reg2;
|
|
|
|
asm volatile("epsw %0,%1" : "=d" (reg1), "=a" (reg2));
|
|
return (((unsigned long) reg1) << 32) | ((unsigned long) reg2);
|
|
}
|
|
|
|
static inline void local_mcck_enable(void)
|
|
{
|
|
__load_psw_mask(__extract_psw() | PSW_MASK_MCHECK);
|
|
}
|
|
|
|
static inline void local_mcck_disable(void)
|
|
{
|
|
__load_psw_mask(__extract_psw() & ~PSW_MASK_MCHECK);
|
|
}
|
|
|
|
/*
|
|
* Rewind PSW instruction address by specified number of bytes.
|
|
*/
|
|
static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc)
|
|
{
|
|
unsigned long mask;
|
|
|
|
mask = (psw.mask & PSW_MASK_EA) ? -1UL :
|
|
(psw.mask & PSW_MASK_BA) ? (1UL << 31) - 1 :
|
|
(1UL << 24) - 1;
|
|
return (psw.addr - ilc) & mask;
|
|
}
|
|
|
|
/*
|
|
* Function to stop a processor until the next interrupt occurs
|
|
*/
|
|
void enabled_wait(void);
|
|
|
|
/*
|
|
* Function to drop a processor into disabled wait state
|
|
*/
|
|
static inline void __noreturn disabled_wait(unsigned long code)
|
|
{
|
|
psw_t psw;
|
|
|
|
psw.mask = PSW_MASK_BASE | PSW_MASK_WAIT | PSW_MASK_BA | PSW_MASK_EA;
|
|
psw.addr = code;
|
|
__load_psw(psw);
|
|
while (1);
|
|
}
|
|
|
|
/*
|
|
* Basic Machine Check/Program Check Handler.
|
|
*/
|
|
|
|
extern void s390_base_mcck_handler(void);
|
|
extern void s390_base_pgm_handler(void);
|
|
extern void s390_base_ext_handler(void);
|
|
|
|
extern void (*s390_base_mcck_handler_fn)(void);
|
|
extern void (*s390_base_pgm_handler_fn)(void);
|
|
extern void (*s390_base_ext_handler_fn)(void);
|
|
|
|
#define ARCH_LOW_ADDRESS_LIMIT 0x7fffffffUL
|
|
|
|
extern int memcpy_real(void *, void *, size_t);
|
|
extern void memcpy_absolute(void *, void *, size_t);
|
|
|
|
#define mem_assign_absolute(dest, val) { \
|
|
__typeof__(dest) __tmp = (val); \
|
|
\
|
|
BUILD_BUG_ON(sizeof(__tmp) != sizeof(val)); \
|
|
memcpy_absolute(&(dest), &__tmp, sizeof(__tmp)); \
|
|
}
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __ASM_S390_PROCESSOR_H */
|