From patchwork Tue Mar 28 18:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 67048 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 4BDD3385842B for ; Tue, 28 Mar 2023 18:50:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4BDD3385842B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680029448; bh=MOcNO8cNv/6r7T4zo26vZjgAa2Zk2Xq5aNRTkqyInec=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=J9lSBKYRe9ZpWw2JeldIiOctXuuLElHsdxMJSm1UYq3D0at/QUtjFrvPY+p3qALk7 +23Fpj5jyBFJykfraYPmR+jTIz4kq2pJMSrdUljxG7zzGhq30eQRg9Tq/byBh/+HmX t5RBJd/u0McfxUUAM2ox4kyHGWo9IJe1mR5OJs7s= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 2BFEA3858C53 for ; Tue, 28 Mar 2023 18:50:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2BFEA3858C53 Received: by mail-ot1-x32f.google.com with SMTP id r40-20020a05683044a800b006a14270bc7eso3576412otv.6 for ; Tue, 28 Mar 2023 11:50:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680029420; 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=MOcNO8cNv/6r7T4zo26vZjgAa2Zk2Xq5aNRTkqyInec=; b=i0SN2sHE4LQmLl/K7baGYIatJwVg2eC/MJY3Fx3zUUE3Wz+Xf1bzJSeEBdwP3lbWj8 5cLen7baLED3XhIfZXENpNnIETe6/JRBoclhQH6nsuJR9D9967pNkj/PandB/55uFvKA Lm5FFH5oB/i050EbKBSedQNJ0BUuliqqKYljyA77GTfkmMYxyoUZTcynsRPFpkzw6JgC dDGFQvSMGTlUkcNRA6dfgkGupr6WW3/b282+2Fc34AwzzMstNTAR9DbdV2hwgMWb/KLk IlzDXQhc47CSmLjWSiNApcuOfmWIbRJ3xPddpR909mzl2LOZinVwP/qaMivEAwx/3rO8 YXqw== X-Gm-Message-State: AO0yUKVOlBrZUEMlv7BcrkA8rPx3+Qvr4xXF1o5cLsg88lfkCQBQDlGe jypqg36KO2Ycmt1WcW1KCUipNb6RU1nbx3eG3XU1Cw== X-Google-Smtp-Source: AK7set/2QNPXDcXDo/GqZvE1Tson1JJpPIB5+Y6W9vc14U0Oe1ZPsT0XoEErwSE0P3aOYhrvofsIig== X-Received: by 2002:a05:6830:1002:b0:6a1:19b0:badd with SMTP id a2-20020a056830100200b006a119b0baddmr7015846otp.14.1680029419646; Tue, 28 Mar 2023 11:50:19 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:60f9:a18:4dbb:49c6:8f85]) by smtp.gmail.com with ESMTPSA id k10-20020a056830168a00b0069dd3d98ec6sm4138020otr.44.2023.03.28.11.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 11:50:19 -0700 (PDT) To: libc-alpha@sourceware.org, DJ Delorie Subject: [PATCH] Remove --disable-experimental-malloc option Date: Tue, 28 Mar 2023 15:50:15 -0300 Message-Id: <20230328185015.2058355-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It is the default since 2.26 and the options has bitrotten over the yeas, with the options multiple malloc tests fails: FAIL: malloc/tst-memalign-2 FAIL: malloc/tst-memalign-2-malloc-hugetlb1 FAIL: malloc/tst-memalign-2-malloc-hugetlb2 FAIL: malloc/tst-memalign-2-mcheck FAIL: malloc/tst-mxfast-malloc-hugetlb1 FAIL: malloc/tst-mxfast-malloc-hugetlb2 FAIL: malloc/tst-tcfree2 FAIL: malloc/tst-tcfree2-malloc-hugetlb1 FAIL: malloc/tst-tcfree2-malloc-hugetlb2 Checked on x86_64-linux-gnu. Reviewed-by: DJ Delorie --- INSTALL | 6 ------ config.make.in | 2 -- configure | 13 ------------- configure.ac | 7 ------- malloc/Makefile | 4 ---- manual/install.texi | 6 ------ scripts/build-many-glibcs.py | 1 - 7 files changed, 39 deletions(-) diff --git a/INSTALL b/INSTALL index 970d6627e2..04388877d5 100644 --- a/INSTALL +++ b/INSTALL @@ -264,12 +264,6 @@ if 'CFLAGS' is specified it must enable optimization. For example: independently-maintained implementations of libcrypt. It may become the default in a future release. -'--disable-experimental-malloc' - By default, a per-thread cache is enabled in 'malloc'. While this - cache can be disabled on a per-application basis using tunables - (set glibc.malloc.tcache_count to zero), this option can be used to - remove it from the build completely. - '--disable-scv' Disable using 'scv' instruction for syscalls. All syscalls will use 'sc' instead, even if the kernel supports 'scv'. PowerPC only. diff --git a/config.make.in b/config.make.in index d7c416cbea..b871fa2a74 100644 --- a/config.make.in +++ b/config.make.in @@ -78,8 +78,6 @@ multi-arch = @multi_arch@ mach-interface-list = @mach_interface_list@ -experimental-malloc = @experimental_malloc@ - memory-tagging = @memory_tagging@ nss-crypt = @libc_cv_nss_crypt@ diff --git a/configure b/configure index efb891456a..162210c71f 100755 --- a/configure +++ b/configure @@ -671,7 +671,6 @@ libc_cv_static_nss_crypt libc_cv_nss_crypt build_crypt memory_tagging -experimental_malloc enable_werror all_warnings force_install @@ -776,7 +775,6 @@ enable_kernel enable_all_warnings enable_werror enable_multi_arch -enable_experimental_malloc enable_memory_tagging enable_crypt enable_nss_crypt @@ -1443,8 +1441,6 @@ Optional Features: --disable-werror do not build with -Werror --enable-multi-arch enable single DSO with optimizations for multiple architectures - --disable-experimental-malloc - disable experimental malloc features --enable-memory-tagging enable memory tagging if supported by the architecture [default=no] --disable-crypt do not build nor install the passphrase hashing @@ -3468,15 +3464,6 @@ else fi -# Check whether --enable-experimental-malloc was given. -if test "${enable_experimental_malloc+set}" = set; then : - enableval=$enable_experimental_malloc; experimental_malloc=$enableval -else - experimental_malloc=yes -fi - - - # Check whether --enable-memory-tagging was given. if test "${enable_memory_tagging+set}" = set; then : enableval=$enable_memory_tagging; memory_tagging=$enableval diff --git a/configure.ac b/configure.ac index 011844a3d4..f1abeda9aa 100644 --- a/configure.ac +++ b/configure.ac @@ -307,13 +307,6 @@ AC_ARG_ENABLE([multi-arch], [multi_arch=$enableval], [multi_arch=default]) -AC_ARG_ENABLE([experimental-malloc], - AS_HELP_STRING([--disable-experimental-malloc], - [disable experimental malloc features]), - [experimental_malloc=$enableval], - [experimental_malloc=yes]) -AC_SUBST(experimental_malloc) - AC_ARG_ENABLE([memory-tagging], AS_HELP_STRING([--enable-memory-tagging], [enable memory tagging if supported by the architecture @<:@default=no@:>@]), diff --git a/malloc/Makefile b/malloc/Makefile index dfb51d344c..f685fc6e6c 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -286,11 +286,7 @@ tst-malloc-usable-tunables-ENV = GLIBC_TUNABLES=glibc.malloc.check=3 \ tst-mxfast-ENV = GLIBC_TUNABLES=glibc.malloc.tcache_count=0:glibc.malloc.mxfast=0 CPPFLAGS-malloc-debug.c += -DUSE_TCACHE=0 -ifeq ($(experimental-malloc),yes) CPPFLAGS-malloc.c += -DUSE_TCACHE=1 -else -CPPFLAGS-malloc.c += -DUSE_TCACHE=0 -endif # Uncomment this for test releases. For public releases it is too expensive. #CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1 diff --git a/manual/install.texi b/manual/install.texi index 260f8a5c82..cb76fbd28f 100644 --- a/manual/install.texi +++ b/manual/install.texi @@ -292,12 +292,6 @@ This option is for hackers and distributions experimenting with independently-maintained implementations of libcrypt. It may become the default in a future release. -@item --disable-experimental-malloc -By default, a per-thread cache is enabled in @code{malloc}. While -this cache can be disabled on a per-application basis using tunables -(set glibc.malloc.tcache_count to zero), this option can be used to -remove it from the build completely. - @item --disable-scv Disable using @code{scv} instruction for syscalls. All syscalls will use @code{sc} instead, even if the kernel supports @code{scv}. PowerPC only. diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 29c10c2916..9c5c77f423 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -447,7 +447,6 @@ class Context(object): '--disable-mathvec', '--disable-tunables', '--disable-crypt', - '--disable-experimental-malloc', '--disable-build-nscd', '--disable-nscd']}, {'variant': 'no-pie',