Skip to content

fix(dietpi-cpuinfo): give each core a chance to scale down before checking its frequency #7700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

fix(dietpi-cpuinfo): give each core a chance to scale down before checking its frequency #7700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc292e4
Beta v9.16.0 (#7660)
MichaIng Aug 16, 2025
e16f1d9
Beta v9.16.1 (#7681)
MichaIng Aug 20, 2025
9830d2a
Beta v9.16.2 (#7685)
MichaIng Aug 21, 2025
996a8db
Beta v9.16.3 (#7687)
MichaIng Aug 24, 2025
7ed2219
Raspberry Pi: remove obsolete rpi[2-5] APT component (#7690)
MichaIng Aug 24, 2025
08ab5d1
Release v9.16 (#7678)
MichaIng Aug 24, 2025
5a1b497
live patch 0: fix Docker socket path for Portainer installation (#7692)
MichaIng Aug 24, 2025
1f98f96
live patch 1: fix CPU frequency limit selection in dietpi-config (#7697)
MichaIng Aug 25, 2025
831476e
fix(dietpi-cpuinfo): give a chance to scale down each core
rozcietrzewiacz Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .update/version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ G_MIN_DEBIAN=6
# Alternative Git branch to automatically migrate to when Debian version is too low
G_OLD_DEBIAN_BRANCH='8'
# Live patches
G_LIVE_PATCH_DESC=()
G_LIVE_PATCH_COND=()
G_LIVE_PATCH=()
G_LIVE_PATCH_DESC=(
[0]='Fix Docker socket path for Portainer installation, only relevant if you plan to install/reinstall/update Portainer via dietpi-software'
[1]='Fix CPU frequency limit selection in dietpi-config'
)
G_LIVE_PATCH_COND=(
[0]='grep -q '\''/run/docker.sock:/run/docker.sock'\'' /boot/dietpi/dietpi-software'
[1]='grep -q '\''\[0-9\]\*scaling_available_frequencies'\'' /boot/dietpi/dietpi-config'
)
G_LIVE_PATCH=(
[0]='sed --follow-symlinks -i '\''s|/run/docker.sock:/run/docker.sock|/run/docker.sock:/var/run/docker.sock|'\'' /boot/dietpi/dietpi-software'
[1]='sed --follow-symlinks -i '\''s|\[0-9\]\*scaling_available_frequencies|\[0-9\]\*/scaling_available_frequencies|'\'' /boot/dietpi/dietpi-config'
)
5 changes: 4 additions & 1 deletion dietpi/dietpi-cpuinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
{
for ((i=0; i<$G_HW_CPU_CORES; i++))
do
[[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]] && read -r aCPU_CUR_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq"
[[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]] && {
sleep 0.05 # Necessary to give the scheduler a chance to scale down the core in (quite likely) case this script has already caused it to ramp up the frequency
Copy link
Owner

@MichaIng MichaIng Aug 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sleep 0.05 # Necessary to give the scheduler a chance to scale down the core in (quite likely) case this script has already caused it to ramp up the frequency
G_SLEEP 0.05 # Necessary to give the scheduler a chance to scale down the core in (quite likely) case this script has already caused it to ramp up the frequency

/bin/sleep is an external executable, expensive to call. We have a G_SLEEP function which provides the functionality very cheaply with pure shell features. This also reduces the processing for the sleep call itself significantly.

read -r aCPU_CUR_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq"
}
[[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq ]] && read -r aCPU_MIN_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq"
[[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq ]] && read -r aCPU_MAX_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq"
done
Expand Down