linux-kernel - [PATCH 1/2] tools/libs/slab.c: fix compiling mistakes of uatomic_inc/uatomic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1661755121-3286-1-git-send-email-chensong_2000@189.cn>
Date:   Mon, 29 Aug 2022 14:38:41 +0800
From:   Song Chen <chensong_2000@....cn>
To:     karolinadrobnik@...il.com, rppt@...nel.org
Cc:     linux-kernel@...r.kernel.org, linux-mm@...ck.org,
        Song Chen <chensong_2000@....cn>
Subject: [PATCH 1/2] tools/libs/slab.c: fix compiling mistakes of uatomic_inc/uatomic_dec

I tried to build tools/test/memblock and got such message:

/usr/bin/ld: slab.o: in function `kmalloc':
slab.c:(.text+0x2b): undefined reference to `uatomic_inc'
/usr/bin/ld: slab.o: in function `kfree':
slab.c:(.text+0x97): undefined reference to `uatomic_dec'
collect2: error: ld returned 1 exit status

I could find any definition or inplememtation of uatomic_inc/uatomic_dec
in anywhere of the code base. So I use atomic_inc/atomic_dec_and_test
to replace like other tests underneath tools/test, it works.

Signed-off-by: Song Chen <chensong_2000@....cn>
---
 tools/lib/slab.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/lib/slab.c b/tools/lib/slab.c
index 959997fb0652..8a5a8d536e35 100644
--- a/tools/lib/slab.c
+++ b/tools/lib/slab.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <urcu/uatomic.h>
+#include <linux/atomic.h>
 #include <linux/slab.h>
 #include <malloc.h>
 #include <linux/gfp.h>
@@ -19,7 +19,7 @@ void *kmalloc(size_t size, gfp_t gfp)
 		return NULL;
 
 	ret = malloc(size);
-	uatomic_inc(&kmalloc_nr_allocated);
+	atomic_inc(&kmalloc_nr_allocated);
 	if (kmalloc_verbose)
 		printf("Allocating %p from malloc\n", ret);
 	if (gfp & __GFP_ZERO)
@@ -31,7 +31,7 @@ void kfree(void *p)
 {
 	if (!p)
 		return;
-	uatomic_dec(&kmalloc_nr_allocated);
+	atomic_dec_and_test(&kmalloc_nr_allocated);
 	if (kmalloc_verbose)
 		printf("Freeing %p to malloc\n", p);
 	free(p);
-- 
2.25.1