From patchwork Wed Oct 11 16:43:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 77541 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 450453857704 for ; Wed, 11 Oct 2023 16:44:15 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 84F2C3858D1E for ; Wed, 11 Oct 2023 16:44:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 84F2C3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1c77449a6daso152905ad.0 for ; Wed, 11 Oct 2023 09:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697042641; x=1697647441; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=sOu8WInTvn7x7Eh7OVcnk8BuUWCD2mi+pwSqvqibdME=; b=XvrQggMfCSfitwwGabJXqRoWL/vf+qZHed0optM32/gWWDIOJlCpUX7YGYSRQoEn77 /lET9iF3oWV/PgxOvUPbKFWawIRTMfJFlEzvaz6NFjzHOAg58sJVTwEnT3klcL7jvAMq z0Jajr392Er3tnOQlPY+VAxHFlGWk/TSoB1EYYukRVv7kTY9MVHM1UfHYyBFc8643m8v mpvwg8e753z3C1PeEpG/WcZT6TTyyzTkB6Mforx1zmaOZiSRaLQ8zwpybiu01Gj1eBC3 pLUjG1t7qni0UwsHzqkHLh40HnH0ERywIr6K6KMuWiNg7a6kI1r6HeFYaUZDvQUnYUm8 ZQIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697042641; x=1697647441; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sOu8WInTvn7x7Eh7OVcnk8BuUWCD2mi+pwSqvqibdME=; b=dOVgAH/7wFS1NzO4HVjsC+JARLPQrwE0GigqHkcQmKq7rp15hrop/JCBn8Gy8050Y7 keBuaIGK41+3LZCU2/w2lLf+/AFWqgmP1KOm6Ut4z1T9mReOreHbzwRbj/QhzjM/CX0a HyDBF8yYSHupRjMUQRsUA4PV/npxN9bQhxM83LwpDElzmC1xdQklea0r7//Ov1fSDdK5 x4NglLXXmzurAR18EaVQ6LCJYF2SGIhwfO4w5cQ32Z40AKIU/T+noGeOEx9P/pO8a0eC dR3RMq4LzvXFl3N9csVblABcjfap3tvmH/l4FGVJkvtpvLCo0o1sk3Zli7w33KC7yfMg GgMg== X-Gm-Message-State: AOJu0YzbNspEqRAF+ZS3/I6BNZFuMVuY6gIC52ifbh2tgWRY2W4ApwFN NW+xq/vpSRJj6+NKP+voQ1M9envfQMXMXUHHQoI7Lg== X-Google-Smtp-Source: AGHT+IFilghGHXuVqT3Vrbdwbb4VtT/W7MMxtXSPLal5vfTVZBC4uv/on/JELZ53fwNv9DO+/D+VNw== X-Received: by 2002:a17:902:7246:b0:1c5:dfe9:b209 with SMTP id c6-20020a170902724600b001c5dfe9b209mr21588211pll.62.1697042640781; Wed, 11 Oct 2023 09:44:00 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c2:d09b:315e:9cf6:1a4f:44cd]) by smtp.gmail.com with ESMTPSA id 6-20020a170902ee4600b001bde65894c8sm35776plo.268.2023.10.11.09.43.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 09:43:59 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] malloc: Use __get_nprocs on arena_get2 (BZ 30945) Date: Wed, 11 Oct 2023 13:43:56 -0300 Message-Id: <20231011164356.2218554-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 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 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 This restore the 2.33 semantic for arena_get2. It was changed by 11a02b035b46 to avoid arena_get2 call malloc (back when __get_nproc was refactored to use an scratch_buffer - 903bc7dcc2acafc). The __get_nproc was refactored over then and now it also avoid to call malloc. The 11a02b035b46 did not take in consideration any performance implication, which should have been discussed properly. The __get_nprocs_sched is still used as a fallback mechanism if procfs and sysfs is not acessible. Checked on x86_64-linux-gnu. Reviewed-by: DJ Delorie --- include/sys/sysinfo.h | 4 ---- malloc/arena.c | 2 +- misc/getsysstats.c | 6 ------ sysdeps/mach/getsysstats.c | 6 ------ sysdeps/unix/sysv/linux/getsysstats.c | 2 +- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h index c490561581..65742b1036 100644 --- a/include/sys/sysinfo.h +++ b/include/sys/sysinfo.h @@ -14,10 +14,6 @@ libc_hidden_proto (__get_nprocs_conf) extern int __get_nprocs (void); libc_hidden_proto (__get_nprocs) -/* Return the number of available processors which the process can - be scheduled. */ -extern int __get_nprocs_sched (void) attribute_hidden; - /* Return number of physical pages of memory in the system. */ extern long int __get_phys_pages (void); libc_hidden_proto (__get_phys_pages) diff --git a/malloc/arena.c b/malloc/arena.c index 6f03955ff2..82b09adb47 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -820,7 +820,7 @@ arena_get2 (size_t size, mstate avoid_arena) narenas_limit = mp_.arena_max; else if (narenas > mp_.arena_test) { - int n = __get_nprocs_sched (); + int n = __get_nprocs (); if (n >= 1) narenas_limit = NARENAS_FROM_NCORES (n); diff --git a/misc/getsysstats.c b/misc/getsysstats.c index 5f36adc0e8..23cc112074 100644 --- a/misc/getsysstats.c +++ b/misc/getsysstats.c @@ -44,12 +44,6 @@ weak_alias (__get_nprocs, get_nprocs) link_warning (get_nprocs, "warning: get_nprocs will always return 1") -int -__get_nprocs_sched (void) -{ - return 1; -} - long int __get_phys_pages (void) { diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c index 5184e5eee1..d3834f3b69 100644 --- a/sysdeps/mach/getsysstats.c +++ b/sysdeps/mach/getsysstats.c @@ -62,12 +62,6 @@ __get_nprocs (void) libc_hidden_def (__get_nprocs) weak_alias (__get_nprocs, get_nprocs) -int -__get_nprocs_sched (void) -{ - return __get_nprocs (); -} - /* Return the number of physical pages on the system. */ long int __get_phys_pages (void) diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index b0b6c154ac..1ea7f1f01f 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -29,7 +29,7 @@ #include #include -int +static int __get_nprocs_sched (void) { enum