Skip to content

Commit

Permalink
Merge pull request #1057 from eric-ch/s8-oxt-1426
Browse files Browse the repository at this point in the history 
STABLE-8: OXT-1426: l1tf: Disable SMT on Xen.
  • Loading branch information
@jean-edouard
jean-edouard authored Oct 30, 2018
2 parents dec5d0e + 334ea40 commit 0785d44
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions recipes-core/images/xenclient-installer-image/isolinux.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ PROMPT 1
TIMEOUT 20
LABEL xenclient
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 console=/dev/tty2 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 console=/dev/tty2 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
LABEL verbose
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
LABEL automatic
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 console=/dev/tty2 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 console=/dev/tty2 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
10 changes: 5 additions & 5 deletions recipes-core/images/xenclient-installer-image/pxelinux.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ timeout 10

label xc-installer
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-upgrade
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-manual
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-download-win
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-manual-download-win
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
2 changes: 1 addition & 1 deletion recipes-openxt/xenclient/xenclient-dom0-tweaks/grub.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ else
fi

TBOOT_COMMON_CMD="min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory"
XEN_COMMON_CMD="console=com1 dom0_mem=min:420M,max:420M,420M com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug ucode=-2"
XEN_COMMON_CMD="console=com1 dom0_mem=min:420M,max:420M,420M com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug ucode=-2 smt=0"
LINUX_COMMON_CMD="console=hvc0 root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3"

menuentry "XenClient: Normal" {
Expand Down
10 changes: 5 additions & 5 deletions recipes-openxt/xenclient/xenclient-dom0-tweaks/openxt.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
default=openxt-normal

[openxt-normal]
options=console=com1 dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug
options=console=com1 dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug smt=0
kernel=bzImage root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3 console=hvc0 autostart
ramdisk=initramfs.gz
xsm=policy.24
ucode=microcode_intel.bin

[openxt-support-safe-graphics]
options=console=com1 dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug
options=console=com1 dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug smt=0
kernel=bzImage root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3 console=hvc0 safe-graphic nomodeset
ramdisk=initramfs.gz
xsm=policy.24
ucode=microcode_intel.bin

[openxt-support-amt]
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,amt mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,amt mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug smt=0
kernel=bzImage root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3 console=hvc0
ramdisk=initramfs.gz
xsm=policy.24
ucode=microcode_intel.bin

[openxt-support-console]
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug sync_console
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,pci mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug sync_console smt=0
kernel=bzImage root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3 console=hvc0,tty0 fbcon 3
ramdisk=initramfs.gz
xsm=policy.24
ucode=microcode_intel.bin

[openxt-support-console-amt]
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,amt mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug sync_console
options=console=com1,vga dom0_mem=min:420M,max:420M,420M efi=no-rs,attr=uc com1=115200,8n1,amt mbi-video vga=current flask=enforcing loglvl=debug guest_loglvl=debug sync_console smt=0
kernel=bzImage root=/dev/mapper/xenclient-root ro boot=/dev/mapper/xenclient-boot swiotlb=16384 xen_pciback.passthrough=1 consoleblank=0 video.delay_init=1 vt.global_cursor_default=0 rootfstype=ext3 bootfstype=ext3 console=hvc0,tty0 fbcon 3
ramdisk=initramfs.gz
xsm=policy.24
Expand Down

0 comments on commit 0785d44

Please sign in to comment.