lkml.org 
[lkml]   [2023]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v3 2/3] selftests: cgroup: Minor code reorganizations
From

On 7/3/23 13:27, Michal Koutný wrote:
> No functional change intended, these small changes are merged into one
> commit and they serve as a preparation for an upcoming new testcase.
>
> Signed-off-by: Michal Koutný <mkoutny@suse.com>
> ---
> MAINTAINERS | 1 +
> tools/testing/selftests/cgroup/cgroup_util.c | 2 ++
> tools/testing/selftests/cgroup/cgroup_util.h | 2 ++
> tools/testing/selftests/cgroup/test_core.c | 2 +-
> tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +-
> 5 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e0976ae2a523..03bec83944c4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5260,6 +5260,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
> F: Documentation/admin-guide/cgroup-v1/cpusets.rst
> F: include/linux/cpuset.h
> F: kernel/cgroup/cpuset.c
> +F: tools/testing/selftests/cgroup/test_cpuset_prs.sh
>
> CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
> M: Johannes Weiner <hannes@cmpxchg.org>
> diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c
> index e8bbbdb77e0d..0340d4ca8f51 100644
> --- a/tools/testing/selftests/cgroup/cgroup_util.c
> +++ b/tools/testing/selftests/cgroup/cgroup_util.c
> @@ -286,6 +286,8 @@ int cg_destroy(const char *cgroup)
> {
> int ret;
>
> + if (!cgroup)
> + return 0;
> retry:
> ret = rmdir(cgroup);
> if (ret && errno == EBUSY) {
> diff --git a/tools/testing/selftests/cgroup/cgroup_util.h b/tools/testing/selftests/cgroup/cgroup_util.h
> index c92df4e5d395..1df7f202214a 100644
> --- a/tools/testing/selftests/cgroup/cgroup_util.h
> +++ b/tools/testing/selftests/cgroup/cgroup_util.h
> @@ -11,6 +11,8 @@
> #define USEC_PER_SEC 1000000L
> #define NSEC_PER_SEC 1000000000L
>
> +#define TEST_UID 65534 /* usually nobody, any !root is fine */
> +
> /*
> * Checks if two given values differ by less than err% of their sum.
> */
> diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
> index 600123503063..80aa6b2373b9 100644
> --- a/tools/testing/selftests/cgroup/test_core.c
> +++ b/tools/testing/selftests/cgroup/test_core.c
> @@ -683,7 +683,7 @@ static int test_cgcore_thread_migration(const char *root)
> */
> static int test_cgcore_lesser_euid_open(const char *root)
> {
> - const uid_t test_euid = 65534; /* usually nobody, any !root is fine */
> + const uid_t test_euid = TEST_UID;
> int ret = KSFT_FAIL;
> char *cg_test_a = NULL, *cg_test_b = NULL;
> char *cg_test_a_procs = NULL, *cg_test_b_procs = NULL;
> diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
> index 2b5215cc599f..4afb132e4e4f 100755
> --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh
> +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
> @@ -10,7 +10,7 @@
> skip_test() {
> echo "$1"
> echo "Test SKIPPED"
> - exit 0
> + exit 4 # ksft_skip
> }
>
> [[ $(id -u) -eq 0 ]] || skip_test "Test must be run as root!"
Reviewed-by: Waiman Long <longman@redhat.com>

\
 
 \ /
  Last update: 2023-07-03 20:03    [W:0.049 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site