| Message ID | 20220726194852.171039-1-borntraeger@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x/cpumodel: add stfl197 processor-activity-instrumentation extension 1 | expand |
On 26.07.22 21:48, Christian Borntraeger wrote: > Add stfle 197 (processor-activity-instrumentation extension 1) to the > gen16 default model and fence it off for 7.0 and older. QEMU is already in soft-freeze. I assume you want to get this still into 7.1. (decision not in my hands :) ) Anyhow, if a re-target to the next release is required or not Reviewed-by: David Hildenbrand <david@redhat.com> > > Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> > --- > hw/s390x/s390-virtio-ccw.c | 1 + > target/s390x/cpu_features_def.h.inc | 1 + > target/s390x/gen-features.c | 2 ++ > 3 files changed, 4 insertions(+) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index cc3097bfee80..6268aa5d0888 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -806,6 +806,7 @@ static void ccw_machine_7_0_instance_options(MachineState *machine) > static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_0 }; > > ccw_machine_7_1_instance_options(machine); > + s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); > s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); > } > > diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc > index 3603e5fb12c6..e3cfe637354b 100644 > --- a/target/s390x/cpu_features_def.h.inc > +++ b/target/s390x/cpu_features_def.h.inc > @@ -114,6 +114,7 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decima > DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility") > DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility") > DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility") > +DEF_FEAT(PAIE, "paie", STFL, 197, "Processor-Activity-Instrumentation extension-1") > > /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */ > DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility") > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index ad140184b903..1558c5262616 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -575,6 +575,7 @@ static uint16_t full_GEN16_GA1[] = { > S390_FEAT_BEAR_ENH, > S390_FEAT_RDP, > S390_FEAT_PAI, > + S390_FEAT_PAIE, > }; > > > @@ -669,6 +670,7 @@ static uint16_t default_GEN16_GA1[] = { > S390_FEAT_BEAR_ENH, > S390_FEAT_RDP, > S390_FEAT_PAI, > + S390_FEAT_PAIE, > }; > > /* QEMU (CPU model) features */
Am 26.07.22 um 22:00 schrieb David Hildenbrand: > On 26.07.22 21:48, Christian Borntraeger wrote: >> Add stfle 197 (processor-activity-instrumentation extension 1) to the >> gen16 default model and fence it off for 7.0 and older. > > QEMU is already in soft-freeze. I assume you want to get this still into > 7.1. (decision not in my hands :) ) Right, 7.1 and 7.2 are both valid options. > Anyhow, if a re-target to the next release is required or not > > Reviewed-by: David Hildenbrand <david@redhat.com> > >> >> Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> >> --- >> hw/s390x/s390-virtio-ccw.c | 1 + >> target/s390x/cpu_features_def.h.inc | 1 + >> target/s390x/gen-features.c | 2 ++ >> 3 files changed, 4 insertions(+) >> >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index cc3097bfee80..6268aa5d0888 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -806,6 +806,7 @@ static void ccw_machine_7_0_instance_options(MachineState *machine) >> static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_0 }; >> >> ccw_machine_7_1_instance_options(machine); >> + s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); >> s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); >> } >> >> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc >> index 3603e5fb12c6..e3cfe637354b 100644 >> --- a/target/s390x/cpu_features_def.h.inc >> +++ b/target/s390x/cpu_features_def.h.inc >> @@ -114,6 +114,7 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decima >> DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility") >> DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility") >> DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility") >> +DEF_FEAT(PAIE, "paie", STFL, 197, "Processor-Activity-Instrumentation extension-1") >> >> /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */ >> DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility") >> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c >> index ad140184b903..1558c5262616 100644 >> --- a/target/s390x/gen-features.c >> +++ b/target/s390x/gen-features.c >> @@ -575,6 +575,7 @@ static uint16_t full_GEN16_GA1[] = { >> S390_FEAT_BEAR_ENH, >> S390_FEAT_RDP, >> S390_FEAT_PAI, >> + S390_FEAT_PAIE, >> }; >> >> >> @@ -669,6 +670,7 @@ static uint16_t default_GEN16_GA1[] = { >> S390_FEAT_BEAR_ENH, >> S390_FEAT_RDP, >> S390_FEAT_PAI, >> + S390_FEAT_PAIE, >> }; >> >> /* QEMU (CPU model) features */ > >
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index cc3097bfee80..6268aa5d0888 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -806,6 +806,7 @@ static void ccw_machine_7_0_instance_options(MachineState *machine) static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_0 }; ccw_machine_7_1_instance_options(machine); + s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); } diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc index 3603e5fb12c6..e3cfe637354b 100644 --- a/target/s390x/cpu_features_def.h.inc +++ b/target/s390x/cpu_features_def.h.inc @@ -114,6 +114,7 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decima DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility") DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility") DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility") +DEF_FEAT(PAIE, "paie", STFL, 197, "Processor-Activity-Instrumentation extension-1") /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */ DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility") diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index ad140184b903..1558c5262616 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -575,6 +575,7 @@ static uint16_t full_GEN16_GA1[] = { S390_FEAT_BEAR_ENH, S390_FEAT_RDP, S390_FEAT_PAI, + S390_FEAT_PAIE, }; @@ -669,6 +670,7 @@ static uint16_t default_GEN16_GA1[] = { S390_FEAT_BEAR_ENH, S390_FEAT_RDP, S390_FEAT_PAI, + S390_FEAT_PAIE, }; /* QEMU (CPU model) features */
Add stfle 197 (processor-activity-instrumentation extension 1) to the gen16 default model and fence it off for 7.0 and older. Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> --- hw/s390x/s390-virtio-ccw.c | 1 + target/s390x/cpu_features_def.h.inc | 1 + target/s390x/gen-features.c | 2 ++ 3 files changed, 4 insertions(+)