Unverified Commit 29487e54 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Verify clock source (#687)

parent 37b3770f

src/boot.sh

+39 −16
Original line number Diff line number Diff line
@@ -11,24 +11,9 @@ BOOT_OPTS="" 


SECURE="off"

[[ "$SMM" == [Yy1]* ]] && SECURE="on"



if [ -n "$BIOS" ]; then

  BOOT_MODE="custom"

  BOOT_OPTS="-bios $BIOS"

  BOOT_DESC=" with custom BIOS file"

  return 0

fi



if [[ "${BOOT_MODE,,}" == "windows"* ]]; then

  BOOT_OPTS="-rtc base=localtime"

  BOOT_OPTS+=" -global ICH9-LPC.disable_s3=1"

  BOOT_OPTS+=" -global ICH9-LPC.disable_s4=1"

fi

[ -n "$BIOS" ] && BOOT_MODE="custom"



case "${BOOT_MODE,,}" in

  "legacy" )

    BOOT_DESC=" with SeaBIOS"

    ;;

  "uefi" | "" )

    BOOT_MODE="uefi"

    ROM="OVMF_CODE_4M.fd"
@@ -57,12 +42,25 @@ case "${BOOT_MODE,,}" in 
    BOOT_DESC=" (legacy)"

    [ -z "${USB:-}" ] && USB="usb-ehci,id=ehci"

    ;;

  "legacy" )

    BOOT_DESC=" with SeaBIOS"

    ;;

  "custom" )

    BOOT_OPTS="-bios $BIOS"

    BOOT_DESC=" with custom BIOS file"

    ;;

  *)

    error "Unknown BOOT_MODE, value \"${BOOT_MODE}\" is not recognized!"

    exit 33

    ;;

esac



if [[ "${BOOT_MODE,,}" == "windows"* ]]; then

  BOOT_OPTS+=" -rtc base=localtime"

  BOOT_OPTS+=" -global ICH9-LPC.disable_s3=1"

  BOOT_OPTS+=" -global ICH9-LPC.disable_s4=1"

fi



case "${BOOT_MODE,,}" in

  "uefi" | "secure" | "windows" | "windows_plain" | "windows_secure" )
@@ -89,6 +87,31 @@ case "${BOOT_MODE,,}" in 
    ;;

esac



MSRS="/sys/module/kvm/parameters/ignore_msrs"

if [ -e "$MSRS" ]; then

  result=$(<"$MSRS")

  if [[ "$result" == "0" ]] || [[ "${result^^}" == "N" ]]; then

    echo 1 | tee "$MSRS" > /dev/null 2>&1 || true

  fi

fi



CLOCKSOURCE="tsc"

[[ "${ARCH,,}" == "arm64" ]] && CLOCKSOURCE="arch_sys_counter"

CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"



if [ ! -f "$CLOCK" ]; then

  warn "file \"$CLOCK\" cannot not found?"

else

  result=$(<"$CLOCK")

  case "${result,,}" in

    "${CLOCKSOURCE,,}" ) ;;

    "kvm-clock" ) info "Nested KVM virtualization detected.." ;;

    "hyperv_clocksource_tsc_page" ) info "Nested Hyper-V virtualization detected.." ;;

    "hpet" ) warn "unsupported clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'" ;;

    *) warn "unexpected clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'" ;;

  esac

fi



if [[ "$TPM" == [Yy1]* ]]; then



  rm -f /var/run/tpm.pid

src/proc.sh

+0 −25
Original line number Diff line number Diff line
@@ -10,31 +10,6 @@ set -Eeuo pipefail 
: "${CPU_MODEL:=""}"

: "${DEF_MODEL:="qemu64"}"



MSRS="/sys/module/kvm/parameters/ignore_msrs"

if [ -e "$MSRS" ]; then

  result=$(<"$MSRS")

  if [[ "$result" == "0" ]] || [[ "${result^^}" == "N" ]]; then

    echo 1 | tee "$MSRS" > /dev/null 2>&1 || true

  fi

fi



CLOCKSOURCE="tsc"

[[ "${ARCH,,}" == "arm64" ]] && CLOCKSOURCE="arch_sys_counter"

CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"



if [ ! -f "$CLOCK" ]; then

  warn "file \"$CLOCK\" cannot not found?"

else

  result=$(<"$CLOCK")

  case "${result,,}" in

    "${CLOCKSOURCE,,}" ) ;;

    "kvm-clock" ) info "Nested KVM virtualization detected.." ;;

    "hyperv_clocksource_tsc_page" ) info "Nested Hyper-V virtualization detected.." ;;

    "hpet" ) warn "unsupported clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'" ;;

    *) warn "unexpected clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'" ;;

  esac

fi



if [[ "${ARCH,,}" != "amd64" ]]; then

  KVM="N"

  warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, this will cause a major loss of performance."

src/reset.sh

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ SPACE_GB=$(formatBytes "$SPACE" "down") 
AVAIL_MEM=$(formatBytes "$RAM_AVAIL" "down")

TOTAL_MEM=$(formatBytes "$RAM_TOTAL" "up")



echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM%% *}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."

echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM/ GB/}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."

echo



# Check compatibilty