| Message ID | 1661755121-3286-1-git-send-email-chensong_2000@189.cn (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] tools/libs/slab.c: fix compiling mistakes of uatomic_inc/uatomic_dec | expand |
Hi, your two patches are not in one thread. Don't send it separately, Please send it together. Or others can't download your all patches from this message-id. On 8/29/2022 2:38 PM, Song Chen wrote: > 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@189.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);
On Mon, Aug 29, 2022 at 02:38:41PM +0800, Song Chen wrote: > 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. They are defined in liburcu headers, in Debian they are found in liburcu-dev package. > Signed-off-by: Song Chen <chensong_2000@189.cn> > ---
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);
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@189.cn> --- tools/lib/slab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)