build: attempt setting tsc as clock source (#2144)

* Use tsc as clocksource for all x86 instances * Add shared set clocksource script, remove service
awslabs · Feb 12, 2025 · 0030ac5 · 0030ac5
1 parent d051ea6
commit 0030ac5
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 84 deletions.
diff --git a/templates/al2/provisioners/install-worker.sh b/templates/al2/provisioners/install-worker.sh
@@ -86,12 +86,6 @@ if yum list installed | grep ec2-net-utils; then sudo yum remove ec2-net-utils -
 
 sudo mkdir -p /etc/eks/
 
-################################################################################
-### Time #######################################################################
-################################################################################
-
-sudo mv $WORKING_DIR/configure-clocksource.service /etc/eks/configure-clocksource.service
-
 ################################################################################
 ### SSH ########################################################################
 ################################################################################

diff --git a/templates/al2/provisioners/upgrade-kernel.sh b/templates/al2/provisioners/upgrade-kernel.sh
@@ -23,9 +23,3 @@ sudo yum install -y "kernel-headers-${KERNEL_VERSION}*" "kernel-devel-${KERNEL_V
 sudo grubby \
   --update-kernel=ALL \
   --args="psi=1"
-
-# use the tsc clocksource by default
-# https://repost.aws/knowledge-center/manage-ec2-linux-clock-source
-sudo grubby \
-  --update-kernel=ALL \
-  --args="clocksource=tsc tsc=reliable"
diff --git a/templates/al2/runtime/bootstrap.sh b/templates/al2/runtime/bootstrap.sh
@@ -335,11 +335,6 @@ if [ "$MOUNT_BPF_FS" = "true" ]; then
   mount-bpf-fs
 fi
 
-cp -v /etc/eks/configure-clocksource.service /etc/systemd/system/configure-clocksource.service
-chown root:root /etc/systemd/system/configure-clocksource.service
-systemctl daemon-reload
-systemctl enable --now configure-clocksource
-
 ECR_URI=$(/etc/eks/get-ecr-uri.sh "${AWS_DEFAULT_REGION}" "${AWS_SERVICES_DOMAIN}" "${PAUSE_CONTAINER_ACCOUNT:-}")
 PAUSE_CONTAINER_IMAGE=${PAUSE_CONTAINER_IMAGE:-$ECR_URI/eks/pause}
 PAUSE_CONTAINER="$PAUSE_CONTAINER_IMAGE:$PAUSE_CONTAINER_VERSION"

diff --git a/templates/al2/template.json b/templates/al2/template.json
@@ -170,6 +170,11 @@
         "KERNEL_VERSION={{user `kernel_version`}}"
       ]
     },
+    {
+      "type": "shell",
+      "remote_folder": "{{ user `remote_folder`}}",
+      "script": "{{template_dir}}/../shared/provisioners/set-clocksource.sh"
+    },
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
@@ -181,7 +186,9 @@
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
-      "inline": ["sudo reboot"],
+      "inline": [
+        "sudo reboot"
+      ],
       "expect_disconnect": true,
       "pause_after": "90s"
     },
@@ -272,4 +279,4 @@
       }
     }
   ]
-}
+}
diff --git a/templates/al2023/provisioners/install-worker.sh b/templates/al2023/provisioners/install-worker.sh
@@ -87,13 +87,6 @@ EOF
 # Temporary fix for https://github.com/aws/amazon-vpc-cni-k8s/pull/2118
 sudo sed -i "s/^MACAddressPolicy=.*/MACAddressPolicy=none/" /usr/lib/systemd/network/99-default.link || true
 
-################################################################################
-### Time #######################################################################
-################################################################################
-
-sudo cp -v $WORKING_DIR/shared/configure-clocksource.service /etc/systemd/system/configure-clocksource.service
-sudo systemctl enable configure-clocksource
-
 ################################################################################
 ### SSH ########################################################################
 ################################################################################

diff --git a/templates/al2023/template.json b/templates/al2023/template.json
@@ -175,6 +175,11 @@
         "sudo chmod -R a+x {{user `working_dir`}}/gpu/*"
       ]
     },
+    {
+      "type": "shell",
+      "remote_folder": "{{ user `remote_folder`}}",
+      "script": "{{template_dir}}/../shared/provisioners/set-clocksource.sh"
+    },
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
@@ -322,4 +327,4 @@
       }
     }
   ]
-}
+}
diff --git a/templates/shared/provisioners/set-clocksource.sh b/templates/shared/provisioners/set-clocksource.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -o nounset
+set -o errexit
+
+# use the tsc clocksource by default
+# https://repost.aws/knowledge-center/manage-ec2-linux-clock-source
+sudo grubby \
+  --update-kernel=ALL \
+  --args="clocksource=tsc tsc=reliable"
diff --git a/templates/shared/runtime/bin/configure-clocksource b/templates/shared/runtime/bin/configure-clocksource
diff --git a/templates/shared/runtime/configure-clocksource.service b/templates/shared/runtime/configure-clocksource.service