From patchwork Thu Nov 23 17:29:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 80651 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 112CD3857C42 for ; Thu, 23 Nov 2023 17:29:39 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 586273858C74 for ; Thu, 23 Nov 2023 17:29:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 586273858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 586273858C74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700760565; cv=none; b=V4z5AFzhRcG2ya/K6SkKFZhJXwG81X8wMJ9xCeGoI3t4VTqMqlGA77jiO++h2iKlzIsp+MVk+MT0F1eNGRre66OEyiqWcuooMy9sIDd/RUr2qeB9oBEQvJ70AorgzVZZmsAo5nEgkwSDlrnmd4+NP/gISSJOYGMOhHKpOgSSVtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700760565; c=relaxed/simple; bh=b39oqgO1udBKXrXzB9OHM84JfuLOyYI8oW1YNQZWq+0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Vj+oabHEQ01orKiO54ZnXogT6vVSzWDzn5cur9egE8gOG/ty5JsQPpSxWG1r6gwnspsjTap5Q69fMMih2BAG+f3LQ2vX/PNEUm41XnkBey/QbRvcl5MIsPcTwBzAX+fnWEXhGbDfb9Vge1gNM6VLxi4CiIb2mpNO/+wOn2G0cdg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6c320a821c4so987554b3a.2 for ; Thu, 23 Nov 2023 09:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700760562; x=1701365362; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d7GmJouxnmkNjRkOTtuVa4PNZ9XGVmx9WTnIjOXbi/s=; b=zI+1mNOJDloF9P9+PLIuiCstkkLP5NTzhOBpEr//lW6iGDUhh0rhKKOHmL17arMcmo UQAFlshHmCid8q1zMVxO+9f+NwPv6sK5mvrRIGKc9rC84PylwU5wk/Tz6N2hgNTzjEiA UIs0moZ1YTeMlwHHZKVHKpweXmWmQ7FMz9OiweB5mcg6K+ryuR5QXP6GDOTmRBudWMCH LPuJUzHFLOt2guFGby1h90ebuj4W74RqTKB1kzgMN6ZIVxp96TOP+1wxJp8tnYc/VBv1 yE75LWQDFFJAoOWw/yJoKKFqAh0i3NUvP5ClMV45PUNQHxNa+zdAIP0J2KW0/F35jS1n ILdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700760562; x=1701365362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d7GmJouxnmkNjRkOTtuVa4PNZ9XGVmx9WTnIjOXbi/s=; b=w3MQwbyWlltaaXbnVvBn/+mPoMlMC0JlfzvnSKv1Z+2Lr8sP+XRDRGWbHVdWCLokrs Amuj3vsPSTNmL0degMm/pgQs+sPpsjYCfY0nAGQDBmO4yNEck641FpHxUzjhkdnfoVoB nb+QwajoW8GGkxq16bc84iZ0wJ+JbnmRlmfE1LSSNyG2HvENyYbnENVQWgyS0m+aPjAF 48l4JR0DG0clElW2QTxB8TCktdi1sl8PQD3L+oWIJdBwKPMpn1sYhTOtDubPXEKeTqCv v6geVJtyEUuRN6vtnOgbVTJ7sHxq/GUgLLThMWsoR8Ae3Uo1wHAr1jpHak48kr4PVOm0 umNw== X-Gm-Message-State: AOJu0YxIO1INhPJ34eZ1PLVmsP5sZqZv0FB+b0drkNlRPhuNNt/K5uWR iFIpJn9DtQ9rguBSk28kx1MaDOU86TfRU0Z2aJJTMg== X-Google-Smtp-Source: AGHT+IFMF5ip31upwJSE4+DY1I8x4oT+0YppOu6XNjMmYTmbhxMP8t9VYDrvXpWhLyAzGOs/5vi89A== X-Received: by 2002:a05:6a20:5485:b0:181:6bde:72aa with SMTP id i5-20020a056a20548500b001816bde72aamr258248pzk.42.1700760561734; Thu, 23 Nov 2023 09:29:21 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:94e:b32d:2af9:e993:fe7c]) by smtp.gmail.com with ESMTPSA id 16-20020aa79150000000b006c2fcb25c15sm1466578pfi.162.2023.11.23.09.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 09:29:21 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, DJ Delorie Cc: Zhangfei Gao Subject: [PATCH v2 1/2] elf: Add a way to check if tunable is set (BZ 27069) Date: Thu, 23 Nov 2023 14:29:14 -0300 Message-Id: <20231123172915.893408-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123172915.893408-1-adhemerval.zanella@linaro.org> References: <20231123172915.893408-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org The patch adds two new macros, TUNABLE_GET_DEFAULT and TUNABLE_IS_INITIALIZED, here the former get the default value with a signature similar to TUNABLE_GET, while the later returns whether the tunable was set by the environment variable. Checked on x86_64-linux-gnu. Reviewed-by: DJ Delorie --- elf/Versions | 1 + elf/dl-tunable-types.h | 1 + elf/dl-tunables.c | 40 ++++++++++++++++++++++++++++++++++++++++ elf/dl-tunables.h | 28 ++++++++++++++++++++++++++++ elf/dl-tunables.list | 1 + scripts/gen-tunables.awk | 4 ++-- 6 files changed, 73 insertions(+), 2 deletions(-) diff --git a/elf/Versions b/elf/Versions index 4614acea3e..1591031da9 100644 --- a/elf/Versions +++ b/elf/Versions @@ -77,6 +77,7 @@ ld { _dl_signal_error; # Set value of a tunable. + __tunable_is_initialized; __tunable_get_val; } } diff --git a/elf/dl-tunable-types.h b/elf/dl-tunable-types.h index 62d6d9e629..a2048058fa 100644 --- a/elf/dl-tunable-types.h +++ b/elf/dl-tunable-types.h @@ -61,6 +61,7 @@ struct _tunable { const char name[TUNABLE_NAME_MAX]; /* Internal name of the tunable. */ tunable_type_t type; /* Data type of the tunable. */ + const tunable_val_t def; /* The value. */ tunable_val_t val; /* The value. */ bool initialized; /* Flag to indicate that the tunable is initialized. */ diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index 83265bc00b..644d21d1b0 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -145,6 +145,13 @@ tunable_initialize (tunable_t *cur, const char *strval) do_tunable_update_val (cur, &val, NULL, NULL); } +bool +__tunable_is_initialized (tunable_id_t id) +{ + return tunable_list[id].initialized; +} +rtld_hidden_def (__tunable_is_initialized) + void __tunable_set_val (tunable_id_t id, tunable_val_t *valp, tunable_num_t *minp, tunable_num_t *maxp) @@ -333,6 +340,39 @@ __tunables_print (void) } } +void +__tunable_get_default (tunable_id_t id, void *valp) +{ + tunable_t *cur = &tunable_list[id]; + + switch (cur->type.type_code) + { + case TUNABLE_TYPE_UINT_64: + { + *((uint64_t *) valp) = (uint64_t) cur->def.numval; + break; + } + case TUNABLE_TYPE_INT_32: + { + *((int32_t *) valp) = (int32_t) cur->def.numval; + break; + } + case TUNABLE_TYPE_SIZE_T: + { + *((size_t *) valp) = (size_t) cur->def.numval; + break; + } + case TUNABLE_TYPE_STRING: + { + *((const char **)valp) = cur->def.strval; + break; + } + default: + __builtin_unreachable (); + } +} +rtld_hidden_def (__tunable_get_default) + /* Set the tunable value. This is called by the module that the tunable exists in. */ void diff --git a/elf/dl-tunables.h b/elf/dl-tunables.h index 45c191e021..0df4dde24e 100644 --- a/elf/dl-tunables.h +++ b/elf/dl-tunables.h @@ -45,18 +45,26 @@ typedef void (*tunable_callback_t) (tunable_val_t *); extern void __tunables_init (char **); extern void __tunables_print (void); +extern bool __tunable_is_initialized (tunable_id_t); extern void __tunable_get_val (tunable_id_t, void *, tunable_callback_t); extern void __tunable_set_val (tunable_id_t, tunable_val_t *, tunable_num_t *, tunable_num_t *); +extern void __tunable_get_default (tunable_id_t id, void *valp); rtld_hidden_proto (__tunables_init) rtld_hidden_proto (__tunables_print) +rtld_hidden_proto (__tunable_is_initialized) rtld_hidden_proto (__tunable_get_val) rtld_hidden_proto (__tunable_set_val) +rtld_hidden_proto (__tunable_get_default) /* Define TUNABLE_GET and TUNABLE_SET in short form if TOP_NAMESPACE and TUNABLE_NAMESPACE are defined. This is useful shorthand to get and set tunables within a module. */ #if defined TOP_NAMESPACE && defined TUNABLE_NAMESPACE +# define TUNABLE_IS_INITIALIZED(__id) \ + TUNABLE_IS_INITIALIZED_FULL(TOP_NAMESPACE, TUNABLE_NAMESPACE, __id) +# define TUNABLE_GET_DEFAULT(__id, __type) \ + TUNABLE_GET_DEFAULT_FULL(TOP_NAMESPACE, TUNABLE_NAMESPACE,__id, __type) # define TUNABLE_GET(__id, __type, __cb) \ TUNABLE_GET_FULL (TOP_NAMESPACE, TUNABLE_NAMESPACE, __id, __type, __cb) # define TUNABLE_SET(__id, __val) \ @@ -65,6 +73,10 @@ rtld_hidden_proto (__tunable_set_val) TUNABLE_SET_WITH_BOUNDS_FULL (TOP_NAMESPACE, TUNABLE_NAMESPACE, __id, \ __val, __min, __max) #else +# define TUNABLE_IS_INITIALIZED(__top, __ns, __id) \ + TUNABLE_IS_INITIALIZED_FULL(__top, __ns, __id) +# define TUNABLE_GET_DEFAULT(__top, __ns, __type) \ + TUNABLE_GET_DEFAULT_FULL(__top, __ns, __id, __type) # define TUNABLE_GET(__top, __ns, __id, __type, __cb) \ TUNABLE_GET_FULL (__top, __ns, __id, __type, __cb) # define TUNABLE_SET(__top, __ns, __id, __val) \ @@ -73,6 +85,22 @@ rtld_hidden_proto (__tunable_set_val) TUNABLE_SET_WITH_BOUNDS_FULL (__top, __ns, __id, __val, __min, __max) #endif +/* Return whether the tunable was initialized by the environment variable. */ +#define TUNABLE_IS_INITIALIZED_FULL(__top, __ns, __id) \ +({ \ + tunable_id_t id = TUNABLE_ENUM_NAME (__top, __ns, __id); \ + __tunable_is_initialized (id); \ +}) + +/* Return the default value of the tunable. */ +#define TUNABLE_GET_DEFAULT_FULL(__top, __ns, __id, __type) \ +({ \ + tunable_id_t id = TUNABLE_ENUM_NAME (__top, __ns, __id); \ + __type __ret; \ + __tunable_get_default (id, &__ret); \ + __ret; \ +}) + /* Get and return a tunable value. If the tunable was set externally and __CB is defined then call __CB before returning the value. */ #define TUNABLE_GET_FULL(__top, __ns, __id, __type, __cb) \ diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list index 720a8ac49c..1b23fc9473 100644 --- a/elf/dl-tunables.list +++ b/elf/dl-tunables.list @@ -20,6 +20,7 @@ # type: Defaults to STRING # minval: Optional minimum acceptable value # maxval: Optional maximum acceptable value +# default: Optional default value (if not specified it will be 0 or "") # env_alias: An alias environment variable glibc { diff --git a/scripts/gen-tunables.awk b/scripts/gen-tunables.awk index 1e9d6b534e..9f5336381e 100644 --- a/scripts/gen-tunables.awk +++ b/scripts/gen-tunables.awk @@ -163,8 +163,8 @@ END { n = indices[2]; m = indices[3]; printf (" {TUNABLE_NAME_S(%s, %s, %s)", t, n, m) - printf (", {TUNABLE_TYPE_%s, %s, %s}, {%s}, false, %s},\n", - types[t,n,m], minvals[t,n,m], maxvals[t,n,m], + printf (", {TUNABLE_TYPE_%s, %s, %s}, {%s}, {%s}, false, %s},\n", + types[t,n,m], minvals[t,n,m], maxvals[t,n,m], default_val[t,n,m], default_val[t,n,m], env_alias[t,n,m]); } print "};"