hw/s390x/sclp.c | 2 ++ include/hw/s390x/sclp.h | 4 +++- linux-headers/asm-s390/kvm.h | 1 + target/s390x/cpu_features.c | 3 +++ target/s390x/cpu_features.h | 1 + target/s390x/cpu_features_def.h.inc | 3 +++ target/s390x/cpu_models.c | 2 ++ target/s390x/gen-features.c | 2 ++ target/s390x/kvm/kvm.c | 1 + 9 files changed, 18 insertions(+), 1 deletion(-)
Allow propagation of the ASTFLEIE2 feature bit.
If the host does have the ASTFLE Interpretive Execution Facility 2 the
guest can enable the ASTFLE format 2 for its guests.
Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
---
Cc: qemu-devel@nongnu.org
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Eric Farman <farman@linux.ibm.com>
Cc: Matthew Rosato <mjrosato@linux.ibm.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
To: qemu-s390x@nongnu.org
Cc: kvm@vger.kernel.org
---
@Christian, @Hendrik: Please confirm that we want to add ASTFLEIE2 to
the Z16 default facilities.
---
hw/s390x/sclp.c | 2 ++
include/hw/s390x/sclp.h | 4 +++-
linux-headers/asm-s390/kvm.h | 1 +
target/s390x/cpu_features.c | 3 +++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h.inc | 3 +++
target/s390x/cpu_models.c | 2 ++
target/s390x/gen-features.c | 2 ++
target/s390x/kvm/kvm.c | 1 +
9 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index b9c3983df195c4130ad91e06d05c43afc6f5d9d2..2d2cde7803ff45f531047944a15308d4077eda3a 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -146,6 +146,8 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB)) {
s390_get_feat_block(S390_FEAT_TYPE_SCLP_FAC134,
&read_info->fac134);
+ s390_get_feat_block(S390_FEAT_TYPE_SCLP_FAC139,
+ &read_info->fac139);
}
read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO |
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index ddc61f1c21480824971888207c4ffbfb381b464b..e1f9b0f6bc10d4b2157da2e5fc8f85f8f755efb3 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -136,7 +136,9 @@ typedef struct ReadInfo {
uint32_t hmfai;
uint8_t _reserved7[134 - 128]; /* 128-133 */
uint8_t fac134;
- uint8_t _reserved8[144 - 135]; /* 135-143 */
+ uint8_t _reserved8[139 - 135]; /* 135-138 */
+ uint8_t fac139;
+ uint8_t _reserved9[144 - 140]; /* 140-143 */
struct CPUEntry entries[];
/*
* When the Extended-Length SCCB (ELS) feature is enabled the
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
index ab5a6bce590c722452dac5aeb476bd1969d2235b..45a6d0a7406a3f1b71026c49e00ac25a6fc620ef 100644
--- a/linux-headers/asm-s390/kvm.h
+++ b/linux-headers/asm-s390/kvm.h
@@ -444,6 +444,7 @@ struct kvm_s390_vm_cpu_machine {
#define KVM_S390_VM_CPU_FEAT_PFMFI 11
#define KVM_S390_VM_CPU_FEAT_SIGPIF 12
#define KVM_S390_VM_CPU_FEAT_KSS 13
+#define KVM_S390_VM_CPU_FEAT_ASTFLEIE2 14
struct kvm_s390_vm_cpu_feat {
__u64 feat[16];
};
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 4b5be6798ef5460c71aa0f2567ebeb0aeb9551da..896914888aa98938f4e1984cec599c5f823b0d9a 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -148,6 +148,9 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_SCLP_FAC134:
clear_be_bit(s390_feat_def(S390_FEAT_DIAG_318)->bit, data);
break;
+ case S390_FEAT_TYPE_SCLP_FAC139:
+ clear_be_bit(s390_feat_def(S390_FEAT_SIE_ASTFLEIE2)->bit, data);
+ break;
default:
return;
}
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index 5635839d032900089515a440bedb0aca6139a41a..52a82da751ec5ac10fc738121ea28a095c08e8c4 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -24,6 +24,7 @@ typedef enum {
S390_FEAT_TYPE_SCLP_CONF_CHAR,
S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT,
S390_FEAT_TYPE_SCLP_FAC134,
+ S390_FEAT_TYPE_SCLP_FAC139,
S390_FEAT_TYPE_SCLP_CPU,
S390_FEAT_TYPE_MISC,
S390_FEAT_TYPE_PLO,
diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
index c017bffcdc4d6fb14855ceaf1e47a2c58865befd..c1eb9c29c595e758329295b8514b0bb777a073af 100644
--- a/target/s390x/cpu_features_def.h.inc
+++ b/target/s390x/cpu_features_def.h.inc
@@ -139,6 +139,9 @@ DEF_FEAT(SIE_IBS, "ibs", SCLP_CONF_CHAR_EXT, 10, "SIE: Interlock-and-broadcast-s
/* Features exposed via SCLP SCCB Facilities byte 134 (bit numbers relative to byte-134) */
DEF_FEAT(DIAG_318, "diag318", SCLP_FAC134, 0, "Control program name and version codes")
+/* Features exposed via SCLP SCCB Facilities byte 139 (bit numbers relative to byte-139) */
+DEF_FEAT(SIE_ASTFLEIE2, "astfleie2", SCLP_FAC139, 1, "SIE: alternate STFLE interpretation facility 2")
+
/* Features exposed via SCLP CPU info. */
DEF_FEAT(SIE_F2, "sief2", SCLP_CPU, 4, "SIE: interception format 2 (Virtual SIE)")
DEF_FEAT(SIE_SKEY, "skey", SCLP_CPU, 5, "SIE: Storage-key facility")
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 954a7a99a9e9b79dfb48639993055a10f8f281d8..128f6643ea235a4ab43834b7044929de885a7fab 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -263,6 +263,7 @@ bool s390_has_feat(S390Feat feat)
case S390_FEAT_SIE_PFMFI:
case S390_FEAT_SIE_IBS:
case S390_FEAT_CONFIGURATION_TOPOLOGY:
+ case S390_FEAT_SIE_ASTFLEIE2:
return false;
break;
default:
@@ -553,6 +554,7 @@ static void check_consistency(const S390CPUModel *model)
{ S390_FEAT_PLO_QSTG, S390_FEAT_PLO_EXT },
{ S390_FEAT_PLO_QSTX, S390_FEAT_PLO_EXT },
{ S390_FEAT_PLO_QSTO, S390_FEAT_PLO_EXT },
+ { S390_FEAT_SIE_ASTFLEIE2, S390_FEAT_STFLE },
};
int i;
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 8218e6470ec9c8c5eaa3eb7c56f04ee44e8b7ea0..a4013bd2341dd89c742010b4a6d09cfb4ff5e286 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -720,6 +720,7 @@ static uint16_t full_GEN16_GA1[] = {
S390_FEAT_PAIE,
S390_FEAT_UV_FEAT_AP,
S390_FEAT_UV_FEAT_AP_INTR,
+ S390_FEAT_SIE_ASTFLEIE2,
};
static uint16_t full_GEN17_GA1[] = {
@@ -829,6 +830,7 @@ static uint16_t default_GEN16_GA1[] = {
S390_FEAT_RDP,
S390_FEAT_PAI,
S390_FEAT_PAIE,
+ S390_FEAT_SIE_ASTFLEIE2,
};
static uint16_t default_GEN17_GA1[] = {
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 54d28e37d4dda8e341675e6bbaf5cc74ca80f45f..a4733365db3702ea17719a68cefd6fd85d2c8633 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -2305,6 +2305,7 @@ static int kvm_to_feat[][2] = {
{ KVM_S390_VM_CPU_FEAT_PFMFI, S390_FEAT_SIE_PFMFI},
{ KVM_S390_VM_CPU_FEAT_SIGPIF, S390_FEAT_SIE_SIGPIF},
{ KVM_S390_VM_CPU_FEAT_KSS, S390_FEAT_SIE_KSS},
+ { KVM_S390_VM_CPU_FEAT_ASTFLEIE2, S390_FEAT_SIE_ASTFLEIE2 },
};
static int query_cpu_feat(S390FeatBitmap features)
---
base-commit: 0b91040d23dc8820724a60c811223b777f3bc6b7
change-id: 20260209-astfleie2-85eec9fd9213
Best regards,
--
Christoph Schlameuss <schlameuss@linux.ibm.com>Am 11.02.26 um 15:56 schrieb Christoph Schlameuss: > Allow propagation of the ASTFLEIE2 feature bit. > > If the host does have the ASTFLE Interpretive Execution Facility 2 the > guest can enable the ASTFLE format 2 for its guests. > > Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> > --- > Cc: qemu-devel@nongnu.org > Cc: Halil Pasic <pasic@linux.ibm.com> > Cc: Christian Borntraeger <borntraeger@linux.ibm.com> > Cc: Eric Farman <farman@linux.ibm.com> > Cc: Matthew Rosato <mjrosato@linux.ibm.com> > Cc: Richard Henderson <richard.henderson@linaro.org> > Cc: Ilya Leoshkevich <iii@linux.ibm.com> > Cc: David Hildenbrand <david@kernel.org> > Cc: Thomas Huth <thuth@redhat.com> > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Hendrik Brueckner <brueckner@linux.ibm.com> > Cc: Nina Schoetterl-Glausch <nsg@linux.ibm.com> > To: qemu-s390x@nongnu.org > Cc: kvm@vger.kernel.org > --- > > @Christian, @Hendrik: Please confirm that we want to add ASTFLEIE2 to > the Z16 default facilities. This depends on the sie facility (sie format2) so I guess it should not be default but rather FULL model.
On Mon Feb 16, 2026 at 8:44 PM CET, Christian Borntraeger wrote: > > > Am 11.02.26 um 15:56 schrieb Christoph Schlameuss: >> Allow propagation of the ASTFLEIE2 feature bit. >> >> If the host does have the ASTFLE Interpretive Execution Facility 2 the >> guest can enable the ASTFLE format 2 for its guests. >> >> Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> >> --- >> Cc: qemu-devel@nongnu.org >> Cc: Halil Pasic <pasic@linux.ibm.com> >> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> >> Cc: Eric Farman <farman@linux.ibm.com> >> Cc: Matthew Rosato <mjrosato@linux.ibm.com> >> Cc: Richard Henderson <richard.henderson@linaro.org> >> Cc: Ilya Leoshkevich <iii@linux.ibm.com> >> Cc: David Hildenbrand <david@kernel.org> >> Cc: Thomas Huth <thuth@redhat.com> >> Cc: Michael S. Tsirkin <mst@redhat.com> >> Cc: Cornelia Huck <cohuck@redhat.com> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: Hendrik Brueckner <brueckner@linux.ibm.com> >> Cc: Nina Schoetterl-Glausch <nsg@linux.ibm.com> >> To: qemu-s390x@nongnu.org >> Cc: kvm@vger.kernel.org >> --- >> >> @Christian, @Hendrik: Please confirm that we want to add ASTFLEIE2 to >> the Z16 default facilities. > > This depends on the sie facility (sie format2) so I guess it should not be default > but rather FULL model. Thank you, will limit it to the full model in the next version.
On Wed, 2026-02-11 at 15:56 +0100, Christoph Schlameuss wrote: > Allow propagation of the ASTFLEIE2 feature bit. > > If the host does have the ASTFLE Interpretive Execution Facility 2 the > guest can enable the ASTFLE format 2 for its guests. > > Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Ehningen / Registergericht: Amtsgericht Stuttgart, HRB 243294
On 11/02/2026 15.56, Christoph Schlameuss wrote:
> Allow propagation of the ASTFLEIE2 feature bit.
>
> If the host does have the ASTFLE Interpretive Execution Facility 2 the
> guest can enable the ASTFLE format 2 for its guests.
>
> Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
> ---
...
> diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
> index ab5a6bce590c722452dac5aeb476bd1969d2235b..45a6d0a7406a3f1b71026c49e00ac25a6fc620ef 100644
> --- a/linux-headers/asm-s390/kvm.h
> +++ b/linux-headers/asm-s390/kvm.h
> @@ -444,6 +444,7 @@ struct kvm_s390_vm_cpu_machine {
> #define KVM_S390_VM_CPU_FEAT_PFMFI 11
> #define KVM_S390_VM_CPU_FEAT_SIGPIF 12
> #define KVM_S390_VM_CPU_FEAT_KSS 13
> +#define KVM_S390_VM_CPU_FEAT_ASTFLEIE2 14
> struct kvm_s390_vm_cpu_feat {
> __u64 feat[16];
> };
Hi!
Please don't send updates to linux-headers/ embedded in patches, such
updates should go via a separate patch instead that has been created by the
scripts/update-linux-headers.sh script.
Thanks,
Thomas
On Wed Feb 11, 2026 at 5:00 PM CET, Thomas Huth wrote:
> On 11/02/2026 15.56, Christoph Schlameuss wrote:
>> Allow propagation of the ASTFLEIE2 feature bit.
>>
>> If the host does have the ASTFLE Interpretive Execution Facility 2 the
>> guest can enable the ASTFLE format 2 for its guests.
>>
>> Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
>> ---
> ...
>> diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
>> index ab5a6bce590c722452dac5aeb476bd1969d2235b..45a6d0a7406a3f1b71026c49e00ac25a6fc620ef 100644
>> --- a/linux-headers/asm-s390/kvm.h
>> +++ b/linux-headers/asm-s390/kvm.h
>> @@ -444,6 +444,7 @@ struct kvm_s390_vm_cpu_machine {
>> #define KVM_S390_VM_CPU_FEAT_PFMFI 11
>> #define KVM_S390_VM_CPU_FEAT_SIGPIF 12
>> #define KVM_S390_VM_CPU_FEAT_KSS 13
>> +#define KVM_S390_VM_CPU_FEAT_ASTFLEIE2 14
>> struct kvm_s390_vm_cpu_feat {
>> __u64 feat[16];
>> };
> Hi!
>
> Please don't send updates to linux-headers/ embedded in patches, such
> updates should go via a separate patch instead that has been created by the
> scripts/update-linux-headers.sh script.
>
> Thanks,
> Thomas
Ah, yes, thank you for the headsup.
I will split this up then into two proper commits for the next series
version. I will just wait for some more feedback before sending that out.
© 2016 - 2026 Red Hat, Inc.