Unverified Commit 58ba28ae authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5813 [intel]OLK-tdx-guest-configs-6.6

Merge Pull Request from: @zhiminghufighting 
 
Content:
Add two tdx guest related configs in arch/x86/config/openeular_defconfig to enable tdx guest.

Intel-kernel issue:
#I9DOCU:enable TDX guest related configs on kernel OLK-6.6

Test:
Test environment:
1)Hardware:
Platfrom: Avenucity
CPU: GNR AP UCC
MEM: 16x16GB
2)Software configs:
Host os: Linux gnr-bkc 6.6.0-gnr.bkc.6.6.15.6.20.x86_64
TDX module:tdx: TDX module: attributes 0x0, vendor_id 0x8086, major_version 2, minor_version 0, build_date 20231112, build_num 635
QEMU: generic-qemu8.1rc0-kernel6.6-v3.4
3)tdx guest kernel configs:
TDX related:
CONFIG_TDX_GUEST_DRIVER=y
CONFIG_INTEL_TDX_GUEST=y
Dependency configs:
CONFIG_VIRTIO_BLK=y
CONFIG_XFS_FS=y
CONFIG_FAT_FS=y
CONFIG_VFAT_FS=y
CONFIG_VIRTIO_CONSOLE=y
4)Test log:
[ OK ] Started Network Manager Script Dispatcher Service.
[ OK ] Started Dynamic System Tuning Daemon.

Red Hat Enterprise Linux 8.5 (Ootpa)
Kernel 6.6.0+ on an x86_64

td-guest login:
Red Hat Enterprise Linux 8.5 (Ootpa)
Kernel 6.6.0+ on an x86_64

td-guest login: root
Password:
[ 14.851661][ T347] systemd[347]: memfd_create() called without MFD_EXEC or MFD_NOEXEC_SEAL set
Last login: Sun Apr 7 05:44:38 on hvc0
======= WELCOME TO TDX GUEST =======
Version : Linux MVP Stack 2022WW22
Release : http://cpio-devops-pub.sh.intel.com/tdx/tdx_release.html
Created : Thu Jun 2 01:38:21 EDT 2022
[root@td-guest lkvs]# stress
`stress' imposes certain types of compute stress on your system

Usage: stress [OPTION [ARG]] ...
-?, --help show this help statement
--version show version statement
-v, --verbose be verbose
-q, --quiet be quiet
-n, --dry-run show what would have been done
-t, --timeout N timeout after N seconds
--backoff N wait factor of N microseconds before work starts
-c, --cpu N spawn N workers spinning on sqrt()
-i, --io N spawn N workers spinning on sync()
-m, --vm N spawn N workers spinning on malloc()/free()
--vm-bytes B malloc B bytes per vm worker (default is 256MB)
--vm-stride B touch a byte every B bytes (default is 4096)
--vm-hang N sleep N secs before free (default none, 0 is inf)
--vm-keep redirty memory instead of freeing and reallocating
-d, --hdd N spawn N workers spinning on write()/unlink()
--hdd-bytes B write B bytes per hdd worker (default is 1GB)

Example: stress --cpu 8 --io 4 --vm 2 --vm-bytes 128M --timeout 10s

Note: Numbers may be suffixed with s,m,h,d,y (time) or B,K,M,G (size). s
stress: info: [408] dispatching hogs: 8 cpu, 4 io, 2 vm, 0 hdd128M --timeout 10s
stress: info: [408] successful run completed in 10s
[root@td-guest lkvs]#
[root@td-guest lkvs]# cat /proc/cpuinfo
processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 173
model name : 06/ad
stepping : 0
microcode : 0x800005f0
cpu MHz : 2400.000
cache size : 16384 KB
physical id : 0
siblings : 2
core id : 0
cpu cores : 2
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 35
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc bts rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq dtes64 ds_cpl ssse3 sdbg fma cx16 pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch cpuid_fault ssbd ibrs ibpb stibp ibrs_enhanced tdx_guest fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx_vnni avx512_bf16 wbnoinvd avx512vbmi umip pku ospke waitpkg avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq la57 rdpid bus_lock_detect cldemote movdiri movdir64b fsrm md_clear serialize tsxldtrk ibt amx_bf16 avx512_fp16 amx_tile amx_int8 flush_l1d arch_capabilities
bugs : spectre_v1 spectre_v2 spec_store_bypass swapgs mmio_unknown eibrs_pbrsb
bogomips : 4800.00
clflush size : 64
cache_alignment : 64
address sizes : 52 bits physical, 57 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 173
model name : 06/ad
stepping : 0
microcode : 0x800005f0
cpu MHz : 2400.000
cache size : 16384 KB
physical id : 0
siblings : 2
core id : 1
cpu cores : 2
apicid : 1
initial apicid : 1
fpu : yes
fpu_exception : yes
cpuid level : 35
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc bts rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq dtes64 ds_cpl ssse3 sdbg fma cx16 pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch cpuid_fault ssbd ibrs ibpb stibp ibrs_enhanced tdx_guest fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx_vnni avx512_bf16 wbnoinvd avx512vbmi umip pku ospke waitpkg avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq la57 rdpid bus_lock_detect cldemote movdiri movdir64b fsrm md_clear serialize tsxldtrk ibt amx_bf16 avx512_fp16 amx_tile amx_int8 flush_l1d arch_capabilities
bugs : spectre_v1 spectre_v2 spec_store_bypass swapgs mmio_unknown eibrs_pbrsb
bogomips : 4800.00
clflush size : 64
cache_alignment : 64
address sizes : 52 bits physical, 57 bits virtual
power management:

[root@td-guest lkvs]#

Known issue:
N/A

Default config change:
If any recommended config change vs upstream default config, please list as git diff format. We may need to change the openEuler default kernel config.
-# CONFIG_INTEL_TDX_GUEST is not set
+CONFIG_INTEL_TDX_GUEST=y
+CONFIG_TDX_GUEST_DRIVER=y 
 
Link:https://gitee.com/openeuler/kernel/pulls/5813

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 2651d161 0fd26194
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
# CONFIG_JAILHOUSE_GUEST is not set
# CONFIG_ACRN_GUEST is not set
# CONFIG_INTEL_TDX_GUEST is not set
CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MK8 is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
@@ -7079,6 +7079,7 @@ CONFIG_VFIO_PCI=m
CONFIG_VFIO_MDEV=m
CONFIG_IRQ_BYPASS_MANAGER=m
# CONFIG_VIRT_DRIVERS is not set
CONFIG_TDX_GUEST_DRIVER=y
CONFIG_VIRTIO_ANCHOR=y
CONFIG_VIRTIO=y
CONFIG_VIRTIO_PCI_LIB=y