Skip to contentSkip to conversation

query-cpu-model-expansion: report deprecated features

PATCH Superseded Collin Walling 3 participants 10 messages Apr 24, 2024 – Apr 26, 2024

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover query-cpu-model-expansion: report deprecated features

Previous version here (different subject line):
https://mail.gnu.org/archive/html/qemu-devel/2024-04/msg03200.html

Changelog

v3
- removed optional disable-deprecated-feats argument
- added deprecated-props array to CpuModelInfo struct
- amended cover letter language to reflect design

v2
- removed "static-recommended" expansion type
- implemented optional disable-deprecated-feats argument

---

The current implementation of query-cpu-model-expansion is lacking a way to retrieve CPU models with properties (i.e. features) that are flagged as deprecated. To remedy this, a list of deprecated-props has been appended to the CpuModelInfo struct, and will currently be reported by a query-cpu-model-expansion.

Check patch #2 description for an example output.

A simple interface is designed that contains an array of feature bits that are flagged as deprecated. This list may be easily populated with more features in the future.

    void s390_get_deprecated_features(S390FeatBitmap features)
    {
        static const int feats[] = {
             /* CSSKE is deprecated on newer generations */
             S390_FEAT_CONDITIONAL_SSKE,
             S390_FEAT_BPB,
             /* Deprecated on z16 */
             S390_FEAT_CONSTRAINT_TRANSACTIONAL_EXE,
             S390_FEAT_TRANSACTIONAL_EXE
        };
        int i;

        for (i = 0; i < ARRAY_SIZE(feats); i++) {
            set_bit(feats[i], features);
        }
    }

Use case example:

Newer s390 machines may signal the end-of-support for particular CPU features, rendering guests operating with older CPU models incapable of running on said machines. A manual effort to disable certain CPU features would be required.

Reporting a list of deprecated features allows the user / management app to take the next steps to ensure the guest is defined in a way that ensures a migration in the future.

Collin L. Walling (2):
target/s390x: report deprecated-props in cpu-model-expansion reply target/s390x: flag te and cte as deprecated

 qapi/machine-target.json         |  5 ++++-
 target/s390x/cpu_features.c      | 17 +++++++++++++++++
 target/s390x/cpu_features.h      |  1 +
 target/s390x/cpu_models_sysemu.c |  6 ++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
Signature · 1 line
2.43.0
#1 lore raw
Quoted 3 lines · Collin Walling

Check patch #2 description for an example output.

I meant patch #1, sorry. Forgot I dropped a patch in this series.

Signature · 2 lines
Regards,
  Collin
#2 lore raw

PATCH v3 1/2 target/s390x: report deprecated-props in cpu-model-expansion reply

In reply to Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

    {
      "return": {
        "model": {
          "name": "z14.2-base",
          "deprecated-props": [
            "bpb",
            "csske"
          ],
          "props": {
            "pfmfi": false,
            "exrl": true,
            ...a lot more props...
            "skey": false,
            "vxpdeh2": false
          }
        }
      }
    }

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

---
 qapi/machine-target.json         |  5 ++++-
 target/s390x/cpu_features.c      | 14 ++++++++++++++
 target/s390x/cpu_features.h      |  1 +
 target/s390x/cpu_models_sysemu.c |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
qapi/machine-target.json +4 -1
index 29e695aa06..3799a60e3d 100644
@@ -20,11 +20,14 @@
 #
 # @props: a dictionary of QOM properties to be applied
 #
+# @deprecated-props: a list of QOM properties that are flagged as deprecated
+#
 # Since: 2.8
 ##
 { 'struct': 'CpuModelInfo',
   'data': { 'name': 'str',
-            '*props': 'any' } }
+            '*props': 'any',
+            '*deprecated-props': ['str'] } }
 
 ##
 # @CpuModelExpansionType:
target/s390x/cpu_features.c +14 -0
index d28eb65845..efafc9711c 100644
@@ -212,6 +212,20 @@ void s390_feat_bitmap_to_ascii(const S390FeatBitmap features, void *opaque,
     };
 }
 
+void s390_get_deprecated_features(S390FeatBitmap features)
+{
+    static const int feats[] = {
+         /* CSSKE is deprecated on newer generations */
+         S390_FEAT_CONDITIONAL_SSKE,
+         S390_FEAT_BPB,
+    };
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(feats); i++) {
+        set_bit(feats[i], features);
+    }
+}
+
 #define FEAT_GROUP_INIT(_name, _group, _desc)        \
     {                                                \
         .name = _name,                               \
target/s390x/cpu_features.h +1 -0
index a9bd68a2e1..661a8cd6db 100644
@@ -69,6 +69,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
                           uint8_t *data);
 void s390_feat_bitmap_to_ascii(const S390FeatBitmap features, void *opaque,
                                void (*fn)(const char *name, void *opaque));
+void s390_get_deprecated_features(S390FeatBitmap features);
 
 /* Definition of a CPU feature group */
 typedef struct {
target/s390x/cpu_models_sysemu.c +6 -0
index 2d99218069..307e3885f4 100644
@@ -206,6 +206,12 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,
     } else {
         info->props = QOBJECT(qdict);
     }
+
+    bitmap_zero(bitmap, S390_FEAT_MAX);
+    s390_get_deprecated_features(bitmap);
+    s390_feat_bitmap_to_ascii(bitmap, &info->deprecated_props,
+                              list_add_feat);
+    info->has_deprecated_props = !!info->deprecated_props;
 }
 
 CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
Signature · 1 line
2.43.0
#3 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

Quoted 39 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

    {
      "return": {
        "model": {
          "name": "z14.2-base",
          "deprecated-props": [
            "bpb",
            "csske"
          ],
          "props": {
            "pfmfi": false,
            "exrl": true,
            ...a lot more props...
            "skey": false,
            "vxpdeh2": false
          }
        }
      }
    }

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

---
 qapi/machine-target.json         |  5 ++++-
 target/s390x/cpu_features.c      | 14 ++++++++++++++
 target/s390x/cpu_features.h      |  1 +
 target/s390x/cpu_models_sysemu.c |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
qapi/machine-target.json +0 -0
index 29e695aa06..3799a60e3d 100644

qapi/machine-target.json line 23

Quoted 4 lines
qapi/machine-target.json +1 -0
@@ -20,11 +20,14 @@
 #
 # @props: a dictionary of QOM properties to be applied
 #
+# @deprecated-props: a list of QOM properties that are flagged as deprecated

Deprecated by whom? QEMU? The CPU vendor?

docs/devel/qapi-code-gen.rst:

For legibility, wrap text paragraphs so every line is at most 70 characters long.

Quoted 11 lines
qapi/machine-target.json +3 -1
+#
 # Since: 2.8
 ##
 { 'struct': 'CpuModelInfo',
   'data': { 'name': 'str',
-            '*props': 'any' } }
+            '*props': 'any',
+            '*deprecated-props': ['str'] } }
 
 ##
 # @CpuModelExpansionType:

[...]

#4 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

Quoted 36 lines · Markus Armbruster
Quoted 34 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

    {
      "return": {
        "model": {
          "name": "z14.2-base",
          "deprecated-props": [
            "bpb",
            "csske"
          ],
          "props": {
            "pfmfi": false,
            "exrl": true,
            ...a lot more props...
            "skey": false,
            "vxpdeh2": false
          }
        }
      }
    }

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

---
 qapi/machine-target.json         |  5 ++++-
 target/s390x/cpu_features.c      | 14 ++++++++++++++
 target/s390x/cpu_features.h      |  1 +
 target/s390x/cpu_models_sysemu.c |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
Quoted 12 lines

qapi/machine-target.json line 23

Quoted 9 lines
qapi/machine-target.json +1 -0
index 29e695aa06..3799a60e3d 100644
@@ -20,11 +20,14 @@
 #
 # @props: a dictionary of QOM properties to be applied
 #
+# @deprecated-props: a list of QOM properties that are flagged as deprecated

Deprecated by whom? QEMU? The CPU vendor?

The CPU vendor would be the one who decides which props are deprecated. How about:

# @deprecated-props: a list of QOM properties that are flagged as
deprecated by the CPU vendor

Quoted 5 lines

docs/devel/qapi-code-gen.rst:

For legibility, wrap text paragraphs so every line is at most 70 characters long.

Noted for next iteration. Thank you.

Quoted 15 lines
Quoted 11 lines
qapi/machine-target.json +3 -1
+#
 # Since: 2.8
 ##
 { 'struct': 'CpuModelInfo',
   'data': { 'name': 'str',
-            '*props': 'any' } }
+            '*props': 'any',
+            '*deprecated-props': ['str'] } }
 
 ##
 # @CpuModelExpansionType:

[...]

Signature · 2 lines
Regards,
  Collin
#5 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

Quoted 50 lines · Collin Walling
Quoted 36 lines · Markus Armbruster
Quoted 34 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

    {
      "return": {
        "model": {
          "name": "z14.2-base",
          "deprecated-props": [
            "bpb",
            "csske"
          ],
          "props": {
            "pfmfi": false,
            "exrl": true,
            ...a lot more props...
            "skey": false,
            "vxpdeh2": false
          }
        }
      }
    }

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

---
 qapi/machine-target.json         |  5 ++++-
 target/s390x/cpu_features.c      | 14 ++++++++++++++
 target/s390x/cpu_features.h      |  1 +
 target/s390x/cpu_models_sysemu.c |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
Quoted 12 lines

qapi/machine-target.json line 23

Quoted 9 lines
qapi/machine-target.json +1 -0
index 29e695aa06..3799a60e3d 100644
@@ -20,11 +20,14 @@
 #
 # @props: a dictionary of QOM properties to be applied
 #
+# @deprecated-props: a list of QOM properties that are flagged as deprecated

Deprecated by whom? QEMU? The CPU vendor?

Quoted 6 lines

The CPU vendor would be the one who decides which props are deprecated. How about:

# @deprecated-props: a list of QOM properties that are flagged as
deprecated by the CPU vendor

^ let's ignore the incorrect indentation here.

Actually, I may be wildly incorrect with my description by referring to this as "a list of QOM properties", when in fact this is just an array of strings. Also, the deprecated props may not always reflect the features that are found by a static expansion, so I added another sentence to describe that they are a part of a full model expansion.

# @deprecated-props: a list of properties that are flagged as deprecated
# by the CPU vendor. These props are a subset of the model's full
# definition list of properties. (since X.Y)

I may need some help with the wording on the 2nd sentence.

[...]

Quoted 17 lines
Quoted 16 lines
Quoted 12 lines
qapi/machine-target.json +3 -1
+#
 # Since: 2.8
 ##
 { 'struct': 'CpuModelInfo',
   'data': { 'name': 'str',
-            '*props': 'any' } }
+            '*props': 'any',
+            '*deprecated-props': ['str'] } }
 
 ##
 # @CpuModelExpansionType:

[...]

Signature · 2 lines
Regards,
  Collin
#6 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

In reply to Collin Walling
Quoted 23 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

     {
       "return": {
         "model": {
           "name": "z14.2-base",
           "deprecated-props": [
             "bpb",
             "csske"
           ],
           "props": {
             "pfmfi": false,
             "exrl": true,
             ...a lot more props...
             "skey": false,
             "vxpdeh2": false
           }
         }
       }
     }
Quoted 2 lines

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

Likely you should only report features that are applicable to a model. that is, if it's part of the full_feat.

Otherwise, the caller might simply want do set all features to "false", and we'd fail setting a feature that is unknown to a specific CPU generation.

That is, you would AND the bitmap with the full_feat of the underlying CPU definition.

Signature · 3 lines
Cheers,

David / dhildenb
#7 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

Quoted 30 lines · David Hildenbrand
Quoted 23 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

      {
        "return": {
          "model": {
            "name": "z14.2-base",
            "deprecated-props": [
              "bpb",
              "csske"
            ],
            "props": {
              "pfmfi": false,
              "exrl": true,
              ...a lot more props...
              "skey": false,
              "vxpdeh2": false
            }
          }
        }
      }
Quoted 2 lines

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

Likely you should only report features that are applicable to a model. that is, if it's part of the full_feat.

Quoted 6 lines

Otherwise, the caller might simply want do set all features to "false", and we'd fail setting a feature that is unknown to a specific CPU generation.

That is, you would AND the bitmap with the full_feat of the underlying CPU definition.

Refreshing my memory, I think we can just clear any CPU features. We only bail out when setting them!

Signature · 3 lines
Cheers,

David / dhildenb
#8 lore raw

Re: [PATCH v3 1/2] target/s390x: report deprecated-props in cpu-model-expansion reply

Quoted 35 lines · David Hildenbrand
Quoted 34 lines · David Hildenbrand
Quoted 23 lines · Collin Walling

Retain a list of deprecated features disjoint from any particular CPU model. A query-cpu-model-expansion reply will now provide a list of properties (i.e. features) that are flagged as deprecated. Example:

      {
        "return": {
          "model": {
            "name": "z14.2-base",
            "deprecated-props": [
              "bpb",
              "csske"
            ],
            "props": {
              "pfmfi": false,
              "exrl": true,
              ...a lot more props...
              "skey": false,
              "vxpdeh2": false
            }
          }
        }
      }
Quoted 2 lines

It is recommended that s390 guests operate with these features explicitly disabled to ensure compatability with future hardware.

Likely you should only report features that are applicable to a model. that is, if it's part of the full_feat.

Otherwise, the caller might simply want do set all features to "false", and we'd fail setting a feature that is unknown to a specific CPU generation.

Quoted 6 lines
Quoted 2 lines

That is, you would AND the bitmap with the full_feat of the underlying CPU definition.

Refreshing my memory, I think we can just clear any CPU features. We only bail out when setting them!

Very good point. I've been working only with newer-gen machines and would not have thought to test / catch that case. I will filter the deprecated-props array with features that are only available on the full_model of the expanded CPU model.

Signature · 2 lines
Regards,
  Collin
#9 lore raw

PATCH v3 2/2 target/s390x: flag te and cte as deprecated

In reply to Collin Walling

Add the CONSTRAINT_TRANSACTIONAL_EXE (cte) and TRANSACTIONAL_EXE (te) to the list of deprecated features.

---
 target/s390x/cpu_features.c | 3 +++
 1 file changed, 3 insertions(+)
target/s390x/cpu_features.c +3 -0
index efafc9711c..cb4e2b8920 100644
@@ -218,6 +218,9 @@ void s390_get_deprecated_features(S390FeatBitmap features)
          /* CSSKE is deprecated on newer generations */
          S390_FEAT_CONDITIONAL_SSKE,
          S390_FEAT_BPB,
+         /* Deprecated on z16 */
+         S390_FEAT_CONSTRAINT_TRANSACTIONAL_EXE,
+         S390_FEAT_TRANSACTIONAL_EXE
     };
     int i;
 
Signature · 1 line
2.43.0