In the package guidelines, PKG_VERSION is supposed to be used as "The upstream version number that we're downloading", while PKG_RELEASE is referred to as "The version of this package Makefile". Thus, the variables in a strict interpretation provide a clear distinction between "their" (upstream) version in PKG_VERSION and "our" (local OpenWrt trunk) version in PKG_RELEASE. For local (OpenWrt-only) packages, this implies that those will only need PKG_RELEASE defined, while PKG_VERSION does not apply following a strict interpretation. While the majority of "our" packages actually follow that scheme, there are also some that mix both variables or have one of them defined but keep them at "1". This is misleading and confusing, which can be observed by the fact that there typically either one of the variables is never bumped or the choice of the variable to increase depends on the person doing the change. Consequently, this patch aims at clarifying the situation by consistently using only PKG_RELEASE for "our" packages. To achieve that, PKG_VERSION is removed there, bumping PKG_RELEASE where necessary to ensure the resulting package version string is bigger than before. During adjustment, one has to make sure that the new resulting composite package version will not be considered "older" than the previous one. A useful tool for evaluating that is 'opkg compare-versions'. In principle, there are the following cases: 1. Sole PKG_VERSION replaced by sole PKG_RELEASE: In this case, the resulting version string does not change, it's just the value of the variable put in the file. Consequently, we do not bump the number in these cases so nobody is tempted to install the same package again. 2. PKG_VERSION and PKG_RELEASE replaced by sole PKG_RELEASE: In this case, the resulting version string has been "version-release", e.g. 1-3 or 1.0-3. For this case, the new PKG_RELEASE will just need to be higher than the previous PKG_VERSION. For the cases where PKG_VERSION has always sticked to "1", and PKG_RELEASE has been incremented, we take the most recent value of PKG_RELEASE. Apart from that, a few packages appear to have developed their own complex versioning scheme, e.g. using x.y.z number for PKG_VERSION _and_ a PKG_RELEASE (qos-scripts) or using dates for PKG_VERSION (adb-enablemodem, wwan). I didn't touch these few in this patch. Cc: Hans Dedecker <dedeckeh@gmail.com> Cc: Felix Fietkau <nbd@nbd.name> Cc: Andre Valentin <avalentin@marcant.net> Cc: Matthias Schiffer <mschiffer@universe-factory.net> Cc: Jo-Philipp Wich <jo@mein.io> Cc: Steven Barth <steven@midlink.org> Cc: Daniel Golle <dgolle@allnet.de> Cc: John Crispin <john@phrozen.org> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
218 lines
6.1 KiB
Bash
Executable File
218 lines
6.1 KiB
Bash
Executable File
#!/bin/sh /etc/rc.common
|
|
|
|
START=15
|
|
|
|
EXTRA_COMMANDS="compact status"
|
|
EXTRA_HELP=" compact trigger compaction for all Z-RAM swap dev's
|
|
status print out status information & statistics about Z-RAM swap devices"
|
|
|
|
ram_getsize()
|
|
{
|
|
local line
|
|
|
|
while read line; do case "$line" in MemTotal:*) set $line; echo "$2"; break ;; esac; done </proc/meminfo
|
|
}
|
|
|
|
zram_getsize() # in megabytes
|
|
{
|
|
local zram_size="$( uci -q get system.@system[0].zram_size_mb )"
|
|
local ram_size="$( ram_getsize )"
|
|
|
|
if [ -z "$zram_size" ]; then
|
|
# e.g. 6mb for 16mb-routers or 61mb for 128mb-routers
|
|
echo $(( ram_size / 2048 ))
|
|
else
|
|
echo "$zram_size"
|
|
fi
|
|
}
|
|
|
|
zram_applicable()
|
|
{
|
|
local zram_dev="$1"
|
|
|
|
[ -e "$zram_dev" ] || {
|
|
logger -s -t zram_applicable -p daemon.crit "[ERROR] device '$zram_dev' not found"
|
|
return 1
|
|
}
|
|
|
|
which mkswap >/dev/null || {
|
|
logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed"
|
|
return 1
|
|
}
|
|
|
|
which swapon >/dev/null || {
|
|
logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed"
|
|
return 1
|
|
}
|
|
|
|
which swapoff >/dev/null || {
|
|
logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed"
|
|
return 1
|
|
}
|
|
}
|
|
|
|
zram_dev()
|
|
{
|
|
local idx="$1"
|
|
echo "/dev/zram${idx:-0}"
|
|
}
|
|
|
|
zram_reset()
|
|
{
|
|
local dev="$1"
|
|
local message="$2"
|
|
local proc_entry="/sys/block/$( basename "$dev" )/reset"
|
|
|
|
logger -s -t zram_reset -p daemon.debug "$message via $proc_entry"
|
|
echo "1" >"$proc_entry"
|
|
}
|
|
|
|
zram_getdev()
|
|
{
|
|
#get unallocated zram dev
|
|
local zdev=$( zram_dev )
|
|
|
|
if [ "$(mount | grep $zdev)" ]; then
|
|
local idx=$(cat /sys/class/zram-control/hot_add)
|
|
zdev="$( zram_dev $idx )"
|
|
fi
|
|
|
|
echo $zdev
|
|
}
|
|
|
|
zram_comp_algo()
|
|
{
|
|
local dev="$1"
|
|
local zram_comp_algo="$( uci -q get system.@system[0].zram_comp_algo )"
|
|
|
|
if [ -z "$zram_comp_algo" ] || [ ! -e /sys/block/$( basename $dev )/comp_algorithm ]; then
|
|
return 0
|
|
fi
|
|
|
|
if [ $(grep -c "$zram_comp_algo" /sys/block/$( basename $dev )/comp_algorithm) -ne 0 ]; then
|
|
logger -s -t zram_comp_algo -p daemon.debug "Set compression algorithm '$zram_comp_algo' for zram '$dev'"
|
|
echo $zram_comp_algo > "/sys/block/$( basename $dev )/comp_algorithm"
|
|
else
|
|
logger -s -t zram_comp_algo -p daemon.debug "Compression algorithm '$zram_comp_algo' is not supported for '$dev'"
|
|
fi
|
|
}
|
|
|
|
zram_comp_streams()
|
|
{
|
|
local dev="$1"
|
|
local logical_cpus=$( grep -ci "^processor" /proc/cpuinfo )
|
|
[ $logical_cpus -gt 1 ] || return 1
|
|
local zram_comp_streams="$( uci -q get system.@system[0].zram_comp_streams )"
|
|
[ -n "$zram_comp_streams" ] && [ "$zram_comp_streams" -le "$logical_cpus" ] || zram_comp_streams=$logical_cpus
|
|
if [ -e /sys/block/$( basename $dev )/max_comp_streams ]; then
|
|
logger -s -t zram_comp_streams -p daemon.debug "Set max compression streams to '$zram_comp_streams' for zram '$dev'"
|
|
echo $zram_comp_streams > /sys/block/$( basename $dev )/max_comp_streams
|
|
fi
|
|
}
|
|
|
|
#print various stats info about zram swap device
|
|
zram_stats()
|
|
{
|
|
local zdev="/sys/block/$( basename "$1" )"
|
|
|
|
printf "\nGathering stats info for zram device \"$( basename "$1" )\"\n\n"
|
|
|
|
printf "Z-RAM\n-----\n"
|
|
printf "%-25s - %s\n" "Block device" $zdev
|
|
awk '{ printf "%-25s - %d MiB\n", "Device size", $1/1024/1024 }' <$zdev/disksize
|
|
printf "%-25s - %s\n" "Compression algo" "$(cat $zdev/comp_algorithm)"
|
|
printf "%-25s - %s\n" "Compression streams" "$( cat $zdev/max_comp_streams)"
|
|
|
|
awk 'BEGIN { fmt = "%-25s - %.2f %s\n"
|
|
fmt2 = "%-25s - %d\n"
|
|
print "\nDATA\n----" }
|
|
{ printf fmt, "Original data size", $1/1024/1024, "MiB"
|
|
printf fmt, "Compressed data size", $2/1024/1024, "MiB"
|
|
printf fmt, "Compress ratio", $1/$2, ""
|
|
print "\nMEMORY\n------"
|
|
printf fmt, "Memory used, total", $3/1024/1024, "MiB"
|
|
printf fmt, "Allocator overhead", ($3-$2)/1024/1024, "MiB"
|
|
printf fmt, "Allocator efficiency", $2/$3*100, "%"
|
|
printf fmt, "Maximum memory ever used", $5/1024/1024, "MiB"
|
|
printf fmt, "Memory limit", $4/1024/1024, "MiB"
|
|
print "\nPAGES\n-----"
|
|
printf fmt2, "Same pages count", $6
|
|
printf fmt2, "Pages compacted", $7 }' <$zdev/mm_stat
|
|
|
|
awk '{ printf "%-25s - %d\n", "Free pages discarded", $4 }' <$zdev/io_stat
|
|
}
|
|
|
|
zram_compact()
|
|
{
|
|
# compact zram device (reduce memory allocation overhead)
|
|
local zdev="/sys/block/$( basename "$1" )"
|
|
|
|
local old_mem_used=$(awk '{print $3}' <$zdev/mm_stat)
|
|
local old_overhead=$(awk '{print $3-$2}' <$zdev/mm_stat)
|
|
|
|
echo 1 > $zdev/compact
|
|
|
|
# If not running interactively, than just return
|
|
[ -z "$PS1" ] && return 0
|
|
|
|
echo ""
|
|
echo "Compacting zram device $zdev"
|
|
awk -v old_mem="$old_mem_used" -v ovr="$old_overhead" 'BEGIN { fmt = "%-25s - %.1f %s\n" }
|
|
{ printf fmt, "Memory usage reduced by ", (old_mem-$3)/1024/1024, "MiB"
|
|
printf fmt, "Overhead reduced by", (ovr-($3-$2))/ovr*100, "%" }' <$zdev/mm_stat
|
|
}
|
|
|
|
start()
|
|
{
|
|
if [ $( grep -cs zram /proc/swaps ) -ne 0 ]; then
|
|
logger -s -t zram_start -p daemon.notice "[OK] zram swap is already mounted"
|
|
return 1
|
|
fi
|
|
|
|
local zram_size="$( zram_getsize )"
|
|
local zram_dev="$( zram_getdev )"
|
|
zram_applicable "$zram_dev" || return 1
|
|
local zram_priority="$( uci -q get system.@system[0].zram_priority )"
|
|
zram_priority=${zram_priority:+-p $zram_priority}
|
|
|
|
logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)"
|
|
|
|
zram_reset "$zram_dev" "enforcing defaults"
|
|
zram_comp_algo "$zram_dev"
|
|
zram_comp_streams "$zram_dev"
|
|
echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize"
|
|
mkswap "$zram_dev"
|
|
swapon -d $zram_priority "$zram_dev"
|
|
}
|
|
|
|
stop()
|
|
{
|
|
local zram_dev
|
|
|
|
for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do {
|
|
logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
|
|
swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back"
|
|
local dev_index="$( echo $zram_dev | grep -o "[0-9]*$" )"
|
|
if [ $dev_index -ne 0 ]; then
|
|
logger -s -t zram_stop -p daemon.debug "removing zram $zram_dev"
|
|
echo $dev_index > /sys/class/zram-control/hot_remove
|
|
fi
|
|
} done
|
|
}
|
|
|
|
# show memory stats for all zram swaps
|
|
status()
|
|
{
|
|
for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do {
|
|
zram_stats "$zram_dev"
|
|
} done
|
|
}
|
|
|
|
# trigger compaction for all zram swaps
|
|
compact()
|
|
{
|
|
for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do {
|
|
zram_compact "$zram_dev"
|
|
} done
|
|
}
|