s390x_cpu_model_expansion: Add gen17 test coverage on s390x #4378

fbq815 · 2025-09-19T11:45:10Z

Add gen17 test coverage on s390x, this includes new subfunctions:
msa10, msa11 and msa13
RHEL7 dosen't support cpu models after gen15, remove gen16.

ID: 3939

Summary by CodeRabbit

New Features
- Added support for new s390x CPU model variants with expanded capabilities and properties
Chores
- Updated CPU model lists and platform configuration for RHEL.7 to remove older variants and include the new generation
- Refined processor model sets and compatibility expectations used in system testing across RHEL versions

fbq815 · 2025-09-19T12:18:19Z

RHEL9:
JOB ID : 4f1cc0f1d4ccc121577fee259938f0ffbc77334e
JOB LOG : /root/avocado/job-results/job-2025-09-19T07.58-4f1cc0f/job.log
(01/10)s390x_cpu_model.expansion.model_type_z196_z196_2_z114.s390-virtio: PASS (30.78 s)
(02/10)s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (31.77 s)
(03/10)s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (26.79 s)
(04/10)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (27.16 s)
(05/10)s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (26.85 s)
(06/10)s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:9.1.0-26, which is not in (,7.1.0] (2.85 s)
(07/10)s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (26.28 s)
(08/10)s390x_cpu_model.expansion.model_type_gen17a_gen17b_with_paie.s390-virtio: PASS (26.98 s)
(09/10)s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (194.02 s)
(10/10)s390x_cpu_model.cpu_baseline.s390-virtio: PASS (26.50 s)
RESULTS : PASS 9 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-09-19T07.58-4f1cc0f/results.html
JOB TIME : 425.70 s

RHEL10:
JOB ID : f092889e278cd8633ef0411012ed5eb63407fbe0
JOB LOG : /root/avocado/job-results/job-2025-09-19T07.59-f092889/job.log
(1/9)s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (28.19 s)
(2/9)s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (26.60 s)
(3/9)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (27.40 s)
(4/9)s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (27.37 s)
(5/9)s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:10.0.0-12, which is not in (,7.1.0] (2.08 s)
(6/9)s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (27.34 s)
(7/9)s390x_cpu_model.expansion.model_type_gen17a_gen17b_with_paie.s390-virtio: PASS (27.39 s)
(8/9)s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (153.51 s)
(9/9)s390x_cpu_model.cpu_baseline.s390-virtio: PASS (26.88 s)
RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-09-19T07.59-f092889/results.html
JOB TIME : 354.61 s

@PaulYuuu please help me review this patch
@smitterl FYI

smitterl

Hi @fbq815 Thanks for this.
Your commit message says "add new subfunctions msa13,msa11,msa10 to tests on s390x" but I don't see any change about this specifically. Can you please clarify?

There are also some minor nitpicks, please check my comments. Please keep also in mind the avocado styleguide for your commit message and header - https://avocado-framework.readthedocs.io/en/latest/guides/contributor/chapters/styleguides.html#commit-style-guide

Rest LGTM, thanks.

qemu/tests/cfg/s390x_cpu_model.cfg

coderabbitai · 2025-10-24T08:02:27Z

Walkthrough

Added a new s390x CPU model variant (gen17a/gen17b) requiring QEMU 9.1.0 with PAIE-related properties, removed gen16a/gen16b from RHEL.7 boot lists, and added gen17b to baseline and RHEL.7 cpu_models.

Changes

Cohort / File(s)	Summary
s390x CPU model config `qemu/tests/cfg/s390x_cpu_model.cfg`	Added `model_type_gen17a_gen17b` variant (requires QEMU 9.1.0) with expanded PAIE and mepoch/vxep properties; removed `gen16a`/`gen16b` from RHEL.7 `boot_cpu_models`; added `gen17b` to `not_expected_props` baseline `cpu_models` and RHEL.7 cpu model set.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

🐇 I hopped through configs late at night,
Gen17s arrived in tidy light.
Gen16 bowed out, gen17 took stage,
PAIE flags added, new lines on the page.
A happy rabbit cheers the change — delight! 🎉

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check	✅ Passed	The pull request title "s390x_cpu_model_expansion: Add gen17 test coverage on s390x" accurately reflects the primary change in the changeset. The PR adds new gen17a/gen17b CPU model variants with comprehensive test configuration updates across multiple RHEL versions, which is exactly what the title conveys. The title is concise, specific, and clear enough for a developer scanning the history to understand the primary objective without being overly broad or containing misleading information.

✨ Finishing touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f9db2b6 and 9971219.

📒 Files selected for processing (1)

qemu/tests/cfg/s390x_cpu_model.cfg (2 hunks)

🔇 Additional comments (2)

qemu/tests/cfg/s390x_cpu_model.cfg (2)

36-39: LGTM! New gen17 variant correctly implements the required subfunctions.

The new model_type_gen17a_gen17b variant correctly includes:

The new CPU subfunctions: msa13, msa11, msa10

Their corresponding pckmo variants: msa13_pckmo, msa11_pckmo, msa10_pckmo

New features: vxpdeh3, vxeh3

Appropriate QEMU version requirement (≥9.1.0)

The test results confirm this variant passes on RHEL9 and RHEL10.

46-46: LGTM! Correctly removes gen16 from RHEL.7.

The removal of gen16a,gen16b from RHEL.7's boot_cpu_models aligns with the PR objective, as RHEL 7 does not support CPU models after gen15.

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

♻️ Duplicate comments (1)

qemu/tests/cfg/s390x_cpu_model.cfg (1)

46-46: RHEL.7 boot: gen16 removed — LGTM

Matches objective “RHEL7 doesn’t support cpu models after gen15.”

🧹 Nitpick comments (1)

qemu/tests/cfg/s390x_cpu_model.cfg (1)

36-39: gen17a/gen17b with_paie added — verify gating and prune redundant props

Please confirm 9.1.0 is the minimal QEMU that supports gen17 + paie on s390x in our CI matrices; if the floor is lower/higher, adjust required_qemu accordingly.

Props include both vxeh2/vxeh3 and vxpdeh2/vxpdeh3. If vxeh3/vxpdeh3 imply the v2 features, consider dropping the v2 flags to reduce noise, unless the harness requires all explicit.

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 02fbc5f and f9db2b6.

📒 Files selected for processing (1)

qemu/tests/cfg/s390x_cpu_model.cfg (2 hunks)

qemu/tests/cfg/s390x_cpu_model.cfg

1. Add gen17 test coverage on s390x, this includes new subfunctions: msa10, msa11 and msa13 2. RHEL7 dosen't support cpu models after gen15, remove gen16. Signed-off-by: bfu bfu@redhat.com

fbq815 · 2025-10-24T10:15:18Z

Test result:
RHEL9:
(01/10) s390x_cpu_model.expansion.model_type_z196_z196_2_z114.s390-virtio: PASS (25.70 s)
(02/10) s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (25.46 s)
(03/10)s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (25.42 s)
(04/10)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (25.45 s)
(05/10)s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (25.40 s)
(06/10) s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:9.1.0-29, which is not in (,7.1.0] (2.13 s)
(07/10).s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (25.47 s)
(08/10)s390x_cpu_model.expansion.model_type_gen17a_gen17b.s390-virtio: PASS (25.46 s)
(09/10) s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (141.34 s)
(10/10)s390x_cpu_model.cpu_baseline.s390-virtio: PASS (25.20 s)
RESULTS : PASS 9 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-10-24T06.03-1176fe6/results.html
JOB TIME : 354.50 s

RHEL10:
(1/9) s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (29.23 s)
(2/9) s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (34.22 s)
(3/9)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (34.78 s)
(4/9) s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (33.77 s)
(5/9) s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:10.0.0-14, which is not in (,7.1.0] (2.22 s)
(6/9)s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (34.70 s)
(7/9) s390x_cpu_model.expansion.model_type_gen17a_gen17b.s390-virtio: PASS (33.95 s)
(8/9) s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (189.72 s)
(9/9) s390x_cpu_model.cpu_baseline.s390-virtio: PASS (27.57 s)
RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-10-24T06.05-ce5c928/results.html
JOB TIME : 427.66 s

@smitterl updated and paste the newest test result here, please help me review again, thanks

smitterl

Thank you very much! LGTM

fbq815 · 2025-10-24T10:18:29Z

@PaulYuuu pleaes help me merge this

fbq815 force-pushed the KVMAUTOMA-3939 branch from 2e1e5f3 to 27f94e6 Compare September 19, 2025 11:55

PaulYuuu previously approved these changes Oct 11, 2025

View reviewed changes

smitterl requested changes Oct 22, 2025

View reviewed changes

qemu/tests/cfg/s390x_cpu_model.cfg Show resolved Hide resolved

qemu/tests/cfg/s390x_cpu_model.cfg Outdated Show resolved Hide resolved

fbq815 force-pushed the KVMAUTOMA-3939 branch from 27f94e6 to f9db2b6 Compare October 24, 2025 08:02

coderabbitai bot reviewed Oct 24, 2025

View reviewed changes

qemu/tests/cfg/s390x_cpu_model.cfg Show resolved Hide resolved

s390x_cpu_model_expansion: Add gen17 test coverage on s390x

9971219

1. Add gen17 test coverage on s390x, this includes new subfunctions: msa10, msa11 and msa13 2. RHEL7 dosen't support cpu models after gen15, remove gen16. Signed-off-by: bfu bfu@redhat.com

fbq815 dismissed PaulYuuu’s stale review via 9971219 October 24, 2025 09:59

fbq815 force-pushed the KVMAUTOMA-3939 branch from f9db2b6 to 9971219 Compare October 24, 2025 09:59

fbq815 changed the title ~~Add new subfunction for gen17 on s390x~~ s390x_cpu_model_expansion: Add gen17 test coverage on s390x Oct 24, 2025

smitterl approved these changes Oct 24, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

s390x_cpu_model_expansion: Add gen17 test coverage on s390x #4378

s390x_cpu_model_expansion: Add gen17 test coverage on s390x #4378

fbq815 commented Sep 19, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

fbq815 commented Sep 19, 2025

Uh oh!

smitterl left a comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Oct 24, 2025 •

edited

Loading

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

fbq815 commented Oct 24, 2025

Uh oh!

smitterl left a comment

Uh oh!

fbq815 commented Oct 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

s390x_cpu_model_expansion: Add gen17 test coverage on s390x #4378

Are you sure you want to change the base?

s390x_cpu_model_expansion: Add gen17 test coverage on s390x #4378

Conversation

fbq815 commented Sep 19, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

fbq815 commented Sep 19, 2025

Uh oh!

smitterl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Poem

Pre-merge checks and finishing touches

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fbq815 commented Oct 24, 2025

Uh oh!

smitterl left a comment

Choose a reason for hiding this comment

Uh oh!

fbq815 commented Oct 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fbq815 commented Sep 19, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Oct 24, 2025 •

edited

Loading