Add support for ptp_kvm to coreos-platform-chrony system-generator

coreos · Mar 10, 2023 · 4e9b385 · 4e9b385
1 parent 413b7db
commit 4e9b385
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/overlay.d/20platform-chrony/usr/lib/systemd/system/coreos-platform-chrony-config.service b/overlay.d/20platform-chrony/usr/lib/systemd/system/coreos-platform-chrony-config.service
@@ -4,6 +4,7 @@ ConditionKernelCommandLine=|ignition.platform.id=azurestack
 ConditionKernelCommandLine=|ignition.platform.id=azure
 ConditionKernelCommandLine=|ignition.platform.id=aws
 ConditionKernelCommandLine=|ignition.platform.id=gcp
+ConditionKernelCommandLine=|ignition.platform.id=qemu
 Before=NetworkManager.service
 Before=chronyd.service
 

diff --git a/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config b/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config
@@ -19,7 +19,6 @@ if ! cmp {/usr,}/etc/chrony.conf >/dev/null; then
     exit 0
 fi
 
-mkdir -p /run/coreos
 confpath=/run/coreos/platform-chrony.conf
 altenvfilepath=/run/coreos/sysconfig-chrony
 cmdline=( $(</proc/cmdline) )
@@ -34,6 +33,14 @@ cmdline_arg() {
 }
 platform=$(cmdline_arg ignition.platform.id)
 
+# Exit early if the ptp_kvm module can't be loaded for the qemu platform
+if [[ ${platform} == "qemu" ]]; then
+    modprobe -q ptp_kvm || exit 0
+fi
+
+# Create /run/coreos
+mkdir -p /run/coreos
+
 # If not set already (by host customization or this script), set
 # PEERNTP=no so that DHCP-provided NTP servers are not added to chrony.
 # By doing this we assume the better NTP server choice is the
@@ -77,6 +84,11 @@ case "${platform}" in
          echo '# and https://cloud.google.com/compute/docs/images/configuring-imported-images'
          echo 'server metadata.google.internal prefer iburst'
         ) >> "${confpath}" ;;
+    qemu)
+        sed -i s,'^#pool,pool,' "${confpath}"
+        (echo '# KVM virtual PHC'
+         echo 'refclock PHC /dev/ptp0 poll 2'
+        ) >> "${confpath}" ;;
     *) echo "should not be reached" 1>&2; exit 1 ;;
 esac
 # Policy doesn't allow chronyd to read run_t

diff --git a/tests/kola/ntp/chrony/coreos-platform-chrony-generator b/tests/kola/ntp/chrony/coreos-platform-chrony-generator
@@ -1,7 +1,7 @@
 #!/bin/bash
 ## kola:
 ##   exclusive: false
-##   platforms: "aws azure gce"
+##   platforms: "aws azure gce qemu"
 #
 # Test the coreos-platform-chrony generator.
 
@@ -14,5 +14,9 @@ case "${platform}" in
     aws) chronyc sources |grep '169.254.169.123'; echo "ok chrony aws" ;;
     azure) chronyc sources |grep 'PHC'; echo "ok chrony azure" ;;
     gcp) chronyc sources | grep '169.254.169.254'; echo "ok chrony gcp" ;;
+    qemu)
+        if [[ -f /run/coreos/sysconfig-chrony ]]; then
+            chronyc sources | grep 'PHC0'; echo "ok chrony qemu"
+        fi ;;
     *) echo "unhandled platform ${platform} ?"; exit 1 ;;
 esac