s390x: pv: Fence additional unavailable SCLP facilities for PV guests
PATCH v2 1/1 s390x: pv: Fence additional unavailable SCLP facilities for PV guests
There's no VSIE support for a protected guest, so let's better not advertise it and its support facilities.
---
v2: added hpma2
--- target/s390x/cpu_features.c | 39 ++++++++++++++++++++++++++++++++++++- target/s390x/cpu_models.c | 25 ++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-)
target/s390x/cpu_features.c +38 -1
@@ -107,8 +107,45 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, feat =find_next_bit (features,S390_FEAT_MAX , feat +1 ); } -if (type ==S390_FEAT_TYPE_SCLP_FAC134 &&s390_is_pv ()) { +if (!s390_is_pv ()) { +return ; + } + +/* +* Some facilities are not available for CPUs in protected mode: +* - All SIE facilities because SIE is not available +* - DIAG318 +* +* As VMs can move in and out of protected mode the CPU model +* doesn't protect us from that problem because it is only +* validated at the start of the VM. +*/ +switch (type) { +case S390_FEAT_TYPE_SCLP_CPU : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_F2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SKEY )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GPERE )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIGPIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IB )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CEI )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GSLS )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_HPMA2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_KSS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_64BSCAO )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CMMA )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_PFMFI )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IBS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_FAC134 :clear_be_bit (s390_feat_def (S390_FEAT_DIAG_318 )->bit, data); +break ; +default : +return ; } }
target/s390x/cpu_models.c +23 -2
@@ -239,8 +239,29 @@ bool s390_has_feat(S390Feat feat) }return 0 ; } -if (feat ==S390_FEAT_DIAG_318 &&s390_is_pv ()) { -return false; + +if (s390_is_pv ()) { +switch (feat) { +case S390_FEAT_DIAG_318 : +case S390_FEAT_HPMA2 : +case S390_FEAT_SIE_F2 : +case S390_FEAT_SIE_SKEY : +case S390_FEAT_SIE_GPERE : +case S390_FEAT_SIE_SIIF : +case S390_FEAT_SIE_SIGPIF : +case S390_FEAT_SIE_IB : +case S390_FEAT_SIE_CEI : +case S390_FEAT_SIE_KSS : +case S390_FEAT_SIE_GSLS : +case S390_FEAT_SIE_64BSCAO : +case S390_FEAT_SIE_CMMA : +case S390_FEAT_SIE_PFMFI : +case S390_FEAT_SIE_IBS : +return false; +break ; +default : +break ; + } }return test_bit (feat, cpu->model->features); }
Signature · 1 line
2.25.1
Quoted 4 lines · Janosch Frank
There's no VSIE support for a protected guest, so let's better not advertise it and its support facilities.
Signed-off-by Janosch Frank <[email protected]>
shall we add
or
?
Quoted 95 lines
---
v2: added hpma2--- target/s390x/cpu_features.c | 39 ++++++++++++++++++++++++++++++++++++- target/s390x/cpu_models.c | 25 ++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-)target/s390x/cpu_features.c +38
-1@@ -107,8 +107,45 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, feat =find_next_bit (features,S390_FEAT_MAX , feat +1 ); } -if (type ==S390_FEAT_TYPE_SCLP_FAC134 &&s390_is_pv ()) { +if (!s390_is_pv ()) { +return ; + } + +/* +* Some facilities are not available for CPUs in protected mode: +* - All SIE facilities because SIE is not available +* - DIAG318 +* +* As VMs can move in and out of protected mode the CPU model +* doesn't protect us from that problem because it is only +* validated at the start of the VM. +*/ +switch (type) { +case S390_FEAT_TYPE_SCLP_CPU : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_F2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SKEY )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GPERE )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIGPIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IB )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CEI )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GSLS )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_HPMA2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_KSS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_64BSCAO )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CMMA )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_PFMFI )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IBS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_FAC134 :clear_be_bit (s390_feat_def (S390_FEAT_DIAG_318 )->bit, data); +break ; +default : +return ; } }target/s390x/cpu_models.c +23
-2@@ -239,8 +239,29 @@ bool s390_has_feat(S390Feat feat) }return 0 ; } -if (feat ==S390_FEAT_DIAG_318 &&s390_is_pv ()) { -return false; + +if (s390_is_pv ()) { +switch (feat) { +case S390_FEAT_DIAG_318 : +case S390_FEAT_HPMA2 : +case S390_FEAT_SIE_F2 : +case S390_FEAT_SIE_SKEY : +case S390_FEAT_SIE_GPERE : +case S390_FEAT_SIE_SIIF : +case S390_FEAT_SIE_SIGPIF : +case S390_FEAT_SIE_IB : +case S390_FEAT_SIE_CEI : +case S390_FEAT_SIE_KSS : +case S390_FEAT_SIE_GSLS : +case S390_FEAT_SIE_64BSCAO : +case S390_FEAT_SIE_CMMA : +case S390_FEAT_SIE_PFMFI : +case S390_FEAT_SIE_IBS : +return false; +break ; +default : +break ; + } }return test_bit (feat, cpu->model->features); }
Quoted 6 lines · Christian Borntraeger
Quoted 3 lines · Janosch Frank
There's no VSIE support for a protected guest, so let's better not advertise it and its support facilities.
Quoted 8 lines
Quoted 1 line
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>shall we add
Fixes 0f73c5b30b8b ("s390x: protvirt: SCLP interpretation")or
Fixes c3347ed0d2ee ("s390x: protvirt: Support unpack facility")
Hmm, rather this one I'd guess
Quoted 98 lines
?
Quoted 95 lines
---
v2: added hpma2--- target/s390x/cpu_features.c | 39 ++++++++++++++++++++++++++++++++++++- target/s390x/cpu_models.c | 25 ++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-)target/s390x/cpu_features.c +38
-1@@ -107,8 +107,45 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, feat =find_next_bit (features,S390_FEAT_MAX , feat +1 ); } -if (type ==S390_FEAT_TYPE_SCLP_FAC134 &&s390_is_pv ()) { +if (!s390_is_pv ()) { +return ; + } + +/* +* Some facilities are not available for CPUs in protected mode: +* - All SIE facilities because SIE is not available +* - DIAG318 +* +* As VMs can move in and out of protected mode the CPU model +* doesn't protect us from that problem because it is only +* validated at the start of the VM. +*/ +switch (type) { +case S390_FEAT_TYPE_SCLP_CPU : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_F2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SKEY )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GPERE )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_SIGPIF )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IB )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CEI )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_GSLS )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_HPMA2 )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_KSS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT : +clear_be_bit (s390_feat_def (S390_FEAT_SIE_64BSCAO )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_CMMA )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_PFMFI )->bit, data); +clear_be_bit (s390_feat_def (S390_FEAT_SIE_IBS )->bit, data); +break ; +case S390_FEAT_TYPE_SCLP_FAC134 :clear_be_bit (s390_feat_def (S390_FEAT_DIAG_318 )->bit, data); +break ; +default : +return ; } }target/s390x/cpu_models.c +23
-2@@ -239,8 +239,29 @@ bool s390_has_feat(S390Feat feat) }return 0 ; } -if (feat ==S390_FEAT_DIAG_318 &&s390_is_pv ()) { -return false; + +if (s390_is_pv ()) { +switch (feat) { +case S390_FEAT_DIAG_318 : +case S390_FEAT_HPMA2 : +case S390_FEAT_SIE_F2 : +case S390_FEAT_SIE_SKEY : +case S390_FEAT_SIE_GPERE : +case S390_FEAT_SIE_SIIF : +case S390_FEAT_SIE_SIGPIF : +case S390_FEAT_SIE_IB : +case S390_FEAT_SIE_CEI : +case S390_FEAT_SIE_KSS : +case S390_FEAT_SIE_GSLS : +case S390_FEAT_SIE_64BSCAO : +case S390_FEAT_SIE_CMMA : +case S390_FEAT_SIE_PFMFI : +case S390_FEAT_SIE_IBS : +return false; +break ; +default : +break ; + } }return test_bit (feat, cpu->model->features); }
Quoted 4 lines · Janosch Frank
There's no VSIE support for a protected guest, so let's better not advertise it and its support facilities.
Signed-off-by Janosch Frank <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb
Cornelia Huck
AppliedQuoted 10 lines · On Fri, 11 Dec 2020 05:51:09 -0500 Janosch Frank <[email protected]> wrote:
There's no VSIE support for a protected guest, so let's better not advertise it and its support facilities.
Signed-off-by Janosch Frank <[email protected]>---
v2: added hpma2--- target/s390x/cpu_features.c | 39 ++++++++++++++++++++++++++++++++++++- target/s390x/cpu_models.c | 25 ++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-)
Thanks, applied.