From: @kuhnchen18 Reviewed-by: @imxcc Signed-off-by: @imxcc
This commit is contained in:
commit
170f7a1dd6
14
qemu.spec
14
qemu.spec
@ -1,6 +1,6 @@
|
||||
Name: qemu
|
||||
Version: 4.1.0
|
||||
Release: 67
|
||||
Release: 68
|
||||
Epoch: 2
|
||||
Summary: QEMU is a generic and open source machine emulator and virtualizer
|
||||
License: GPLv2 and BSD and MIT and CC-BY-SA-4.0
|
||||
@ -386,6 +386,11 @@ Patch0373: block-Call-attention-to-truncation-of-long-NBD-expor.patch
|
||||
Patch0374: qemu-img-convert-Don-t-pre-zero-images.patch
|
||||
Patch0375: qcow2-Fix-qcow2_alloc_cluster_abort-for-external-dat.patch
|
||||
Patch0376: mirror-Wait-only-for-in-flight-operations.patch
|
||||
Patch0377: virtio-net-delete-also-control-queue-when-TX-RX-dele.patch
|
||||
Patch0378: target-i386-enable-monitor-and-ucode-revision-with-c.patch
|
||||
Patch0379: target-i386-set-the-CPUID-level-to-0x14-on-old-machi.patch
|
||||
Patch0380: target-i386-kvm-initialize-feature-MSRs-very-early.patch
|
||||
Patch0381: target-i386-add-a-ucode-rev-property.patch
|
||||
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc
|
||||
@ -780,6 +785,13 @@ getent passwd qemu >/dev/null || \
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 22 2021 Chen Qun <kuhn.chenqun@huawei.com>
|
||||
- virtio-net: delete also control queue when TX/RX deleted
|
||||
- target/i386: enable monitor and ucode revision with -cpu max
|
||||
- target/i386: set the CPUID level to 0x14 on old machine-type
|
||||
- target/i386: kvm: initialize feature MSRs very early
|
||||
- target/i386: add a ucode-rev property
|
||||
|
||||
* Thu Jul 22 2021 Chen Qun <kuhn.chenqun@huawei.com>
|
||||
- qcow2: Fix qcow2_alloc_cluster_abort() for external data file
|
||||
- mirror: Wait only for in-flight operations
|
||||
|
||||
125
target-i386-add-a-ucode-rev-property.patch
Normal file
125
target-i386-add-a-ucode-rev-property.patch
Normal file
@ -0,0 +1,125 @@
|
||||
From 9b3b22bfe87be7eec126056b96f7cea7e3ab9257 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 17 Feb 2020 16:23:12 +0000
|
||||
Subject: [PATCH] target/i386: add a ucode-rev property
|
||||
|
||||
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: <20200217162316.2464-3-pbonzini@redhat.com>
|
||||
Patchwork-id: 93909
|
||||
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/6] target/i386: add a ucode-rev property
|
||||
Bugzilla: 1791648
|
||||
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||||
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||
|
||||
Add the property and plumb it in TCG and HVF (the latter of which
|
||||
tried to support returning a constant value but used the wrong MSR).
|
||||
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-Id: <1579544504-3616-3-git-send-email-pbonzini@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 4e45aff398cd1542c2a384a2a3b8600f23337d86)
|
||||
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||
---
|
||||
target/i386/cpu.c | 10 ++++++++++
|
||||
target/i386/cpu.h | 3 +++
|
||||
target/i386/hvf/x86_emu.c | 4 +---
|
||||
target/i386/misc_helper.c | 4 ++++
|
||||
4 files changed, 18 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||
index 35a33db39a..ec8bc9957e 100644
|
||||
--- a/target/i386/cpu.c
|
||||
+++ b/target/i386/cpu.c
|
||||
@@ -6332,6 +6332,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (cpu->ucode_rev == 0) {
|
||||
+ /* The default is the same as KVM's. */
|
||||
+ if (IS_AMD_CPU(env)) {
|
||||
+ cpu->ucode_rev = 0x01000065;
|
||||
+ } else {
|
||||
+ cpu->ucode_rev = 0x100000000ULL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* mwait extended info: needed for Core compatibility */
|
||||
/* We always wake on interrupt even if host does not have the capability */
|
||||
cpu->mwait.ecx |= CPUID_MWAIT_EMX | CPUID_MWAIT_IBE;
|
||||
@@ -7011,6 +7020,7 @@ static Property x86_cpu_properties[] = {
|
||||
DEFINE_PROP_UINT32("min-level", X86CPU, env.cpuid_min_level, 0),
|
||||
DEFINE_PROP_UINT32("min-xlevel", X86CPU, env.cpuid_min_xlevel, 0),
|
||||
DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0),
|
||||
+ DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0),
|
||||
DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true),
|
||||
DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
|
||||
DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),
|
||||
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||||
index 0b57b915af..ca7de143af 100644
|
||||
--- a/target/i386/cpu.h
|
||||
+++ b/target/i386/cpu.h
|
||||
@@ -345,6 +345,7 @@ typedef enum X86Seg {
|
||||
#define MSR_IA32_SPEC_CTRL 0x48
|
||||
#define MSR_VIRT_SSBD 0xc001011f
|
||||
#define MSR_IA32_PRED_CMD 0x49
|
||||
+#define MSR_IA32_UCODE_REV 0x8b
|
||||
#define MSR_IA32_CORE_CAPABILITY 0xcf
|
||||
#define MSR_IA32_ARCH_CAPABILITIES 0x10a
|
||||
#define MSR_IA32_TSCDEADLINE 0x6e0
|
||||
@@ -1562,6 +1563,8 @@ struct X86CPU {
|
||||
CPUNegativeOffsetState neg;
|
||||
CPUX86State env;
|
||||
|
||||
+ uint64_t ucode_rev;
|
||||
+
|
||||
uint32_t hyperv_spinlock_attempts;
|
||||
char *hyperv_vendor_id;
|
||||
bool hyperv_synic_kvm_only;
|
||||
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
|
||||
index 1b04bd7e94..cd40520c16 100644
|
||||
--- a/target/i386/hvf/x86_emu.c
|
||||
+++ b/target/i386/hvf/x86_emu.c
|
||||
@@ -664,8 +664,6 @@ static void exec_lods(struct CPUX86State *env, struct x86_decode *decode)
|
||||
RIP(env) += decode->len;
|
||||
}
|
||||
|
||||
-#define MSR_IA32_UCODE_REV 0x00000017
|
||||
-
|
||||
void simulate_rdmsr(struct CPUState *cpu)
|
||||
{
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
@@ -681,7 +679,7 @@ void simulate_rdmsr(struct CPUState *cpu)
|
||||
val = cpu_get_apic_base(X86_CPU(cpu)->apic_state);
|
||||
break;
|
||||
case MSR_IA32_UCODE_REV:
|
||||
- val = (0x100000000ULL << 32) | 0x100000000ULL;
|
||||
+ val = x86_cpu->ucode_rev;
|
||||
break;
|
||||
case MSR_EFER:
|
||||
val = rvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER);
|
||||
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
|
||||
index 3eff6885f8..aed16fe3f0 100644
|
||||
--- a/target/i386/misc_helper.c
|
||||
+++ b/target/i386/misc_helper.c
|
||||
@@ -229,6 +229,7 @@ void helper_rdmsr(CPUX86State *env)
|
||||
#else
|
||||
void helper_wrmsr(CPUX86State *env)
|
||||
{
|
||||
+ X86CPU *x86_cpu = env_archcpu(env);
|
||||
uint64_t val;
|
||||
|
||||
cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC());
|
||||
@@ -371,6 +372,9 @@ void helper_wrmsr(CPUX86State *env)
|
||||
env->msr_bndcfgs = val;
|
||||
cpu_sync_bndcs_hflags(env);
|
||||
break;
|
||||
+ case MSR_IA32_UCODE_REV:
|
||||
+ val = x86_cpu->ucode_rev;
|
||||
+ break;
|
||||
default:
|
||||
if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
|
||||
&& (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
|
||||
--
|
||||
2.27.0
|
||||
|
||||
48
target-i386-enable-monitor-and-ucode-revision-with-c.patch
Normal file
48
target-i386-enable-monitor-and-ucode-revision-with-c.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 8470399d9508b3b56d625866ea235c2a5b4cb39a Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 17 Feb 2020 16:23:16 +0000
|
||||
Subject: [PATCH] target/i386: enable monitor and ucode revision with -cpu max
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: <20200217162316.2464-7-pbonzini@redhat.com>
|
||||
Patchwork-id: 93910
|
||||
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 6/6] target/i386: enable monitor and ucode revision with -cpu max
|
||||
Bugzilla: 1791648
|
||||
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||
|
||||
These two features were incorrectly tied to host_cpuid_required rather than
|
||||
cpu->max_features. As a result, -cpu max was not enabling either MONITOR
|
||||
features or ucode revision.
|
||||
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit be02cda3afde60d219786e23c3f8edb53aec8e17)
|
||||
|
||||
[RHEL7: context, upstream uses g_autofree]
|
||||
|
||||
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||
---
|
||||
target/i386/cpu.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||
index 22e0e89718..6147cd419a 100644
|
||||
--- a/target/i386/cpu.c
|
||||
+++ b/target/i386/cpu.c
|
||||
@@ -6317,7 +6317,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||
g_free(name);
|
||||
goto out;
|
||||
}
|
||||
+ }
|
||||
|
||||
+ if (cpu->max_features && accel_uses_host_cpuid()) {
|
||||
if (enable_cpu_pm) {
|
||||
host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx,
|
||||
&cpu->mwait.ecx, &cpu->mwait.edx);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
178
target-i386-kvm-initialize-feature-MSRs-very-early.patch
Normal file
178
target-i386-kvm-initialize-feature-MSRs-very-early.patch
Normal file
@ -0,0 +1,178 @@
|
||||
From c222711e37196e4be1776a084a1acb3c5a1f7283 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 17 Feb 2020 16:23:11 +0000
|
||||
Subject: [PATCH] target/i386: kvm: initialize feature MSRs very early
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: <20200217162316.2464-2-pbonzini@redhat.com>
|
||||
Patchwork-id: 93899
|
||||
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/6] target/i386: kvm: initialize feature MSRs very early
|
||||
Bugzilla: 1791648
|
||||
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||
|
||||
Some read-only MSRs affect the behavior of ioctls such as
|
||||
KVM_SET_NESTED_STATE. We can initialize them once and for all
|
||||
right after the CPU is realized, since they will never be modified
|
||||
by the guest.
|
||||
|
||||
Reported-by: Qingua Cheng <qcheng@redhat.com>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-Id: <1579544504-3616-2-git-send-email-pbonzini@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 420ae1fc51c99abfd03b1c590f55617edd2a2bed)
|
||||
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||
---
|
||||
target/i386/kvm.c | 81 +++++++++++++++++++++++++-----------------
|
||||
target/i386/kvm_i386.h | 1 +
|
||||
2 files changed, 49 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
||||
index 7328746d92..60060087fd 100644
|
||||
--- a/target/i386/kvm.c
|
||||
+++ b/target/i386/kvm.c
|
||||
@@ -63,6 +63,8 @@
|
||||
* 255 kvm_msr_entry structs */
|
||||
#define MSR_BUF_SIZE 4096
|
||||
|
||||
+static void kvm_init_msrs(X86CPU *cpu);
|
||||
+
|
||||
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
|
||||
KVM_CAP_INFO(SET_TSS_ADDR),
|
||||
KVM_CAP_INFO(EXT_CPUID),
|
||||
@@ -1777,6 +1779,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||||
has_msr_tsc_aux = false;
|
||||
}
|
||||
|
||||
+ kvm_init_msrs(cpu);
|
||||
+
|
||||
r = hyperv_init_vcpu(cpu);
|
||||
if (r) {
|
||||
goto fail;
|
||||
@@ -2592,11 +2596,53 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu, FeatureWordArray f)
|
||||
VMCS12_MAX_FIELD_INDEX << 1);
|
||||
}
|
||||
|
||||
+static int kvm_buf_set_msrs(X86CPU *cpu)
|
||||
+{
|
||||
+ int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);
|
||||
+ if (ret < 0) {
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ if (ret < cpu->kvm_msr_buf->nmsrs) {
|
||||
+ struct kvm_msr_entry *e = &cpu->kvm_msr_buf->entries[ret];
|
||||
+ error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx64,
|
||||
+ (uint32_t)e->index, (uint64_t)e->data);
|
||||
+ }
|
||||
+
|
||||
+ assert(ret == cpu->kvm_msr_buf->nmsrs);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void kvm_init_msrs(X86CPU *cpu)
|
||||
+{
|
||||
+ CPUX86State *env = &cpu->env;
|
||||
+
|
||||
+ kvm_msr_buf_reset(cpu);
|
||||
+ if (has_msr_arch_capabs) {
|
||||
+ kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
||||
+ env->features[FEAT_ARCH_CAPABILITIES]);
|
||||
+ }
|
||||
+
|
||||
+ if (has_msr_core_capabs) {
|
||||
+ kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
||||
+ env->features[FEAT_CORE_CAPABILITY]);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
||||
+ * all kernels with MSR features should have them.
|
||||
+ */
|
||||
+ if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
||||
+ kvm_msr_entry_add_vmx(cpu, env->features);
|
||||
+ }
|
||||
+
|
||||
+ assert(kvm_buf_set_msrs(cpu) == 0);
|
||||
+}
|
||||
+
|
||||
static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||
{
|
||||
CPUX86State *env = &cpu->env;
|
||||
int i;
|
||||
- int ret;
|
||||
|
||||
kvm_msr_buf_reset(cpu);
|
||||
|
||||
@@ -2648,17 +2694,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||
}
|
||||
#endif
|
||||
|
||||
- /* If host supports feature MSR, write down. */
|
||||
- if (has_msr_arch_capabs) {
|
||||
- kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
||||
- env->features[FEAT_ARCH_CAPABILITIES]);
|
||||
- }
|
||||
-
|
||||
- if (has_msr_core_capabs) {
|
||||
- kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
||||
- env->features[FEAT_CORE_CAPABILITY]);
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* The following MSRs have side effects on the guest or are too heavy
|
||||
* for normal writeback. Limit them to reset or full state updates.
|
||||
@@ -2831,14 +2866,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||
|
||||
/* Note: MSR_IA32_FEATURE_CONTROL is written separately, see
|
||||
* kvm_put_msr_feature_control. */
|
||||
-
|
||||
- /*
|
||||
- * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
||||
- * all kernels with MSR features should have them.
|
||||
- */
|
||||
- if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
||||
- kvm_msr_entry_add_vmx(cpu, env->features);
|
||||
- }
|
||||
}
|
||||
|
||||
if (env->mcg_cap) {
|
||||
@@ -2854,19 +2881,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||
}
|
||||
}
|
||||
|
||||
- ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);
|
||||
- if (ret < 0) {
|
||||
- return ret;
|
||||
- }
|
||||
-
|
||||
- if (ret < cpu->kvm_msr_buf->nmsrs) {
|
||||
- struct kvm_msr_entry *e = &cpu->kvm_msr_buf->entries[ret];
|
||||
- error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx64,
|
||||
- (uint32_t)e->index, (uint64_t)e->data);
|
||||
- }
|
||||
-
|
||||
- assert(ret == cpu->kvm_msr_buf->nmsrs);
|
||||
- return 0;
|
||||
+ return kvm_buf_set_msrs(cpu);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h
|
||||
index 06fe06bdb3..d98c6f69d0 100644
|
||||
--- a/target/i386/kvm_i386.h
|
||||
+++ b/target/i386/kvm_i386.h
|
||||
@@ -66,4 +66,5 @@ bool kvm_enable_x2apic(void);
|
||||
bool kvm_has_x2apic_api(void);
|
||||
|
||||
bool kvm_hv_vpindex_settable(void);
|
||||
+
|
||||
#endif
|
||||
--
|
||||
2.27.0
|
||||
|
||||
68
target-i386-set-the-CPUID-level-to-0x14-on-old-machi.patch
Normal file
68
target-i386-set-the-CPUID-level-to-0x14-on-old-machi.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From 3b172cd5a6e62be725c778b8397310462fe0a890 Mon Sep 17 00:00:00 2001
|
||||
From: "plai@redhat.com" <plai@redhat.com>
|
||||
Date: Thu, 7 May 2020 22:09:23 +0100
|
||||
Subject: [PATCH] target/i386: set the CPUID level to 0x14 on old machine-type
|
||||
|
||||
RH-Author: plai@redhat.com
|
||||
Message-id: <20200507220923.13723-1-plai@redhat.com>
|
||||
Patchwork-id: 96347
|
||||
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH RESEND] target/i386: set the CPUID level to 0x14 on old machine-type
|
||||
Bugzilla: 1513681
|
||||
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||||
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||||
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||
|
||||
From: Luwei Kang <luwei.kang@intel.com>
|
||||
|
||||
BZ https://bugzilla.redhat.com/show_bug.cgi?id=1513681
|
||||
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=28146304
|
||||
Branch: rhel-av-8.2.1
|
||||
|
||||
Tested on intel-icelake-y-01.ml3.eng.bos.redhat.com.
|
||||
|
||||
The CPUID level need to be set to 0x14 manually on old
|
||||
machine-type if Intel PT is enabled in guest. E.g. the
|
||||
CPUID[0].EAX(level)=7 and CPUID[7].EBX[25](intel-pt)=1 when the
|
||||
Qemu with "-machine pc-i440fx-3.1 -cpu qemu64,+intel-pt" parameter.
|
||||
|
||||
Some Intel PT capabilities are exposed by leaf 0x14 and the
|
||||
missing capabilities will cause some MSRs access failed.
|
||||
This patch add a warning message to inform the user to extend
|
||||
the CPUID level.
|
||||
|
||||
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
|
||||
Signed-off-by: Luwei Kang <luwei.kang@intel.com>
|
||||
Message-Id: <1584031686-16444-1-git-send-email-luwei.kang@intel.com>
|
||||
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
||||
(cherry picked from commit ddc2fc9e4e42ebce48b088963dc7fbd1c08d5f33)
|
||||
Signed-off-by: Paul Lai <plai@redhat.com>
|
||||
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||
---
|
||||
target/i386/cpu.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||
index 6147cd419a..35a33db39a 100644
|
||||
--- a/target/i386/cpu.c
|
||||
+++ b/target/i386/cpu.c
|
||||
@@ -6206,9 +6206,14 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
|
||||
x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE);
|
||||
|
||||
/* Intel Processor Trace requires CPUID[0x14] */
|
||||
- if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT) &&
|
||||
- kvm_enabled() && cpu->intel_pt_auto_level) {
|
||||
- x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14);
|
||||
+ if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) {
|
||||
+ if (cpu->intel_pt_auto_level) {
|
||||
+ x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14);
|
||||
+ } else if (cpu->env.cpuid_min_level < 0x14) {
|
||||
+ mark_unavailable_features(cpu, FEAT_7_0_EBX,
|
||||
+ CPUID_7_0_EBX_INTEL_PT,
|
||||
+ "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,+intel-pt,level=0x14\"");
|
||||
+ }
|
||||
}
|
||||
|
||||
/* CPU topology with multi-dies support requires CPUID[0x1F] */
|
||||
--
|
||||
2.27.0
|
||||
|
||||
49
virtio-net-delete-also-control-queue-when-TX-RX-dele.patch
Normal file
49
virtio-net-delete-also-control-queue-when-TX-RX-dele.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From 358e2bfe2e1a65b1e926163d7d1ffaefd601d874 Mon Sep 17 00:00:00 2001
|
||||
From: Julia Suvorova <jusual@redhat.com>
|
||||
Date: Wed, 19 Feb 2020 21:34:31 +0000
|
||||
Subject: [PATCH] virtio-net: delete also control queue when TX/RX deleted
|
||||
|
||||
RH-Author: Julia Suvorova <jusual@redhat.com>
|
||||
Message-id: <20200219213431.11913-5-jusual@redhat.com>
|
||||
Patchwork-id: 93983
|
||||
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 4/4] virtio-net: delete also control queue when TX/RX deleted
|
||||
Bugzilla: 1791590
|
||||
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||||
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
|
||||
From: Yuri Benditovich <yuri.benditovich@daynix.com>
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1708480
|
||||
If the control queue is not deleted together with TX/RX, it
|
||||
later will be ignored in freeing cache resources and hot
|
||||
unplug will not be completed.
|
||||
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
|
||||
Message-Id: <20191226043649.14481-3-yuri.benditovich@daynix.com>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
(cherry picked from commit d945d9f1731244ef341f74ede93120fc9de35913)
|
||||
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||
---
|
||||
hw/net/virtio-net.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
||||
index 6adb0fe252..63f1bae99c 100644
|
||||
--- a/hw/net/virtio-net.c
|
||||
+++ b/hw/net/virtio-net.c
|
||||
@@ -2803,7 +2803,8 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
|
||||
for (i = 0; i < max_queues; i++) {
|
||||
virtio_net_del_queue(n, i);
|
||||
}
|
||||
-
|
||||
+ /* delete also control vq */
|
||||
+ virtio_del_queue(vdev, max_queues * 2);
|
||||
qemu_announce_timer_del(&n->announce_timer, false);
|
||||
g_free(n->vqs);
|
||||
qemu_del_nic(n->nic);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user