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: 746496 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1005722wru; Thu, 23 Nov 2023 09:29:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGMZkzDBkEkCC3e9/J6XOb3o0Suw2yhd91zV0pwAvgxCfSb8Vd11zaOJoPhp6sNLoIs/Fi X-Received: by 2002:a05:620a:3c96:b0:77d:61d2:f37e with SMTP id tp22-20020a05620a3c9600b0077d61d2f37emr18452qkn.20.1700760571673; Thu, 23 Nov 2023 09:29:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700760571; cv=pass; d=google.com; s=arc-20160816; b=wmM4PMgyU3U3Aouc9VEJH3j3Jisl/jrpwllnZauXk7svyBYQ14ijAMocZ2HbPJUGvr CU5UdGRVC5IWl5ZyHlljNpjayosorKSs3Nk+kf8cKUSWW6Cf9vCArYTpdS3jvD4E6EXt VElKA9sUkbKQT80fEGpE7ucVUXFFsw2HZKOVxmSDQ/RdE2CL5mET9wNgOALpqfglECmp TalBBZkxqj/cOVCURcsfk7RdwaTwzyIgiZGiDPuyJY09vcD6fdz0uL2WLsyDvtBXBib8 Y7twfAq20XC5KgeTcqrupvpzCmpgC+rBvhJcIEwF0WH8qCEZWibuw4an+cvqnBVR3g9U zsvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=d7GmJouxnmkNjRkOTtuVa4PNZ9XGVmx9WTnIjOXbi/s=; fh=owzmwJnk3EL8tjIn4FY0sDcSwr6h8IADdtFZ1RAuOm0=; b=XVhqZF/E3iIag4faE/okqFBhOjfX7QmZnqH4fS63R3RRo9UZui9+4qGfypJe4bASGL bjj3oEWlMrCpbw7k2/1L9t9nVtGOKq8sKYGAxzvXM3CPow5LBsj6kI4Nd5expDzGW5F3 TuPH0e1HVQkYPkxdBTSIyhxMa47PF9b+LtOEbbwDlXS9IT0asXF4/cmInXq4BCgEBIpg pL73Zx4S00kHql7L+UK8lSm457I8Z+uPAaoOkCu1aO+mRO2va6Mvm9xoZ+bx0WrT2uyF 47PXZzDW6hs/AEx/MGfbEvdPvEvnKQ6TxWBczpJozn/m9/kEr+9WrdtuuLDbv6i7IVXO xnHg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zI+1mNOJ; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id bq10-20020a05620a468a00b00778b0f5d4bfsi1550437qkb.145.2023.11.23.09.29.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 09:29:31 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zI+1mNOJ; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 580903857C4A for ; Thu, 23 Nov 2023 17:29:31 +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-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+patch=linaro.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. --- 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 "};" From patchwork Thu Nov 23 17:29:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 746497 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1005753wru; Thu, 23 Nov 2023 09:29:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYGLUDdct8+3r1P7/Ur18MFtixrcV1aUQWyHjJgx7T9vqop7HmrNfvUFB78JF/ofHbmL49 X-Received: by 2002:ac8:7f89:0:b0:423:8b3d:dd27 with SMTP id z9-20020ac87f89000000b004238b3ddd27mr72976qtj.10.1700760574454; Thu, 23 Nov 2023 09:29:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700760574; cv=pass; d=google.com; s=arc-20160816; b=lNqenN1w55GZc2zGaG5KVQE17FuVyshD4HykbeI+ei2vu/PtSxm5cgjZdZqbup9Wnd SOH1jmqYyyEIaLqNBmAuyBHF7btDy+e4Mn3Sxy3UpLSiwD+/BJRbCAE96Fz4uGSFxv8Z J8HSsBtY1nMaOQKF34vN3xPls8VE/IjIjgn/Z4/VfABZeoGPzWTjjpH1kAaz+HBijf5V AX9Bwe/MI04z5hTc2KMcOy3ER0T9hVekKLxffJOUktA5gird7p4Gco14J9Hy3OCmi7Z3 TbYWtbAxb9NeeMvCe4ukJ2j5DYJ+qq4FNZhHRsKTJTLSbFHGdydN4fbw0OvZoAbXVja9 5kwA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=nvOMmR5nPPRiCAP9uZifd0VYB7zzegrn6fbP+R0su68=; fh=owzmwJnk3EL8tjIn4FY0sDcSwr6h8IADdtFZ1RAuOm0=; b=WC9FVqOdRtSY0CZ7uk2Vm7/Q+D2JLSilzTM7CSEkMvfU23dtST3jx3FjEYKkoFYFAL 18i5Qn7djGnpWc0xTeEZSSh+XJGPh17NnmWr2N3I+tP4j0la7fU2K3+WDg+572RJCncE +Zdlq1dZeyxz1BLT3spTZuN5tIG1MDi1zz79LoamYE6rXmUIMaUxjZb9iUNfvq3eeFrY T378+jI2iBXwB2eo7JIn/y9LTaszjMPvPSzKZrmf0uyE0YQNIzcHVs/WJ0QRAnZzV5xK ojCIwpom8y6p4d1ejGzQi3II0CX5nQeO4pZvpnhDPcGSOQ6NV7syP22i1bZPWrCXvhJo tudg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M1j5mYFn; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id q18-20020a05622a031200b0042372843e7dsi1443244qtw.297.2023.11.23.09.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 09:29:34 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M1j5mYFn; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EF8FC385AC3A for ; Thu, 23 Nov 2023 17:29:33 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 0E91C385841B for ; Thu, 23 Nov 2023 17:29:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0E91C385841B 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 0E91C385841B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700760566; cv=none; b=PkPzY5kVivy4PMvbJmyzZspIhHerNXjQim0MefQB4w7Ldxt9EWEfhNq4XdmWYzTmvEMfPnAX65aqMnK+V+A8ozSK3I5IT9vtaaVhl/UAq6khCrh4Ft5xvSvZbBGRU6MEZuLqw5RxypZ/8/LOI5/8s+DRW1gKjiNX9mtTRsLcl5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700760566; c=relaxed/simple; bh=fu9fqQPysqLW+4ihIaoIuQWazerxcNBuNYwBFj8awFw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=SZz3anMILxmpOkjTY+66Jzx6ek+0gX3zl+4sn6JA07ZA/O1lRKUhsFIW+1Upg5lPVhA6NukWodXdFoYto8bj9VYhqNQ5q3rsOSD/5YVGh5BK9nuk33skzPEDp+JniCLwa5dNdBBW67Za8qI62nzNXdj9geIJVgFNuM19C0PWdGA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6c4cf0aea06so1093350b3a.0 for ; Thu, 23 Nov 2023 09:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700760563; x=1701365363; 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=nvOMmR5nPPRiCAP9uZifd0VYB7zzegrn6fbP+R0su68=; b=M1j5mYFnNwghq1UI/BSKzLHydqtnp5fhDQ/hXAkSC1r4UtxpbrxPM99jvL/QPYqfYn bJ1lh0r93cKh4iqujRTnX7sAsGO3tAQzDdH8A/AaSrewVjv0G5r9cut8FO1F55iwjVL5 QnbTrOBW/roABY/dyvemBZou1/uEboQMf7EVOLmd4w9vhL5HTeWQvRaj3MWi3VHgxilN 7NGKhsNuLQAA3xXkMCSrN37PXRfD1QB9pXZ7SClRISzXDjq/ayR8WVBHTsPXYDhMSAKd Byn9M/UELxAPiNvywaAw2Ay5Vbf7HX8BOdEqaVPIycyc1KJB67hI2ZBXGmIw56MMiwOX 8nvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700760563; x=1701365363; 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=nvOMmR5nPPRiCAP9uZifd0VYB7zzegrn6fbP+R0su68=; b=mmHs1LakcXUNvDu6U/LK0RXket5y0rMaQvuPakJ/R1qSQ91KRwdcH+Grf4XomQ3vjk 9F3SZN2VOeGXESy6tPveppzzEXAgjk8dCm8UOHBgy3x0+LY2gNcbkD7SABm9hBx6qOKg G6n3Ed+uVz5T24ATumXEkgMISv222WL7ROg5oOZBLNHTpYPdH4zwF187PQw+GaYRXYLY aAgGeJojFv7Nm8DfguVwoJoRF3QTbPlekZ7+cFMYZ/NJ30ypBqFqu6NBS0uLqenl4wQj uzaUv0KXKXgSVdvY2pHFlCz7i4Z8YyaxF0LjiTnQZB5Yoa9G3wnAJaYMdRLNP2Gy5rAM 1MEg== X-Gm-Message-State: AOJu0YzVfnb51gioRh65HOeq8qd3/L6WSj+T8ML0czxX4iKLszp2jzJ/ 42Q9UeU/tUNXD3V/7qjvsj/IWiz6RknhDDVsjpZtNg== X-Received: by 2002:a05:6a20:8418:b0:187:5302:4b2e with SMTP id c24-20020a056a20841800b0018753024b2emr285300pzd.41.1700760563663; Thu, 23 Nov 2023 09:29:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 09:29:23 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, DJ Delorie Cc: Zhangfei Gao Subject: [PATCH v2 2/2] malloc: Improve MAP_HUGETLB with glibc.malloc.hugetlb=2 Date: Thu, 23 Nov 2023 14:29:15 -0300 Message-Id: <20231123172915.893408-3-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, KAM_NUMSUBJECT, 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+patch=linaro.org@sourceware.org Even for explicit large page support, allocation might use mmap without the hugepage bit set if the requested size is smaller than mmap_threshold. For this case where mmap is issued, MAP_HUGETLB is set iff the allocation size is larger than the used large page. To force such allocations to use large pages, also tune the mmap_threhold (if it is not explicit set by a tunable). This forces allocation to follow the sbrk path, which will fall back to mmap (which will try large pages before galling back to default mmap). Checked on x86_64-linux-gnu. --- malloc/arena.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/malloc/arena.c b/malloc/arena.c index a1a75e5a2b..c73f68890d 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -312,10 +312,17 @@ ptmalloc_init (void) # endif TUNABLE_GET (mxfast, size_t, TUNABLE_CALLBACK (set_mxfast)); TUNABLE_GET (hugetlb, size_t, TUNABLE_CALLBACK (set_hugetlb)); + if (mp_.hp_pagesize > 0) - /* Force mmap for main arena instead of sbrk, so hugepages are explicitly - used. */ - __always_fail_morecore = true; + { + /* Force mmap for main arena instead of sbrk, so MAP_HUGETLB is always + tried. Also tune the mmap threshold, so allocation smaller than the + large page will also try to use large pages by falling back + to sysmalloc_mmap_fallback on sysmalloc. */ + if (!TUNABLE_IS_INITIALIZED (mmap_threshold)) + do_set_mmap_threshold (mp_.hp_pagesize); + __always_fail_morecore = true; + } } /* Managing heaps and arenas (for concurrent threads) */