Commit 9a8fb9ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: shut up uninit compiler warning in paging_tmpl.h
  KVM: Ignore reads to K7 EVNTSEL MSRs
  KVM: VMX: Handle vmx instruction vmexits
  KVM: s390: Allow stfle instruction in the guest
  KVM: kvm/x86_emulate.c toggle_interruptibility() should be static
  KVM: ia64: fix ia64 build due to missing kallsyms_lookup() and double export
  KVM: protect concurrent make_all_cpus_request
  KVM: MMU: Allow 4K ptes with bit 7 (PAT) set
  KVM: Fix dirty bit tracking for slots with large pages
parents 4142ac67 bde89223

arch/ia64/kvm/kvm_lib.c

+6 −0
Original line number Diff line number Diff line
@@ -11,5 +11,11 @@ 
 *

 */

#undef CONFIG_MODULES

#include <linux/module.h>

#undef CONFIG_KALLSYMS

#undef EXPORT_SYMBOL

#undef EXPORT_SYMBOL_GPL

#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)

#include "../../../lib/vsprintf.c"

#include "../../../lib/ctype.c"

arch/s390/include/asm/kvm_host.h

+3 −1
Original line number Diff line number Diff line
@@ -99,7 +99,9 @@ struct kvm_s390_sie_block { 
	__u8	reservedd0[48];		/* 0x00d0 */

	__u64	gcr[16];		/* 0x0100 */

	__u64	gbea;			/* 0x0180 */

	__u8	reserved188[120];	/* 0x0188 */

	__u8	reserved188[24];	/* 0x0188 */

	__u32	fac;			/* 0x01a0 */

	__u8	reserved1a4[92];	/* 0x01a4 */

} __attribute__((packed));



struct kvm_vcpu_stat {

arch/s390/kvm/kvm-s390.c

+22 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/lowcore.h>

#include <asm/pgtable.h>

#include <asm/nmi.h>

#include <asm/system.h>

#include "kvm-s390.h"

#include "gaccess.h"
@@ -69,6 +70,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ NULL }

};



static unsigned long long *facilities;



/* Section: not file related */

void kvm_arch_hardware_enable(void *garbage)
@@ -288,6 +290,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	vcpu->arch.sie_block->gmsor = vcpu->kvm->arch.guest_origin;

	vcpu->arch.sie_block->ecb   = 2;

	vcpu->arch.sie_block->eca   = 0xC1002001U;

	vcpu->arch.sie_block->fac   = (int) (long) facilities;

	hrtimer_init(&vcpu->arch.ckc_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);

	tasklet_init(&vcpu->arch.tasklet, kvm_s390_tasklet,

		     (unsigned long) vcpu);
@@ -739,11 +742,29 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) 


static int __init kvm_s390_init(void)

{

	return kvm_init(NULL, sizeof(struct kvm_vcpu), THIS_MODULE);

	int ret;

	ret = kvm_init(NULL, sizeof(struct kvm_vcpu), THIS_MODULE);

	if (ret)

		return ret;



	/*

	 * guests can ask for up to 255+1 double words, we need a full page

	 * to hold the maximum amount of facilites. On the other hand, we

	 * only set facilities that are known to work in KVM.

	 */

	facilities = (unsigned long long *) get_zeroed_page(GFP_DMA);

	if (!facilities) {

		kvm_exit();

		return -ENOMEM;

	}

	stfle(facilities, 1);

	facilities[0] &= 0xff00fff3f0700000ULL;

	return 0;

}



static void __exit kvm_s390_exit(void)

{

	free_page((unsigned long) facilities);

	kvm_exit();

}

arch/s390/kvm/priv.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int handle_stfl(struct kvm_vcpu *vcpu) 


	vcpu->stat.instruction_stfl++;

	/* only pass the facility bits, which we can handle */

	facility_list &= 0xfe00fff3;

	facility_list &= 0xff00fff3;



	rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),

			   &facility_list, sizeof(facility_list));

arch/x86/kvm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		else

			/* 32 bits PSE 4MB page */

			context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

	case PT32E_ROOT_LEVEL:

		context->rsvd_bits_mask[0][2] =
@@ -2170,7 +2170,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

			rsvd_bits(maxphyaddr, 62) |

			rsvd_bits(13, 20);		/* large page */

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

	case PT64_ROOT_LEVEL:

		context->rsvd_bits_mask[0][3] = exb_bit_rsvd |
@@ -2186,7 +2186,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

			rsvd_bits(maxphyaddr, 51) |

			rsvd_bits(13, 20);		/* large page */

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE