Ubuntu
libvirt package

Merge ~paelzer/ubuntu/+source/libvirt:lp-1921880-1921754-amd-epyc-1922907-stepping-parsing-GROOVY into ubuntu/+source/libvirt:ubuntu/groovy-devel

  1. Git
  2. lp:~paelzer/ubuntu/+source/libvirt
  3. lp-1921880-1921754-amd-epyc-1922907-stepping-parsing-GROOVY
  4. Merge into ubuntu/groovy-devel
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 251a44900667d1cf12b60fb28436cc324f410d54
Merge reported by: Christian Ehrhardt 
Merged at revision: 251a44900667d1cf12b60fb28436cc324f410d54
Proposed branch: ~paelzer/ubuntu/+source/libvirt:lp-1921880-1921754-amd-epyc-1922907-stepping-parsing-GROOVY
Merge into: ubuntu/+source/libvirt:ubuntu/groovy-devel
Diff against target: 452 lines (+400/-0)
8 files modified
debian/changelog (+10/-0)
debian/patches/series (+6/-0)
debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch (+59/-0)
debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch (+129/-0)
debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch (+73/-0)
debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch (+51/-0)
debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch (+39/-0)
debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch (+33/-0)
Reviewer Review Type Date Requested Status
Robie Basak sru Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+401374@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4525

Revision history for this message
Robie Basak (racb) :
review: Approve (sru)
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks for the Review Robie!

FYI tests also completed (again in a more complete fashion) and LGTM:

prep (x86_64) : Pass 25 F/S/N 0/0/0 - RC 0 (15 min 44428 lin)
migrate (x86_64) : Pass 720 F/S/N 36/0/0 - RC 36 (496 min 820003 lin)
cross (x86_64) : Pass 58 F/S/N 0/1/2 - RC 0 (82 min 100241 lin)
misc (x86_64) : Pass 219 F/S/N 0/0/0 - RC 0 (84 min 120581 lin)

prep (s390x) : Pass 25 F/S/N 0/0/0 - RC 0 (14 min 31196 lin)
migrate (s390x) : Pass 804 F/S/N 0/15/0 - RC 0 (311 min 517498 lin)
cross (s390x) : Pass 62 F/S/N 0/1/1 - RC 0 (94 min 93721 lin)
misc (s390x) : Pass 199 F/S/N 2/0/0 - RC 2 (78 min 94668 lin)

The 36 fails in x86 are an issue with postcopy-after-precopy that isn't due to this new version.
The 2 fails on s390x are a real issue in Hirsute guests, but not due to these updates.
The tests above included F/G/H releases.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Hirsute is completed, uploading this one

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libvirt
 * [new tag] upload/6.6.0-1ubuntu3.5 -> upload/6.6.0-1ubuntu3.5

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_6.6.0-1ubuntu3.5.dsc: done.
  Uploading libvirt_6.6.0-1ubuntu3.5.debian.tar.xz: done.
  Uploading libvirt_6.6.0-1ubuntu3.5_source.buildinfo: done.
  Uploading libvirt_6.6.0-1ubuntu3.5_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This is in F/G-proposed, setting the MP to merged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 95eef86..a93ad0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
1libvirt (6.6.0-1ubuntu3.5) groovy; urgency=medium
2
3 * d/p/u/lp-1921754*: add EPYC-Rome-v2 as v1 missed IBRS and thereby fails
4 on some HW/Guest combinations e.g. Windows 10 on Threadripper
5 (LP: #1921754)
6 * d/p/u/lp-1921880*: add EPYC-Milan features and named cpu type support
7 (LP: #1921880)
8
9 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 07 Apr 2021 13:33:46 +0200
10
1libvirt (6.6.0-1ubuntu3.4) groovy; urgency=medium11libvirt (6.6.0-1ubuntu3.4) groovy; urgency=medium
212
3 * d/p/lp1915811-*: Fix NUMA topology population for machines with high number13 * d/p/lp1915811-*: Fix NUMA topology population for machines with high number
diff --git a/debian/patches/series b/debian/patches/series
index 9841757..02c394a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,9 @@ ubuntu/lp-1901242-util-Fix-logic-in-virFileSetCOW.patch
50ubuntu/lp-1913266-qemu-Add-virtio-related-options-to-vsock.patch50ubuntu/lp-1913266-qemu-Add-virtio-related-options-to-vsock.patch
51ubuntu/lp1915811-01-virnuma-Don-t-work-around-numa_node_to_cpus.patch51ubuntu/lp1915811-01-virnuma-Don-t-work-around-numa_node_to_cpus.patch
52ubuntu/lp1915811-02-virnuma-Use-numa_nodes_ptr-when-checking-av.patch52ubuntu/lp1915811-02-virnuma-Use-numa_nodes_ptr-when-checking-av.patch
53ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
54ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
55ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
56ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
57ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
58ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
diff --git a/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch b/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
53new file mode 10064459new file mode 100644
index 0000000..5cd251d
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
@@ -0,0 +1,59 @@
1From 5c17a7ba41670f3182186c06e621995b5d03fc95 Mon Sep 17 00:00:00 2001
2From: Tim Wiederhake <twiederh@redhat.com>
3Date: Mon, 22 Feb 2021 13:20:09 +0100
4Subject: [PATCH] cpumap: Add support for ibrs CPU feature
5
6Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
7Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
8
9Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5c17a7ba
10Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921754
11Last-Update: 2021-04-07
12
13---
14 src/cpu_map/x86_features.xml | 3 +++
15 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 +
16 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 +
17 3 files changed, 5 insertions(+)
18
19diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
20index 5cfa07502a..b03a6b065d 100644
21--- a/src/cpu_map/x86_features.xml
22+++ b/src/cpu_map/x86_features.xml
23@@ -507,6 +507,9 @@
24 <feature name='ibpb'>
25 <cpuid eax_in='0x80000008' ebx='0x00001000'/>
26 </feature>
27+ <feature name='ibrs'>
28+ <cpuid eax_in='0x80000008' ebx='0x00004000'/>
29+ </feature>
30 <feature name='amd-stibp'>
31 <cpuid eax_in='0x80000008' ebx='0x00008000'/>
32 </feature>
33diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
34index 6d95b508b2..40e7912398 100644
35--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
36+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
37@@ -17,6 +17,7 @@
38 <feature policy='require' name='topoext'/>
39 <feature policy='require' name='perfctr_nb'/>
40 <feature policy='require' name='invtsc'/>
41+ <feature policy='require' name='ibrs'/>
42 <feature policy='require' name='amd-ssbd'/>
43 <feature policy='require' name='lbrv'/>
44 <feature policy='require' name='svm-lock'/>
45diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
46index 65eaeabdd0..9f8108cdaa 100644
47--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
48+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
49@@ -18,6 +18,7 @@
50 <feature name='topoext'/>
51 <feature name='perfctr_nb'/>
52 <feature name='invtsc'/>
53+ <feature name='ibrs'/>
54 <feature name='amd-ssbd'/>
55 <feature name='lbrv'/>
56 <feature name='svm-lock'/>
57--
582.31.1
59
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
0new file mode 10064460new file mode 100644
index 0000000..50710d5
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
@@ -0,0 +1,129 @@
1From f321a4822e9fa6542e48a78611989ecd9acaa83a Mon Sep 17 00:00:00 2001
2From: Jiri Denemark <jdenemar@redhat.com>
3Date: Mon, 1 Mar 2021 19:20:51 +0100
4Subject: [PATCH] cpu_map: Add EPYC-Milan x86 CPU model
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937
10
11Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
12Reviewed-by: Ján Tomko <jtomko@redhat.com>
13
14Backport-Note: only whitespace damage
15Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=f321a482
16Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
17Last-Update: 2021-04-07
18
19---
20 src/cpu_map/index.xml | 1 +
21 src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++
22 2 files changed, 93 insertions(+)
23 create mode 100644 src/cpu_map/x86_EPYC-Milan.xml
24
25--- /dev/null
26+++ b/src/cpu_map/x86_EPYC-Milan.xml
27@@ -0,0 +1,92 @@
28+<cpus>
29+ <model name='EPYC-Milan'>
30+ <decode host='on' guest='on'/>
31+ <signature family='25' model='1'/>
32+ <vendor name='AMD'/>
33+ <feature name='3dnowprefetch'/>
34+ <feature name='abm'/>
35+ <feature name='adx'/>
36+ <feature name='aes'/>
37+ <feature name='amd-ssbd'/>
38+ <feature name='amd-stibp'/>
39+ <feature name='apic'/>
40+ <feature name='arat'/>
41+ <feature name='avx'/>
42+ <feature name='avx2'/>
43+ <feature name='bmi1'/>
44+ <feature name='bmi2'/>
45+ <feature name='clflush'/>
46+ <feature name='clflushopt'/>
47+ <feature name='clwb'/>
48+ <feature name='clzero'/>
49+ <feature name='cmov'/>
50+ <feature name='cr8legacy'/>
51+ <feature name='cx16'/>
52+ <feature name='cx8'/>
53+ <feature name='de'/>
54+ <feature name='erms'/>
55+ <feature name='f16c'/>
56+ <feature name='fma'/>
57+ <feature name='fpu'/>
58+ <feature name='fsgsbase'/>
59+ <feature name='fsrm'/>
60+ <feature name='fxsr'/>
61+ <feature name='fxsr_opt'/>
62+ <feature name='ibpb'/>
63+ <feature name='ibrs'/>
64+ <feature name='invpcid'/>
65+ <feature name='lahf_lm'/>
66+ <feature name='lm'/>
67+ <feature name='mca'/>
68+ <feature name='mce'/>
69+ <feature name='misalignsse'/>
70+ <feature name='mmx'/>
71+ <feature name='mmxext'/>
72+ <feature name='movbe'/>
73+ <feature name='msr'/>
74+ <feature name='mtrr'/>
75+ <feature name='npt'/>
76+ <feature name='nrip-save'/>
77+ <feature name='nx'/>
78+ <feature name='osvw'/>
79+ <feature name='pae'/>
80+ <feature name='pat'/>
81+ <feature name='pcid'/>
82+ <feature name='pclmuldq'/>
83+ <feature name='pdpe1gb'/>
84+ <feature name='perfctr_core'/>
85+ <feature name='pge'/>
86+ <feature name='pku'/>
87+ <feature name='pni'/>
88+ <feature name='popcnt'/>
89+ <feature name='pse'/>
90+ <feature name='pse36'/>
91+ <feature name='rdpid'/>
92+ <feature name='rdrand'/>
93+ <feature name='rdseed'/>
94+ <feature name='rdtscp'/>
95+ <feature name='sep'/>
96+ <feature name='sha-ni'/>
97+ <feature name='smap'/>
98+ <feature name='smep'/>
99+ <feature name='sse'/>
100+ <feature name='sse2'/>
101+ <feature name='sse4.1'/>
102+ <feature name='sse4.2'/>
103+ <feature name='sse4a'/>
104+ <feature name='ssse3'/>
105+ <feature name='svm'/>
106+ <feature name='svme-addr-check'/>
107+ <feature name='syscall'/>
108+ <feature name='tsc'/>
109+ <feature name='umip'/>
110+ <feature name='vme'/>
111+ <feature name='wbnoinvd'/>
112+ <feature name='xgetbv1'/>
113+ <feature name='xsave'/>
114+ <feature name='xsavec'/>
115+ <feature name='xsaveerptr'/>
116+ <feature name='xsaveopt'/>
117+ <feature name='xsaves'/>
118+ </model>
119+</cpus>
120--- a/src/cpu_map/index.xml
121+++ b/src/cpu_map/index.xml
122@@ -66,6 +66,7 @@
123 <include filename="x86_EPYC.xml"/>
124 <include filename="x86_EPYC-IBPB.xml"/>
125 <include filename="x86_EPYC-Rome.xml"/>
126+ <include filename='x86_EPYC-Milan.xml'/>
127
128 <!-- Hygon CPU models -->
129 <include filename="x86_Dhyana.xml"/>
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
0new file mode 100644130new file mode 100644
index 0000000..72a6c0f
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
@@ -0,0 +1,73 @@
1From 8c5c660b99101544d8cfcb8edbe48688c04bee25 Mon Sep 17 00:00:00 2001
2From: Tim Wiederhake <twiederh@redhat.com>
3Date: Wed, 6 Jan 2021 11:05:06 +0100
4Subject: [PATCH] cpu_map: Add support for fsrm CPU feature
5
6Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
7Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
8
9Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=8c5c660b
10Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
11Last-Update: 2021-04-07
12
13---
14 src/cpu_map/x86_features.xml | 3 +++
15 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
16 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
17 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
18 4 files changed, 6 insertions(+), 1 deletion(-)
19
20diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
21index a55f52b16c..b0bf22d916 100644
22--- a/src/cpu_map/x86_features.xml
23+++ b/src/cpu_map/x86_features.xml
24@@ -339,6 +339,9 @@
25 <feature name='avx512-4fmaps'>
26 <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
27 </feature>
28+ <feature name='fsrm'>
29+ <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000010'/>
30+ </feature>
31 <feature name='md-clear'> <!-- md_clear -->
32 <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
33 </feature>
34diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
35index ce65579bcc..33bd1013f0 100644
36--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
37+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
38@@ -1,7 +1,7 @@
39 <!-- Features disabled by QEMU -->
40 <cpudata arch='x86'>
41 <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
42- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000000'/>
43+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000010'/>
44 <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
45 <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
46 </cpudata>
47diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
48index 9b75ace710..3a71b28cfb 100644
49--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
50+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
51@@ -24,6 +24,7 @@
52 <feature policy='require' name='sha-ni'/>
53 <feature policy='require' name='ospke'/>
54 <feature policy='require' name='rdpid'/>
55+ <feature policy='require' name='fsrm'/>
56 <feature policy='require' name='stibp'/>
57 <feature policy='require' name='arch-capabilities'/>
58 <feature policy='require' name='xsaves'/>
59diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
60index efbf9d363b..1582de0422 100644
61--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
62+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
63@@ -25,6 +25,7 @@
64 <feature name='sha-ni'/>
65 <feature name='ospke'/>
66 <feature name='rdpid'/>
67+ <feature name='fsrm'/>
68 <feature name='stibp'/>
69 <feature name='arch-capabilities'/>
70 <feature name='xsaves'/>
71--
722.31.1
73
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
0new file mode 10064474new file mode 100644
index 0000000..8d23051
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
@@ -0,0 +1,51 @@
1From b5abf9a192248b1005f63a7102d2627375d70fe5 Mon Sep 17 00:00:00 2001
2From: Jiri Denemark <jdenemar@redhat.com>
3Date: Thu, 4 Mar 2021 08:43:09 +0100
4Subject: [PATCH] cpu_map: Fix spelling of svme-addr-chk feature
5
6Commit a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 introduced this feature
7with an incorrect "svme-addr-check" spelling.
8
9Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
10Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
11
12Backport-Note: sync_qemu_cpu_i386 didn't exist before v6.10
13Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=b5abf9a1
14Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
15Last-Update: 2021-04-07
16
17---
18 src/cpu_map/sync_qemu_i386.py | 2 +-
19 src/cpu_map/x86_EPYC-Milan.xml | 2 +-
20 src/cpu_map/x86_features.xml | 2 +-
21 3 files changed, 3 insertions(+), 3 deletions(-)
22
23diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
24index 53f0cd6aac..3055e175fa 100644
25--- a/src/cpu_map/x86_EPYC-Milan.xml
26+++ b/src/cpu_map/x86_EPYC-Milan.xml
27@@ -76,7 +76,7 @@
28 <feature name='sse4a'/>
29 <feature name='ssse3'/>
30 <feature name='svm'/>
31- <feature name='svme-addr-check'/>
32+ <feature name='svme-addr-chk'/>
33 <feature name='syscall'/>
34 <feature name='tsc'/>
35 <feature name='umip'/>
36diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
37index c43520d08f..e98b84f3ef 100644
38--- a/src/cpu_map/x86_features.xml
39+++ b/src/cpu_map/x86_features.xml
40@@ -554,7 +554,7 @@
41 <feature name='pfthreshold'>
42 <cpuid eax_in='0x8000000a' edx='0x00001000'/>
43 </feature>
44- <feature name='svme-addr-check'>
45+ <feature name='svme-addr-chk'>
46 <cpuid eax_in='0x8000000a' edx='0x10000000'/>
47 </feature>
48
49--
502.31.1
51
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
0new file mode 10064452new file mode 100644
index 0000000..263e151
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
@@ -0,0 +1,39 @@
1From d3de79dbfc20dc4dfc19154b16079861c542b71e Mon Sep 17 00:00:00 2001
2From: Jiri Denemark <jdenemar@redhat.com>
3Date: Tue, 2 Mar 2021 10:32:42 +0100
4Subject: [PATCH] cpu_map: Install x86_EPYC-Milan.xml
5
6Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
7Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
8
9Backport-Note: Groovy is pre-meson so the patch needed to be adapted to
10 fit the Make based build, the same that we've done in patch
11 ubuntu/lp-1887490-cpu_map-Defined-and-enable-EPYC-Rome-model.patch
12Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=d3de79db
13Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
14Last-Update: 2021-04-07
15
16---
17 src/cpu_map/meson.build | 1 +
18 1 file changed, 1 insertion(+)
19
20--- a/src/Makefile.in
21+++ b/src/Makefile.in
22@@ -5561,6 +5561,7 @@ cpumap_DATA = \
23 cpu_map/x86_Dhyana.xml \
24 cpu_map/x86_EPYC.xml \
25 cpu_map/x86_EPYC-IBPB.xml \
26+ cpu_map/x86_EPYC-Milan.xml \
27 cpu_map/x86_EPYC-Rome.xml \
28 cpu_map/x86_Haswell.xml \
29 cpu_map/x86_Haswell-IBRS.xml \
30--- a/src/cpu_map/Makefile.inc.am
31+++ b/src/cpu_map/Makefile.inc.am
32@@ -29,6 +29,7 @@ cpumap_DATA = \
33 cpu_map/x86_Dhyana.xml \
34 cpu_map/x86_EPYC.xml \
35 cpu_map/x86_EPYC-IBPB.xml \
36+ cpu_map/x86_EPYC-Milan.xml \
37 cpu_map/x86_EPYC-Rome.xml \
38 cpu_map/x86_Haswell.xml \
39 cpu_map/x86_Haswell-IBRS.xml \
diff --git a/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch b/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
0new file mode 10064440new file mode 100644
index 0000000..5e5420e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
@@ -0,0 +1,33 @@
1From 5ac6ab2fde63881d3c5cc7372a0d0e59618feb55 Mon Sep 17 00:00:00 2001
2From: Tim Wiederhake <twiederh@redhat.com>
3Date: Mon, 22 Feb 2021 13:20:10 +0100
4Subject: [PATCH] cpumap: Add support for svme-addr-check CPU feature
5
6Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
7Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
8
9Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5ac6ab2f
10Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
11Last-Update: 2021-04-07
12
13---
14 src/cpu_map/x86_features.xml | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
18index b03a6b065d..c43520d08f 100644
19--- a/src/cpu_map/x86_features.xml
20+++ b/src/cpu_map/x86_features.xml
21@@ -554,6 +554,9 @@
22 <feature name='pfthreshold'>
23 <cpuid eax_in='0x8000000a' edx='0x00001000'/>
24 </feature>
25+ <feature name='svme-addr-check'>
26+ <cpuid eax_in='0x8000000a' edx='0x10000000'/>
27+ </feature>
28
29 <!-- IA32_ARCH_CAPABILITIES features -->
30 <feature name='rdctl-no'>
31--
322.31.1
33

Subscribers

People subscribed via source and target branches