Commit 515f7141 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:

 - Check for invalid flags to KVM_CAP_X86_USER_SPACE_MSR

 - Fix use of sched_setaffinity in selftests

 - Sync kernel headers to tools

 - Fix KVM_STATS_UNIT_MAX

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Protect the unused bits in MSR exiting flags
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  KVM: selftests: Fix target thread to be migrated in rseq_test
  KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats
parents 301c8949 cf5029d5

Documentation/virt/kvm/api.rst

+1 −1
Original line number Diff line number Diff line
@@ -5658,7 +5658,7 @@ by a string of size ``name_size``. 
	#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES

	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN



	#define KVM_STATS_BASE_SHIFT		8

	#define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)

arch/x86/kvm/x86.c

+8 −0
Original line number Diff line number Diff line
@@ -6029,6 +6029,11 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, 
		r = 0;

		break;

	case KVM_CAP_X86_USER_SPACE_MSR:

		r = -EINVAL;

		if (cap->args[0] & ~(KVM_MSR_EXIT_REASON_INVAL |

				     KVM_MSR_EXIT_REASON_UNKNOWN |

				     KVM_MSR_EXIT_REASON_FILTER))

			break;

		kvm->arch.user_space_msr_mask = cap->args[0];

		r = 0;

		break;
@@ -6183,6 +6188,9 @@ static int kvm_vm_ioctl_set_msr_filter(struct kvm *kvm, void __user *argp) 
	if (copy_from_user(&filter, user_msr_filter, sizeof(filter)))

		return -EFAULT;



	if (filter.flags & ~KVM_MSR_FILTER_DEFAULT_DENY)

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(filter.ranges); i++)

		empty &= !filter.ranges[i].nmsrs;

include/uapi/linux/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -2084,7 +2084,7 @@ struct kvm_stats_header { 
#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES

#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN



#define KVM_STATS_BASE_SHIFT		8

#define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)

tools/include/uapi/linux/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -2084,7 +2084,7 @@ struct kvm_stats_header { 
#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)

#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES

#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN



#define KVM_STATS_BASE_SHIFT		8

#define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)

tools/testing/selftests/kvm/rseq_test.c

+5 −3
Original line number Diff line number Diff line
@@ -82,8 +82,9 @@ static int next_cpu(int cpu) 
	return cpu;

}



static void *migration_worker(void *ign)

static void *migration_worker(void *__rseq_tid)

{

	pid_t rseq_tid = (pid_t)(unsigned long)__rseq_tid;

	cpu_set_t allowed_mask;

	int r, i, cpu;
@@ -106,7 +107,7 @@ static void *migration_worker(void *ign) 
		 * stable, i.e. while changing affinity is in-progress.

		 */

		smp_wmb();

		r = sched_setaffinity(0, sizeof(allowed_mask), &allowed_mask);

		r = sched_setaffinity(rseq_tid, sizeof(allowed_mask), &allowed_mask);

		TEST_ASSERT(!r, "sched_setaffinity failed, errno = %d (%s)",

			    errno, strerror(errno));

		smp_wmb();
@@ -231,7 +232,8 @@ int main(int argc, char *argv[]) 
	vm = vm_create_default(VCPU_ID, 0, guest_code);

	ucall_init(vm, NULL);



	pthread_create(&migration_thread, NULL, migration_worker, 0);

	pthread_create(&migration_thread, NULL, migration_worker,

		       (void *)(unsigned long)gettid());



	for (i = 0; !done; i++) {

		vcpu_run(vm, VCPU_ID);