Commit 53df84f8 authored by Guenther Hutzl's avatar Guenther Hutzl Committed by Christian Borntraeger
Browse files

KVM: s390: Enable guest EDAT2 support 



1. Enable EDAT2 in the list of KVM facilities

2. Handle 2G frames in pfmf instruction
If we support EDAT2, we may enable handling of 2G frames if not in 24
bit mode.

3. Enable EDAT2 in sie_block
If the EDAT2 facility is available we enable GED2 mode control in the
sie_block.

Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarGuenther Hutzl <hutzl@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a4a4f191

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct sca_block { 
#define CPUSTAT_MCDS       0x00000100

#define CPUSTAT_SM         0x00000080

#define CPUSTAT_IBS        0x00000040

#define CPUSTAT_GED2       0x00000010

#define CPUSTAT_G          0x00000008

#define CPUSTAT_GED        0x00000004

#define CPUSTAT_J          0x00000002

arch/s390/kvm/kvm-s390.c

+4 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
/* upper facilities limit for kvm */

unsigned long kvm_s390_fac_list_mask[] = {

	0xffe6fffbfcfdfc40UL,

	0x005c800000000000UL,

	0x005e800000000000UL,

};



unsigned long kvm_s390_fac_list_mask_size(void)
@@ -1313,7 +1313,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
						    CPUSTAT_SM |

						    CPUSTAT_STOPPED);



	if (test_kvm_facility(vcpu->kvm, 8))

	if (test_kvm_facility(vcpu->kvm, 78))

		atomic_set_mask(CPUSTAT_GED2, &vcpu->arch.sie_block->cpuflags);

	else if (test_kvm_facility(vcpu->kvm, 8))

		atomic_set_mask(CPUSTAT_GED, &vcpu->arch.sie_block->cpuflags);



	kvm_s390_vcpu_setup_model(vcpu);

arch/s390/kvm/priv.c

+6 −2
Original line number Diff line number Diff line
@@ -698,10 +698,14 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) 
	case 0x00001000:

		end = (start + (1UL << 20)) & ~((1UL << 20) - 1);

		break;

	/* We dont support EDAT2

	case 0x00002000:

		/* only support 2G frame size if EDAT2 is available and we are

		   not in 24-bit addressing mode */

		if (!test_kvm_facility(vcpu->kvm, 78) ||

		    psw_bits(vcpu->arch.sie_block->gpsw).eaba == PSW_AMODE_24BIT)

			return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		end = (start + (1UL << 31)) & ~((1UL << 31) - 1);

		break;*/

		break;

	default:

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE