Commit 1da23632 authored by John Hubbard's avatar John Hubbard Committed by Tejun Heo
Browse files

selftests/cgroup: fix clang build failures for abs() calls 

First of all, in order to build with clang at all, one must first apply
Valentin Obst's build fix for LLVM [1]. Once that is done, then when
building with clang, via:

    make LLVM=1 -C tools/testing/selftests

...clang is pickier than gcc, about which version of abs(3) to call,
depending on the argument type:

   int abs(int j);
   long labs(long j);
   long long llabs(long long j);

...and this is causing both build failures and warnings, when running:

    make LLVM=1 -C tools/testing/selftests

Fix this by calling labs() in value_close(), because the arguments are
unambiguously "long" type.

[1] https://lore.kernel.org/all/20240329-selftests-libmk-llvm-rfc-v1-1-2f9ed7d1c49f@valentinobst.de/



Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent b7d56d95

tools/testing/selftests/cgroup/cgroup_util.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 */

static inline int values_close(long a, long b, int err)

{

	return abs(a - b) <= (a + b) / 100 * err;

	return labs(a - b) <= (a + b) / 100 * err;

}



extern int cg_find_unified_root(char *root, size_t len, bool *nsdelegate);

tools/testing/selftests/cgroup/test_kmem.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int test_kmem_memcg_deletion(const char *root) 
		goto cleanup;



	sum = anon + file + kernel + sock;

	if (abs(sum - current) < MAX_VMSTAT_ERROR) {

	if (labs(sum - current) < MAX_VMSTAT_ERROR) {

		ret = KSFT_PASS;

	} else {

		printf("memory.current = %ld\n", current);
@@ -380,7 +380,7 @@ static int test_percpu_basic(const char *root) 
	current = cg_read_long(parent, "memory.current");

	percpu = cg_read_key_long(parent, "memory.stat", "percpu ");



	if (current > 0 && percpu > 0 && abs(current - percpu) <

	if (current > 0 && percpu > 0 && labs(current - percpu) <

	    MAX_VMSTAT_ERROR)

		ret = KSFT_PASS;

	else