common/rc: create $RESULT_BASE before dumping kmemleak leaks
diff mbox series

Message ID 20181220125222.12041-1-jthumshirn@suse.de
State New
Headers show
Series
  • common/rc: create $RESULT_BASE before dumping kmemleak leaks
Related show

Commit Message

Johannes Thumshirn Dec. 20, 2018, 12:52 p.m. UTC
In _init_kmemleak() we're touching a check_kmemleak file in ${RESULT_BASE}
if ${DEBUGFS_MNT/kmemleak} exists as a marker that we have to check for
kmemleak output after running a test.

In 'check' we're calling _init_kmemleak() at around 60% of the file, but
${RESULT_BASE} is created later at around 62% of the file, causing the
'touch' in _init_kmemleak() to fail.

The workaround to this is creating ${RESULT_BASE} before touching
${RESULT_BASE}/check_kmemleak to always have the marker.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 common/rc | 1 +
 1 file changed, 1 insertion(+)

Comments

Darrick J. Wong Dec. 20, 2018, 4:30 p.m. UTC | #1
On Thu, Dec 20, 2018 at 01:52:22PM +0100, Johannes Thumshirn wrote:
> In _init_kmemleak() we're touching a check_kmemleak file in ${RESULT_BASE}
> if ${DEBUGFS_MNT/kmemleak} exists as a marker that we have to check for
> kmemleak output after running a test.
> 
> In 'check' we're calling _init_kmemleak() at around 60% of the file, but
> ${RESULT_BASE} is created later at around 62% of the file, causing the
> 'touch' in _init_kmemleak() to fail.
> 
> The workaround to this is creating ${RESULT_BASE} before touching
> ${RESULT_BASE}/check_kmemleak to always have the marker.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>

Looks reasonable to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  common/rc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/common/rc b/common/rc
> index e5da648466eb..5565b63e07ed 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3528,6 +3528,7 @@ _init_kmemleak()
>  	# then dump all the leaks recorded so far.
>  	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
>  		_capture_kmemleak /dev/null
> +		mkdir -p ${RESULT_BASE}
>  		touch ${RESULT_BASE}/check_kmemleak
>  	fi
>  }
> -- 
> 2.16.4
>
Eryu Guan Dec. 21, 2018, 5:13 a.m. UTC | #2
On Thu, Dec 20, 2018 at 01:52:22PM +0100, Johannes Thumshirn wrote:
> In _init_kmemleak() we're touching a check_kmemleak file in ${RESULT_BASE}
> if ${DEBUGFS_MNT/kmemleak} exists as a marker that we have to check for
> kmemleak output after running a test.
> 
> In 'check' we're calling _init_kmemleak() at around 60% of the file, but
> ${RESULT_BASE} is created later at around 62% of the file, causing the
> 'touch' in _init_kmemleak() to fail.
> 
> The workaround to this is creating ${RESULT_BASE} before touching
> ${RESULT_BASE}/check_kmemleak to always have the marker.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>  common/rc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/common/rc b/common/rc
> index e5da648466eb..5565b63e07ed 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3528,6 +3528,7 @@ _init_kmemleak()
>  	# then dump all the leaks recorded so far.
>  	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
>  		_capture_kmemleak /dev/null
> +		mkdir -p ${RESULT_BASE}

Hmm, hiding the $RESULT_BASE creation here seems odd to me. I'd suggest
create $RESULT_BASE just after setting the default value in
common/config (in get_next_config()), which is sourced by common/rc then
by check, so we get all the environment setup before calling
_init_kmemleak().

Thanks,
Eryu

>  		touch ${RESULT_BASE}/check_kmemleak
>  	fi
>  }
> -- 
> 2.16.4
>

Patch
diff mbox series

diff --git a/common/rc b/common/rc
index e5da648466eb..5565b63e07ed 100644
--- a/common/rc
+++ b/common/rc
@@ -3528,6 +3528,7 @@  _init_kmemleak()
 	# then dump all the leaks recorded so far.
 	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
 		_capture_kmemleak /dev/null
+		mkdir -p ${RESULT_BASE}
 		touch ${RESULT_BASE}/check_kmemleak
 	fi
 }