common: fix kmemleak to work with sections

Refactor the kmemleak code to work correctly with sections.  This
requires changing the location of the "is kmemleak enabled?" flag to
use /tmp instead of RESULT_BASE, scanning for leaks after every
test, and clarifying which functions get used when.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2019-02-11 18:17:26 -08:00
committed by Eryu Guan
parent c869a6712a
commit 0c24aa077f
3 changed files with 29 additions and 12 deletions
+2
View File
@@ -99,6 +99,8 @@ Preparing system for tests:
that relevant results are compared. For example 'spinningrust' that relevant results are compared. For example 'spinningrust'
for configurations that use spinning disks and 'nvme' for tests for configurations that use spinning disks and 'nvme' for tests
using nvme drives. using nvme drives.
- set USE_KMEMLEAK=yes to scan for memory leaks in the kernel
after every test, if the kernel supports kmemleak.
- or add a case to the switch in common/config assigning - or add a case to the switch in common/config assigning
these variables based on the hostname of your test these variables based on the hostname of your test
+5 -2
View File
@@ -496,7 +496,7 @@ _expunge_test()
return 0 return 0
} }
_init_kmemleak _detect_kmemleak
_prepare_test_list _prepare_test_list
if $OPTIONS_HAVE_SECTIONS; then if $OPTIONS_HAVE_SECTIONS; then
@@ -771,9 +771,12 @@ for section in $HOST_OPTIONS_SECTIONS; do
# and log messages that shouldn't be there. # and log messages that shouldn't be there.
_check_filesystems _check_filesystems
_check_dmesg || err=true _check_dmesg || err=true
_check_kmemleak || err=true
fi fi
# Scan for memory leaks after every test so that associating
# a leak to a particular test will be as accurate as possible.
_check_kmemleak || err=true
# test ends after all checks are done. # test ends after all checks are done.
$timestamp && _timestamp $timestamp && _timestamp
stop=`_wallclock` stop=`_wallclock`
+22 -10
View File
@@ -3500,7 +3500,7 @@ _check_dmesg()
# capture the kmemleak report # capture the kmemleak report
_capture_kmemleak() _capture_kmemleak()
{ {
local kern_knob="${DEBUGFS_MNT}/kmemleak" local kern_knob="$DEBUGFS_MNT/kmemleak"
local leak_file="$1" local leak_file="$1"
# Tell the kernel to scan for memory leaks. Apparently the write # Tell the kernel to scan for memory leaks. Apparently the write
@@ -3521,17 +3521,20 @@ ENDL
echo "clear" > "$kern_knob" echo "clear" > "$kern_knob"
} }
# set up kmemleak # Figure out if the running kernel supports kmemleak; if it does, clear out
_init_kmemleak() # anything that leaked before we even started testing. The leak checker only
# needs to be primed like this once per ./check invocation.
_detect_kmemleak()
{ {
local kern_knob="${DEBUGFS_MNT}/kmemleak" local kern_knob="$DEBUGFS_MNT/kmemleak"
KMEMLEAK_CHECK_FILE="/tmp/check_kmemleak"
# Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is # Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is
# disabled, but returns EBUSY on write. So instead of relying on # disabled, but returns EBUSY on write. So instead of relying on
# existance of writable knob file, we use a test file to indicate that # existance of writable knob file, we use a test file to indicate that
# _check_kmemleak() is enabled only if we actually managed to write to # _check_kmemleak() is enabled only if we actually managed to write to
# the knob file. # the knob file.
rm -f ${RESULT_BASE}/check_kmemleak rm -f "$KMEMLEAK_CHECK_FILE"
if [ ! -w "$kern_knob" ]; then if [ ! -w "$kern_knob" ]; then
return 0 return 0
@@ -3541,17 +3544,26 @@ _init_kmemleak()
# then dump all the leaks recorded so far. # then dump all the leaks recorded so far.
if echo "scan=off" > "$kern_knob" 2>/dev/null; then if echo "scan=off" > "$kern_knob" 2>/dev/null; then
_capture_kmemleak /dev/null _capture_kmemleak /dev/null
touch ${RESULT_BASE}/check_kmemleak touch "$KMEMLEAK_CHECK_FILE"
fi fi
} }
# check kmemleak log # Kick the kmemleak checker to scan for leaks. Background leak scan mode is
# not enabled, so we must call the kernel to ask for a scan and deal with the
# results appropriately. This we do after every test completes, whether or not
# it was successful.
_check_kmemleak() _check_kmemleak()
{ {
local kern_knob="${DEBUGFS_MNT}/kmemleak" local kern_knob="$DEBUGFS_MNT/kmemleak"
local leak_file="${seqres}.kmemleak" local leak_file="$seqres.kmemleak"
if [ ! -f ${RESULT_BASE}/check_kmemleak ]; then if [ ! -f "$KMEMLEAK_CHECK_FILE" ]; then
return 0
fi
# Not enabled, so discard any report of leaks found.
if [ "$USE_KMEMLEAK" != "yes" ]; then
_capture_kmemleak /dev/null
return 0 return 0
fi fi