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: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Guenther Hutzl <hutzl@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

2 files changed, 10 insertions, 4 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 2da36c432aea..142d9b40528d 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -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);
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index d22d8ee1ff9d..ad4242245771 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -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);
         }