Commit 79b1e565 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

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

KVM: s390: Features for 5.14

- new HW facilities for guests
- make inline assembly more robust with KASAN and co
parents a01b45e9 1f703d2c

arch/s390/kvm/kvm-s390.c

+13 −9
Original line number Diff line number Diff line
@@ -349,31 +349,31 @@ static void allow_cpu_feat(unsigned long nr) 


static inline int plo_test_bit(unsigned char nr)

{

	register unsigned long r0 asm("0") = (unsigned long) nr | 0x100;

	unsigned long function = (unsigned long)nr | 0x100;

	int cc;



	asm volatile(

		"	lgr	0,%[function]\n"

		/* Parameter registers are ignored for "test bit" */

		"	plo	0,0,0,0(0)\n"

		"	ipm	%0\n"

		"	srl	%0,28\n"

		: "=d" (cc)

		: "d" (r0)

		: "cc");

		: [function] "d" (function)

		: "cc", "0");

	return cc == 0;

}



static __always_inline void __insn32_query(unsigned int opcode, u8 *query)

{

	register unsigned long r0 asm("0") = 0;	/* query function */

	register unsigned long r1 asm("1") = (unsigned long) query;



	asm volatile(

		/* Parameter regs are ignored */

		"	lghi	0,0\n"

		"	lgr	1,%[query]\n"

		/* Parameter registers are ignored */

		"	.insn	rrf,%[opc] << 16,2,4,6,0\n"

		:

		: "d" (r0), "a" (r1), [opc] "i" (opcode)

		: "cc", "memory");

		: [query] "d" ((unsigned long)query), [opc] "i" (opcode)

		: "cc", "memory", "0", "1");

}



#define INSN_SORTL 0xb938
@@ -733,6 +733,10 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap) 
				set_kvm_facility(kvm->arch.model.fac_mask, 152);

				set_kvm_facility(kvm->arch.model.fac_list, 152);

			}

			if (test_facility(192)) {

				set_kvm_facility(kvm->arch.model.fac_mask, 192);

				set_kvm_facility(kvm->arch.model.fac_list, 192);

			}

			r = 0;

		} else

			r = -EINVAL;

arch/s390/tools/gen_facilities.c

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ static struct facility_def facility_defs[] = { 
			12, /* AP Query Configuration Information */

			15, /* AP Facilities Test */

			156, /* etoken facility */

			165, /* nnpa facility */

			193, /* bear enhancement facility */

			194, /* rdp enhancement facility */

			196, /* processor activity instrumentation facility */

			-1  /* END */

		}

	},