Commit e8614e5e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-5.11-1' of... 

Merge tag 'kvm-s390-next-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Features and Test for 5.11

- memcg accouting for s390 specific parts of kvm and gmap
- selftest for diag318
- new kvm_stat for when async_pf falls back to sync

The selftest even triggers a non-critical bug that is unrelated
to diag318, fix will follow later.
parents 39485ed9 50a05be4

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ struct kvm_vcpu_stat { 
	u64 diagnose_308;

	u64 diagnose_500;

	u64 diagnose_other;

	u64 pfault_sync;

};



#define PGM_OPERATION			0x01

arch/s390/kvm/guestdbg.c

+4 −4
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int __import_wp_info(struct kvm_vcpu *vcpu, 
	if (wp_info->len < 0 || wp_info->len > MAX_WP_SIZE)

		return -EINVAL;



	wp_info->old_data = kmalloc(bp_data->len, GFP_KERNEL);

	wp_info->old_data = kmalloc(bp_data->len, GFP_KERNEL_ACCOUNT);

	if (!wp_info->old_data)

		return -ENOMEM;

	/* try to backup the original value */
@@ -234,7 +234,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, 
	if (nr_wp > 0) {

		wp_info = kmalloc_array(nr_wp,

					sizeof(*wp_info),

					GFP_KERNEL);

					GFP_KERNEL_ACCOUNT);

		if (!wp_info) {

			ret = -ENOMEM;

			goto error;
@@ -243,7 +243,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, 
	if (nr_bp > 0) {

		bp_info = kmalloc_array(nr_bp,

					sizeof(*bp_info),

					GFP_KERNEL);

					GFP_KERNEL_ACCOUNT);

		if (!bp_info) {

			ret = -ENOMEM;

			goto error;
@@ -349,7 +349,7 @@ static struct kvm_hw_wp_info_arch *any_wp_changed(struct kvm_vcpu *vcpu) 
		if (!wp_info || !wp_info->old_data || wp_info->len <= 0)

			continue;



		temp = kmalloc(wp_info->len, GFP_KERNEL);

		temp = kmalloc(wp_info->len, GFP_KERNEL_ACCOUNT);

		if (!temp)

			continue;

arch/s390/kvm/intercept.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu) 
	if (!kvm_s390_pv_cpu_is_protected(vcpu) && (addr & ~PAGE_MASK))

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	sctns = (void *)get_zeroed_page(GFP_KERNEL);

	sctns = (void *)get_zeroed_page(GFP_KERNEL_ACCOUNT);

	if (!sctns)

		return -ENOMEM;

arch/s390/kvm/interrupt.c

+5 −5
Original line number Diff line number Diff line
@@ -1792,7 +1792,7 @@ struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm, 
		goto out;

	}

gisa_out:

	tmp_inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	tmp_inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);

	if (tmp_inti) {

		tmp_inti->type = KVM_S390_INT_IO(1, 0, 0, 0);

		tmp_inti->io.io_int_word = isc_to_int_word(isc);
@@ -2015,7 +2015,7 @@ int kvm_s390_inject_vm(struct kvm *kvm, 
	struct kvm_s390_interrupt_info *inti;

	int rc;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);

	if (!inti)

		return -ENOMEM;
@@ -2414,7 +2414,7 @@ static int enqueue_floating_irq(struct kvm_device *dev, 
		return -EINVAL;



	while (len >= sizeof(struct kvm_s390_irq)) {

		inti = kzalloc(sizeof(*inti), GFP_KERNEL);

		inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);

		if (!inti)

			return -ENOMEM;
@@ -2462,7 +2462,7 @@ static int register_io_adapter(struct kvm_device *dev, 
	if (dev->kvm->arch.adapters[adapter_info.id] != NULL)

		return -EINVAL;



	adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);

	adapter = kzalloc(sizeof(*adapter), GFP_KERNEL_ACCOUNT);

	if (!adapter)

		return -ENOMEM;
@@ -3290,7 +3290,7 @@ int kvm_s390_gib_init(u8 nisc) 
		goto out;

	}



	gib = (struct kvm_s390_gib *)get_zeroed_page(GFP_KERNEL | GFP_DMA);

	gib = (struct kvm_s390_gib *)get_zeroed_page(GFP_KERNEL_ACCOUNT | GFP_DMA);

	if (!gib) {

		rc = -ENOMEM;

		goto out;

arch/s390/kvm/kvm-s390.c

+12 −10
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("userspace_handled", exit_userspace),

	VCPU_STAT("exit_null", exit_null),

	VCPU_STAT("pfault_sync", pfault_sync),

	VCPU_STAT("exit_validity", exit_validity),

	VCPU_STAT("exit_stop_request", exit_stop_request),

	VCPU_STAT("exit_external_request", exit_external_request),
@@ -1254,7 +1255,7 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr) 
		ret = -EBUSY;

		goto out;

	}

	proc = kzalloc(sizeof(*proc), GFP_KERNEL);

	proc = kzalloc(sizeof(*proc), GFP_KERNEL_ACCOUNT);

	if (!proc) {

		ret = -ENOMEM;

		goto out;
@@ -1416,7 +1417,7 @@ static int kvm_s390_get_processor(struct kvm *kvm, struct kvm_device_attr *attr) 
	struct kvm_s390_vm_cpu_processor *proc;

	int ret = 0;



	proc = kzalloc(sizeof(*proc), GFP_KERNEL);

	proc = kzalloc(sizeof(*proc), GFP_KERNEL_ACCOUNT);

	if (!proc) {

		ret = -ENOMEM;

		goto out;
@@ -1444,7 +1445,7 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr) 
	struct kvm_s390_vm_cpu_machine *mach;

	int ret = 0;



	mach = kzalloc(sizeof(*mach), GFP_KERNEL);

	mach = kzalloc(sizeof(*mach), GFP_KERNEL_ACCOUNT);

	if (!mach) {

		ret = -ENOMEM;

		goto out;
@@ -1812,7 +1813,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
	if (args->count < 1 || args->count > KVM_S390_SKEYS_MAX)

		return -EINVAL;



	keys = kvmalloc_array(args->count, sizeof(uint8_t), GFP_KERNEL);

	keys = kvmalloc_array(args->count, sizeof(uint8_t), GFP_KERNEL_ACCOUNT);

	if (!keys)

		return -ENOMEM;
@@ -1857,7 +1858,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
	if (args->count < 1 || args->count > KVM_S390_SKEYS_MAX)

		return -EINVAL;



	keys = kvmalloc_array(args->count, sizeof(uint8_t), GFP_KERNEL);

	keys = kvmalloc_array(args->count, sizeof(uint8_t), GFP_KERNEL_ACCOUNT);

	if (!keys)

		return -ENOMEM;
@@ -2625,7 +2626,7 @@ static void sca_dispose(struct kvm *kvm) 


int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

{

	gfp_t alloc_flags = GFP_KERNEL;

	gfp_t alloc_flags = GFP_KERNEL_ACCOUNT;

	int i, rc;

	char debug_name[16];

	static unsigned long sca_offset;
@@ -2670,7 +2671,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


	BUILD_BUG_ON(sizeof(struct sie_page2) != 4096);

	kvm->arch.sie_page2 =

	     (struct sie_page2 *) get_zeroed_page(GFP_KERNEL | GFP_DMA);

	     (struct sie_page2 *) get_zeroed_page(GFP_KERNEL_ACCOUNT | GFP_DMA);

	if (!kvm->arch.sie_page2)

		goto out_err;
@@ -2900,7 +2901,7 @@ static int sca_switch_to_extended(struct kvm *kvm) 
	if (kvm->arch.use_esca)

		return 0;



	new_sca = alloc_pages_exact(sizeof(*new_sca), GFP_KERNEL|__GFP_ZERO);

	new_sca = alloc_pages_exact(sizeof(*new_sca), GFP_KERNEL_ACCOUNT | __GFP_ZERO);

	if (!new_sca)

		return -ENOMEM;
@@ -3133,7 +3134,7 @@ void kvm_s390_vcpu_unsetup_cmma(struct kvm_vcpu *vcpu) 


int kvm_s390_vcpu_setup_cmma(struct kvm_vcpu *vcpu)

{

	vcpu->arch.sie_block->cbrlo = get_zeroed_page(GFP_KERNEL);

	vcpu->arch.sie_block->cbrlo = get_zeroed_page(GFP_KERNEL_ACCOUNT);

	if (!vcpu->arch.sie_block->cbrlo)

		return -ENOMEM;

	return 0;
@@ -3243,7 +3244,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	int rc;



	BUILD_BUG_ON(sizeof(struct sie_page) != 4096);

	sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL);

	sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL_ACCOUNT);

	if (!sie_page)

		return -ENOMEM;
@@ -4111,6 +4112,7 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason) 
		current->thread.gmap_pfault = 0;

		if (kvm_arch_setup_async_pf(vcpu))

			return 0;

		vcpu->stat.pfault_sync++;

		return kvm_arch_fault_in_page(vcpu, current->thread.gmap_addr, 1);

	}

	return vcpu_post_run_fault_in_sie(vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE