From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NO_DNS_FOR_FROM,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from integral2.. (unknown [182.2.42.189]) by gnuweeb.org (Postfix) with ESMTPSA id B40567E333; Sun, 20 Mar 2022 09:38:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1647769140; bh=RSEq8dI5RloSlWnt62U9OOk+SbaLshrfq3hpAG2JDpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EvatmLBmNzRkFYsBQuFHEtUP6oTAmULHalxKHODm24mf0pEraWorzAhDCnV8J/P69 lYp//Sw2RRvob30XXxfYOs8gVxEYEnfE98wkKgtKo+ovQwAeP9EI+hcQHowj+fsF9k T1W2sg4adNOwY9SxD3lCNFsHirdDLPkKY0VOVLE2/9xFTJkM69Zfz3KGrcXycvPyfg Lh0tiIBoufRvogJblWrXMx7B3K+UYdbtGf/wh1d1jUVDqWJFG+XmpNpPaIWnotesWS igV5zUBo6E1A9mLpFSkDlgahAPONLbVjBcEH6OKMYjVSIm8gvIcRHylusWx/FJhL56 EnnSJKKtjp9eg== From: Ammar Faizi To: Willy Tarreau Cc: "Paul E. McKenney" , Alviro Iskandar Setiawan , Nugraha , Linux Kernel Mailing List , GNU/Weeb Mailing List , Ammar Faizi Subject: [RFC PATCH v1 5/6] tools/nolibc/stdlib: Implement `malloc()`, `calloc()`, `realloc()` and `free()` Date: Sun, 20 Mar 2022 16:37:49 +0700 Message-Id: <20220320093750.159991-6-ammarfaizi2@gnuweeb.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220320093750.159991-1-ammarfaizi2@gnuweeb.org> References: <20220320093750.159991-1-ammarfaizi2@gnuweeb.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Implement basic dynamic allocator functions. These functions are currently only available on architectures that have nolibc mmap() syscall implemented. These are not a super-fast memory allocator, but at least they can satisfy basic needs for having heap without libc. Signed-off-by: Ammar Faizi --- tools/include/nolibc/stdlib.h | 79 +++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h index 733105c574ee..13600e73404d 100644 --- a/tools/include/nolibc/stdlib.h +++ b/tools/include/nolibc/stdlib.h @@ -10,8 +10,24 @@ #include "std.h" #include "arch.h" #include "types.h" +#include "string.h" #include "sys.h" +struct nolibc_heap { + size_t len; + char user_p[] __attribute__((__aligned__)); +}; + +#ifndef offsetof +#define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD) +#endif + +#ifndef container_of +#define container_of(PTR, TYPE, FIELD) ({ \ + __typeof__(((TYPE *)0)->FIELD) *__FIELD_PTR = (PTR); \ + (TYPE *)((char *) __FIELD_PTR - offsetof(TYPE, FIELD)); \ +}) +#endif /* Buffer used to store int-to-ASCII conversions. Will only be implemented if * any of the related functions is implemented. The area is large enough to @@ -60,6 +76,18 @@ int atoi(const char *s) return atol(s); } +static __attribute__((unused)) +void free(void *ptr) +{ + struct nolibc_heap *heap; + + if (!ptr) + return; + + heap = container_of(ptr, struct nolibc_heap, user_p); + munmap(heap, heap->len); +} + /* Converts the unsigned long integer to its hex representation into * buffer , which must be long enough to store the number and the * trailing zero (17 bytes for "ffffffffffffffff" or 9 for "ffffffff"). The @@ -182,6 +210,57 @@ char *ltoa(long in) return itoa_buffer; } +static inline __attribute__((unused)) +void *malloc(size_t len) +{ + struct nolibc_heap *heap; + + heap = mmap(NULL, sizeof(*heap) + len, PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + if (__builtin_expect(heap == MAP_FAILED, 0)) + return NULL; + + heap->len = sizeof(*heap) + len; + return heap->user_p; +} + +static inline __attribute__((unused)) +void *calloc(size_t size, size_t nmemb) +{ + void *orig; + size_t res = 0; + + if (__builtin_expect(__builtin_mul_overflow(nmemb, size, &res), 0)) { + SET_ERRNO(ENOMEM); + return NULL; + } + + /* + * No need to zero the heap, the MAP_ANONYMOUS in malloc() + * already does it. + */ + return malloc(res); +} + +static inline __attribute__((unused)) +void *realloc(void *old_ptr, size_t new_size) +{ + struct nolibc_heap *heap; + void *ret; + + if (!old_ptr) + return malloc(new_size); + + ret = malloc(new_size); + if (__builtin_expect(!ret, 0)) + return NULL; + + heap = container_of(old_ptr, struct nolibc_heap, user_p); + memcpy(ret, heap->user_p, heap->len); + munmap(heap, heap->len); + return ret; +} + /* converts unsigned long integer to a string using the static itoa_buffer * and returns the pointer to that string. */ -- Ammar Faizi