* [GIT PULL] Kselftest update for Linux 5.1-rc4
@ 2019-04-04 1:34 shuah
2019-04-08 18:51 ` shuah
0 siblings, 1 reply; 4+ messages in thread
From: shuah @ 2019-04-04 1:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: shuah, linux-kernel, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
Hi Linus,
Please pull the following Kselftest update for Linux 5.1-rc4
This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq,
cgroup, and efivarfs tests.
diff is attached.
thanks,
-- Shuah
----------------------------------------------------------------
The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
tags/linux-kselftest-5.1-rc4
for you to fetch changes up to 1bb208e36bc9e9f8558f8e19bcb672ac49c3a5c2:
selftests: cgroup: fix cleanup path in test_memcg_subtree_control()
(2019-03-28 08:07:32 -0600)
----------------------------------------------------------------
linux-kselftest-5.1-rc4
This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq,
cgroup, and efivarfs tests.
----------------------------------------------------------------
Mathieu Desnoyers (1):
rseq/selftests: Adapt number of threads to the number of detected
cpus
Roman Gushchin (1):
selftests: cgroup: fix cleanup path in test_memcg_subtree_control()
ZhangXiaoxu (1):
selftests: efivarfs: remove the test_create_read file if it was exist
tools/testing/selftests/cgroup/test_memcontrol.c | 38
+++++++++++++-----------
tools/testing/selftests/efivarfs/efivarfs.sh | 4 +++
tools/testing/selftests/rseq/run_param_test.sh | 7 +++--
3 files changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------
[-- Attachment #2: linux-kselftest-5.1-rc4.diff --]
[-- Type: text/x-patch, Size: 3536 bytes --]
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index 28d321ba311b..6f339882a6ca 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -26,7 +26,7 @@
*/
static int test_memcg_subtree_control(const char *root)
{
- char *parent, *child, *parent2, *child2;
+ char *parent, *child, *parent2 = NULL, *child2 = NULL;
int ret = KSFT_FAIL;
char buf[PAGE_SIZE];
@@ -34,50 +34,54 @@ static int test_memcg_subtree_control(const char *root)
parent = cg_name(root, "memcg_test_0");
child = cg_name(root, "memcg_test_0/memcg_test_1");
if (!parent || !child)
- goto cleanup;
+ goto cleanup_free;
if (cg_create(parent))
- goto cleanup;
+ goto cleanup_free;
if (cg_write(parent, "cgroup.subtree_control", "+memory"))
- goto cleanup;
+ goto cleanup_parent;
if (cg_create(child))
- goto cleanup;
+ goto cleanup_parent;
if (cg_read_strstr(child, "cgroup.controllers", "memory"))
- goto cleanup;
+ goto cleanup_child;
/* Create two nested cgroups without enabling memory controller */
parent2 = cg_name(root, "memcg_test_1");
child2 = cg_name(root, "memcg_test_1/memcg_test_1");
if (!parent2 || !child2)
- goto cleanup;
+ goto cleanup_free2;
if (cg_create(parent2))
- goto cleanup;
+ goto cleanup_free2;
if (cg_create(child2))
- goto cleanup;
+ goto cleanup_parent2;
if (cg_read(child2, "cgroup.controllers", buf, sizeof(buf)))
- goto cleanup;
+ goto cleanup_all;
if (!cg_read_strstr(child2, "cgroup.controllers", "memory"))
- goto cleanup;
+ goto cleanup_all;
ret = KSFT_PASS;
-cleanup:
- cg_destroy(child);
- cg_destroy(parent);
- free(parent);
- free(child);
-
+cleanup_all:
cg_destroy(child2);
+cleanup_parent2:
cg_destroy(parent2);
+cleanup_free2:
free(parent2);
free(child2);
+cleanup_child:
+ cg_destroy(child);
+cleanup_parent:
+ cg_destroy(parent);
+cleanup_free:
+ free(parent);
+ free(child);
return ret;
}
diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh
index a47029a799d2..d3866100e884 100755
--- a/tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -77,6 +77,10 @@ test_create_empty()
test_create_read()
{
local file=$efivarfs_mount/$FUNCNAME-$test_guid
+ if [ -f $file]; then
+ chattr -i $file
+ rm -rf $file
+ fi
./create-read $file
}
diff --git a/tools/testing/selftests/rseq/run_param_test.sh b/tools/testing/selftests/rseq/run_param_test.sh
index 3acd6d75ff9f..e426304fd4a0 100755
--- a/tools/testing/selftests/rseq/run_param_test.sh
+++ b/tools/testing/selftests/rseq/run_param_test.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0+ or MIT
+NR_CPUS=`grep '^processor' /proc/cpuinfo | wc -l`
+
EXTRA_ARGS=${@}
OLDIFS="$IFS"
@@ -28,15 +30,16 @@ IFS="$OLDIFS"
REPS=1000
SLOW_REPS=100
+NR_THREADS=$((6*${NR_CPUS}))
function do_tests()
{
local i=0
while [ "$i" -lt "${#TEST_LIST[@]}" ]; do
echo "Running test ${TEST_NAME[$i]}"
- ./param_test ${TEST_LIST[$i]} -r ${REPS} ${@} ${EXTRA_ARGS} || exit 1
+ ./param_test ${TEST_LIST[$i]} -r ${REPS} -t ${NR_THREADS} ${@} ${EXTRA_ARGS} || exit 1
echo "Running compare-twice test ${TEST_NAME[$i]}"
- ./param_test_compare_twice ${TEST_LIST[$i]} -r ${REPS} ${@} ${EXTRA_ARGS} || exit 1
+ ./param_test_compare_twice ${TEST_LIST[$i]} -r ${REPS} -t ${NR_THREADS} ${@} ${EXTRA_ARGS} || exit 1
let "i++"
done
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [GIT PULL] Kselftest update for Linux 5.1-rc4
2019-04-04 1:34 [GIT PULL] Kselftest update for Linux 5.1-rc4 shuah
2019-04-08 18:51 ` shuah
@ 2019-04-08 18:51 ` shuah
0 siblings, 0 replies; 4+ messages in thread
From: shuah @ 2019-04-08 18:51 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-kselftest, shuah
On 4/3/19 7:34 PM, shuah wrote:
> Hi Linus,
>
> Please pull the following Kselftest update for Linux 5.1-rc4
>
> This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq,
> cgroup, and efivarfs tests.
>
> diff is attached.
>
> thanks,
> -- Shuah
>
Hi Linus,
I just noticed that one commit in this pull request has mismatched
author and signed-off. Please disregard the pull request.
I will fix this and send a new pull request. Sorry for the noise.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] Kselftest update for Linux 5.1-rc4
@ 2019-04-08 18:51 ` shuah
0 siblings, 0 replies; 4+ messages in thread
From: shuah @ 2019-04-08 18:51 UTC (permalink / raw)
On 4/3/19 7:34 PM, shuah wrote:
> Hi Linus,
>
> Please pull the following Kselftest update for Linux 5.1-rc4
>
> This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq,
> cgroup, and efivarfs tests.
>
> diff is attached.
>
> thanks,
> -- Shuah
>
Hi Linus,
I just noticed that one commit in this pull request has mismatched
author and signed-off. Please disregard the pull request.
I will fix this and send a new pull request. Sorry for the noise.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] Kselftest update for Linux 5.1-rc4
@ 2019-04-08 18:51 ` shuah
0 siblings, 0 replies; 4+ messages in thread
From: shuah @ 2019-04-08 18:51 UTC (permalink / raw)
On 4/3/19 7:34 PM, shuah wrote:
> Hi Linus,
>
> Please pull the following Kselftest update for Linux 5.1-rc4
>
> This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq,
> cgroup, and efivarfs tests.
>
> diff is attached.
>
> thanks,
> -- Shuah
>
Hi Linus,
I just noticed that one commit in this pull request has mismatched
author and signed-off. Please disregard the pull request.
I will fix this and send a new pull request. Sorry for the noise.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-08 18:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-04 1:34 [GIT PULL] Kselftest update for Linux 5.1-rc4 shuah
2019-04-08 18:51 ` shuah
2019-04-08 18:51 ` shuah
2019-04-08 18:51 ` shuah
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.