Dev to main

affinity-setup.sh

@@ -1,256 +1,69 @@
 #!/bin/sh
-# Klipper stack affinity + PREEMPT_RT realtime setup (no unit file edits on disk)
+# Minimal display affinity helper:
+# - optionally set CPU governor to performance
+# - de-prioritize display.service so UI work is less likely to interfere
+#   with Klipper/Moonraker on low-power SBCs
 
 set -eu
 
-TAG="affinity-setup"
+TAG="display-affinity-minimal"
+ENABLE_PERFORMANCE_GOVERNOR="${ENABLE_PERFORMANCE_GOVERNOR:-yes}"
+
 log() {
-  logger -t "$TAG" -- "$@"
+  logger -t "$TAG" -- "$@" 2>/dev/null || true
   printf '%s: %s\n' "$TAG" "$*"
 }
 
-# Re-exec as root if needed
+have() { command -v "$1" >/dev/null 2>&1; }
+
+# Re-exec as root because systemd may call this via affinity.service.
 if [ "$(id -u)" != 0 ]; then
   exec sudo -E -- "$0" "$@"
 fi
 
-# --- CPU layout (0-based) ----------------------------------------------------
-MISC_CPU=0               # moonraker/mobileraker/mjpg-streamer/power_monitor + ttyS2 IRQ
-DISPLAY_TTY_CPU=1        # display.service + ttyS1 IRQ
-KLIPPER_MCU_RPI_CPU=2    # klipper-mcu.service (host-MCU tasks)
-KLIPPER_MCU_TTY_CPU=3    # klipper.service + ttyS0 IRQ
-
-# --- basic env checks (warn-only) --------------------------------------------
-have() { command -v "$1" >/dev/null 2>&1; }
-if systemctl is-active --quiet irqbalance.service 2>/dev/null; then
-  log "WARN: irqbalance is active; it may override IRQ affinities."
-fi
-for bin in systemctl awk ps sed chrt taskset ionice renice stty sysctl logger; do
-  have "$bin" || log "WARN: missing helper '$bin' (some steps may be skipped)."
-done
-
-cpu_online() {
-  c="$1"
-  [ -d "/sys/devices/system/cpu/cpu$c" ] || return 1
-  onf="/sys/devices/system/cpu/cpu$c/online"
-  [ ! -f "$onf" ] || [ "$(cat "$onf" 2>/dev/null || echo 1)" = "1" ]
-}
-
-# --- helpers -----------------------------------------------------------------
-wait_active() { # wait until systemd unit is active and has a MainPID
-  unit="$1"; t=0
-  while [ "$t" -lt 30 ]; do
-    state=$(systemctl is-active "$unit" 2>/dev/null || true)
-    pid=$(systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0)
-    if [ "$state" = "active" ] && [ "${pid:-0}" -gt 0 ]; then
-      return 0
-    fi
-    sleep 0.5
-    t=$((t+1))
-  done
-  log "WARN: $unit did not become active in time; continuing."
-  return 0
-}
-
-wait_irq_present() { # wait until /proc/interrupts shows the device name
-  dev="$1"; t=0
-  while [ "$t" -lt 20 ]; do
-    irq=$(awk -v n="$dev" '$NF==n{gsub(":", "", $1); print $1; exit}' /proc/interrupts)
-    [ -n "$irq" ] && return 0
-    sleep 0.5
-    t=$((t+1))
-  done
-  log "WARN: IRQ for $dev not found; continuing."
-  return 0
-}
-
-irq_for() {
-  awk -v name="$1" '$NF==name{gsub(":", "", $1); print $1; exit}' /proc/interrupts
-}
-
-pin_irq() {
-  irq="$1"; cpu="$2"
-  [ -n "$irq" ] || return 0
-  p="/proc/irq/$irq"
-  [ -d "$p" ] || return 0
-  cpu_online "$cpu" || { log "WARN: CPU $cpu not online; skip pin IRQ $irq"; return 0; }
-
-  if [ -w "$p/smp_affinity_list" ]; then
-    echo "$cpu" > "$p/smp_affinity_list" 2>/dev/null || true
-  else
-    # list path preferred; mask unsafe for cpu>=32
-    printf '%x\n' "$((1<<cpu))" > "$p/smp_affinity" 2>/dev/null || true
-  fi
-  log "Pinned IRQ $irq to CPU $cpu"
-}
-
-set_unit_cpus() {
-  unit="$1"; cpus="$2"
-  cpu_online "$cpus" || { log "WARN: CPU $cpus not online; skip $unit CPU pin"; return 0; }
-  if systemctl set-property --runtime "$unit" "AllowedCPUs=$cpus" >/dev/null 2>&1; then
-    log "AllowedCPUs for $unit -> $cpus"
-  else
-    pid=$(systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0)
-    if [ "${pid:-0}" -gt 0 ] && taskset -pc "$cpus" "$pid" >/dev/null 2>&1; then
-      log "taskset fallback for $unit(pid=$pid) -> $cpus"
-    fi
-  fi
+mainpid() {
+  unit="$1"
+  systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0
 }
 
 renice_unit() {
-  unit="$1"; niceval="$2"
-  pid=$(systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0)
-  if [ "${pid:-0}" -gt 0 ] && renice -n "$niceval" -p "$pid" >/dev/null 2>&1; then
-    log "renice $unit(pid=$pid) -> $niceval"
-  fi
-  return 0
+  unit="$1"
+  nice_val="$2"
+  pid="$(mainpid "$unit")"
+  [ "$pid" -gt 0 ] || return 0
+  renice "$nice_val" -p "$pid" >/dev/null 2>&1 || true
 }
 
 ionice_idle_unit() {
   unit="$1"
-  pid=$(systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0)
-  if [ "${pid:-0}" -gt 0 ] && ionice -c3 -p "$pid" >/dev/null 2>&1; then
-    log "ionice idle $unit(pid=$pid)"
-  fi
-  return 0
+  pid="$(mainpid "$unit")"
+  [ "$pid" -gt 0 ] || return 0
+  have ionice || return 0
+  ionice -c3 -p "$pid" >/dev/null 2>&1 || true
 }
 
-ps_line() {
-  pid="$1"
-  ps -o pid,cls,rtprio,psr,cmd -p "$pid" --no-headers 2>/dev/null | sed 's/^/    /'
-}
-
-# Ensure a unit runs as SCHED_FIFO:prio even if the process set its own (-r/49)
-promote_unit_fifo() {
-  unit="$1"; prio="$2"
-  systemctl set-property --runtime "$unit" CPUSchedulingPolicy=fifo CPUSchedulingPriority="$prio" >/dev/null 2>&1 || true
-  pid=$(systemctl show -p MainPID --value "$unit" 2>/dev/null || echo 0)
-  [ "${pid:-0}" -gt 0 ] || return 0
-  n=0
-  while [ "$n" -lt 10 ]; do
-    chrt -a -f -p "$prio" "$pid" >/dev/null 2>&1 || true
-    cls=$(ps -o cls= -p "$pid" 2>/dev/null | xargs || true)
-    rt=$(ps -o rtprio= -p "$pid" 2>/dev/null | xargs || true)
-    if [ "$cls" = "FF" ] && [ "$rt" = "$prio" ]; then
-      log "$unit(pid=$pid) -> FIFO $prio (all threads)"
-      return 0
-    fi
-    sleep 0.3
-    n=$((n+1))
-  done
-  log "WARN: $unit(pid=$pid) did not reach FIFO $prio (last: cls=$cls rtprio=$rt)"
-  return 0
-}
+set_performance_governor() {
+  [ "$ENABLE_PERFORMANCE_GOVERNOR" = "yes" ] || {
+    log "Skipping CPU governor change"
+    return 0
+  }
 
-# Promote a threaded IRQ kernel thread (irq/<N>-*) to FIFO priority
-# Handles kernel threads displayed as "[irq/<N>-...]" by stripping brackets.
-chrt_irq_thread() {
-  irq="$1"; prio="$2"; t=0
-  [ -n "$irq" ] || return 0
-  while [ "$t" -lt 20 ]; do
-    pid=$(
-      ps -eLo pid=,cmd= 2>/dev/null | awk -v irq="$irq" '
-        {
-          pid=$1; $1=""; sub(/^[ \t]+/,""); name=$0;
-          gsub(/^\[/,"",name); gsub(/\]$/,"",name);
-          if (name ~ ("^irq/" irq "-")) { print pid; exit }
-        }'
-    )
-    if [ -n "$pid" ]; then
-      chrt -f -p "$prio" "$pid" >/dev/null 2>&1 || true
-      log "IRQ thread irq/$irq -> FIFO $prio (pid=$pid)"
-      return 0
-    fi
-    sleep 0.5
-    t=$((t+1))
-  done
-  log "WARN: did not find threaded IRQ for $irq"
-  return 0
+  if have cpupower; then
+    cpupower frequency-set -g performance >/dev/null 2>&1 || true
+  else
+    for g in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+      [ -w "$g" ] && echo performance > "$g" 2>/dev/null || true
+    done
+  fi
+  log "CPU governor set to performance (best effort)"
 }
 
-# --- wait for services -------------------------------------------------------
-for u in klipper.service klipper-mcu.service moonraker.service display.service; do
-  wait_active "$u"
-done
-
-# --- wait for UART IRQs ------------------------------------------------------
-wait_irq_present ttyS0
-wait_irq_present ttyS1
-wait_irq_present ttyS2
-
-# --- pin UART IRQs -----------------------------------------------------------
-IRQ_S0="$(irq_for ttyS0 || true)"
-IRQ_S1="$(irq_for ttyS1 || true)"
-IRQ_S2="$(irq_for ttyS2 || true)"
-
-[ -n "${IRQ_S0:-}" ] && pin_irq "$IRQ_S0" "$KLIPPER_MCU_TTY_CPU"
-[ -n "${IRQ_S1:-}" ] && pin_irq "$IRQ_S1" "$DISPLAY_TTY_CPU"
-[ -n "${IRQ_S2:-}" ] && pin_irq "$IRQ_S2" "$MISC_CPU"
+set_performance_governor
 
-# --- place units on CPUs -----------------------------------------------------
-set_unit_cpus klipper-mcu.service "$KLIPPER_MCU_RPI_CPU"
-set_unit_cpus klipper.service     "$KLIPPER_MCU_TTY_CPU"
-set_unit_cpus display.service     "$DISPLAY_TTY_CPU"
-set_unit_cpus moonraker.service   "$MISC_CPU"
-set_unit_cpus mjpg-streamer-webcam1.service "$MISC_CPU" || true
-set_unit_cpus mobileraker.service            "$MISC_CPU" || true
-set_unit_cpus power_monitor.service          "$MISC_CPU" || true
-
-# --- serial tuning for /dev/ttyS0 -------------------------------------------
-if [ -e /dev/ttyS0 ]; then
-  have setserial && setserial /dev/ttyS0 low_latency || true
-  stty -F /dev/ttyS0 cs8 -parenb -cstopb -ixon -ixoff -crtscts \
-       -icanon -echo -echoe -echok -echoctl -echoke -iexten \
-       -inlcr -igncr -icrnl -opost -hupcl min 1 time 0 || true
-else
-  log "WARN: /dev/ttyS0 not present; skipped stty/setserial"
-fi
-
-# --- make display gentle -----------------------------------------------------
-renice_unit      display.service 19
+# Keep the UI process gentle. Do not touch klipper/klipper-mcu scheduling,
+# CPU affinity, IRQ affinity, or serial driver tuning here.
+renice_unit display.service 19
 ionice_idle_unit display.service
+log "Applied gentle priority tuning to display.service"
 
-# --- RT budget ---------------------------------------------------------------
-sysctl -w kernel.sched_rt_runtime_us=-1 >/dev/null 2>&1 || \
-  echo -1 > /proc/sys/kernel/sched_rt_runtime_us 2>/dev/null || \
-  log "WARN: failed to set sched_rt_runtime_us"
-
-# --- promote Klippy + host MCU to SCHED_FIFO 60 (sticky) ---------------------
-promote_unit_fifo klipper-mcu.service 60
-promote_unit_fifo klipper.service     60
-
-# --- bump ttyS0 IRQ thread if present ----------------------------------------
-if [ -n "${IRQ_S0:-}" ]; then
-  chrt_irq_thread "$IRQ_S0" 70
-fi
-
-# --- summary -----------------------------------------------------------------
-if [ -n "${IRQ_S0:-}" ]; then
-  aff0=$(
-    cat "/proc/irq/$IRQ_S0/smp_affinity_list" 2>/dev/null ||
-    cat "/proc/irq/$IRQ_S0/smp_affinity" 2>/dev/null ||
-    echo "?"
-  )
-  log "ttyS0 irq=$IRQ_S0 aff=$aff0"
-fi
-if [ -n "${IRQ_S1:-}" ]; then
-  aff1=$(
-    cat "/proc/irq/$IRQ_S1/smp_affinity_list" 2>/dev/null ||
-    cat "/proc/irq/$IRQ_S1/smp_affinity" 2>/dev/null ||
-    echo "?"
-  )
-  log "ttyS1 irq=$IRQ_S1 aff=$aff1"
-fi
-if [ -n "${IRQ_S2:-}" ]; then
-  aff2=$(
-    cat "/proc/irq/$IRQ_S2/smp_affinity_list" 2>/dev/null ||
-    cat "/proc/irq/$IRQ_S2/smp_affinity" 2>/dev/null ||
-    echo "?"
-  )
-  log "ttyS2 irq=$IRQ_S2 aff=$aff2"
-fi
-
-log "klipper-mcu:$(ps_line "$(systemctl show -p MainPID --value klipper-mcu.service 2>/dev/null || echo 0)" || true)"
-log "klipper:    $(ps_line "$(systemctl show -p MainPID --value klipper.service 2>/dev/null || echo 0)" || true)"
-log "done (IRQs: ttyS0:${IRQ_S0:-?} ttyS1:${IRQ_S1:-?} ttyS2:${IRQ_S2:-?})"
 exit 0

affinity.service

@@ -1,20 +1,16 @@
 [Unit]
-Description=Pin UART IRQs and set CPU affinities/priorities for Klipper stack (dynamic detection)
+Description=Apply minimal display priority tuning
 
-# Start after these are up, and pull them in if needed
-After=klipper-mcu.service klipper.service display.service moonraker.service
-Wants=klipper-mcu.service klipper.service display.service moonraker.service
+# Run after display is up so the script can tune display.service safely.
+After=display.service
 
-# If any of these restart/stop, restart this oneshot too
-PartOf=klipper-mcu.service klipper.service display.service
+# Re-run when display.service is restarted/stopped.
+PartOf=display.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/local/sbin/affinity-setup.sh
+ExecStart=/home/mks/display_connector/affinity-setup.sh
 
 [Install]
-WantedBy=multi-user.target
-WantedBy=klipper-mcu.service
-WantedBy=klipper.service
 WantedBy=display.service

display-service-installer.sh

@@ -58,9 +58,8 @@ echo "Reloading systemd units..."
 sudo systemctl daemon-reload
 
 # --- Enable + start services -------------------------------------------------
-echo "Enabling and starting affinity.service..."
+echo "Enabling affinity.service..."
 sudo systemctl enable affinity.service
-sudo systemctl start affinity.service
 
 echo "Enabling and starting display.service..."
 sudo systemctl enable display.service