6c5e9f07c4
- i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - target/i386: Change wrong XFRM value in SGX CPUID leaf - target/i386: Enable support for XSAVES based features - target/i386: Add kvm_get_one_msr helper - hw/block/hd-geometry: Do not override specified bios-chs-trans mainline inclusion commit fd8a68ad6823d33bedeba20a22857867a1c3890e category: bugfix - linux-user/riscv: Align signal frame to 16 bytes mainline inclusion commit 1eaa63429a9944265c92efdb94c02fabb231f564 category: bugfix - ipmi:smbus: Add a check around a memcpy mainline inclusion commit 3fde641e7286f9b968bdb3b4b922c6465f2a9abc category: bugfix - tests/tcg/linux-test: Fix random hangs in test_socket mainline inclusion commit b9e6074fc5b429b1e956e9c60db7e284a91e0f3d category: bugfix - qemu-options.hx: Don't claim "-serial" has limit of 4 serial ports Before v2.12, the implementation of serial ports was limited to a value of MAX_SERIAL_PORTS = 4. We now dynamically allocate the data structures for serial ports, so this limit is no longer present, but the documentation for the -serial options still reads: - target/ppc: Modify the uncorrect value irq to n_IRQ - block-migration: Ensure we don't crash during migration cleanup - target/s390x: fix handling of zeroes in vfmin/vfmax mainline inclusion commit 13c59eb09bd6d1fbc13f08b708226421f14a232b category: bugfix - hw/virtio/virtio-iommu: Enforce power-of-two notify for both MAP and UNMAP mainline inclusion commit 0522be9a0c0094088ccef7aab352c57f483ca250 category: bugfix - configure: Add missing POSIX-required space mainline inclusion commit 35a7a6fc5624b1df828d82f2dfa74d0e4188b3b2 category: bugfix - vga: fix incorrect line height in 640x200x2 mode mainline inclusion commit 37e7b86766244b62a406747bb78e049390d0b528 category: bugfix - hw/ide/core: set ERR_STAT in unsupported command completion - linux-user/flatload.c: Fix setting of image_info::end_code mainline inclusion commit 734a659ad264ac080457167e845ffabbaaa66d0e category: bugfix - load_elf: fix iterator's type for elf file processing - hw/misc/mps2-scc: Free MPS2SCC::oscclk[] array on finalize() - hw/nvram/xlnx-efuse: Free XlnxEFuse::ro_bits[] array on finalize() - hw/nvram/xlnx-efuse-ctrl: Free XlnxVersalEFuseCtrl[] "pg0-lock" array - chardev/char.c: fix "abstract device type" error message - block/rbd: fix handling of holes in .bdrv_co_block_status - qga: treat get-guest-fsinfo as "best effort" mainline inclusion commit bbb0151cf2e82489120a15df5e2eb9653312b0ec category: bugfix - usb/hcd-xhci: check slotid in xhci_wakeup_endpoint() mainline inclusion commit 84218892f05515d20347fde4506e1944eb11cb25 category: bugfix - hw/display/bcm2835_fb: Fix framebuffer allocation address mainline inclusion commit 5865d99fe88d8c8fa437c18c6b63fb2a8165634f category: bugfix - block/parallels: Fix buffer-based write call mainline inclusion commit eba088f91d21d9e42a81bef847173da30c5da961 category: bugfix - vl: Improve error message for conflicting -incoming and -loadvm - hw/smbios: Fix OEM strings table option validation Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 5d1a5160936dce1757c09050d97d12f42642794b)
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From ad727933a766e952b5054bfd53c93ad43fdb6dec Mon Sep 17 00:00:00 2001
|
||
From: Yang Zhong <yang.zhong@linux.intel.com>
|
||
Date: Thu, 6 Apr 2023 02:40:41 -0400
|
||
Subject: [PATCH] target/i386: Change wrong XFRM value in SGX CPUID leaf
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
commit 72497cff896fecf74306ed33626c30e43633cdd6 upstream.
|
||
|
||
The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with
|
||
FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}. As a result,
|
||
SGX enclaves only supported SSE and x87 feature (xfrm=0x3).
|
||
|
||
Intel-SIG: commit 72497cff896f target/i386: Change wrong XFRM value in SGX CPUID leaf
|
||
Backport i386/cpu bugfixes
|
||
|
||
Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
|
||
Signed-off-by: Yang Zhong <yang.zhong@linux.intel.com>
|
||
Reviewed-by: Yang Weijiang <weijiang.yang@intel.com>
|
||
Reviewed-by: Kai Huang <kai.huang@intel.com>
|
||
Message-Id: <20230406064041.420039-1-yang.zhong@linux.intel.com>
|
||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
||
---
|
||
target/i386/cpu.c | 4 ++--
|
||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
index 6b098cc832..9ab8ef3bd1 100644
|
||
--- a/target/i386/cpu.c
|
||
+++ b/target/i386/cpu.c
|
||
@@ -5951,8 +5951,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
||
} else {
|
||
*eax &= env->features[FEAT_SGX_12_1_EAX];
|
||
*ebx &= 0; /* ebx reserve */
|
||
- *ecx &= env->features[FEAT_XSAVE_XSS_LO];
|
||
- *edx &= env->features[FEAT_XSAVE_XSS_HI];
|
||
+ *ecx &= env->features[FEAT_XSAVE_XCR0_LO];
|
||
+ *edx &= env->features[FEAT_XSAVE_XCR0_HI];
|
||
|
||
/* FP and SSE are always allowed regardless of XSAVE/XCR0. */
|
||
*ecx |= XSTATE_FP_MASK | XSTATE_SSE_MASK;
|
||
--
|
||
2.27.0
|
||
|