From patchwork Tue Feb 7 06:49:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 19135 Received: (qmail 121220 invoked by alias); 7 Feb 2017 06:49:54 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 121189 invoked by uid 89); 7 Feb 2017 06:49:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.5 required=5.0 tests=AWL, BAYES_50, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=no version=3.3.2 spammy=U*siddhesh, siddheshsourcewareorg, siddhesh@sourceware.org, 436 X-HELO: homiemail-a45.g.dreamhost.com Reply-To: siddhesh@sourceware.org Subject: Re: [PATCH 1/4] Add framework for tunables References: <1483070938-2308-1-git-send-email-siddhesh@sourceware.org> <1483070938-2308-2-git-send-email-siddhesh@sourceware.org> <87y3xjc5gd.fsf@linux-m68k.org> To: Andreas Schwab Cc: libc-alpha@sourceware.org, fweimer@redhat.com, carlos@redhat.com From: Siddhesh Poyarekar Message-ID: Date: Tue, 7 Feb 2017 12:19:37 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <87y3xjc5gd.fsf@linux-m68k.org> On Tuesday 07 February 2017 04:06 AM, Andreas Schwab wrote: > On Dez 30 2016, Siddhesh Poyarekar wrote: > >> diff --git a/malloc/arena.c b/malloc/arena.c >> index eed4247..234035f 100644 >> --- a/malloc/arena.c >> +++ b/malloc/arena.c >> @@ -19,6 +19,11 @@ >> >> #include >> >> +#if HAVE_TUNABLES >> +# define TUNABLE_NAMESPACE malloc >> +#endif >> +#include >> + >> /* Compile-time constants. */ >> >> #define HEAP_MIN_SIZE (32 * 1024) >> @@ -204,6 +209,34 @@ __malloc_fork_unlock_child (void) >> __libc_lock_init (list_lock); >> } >> >> +#if HAVE_TUNABLES >> +static inline int do_set_mallopt_check (int32_t value); >> +void >> +DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) >> +{ >> + int32_t value = *(int32_t *) valp; > > This is wrong. The callback receives a pointer to tunable_val_t. Does the attached (sanity tested on little-endian) patch work for you? Siddhesh diff --git a/elf/dl-tunable-types.h b/elf/dl-tunable-types.h index a986f0b..37a4e80 100644 --- a/elf/dl-tunable-types.h +++ b/elf/dl-tunable-types.h @@ -21,8 +21,6 @@ # define _TUNABLE_TYPES_H_ #include -typedef void (*tunable_callback_t) (void *); - typedef enum { TUNABLE_TYPE_INT_32, @@ -43,6 +41,8 @@ typedef union const char *strval; } tunable_val_t; +typedef void (*tunable_callback_t) (tunable_val_t *); + /* Security level for tunables. This decides what to do with individual tunables for AT_SECURE binaries. */ typedef enum diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index a8d53d6..e42aa67 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -455,6 +455,8 @@ __tunable_set_val (tunable_id_t id, void *valp, tunable_callback_t callback) if (cur->strval == NULL) return; + /* Caller does not need the value, just call the callback with our tunable + value. */ if (valp == NULL) goto cb; diff --git a/malloc/arena.c b/malloc/arena.c index b91d7d6..d49e4a2 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -212,9 +212,9 @@ __malloc_fork_unlock_child (void) #if HAVE_TUNABLES static inline int do_set_mallopt_check (int32_t value); void -DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) +DL_TUNABLE_CALLBACK (set_mallopt_check) (tunable_val_t *valp) { - int32_t value = *(int32_t *) valp; + int32_t value = (int32_t) valp->numval; do_set_mallopt_check (value); if (check_action != 0) __malloc_check_init (); @@ -223,9 +223,9 @@ DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) # define DL_TUNABLE_CALLBACK_FNDECL(__name, __type) \ static inline int do_ ## __name (__type value); \ void \ -DL_TUNABLE_CALLBACK (__name) (void *valp) \ +DL_TUNABLE_CALLBACK (__name) (tunable_val_t *valp) \ { \ - __type value = *(__type *) valp; \ + __type value = (__type) (valp)->numval; \ do_ ## __name (value); \ }