contrib/check-config.sh: fix MEMCG_SWAP_ENABLED
Kernel commit 2d1c498072de69e (which made its way into kernel v5.8-rc1)
removed CONFIG_MEMCG_SWAP_ENABLED Kconfig option, making swap accounting
always enabled (unless swapaccount=0 boot option is provided).
Make the check conditional.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 070f9d9dd3
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
db47bec3c7
commit
bb0866f04e
|
@ -230,14 +230,22 @@ echo 'Optional Features:'
|
||||||
check_flags CGROUP_PIDS
|
check_flags CGROUP_PIDS
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
check_flags MEMCG_SWAP
|
||||||
|
# Kernel v5.8+ removes MEMCG_SWAP_ENABLED.
|
||||||
|
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 8 ]; then
|
||||||
CODE=${EXITCODE}
|
CODE=${EXITCODE}
|
||||||
check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED
|
check_flags MEMCG_SWAP_ENABLED
|
||||||
|
# FIXME this check is cgroupv1-specific
|
||||||
if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then
|
if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then
|
||||||
echo " $(wrap_color '(cgroup swap accounting is currently enabled)' bold black)"
|
echo " $(wrap_color '(cgroup swap accounting is currently enabled)' bold black)"
|
||||||
EXITCODE=${CODE}
|
EXITCODE=${CODE}
|
||||||
elif is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then
|
elif is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then
|
||||||
echo " $(wrap_color '(cgroup swap accounting is currently not enabled, you can enable it by setting boot option "swapaccount=1")' bold black)"
|
echo " $(wrap_color '(cgroup swap accounting is currently not enabled, you can enable it by setting boot option "swapaccount=1")' bold black)"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
# Kernel v5.8+ enables swap accounting by default.
|
||||||
|
echo " $(wrap_color '(cgroup swap accounting is currently enabled)' bold black)"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
if is_set LEGACY_VSYSCALL_NATIVE; then
|
if is_set LEGACY_VSYSCALL_NATIVE; then
|
||||||
|
|
Loading…
Reference in New Issue