forked from mirrors/linux
		
	 221bb8a46e
			
		
	
	
		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 ...
		
			
				
	
	
		
			174 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			174 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _LINUX_CONTEXT_TRACKING_H
 | |
| #define _LINUX_CONTEXT_TRACKING_H
 | |
| 
 | |
| #include <linux/sched.h>
 | |
| #include <linux/vtime.h>
 | |
| #include <linux/context_tracking_state.h>
 | |
| #include <asm/ptrace.h>
 | |
| 
 | |
| 
 | |
| #ifdef CONFIG_CONTEXT_TRACKING
 | |
| extern void context_tracking_cpu_set(int cpu);
 | |
| 
 | |
| /* Called with interrupts disabled.  */
 | |
| extern void __context_tracking_enter(enum ctx_state state);
 | |
| extern void __context_tracking_exit(enum ctx_state state);
 | |
| 
 | |
| extern void context_tracking_enter(enum ctx_state state);
 | |
| extern void context_tracking_exit(enum ctx_state state);
 | |
| extern void context_tracking_user_enter(void);
 | |
| extern void context_tracking_user_exit(void);
 | |
| 
 | |
| static inline void user_enter(void)
 | |
| {
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		context_tracking_enter(CONTEXT_USER);
 | |
| 
 | |
| }
 | |
| static inline void user_exit(void)
 | |
| {
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		context_tracking_exit(CONTEXT_USER);
 | |
| }
 | |
| 
 | |
| /* Called with interrupts disabled.  */
 | |
| static inline void user_enter_irqoff(void)
 | |
| {
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		__context_tracking_enter(CONTEXT_USER);
 | |
| 
 | |
| }
 | |
| static inline void user_exit_irqoff(void)
 | |
| {
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		__context_tracking_exit(CONTEXT_USER);
 | |
| }
 | |
| 
 | |
| static inline enum ctx_state exception_enter(void)
 | |
| {
 | |
| 	enum ctx_state prev_ctx;
 | |
| 
 | |
| 	if (!context_tracking_is_enabled())
 | |
| 		return 0;
 | |
| 
 | |
| 	prev_ctx = this_cpu_read(context_tracking.state);
 | |
| 	if (prev_ctx != CONTEXT_KERNEL)
 | |
| 		context_tracking_exit(prev_ctx);
 | |
| 
 | |
| 	return prev_ctx;
 | |
| }
 | |
| 
 | |
| static inline void exception_exit(enum ctx_state prev_ctx)
 | |
| {
 | |
| 	if (context_tracking_is_enabled()) {
 | |
| 		if (prev_ctx != CONTEXT_KERNEL)
 | |
| 			context_tracking_enter(prev_ctx);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| 
 | |
| /**
 | |
|  * ct_state() - return the current context tracking state if known
 | |
|  *
 | |
|  * Returns the current cpu's context tracking state if context tracking
 | |
|  * is enabled.  If context tracking is disabled, returns
 | |
|  * CONTEXT_DISABLED.  This should be used primarily for debugging.
 | |
|  */
 | |
| static inline enum ctx_state ct_state(void)
 | |
| {
 | |
| 	return context_tracking_is_enabled() ?
 | |
| 		this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
 | |
| }
 | |
| #else
 | |
| static inline void user_enter(void) { }
 | |
| static inline void user_exit(void) { }
 | |
| static inline void user_enter_irqoff(void) { }
 | |
| static inline void user_exit_irqoff(void) { }
 | |
| static inline enum ctx_state exception_enter(void) { return 0; }
 | |
| static inline void exception_exit(enum ctx_state prev_ctx) { }
 | |
| static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
 | |
| #endif /* !CONFIG_CONTEXT_TRACKING */
 | |
| 
 | |
| #define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond))
 | |
| 
 | |
| #ifdef CONFIG_CONTEXT_TRACKING_FORCE
 | |
| extern void context_tracking_init(void);
 | |
| #else
 | |
| static inline void context_tracking_init(void) { }
 | |
| #endif /* CONFIG_CONTEXT_TRACKING_FORCE */
 | |
| 
 | |
| 
 | |
| #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
 | |
| /* must be called with irqs disabled */
 | |
| static inline void guest_enter_irqoff(void)
 | |
| {
 | |
| 	if (vtime_accounting_cpu_enabled())
 | |
| 		vtime_guest_enter(current);
 | |
| 	else
 | |
| 		current->flags |= PF_VCPU;
 | |
| 
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		__context_tracking_enter(CONTEXT_GUEST);
 | |
| 
 | |
| 	/* KVM does not hold any references to rcu protected data when it
 | |
| 	 * switches CPU into a guest mode. In fact switching to a guest mode
 | |
| 	 * is very similar to exiting to userspace from rcu point of view. In
 | |
| 	 * addition CPU may stay in a guest mode for quite a long time (up to
 | |
| 	 * one time slice). Lets treat guest mode as quiescent state, just like
 | |
| 	 * we do with user-mode execution.
 | |
| 	 */
 | |
| 	if (!context_tracking_cpu_is_enabled())
 | |
| 		rcu_virt_note_context_switch(smp_processor_id());
 | |
| }
 | |
| 
 | |
| static inline void guest_exit_irqoff(void)
 | |
| {
 | |
| 	if (context_tracking_is_enabled())
 | |
| 		__context_tracking_exit(CONTEXT_GUEST);
 | |
| 
 | |
| 	if (vtime_accounting_cpu_enabled())
 | |
| 		vtime_guest_exit(current);
 | |
| 	else
 | |
| 		current->flags &= ~PF_VCPU;
 | |
| }
 | |
| 
 | |
| #else
 | |
| static inline void guest_enter_irqoff(void)
 | |
| {
 | |
| 	/*
 | |
| 	 * This is running in ioctl context so its safe
 | |
| 	 * to assume that it's the stime pending cputime
 | |
| 	 * to flush.
 | |
| 	 */
 | |
| 	vtime_account_system(current);
 | |
| 	current->flags |= PF_VCPU;
 | |
| 	rcu_virt_note_context_switch(smp_processor_id());
 | |
| }
 | |
| 
 | |
| static inline void guest_exit_irqoff(void)
 | |
| {
 | |
| 	/* Flush the guest cputime we spent on the guest */
 | |
| 	vtime_account_system(current);
 | |
| 	current->flags &= ~PF_VCPU;
 | |
| }
 | |
| #endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */
 | |
| 
 | |
| static inline void guest_enter(void)
 | |
| {
 | |
| 	unsigned long flags;
 | |
| 
 | |
| 	local_irq_save(flags);
 | |
| 	guest_enter_irqoff();
 | |
| 	local_irq_restore(flags);
 | |
| }
 | |
| 
 | |
| static inline void guest_exit(void)
 | |
| {
 | |
| 	unsigned long flags;
 | |
| 
 | |
| 	local_irq_save(flags);
 | |
| 	guest_exit_irqoff();
 | |
| 	local_irq_restore(flags);
 | |
| }
 | |
| 
 | |
| #endif
 |