From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by sourceware.org (Postfix) with ESMTPS id E779F3849AF5 for ; Sat, 13 Apr 2024 15:28:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E779F3849AF5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E779F3849AF5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b29 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713022098; cv=none; b=vuVX/c2+Q3Ib+jo/MxoRNGvxPwwvmJRQsWNB3v6SotltTw9GugFp8Eyv7g2gHmJ6UNDPhd5q1C/hMrv6ngNUJWspGDcujV/eyruNHCvKezvO54g0baEdt9t3wqXCfTgUU/urP4CPMQ/f+d05UxaJoh+l6gi0E5YlTIKQSlL3MqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713022098; c=relaxed/simple; bh=TTw7wzpPU3ySSVNh09AuoSTRUrXv0auUYHC5ZAsgD5M=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=In2xG2oDGLUzIcqLriWHMdTDXrz9UVrWgscM0TEWahZdxhG47Do+Ki9i7nRDKOkDcA5cmoqdt7YV3/TkV7MykxRpXA95H+3UmeycSFJ3S34nrm9O+6sjRrzJTLvMLSPqnXBDpgJkCG/KXyaghDF+TDUm+VmqddhOLHOi9t2X5n8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb29.google.com with SMTP id 3f1490d57ef6-de0f9a501d6so1777700276.3 for ; Sat, 13 Apr 2024 08:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713022095; x=1713626895; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=x3YS3CcCe4vPd8FizvNmZzNdXNJiK8lsSfzwL2lrU4M=; b=Mu/PVZYhsZj3mpzSPYMIWjDr+hJcNyfc7caP58A42q14mAO0EQkzLxnEUyxcuRc7PB RQjUfSup9kVdLBfoVVtF/LntBStbPy1USAk3HwyEjQpkSknZUOAgclJsboHbn0IGjOPm wFt3iuHB3btjxoOm0nWJgy+CSuBduocauPpB1PJ6KB6kA6XV8qc/deeuC5HOE67+hrYH Fv52CUiBBcr56EuC6+NaB5ninxXELY8nw++3gmvFqqzC6oRKRIC6R1jl2+kdf00bzRGM 7i5nPlVv2pyAoQTXTjkE8H44vNBOqPPio0RzDyu2rV9dSfgfm6cP2HUvufpSc4gd6ITq Gw7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713022095; x=1713626895; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x3YS3CcCe4vPd8FizvNmZzNdXNJiK8lsSfzwL2lrU4M=; b=p/1J84IJjmEI6fpJwuxmmZe/St/Ipdbn2PN2Zdfy61SVoZN0VgFCvBUYlVUWrObejf 8QOUCa84Xibjh2p7YXxwP8HnKl7hvSc+RiQXw1RYaK9uz8DAOzvutOtMNdGiic713GUD gWZKGbnxNSp/84bSU/eDdwuPh1fj4ZElv+rzvjwlmHPaBQIJD7DWgRnufd3afBik7g7D puVmELjlnfsC08wFNJJMtZPKwQczQYoKrjcsPTxb3UZpJ42C8JuDGNiQhzhZ+MN9494q xp5Ohbx8HbE+NmPayswAyELCs3Sbxd6EZMph7+BeHkifQoKuXryVNarxjJu3sqMBueX4 Za7g== X-Gm-Message-State: AOJu0YxwfjQOy0VJelnQQaDCHDo7lP/CBoxN0vqFOfZWHlpKbeXPZSfc JPe1GYlJZepwcjx3OSlBq59J30+CRWMmVF5lBtZEqHLoA9CWMnTftv1d+0j8GdqDNqU9X8QulvZ geSERjaC8Yjvg0Tb6hLfSUmFvXZU= X-Google-Smtp-Source: AGHT+IFkNcATubLnLYNqRduuqX0hjRP+I2R9zjqHUlcaNHJIVrL/ifi7rpU5pnXXitpdSpbaZAtRSLT+9H4UXU4tvB0= X-Received: by 2002:a05:6902:641:b0:dc7:47b7:9053 with SMTP id h1-20020a056902064100b00dc747b79053mr5553554ybt.15.1713022095323; Sat, 13 Apr 2024 08:28:15 -0700 (PDT) MIME-Version: 1.0 References: <87ttk51e69.fsf@oldenburg.str.redhat.com> In-Reply-To: <87ttk51e69.fsf@oldenburg.str.redhat.com> From: "H.J. Lu" Date: Sat, 13 Apr 2024 08:27:39 -0700 Message-ID: Subject: Re: [PATCH] Revert "x86_64: Suppress false positive valgrind error" To: Florian Weimer Cc: libc-alpha@sourceware.org, Sunil K Pandey Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3019.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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 List-Id: On Sat, Apr 13, 2024 at 8:21=E2=80=AFAM Florian Weimer = wrote: > > This reverts commit a1735e0aa858f0c8b15e5ee9975bff4279423680. > > The test failure is a real valgrind bug that needs to be fixed before > valgrind is usable with a glibc that has been built with > CC=3D"gcc -march=3Dx86-64-v3". The proposed valgrind patch teaches > valgrind to replace ld.so strcmp with an unoptimized scalar > implementation, thus avoiding any AVX2-related problems. > > Valgrind bug: > > --- > elf/Makefile | 3 +-- > elf/tst-valgrind-smoke.sh | 5 ++--- > sysdeps/x86_64/Makefile | 7 ------- > sysdeps/x86_64/tst-valgrind-smoke.supp | 17 ----------------- > 4 files changed, 3 insertions(+), 29 deletions(-) > > diff --git a/elf/Makefile b/elf/Makefile > index 6dad11bcfb..fb3c3c4dff 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -618,8 +618,7 @@ tests-special +=3D $(objpfx)tst-valgrind-smoke.out > endif > $(objpfx)tst-valgrind-smoke.out: tst-valgrind-smoke.sh $(objpfx)ld.so $(= objpfx)valgrind-test > $(SHELL) $< $(objpfx)ld.so $(rtlddir)/$(rtld-installed-name) '$(= test-wrapper-env)' \ > - '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-te= st \ > - '$(valgrind-suppressions-tst-valgrind-smoke)' > $@; $(eva= luate-test) > + '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-te= st > $@; $(evaluate-test) > > ifeq ($(run-built-tests),yes) > tests-special +=3D $(objpfx)tst-rtld-does-not-exist.out > diff --git a/elf/tst-valgrind-smoke.sh b/elf/tst-valgrind-smoke.sh > index 7d0ceac6b1..e33b2fa1d7 100644 > --- a/elf/tst-valgrind-smoke.sh > +++ b/elf/tst-valgrind-smoke.sh > @@ -25,7 +25,6 @@ test_wrapper_env=3D"$3" > run_program_env=3D"$4" > library_path=3D"$5" > test_prog=3D"$6" > -valgrind_suppressions=3D"$7" > > # Test whether valgrind is available in the test > # environment. If not, skip the test. > @@ -35,7 +34,7 @@ ${test_wrapper_env} ${run_program_env} \ > # Test valgrind works with the system ld.so in the test environment > /bin/sh -c \ > "${test_wrapper_env} ${run_program_env} \ > - valgrind -q --error-exitcode=3D1 ${valgrind_suppressions} \ > + valgrind -q --error-exitcode=3D1 \ > ${system_rtld} /bin/echo ${system_rtld}" || exit 77 > > # Finally the actual test inside the test environment, > @@ -43,5 +42,5 @@ ${test_wrapper_env} ${run_program_env} \ > # the smoke test under valgrind. > /bin/sh -c \ > "${test_wrapper_env} ${run_program_env} \ > - valgrind -q --error-exitcode=3D1 ${valgrind_suppressions} \ > + valgrind -q --error-exitcode=3D1 \ > ${rtld} --library-path ${library_path} ${test_prog} ${rtld}" > diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile > index 39048b12e0..ce949dba27 100644 > --- a/sysdeps/x86_64/Makefile > +++ b/sysdeps/x86_64/Makefile > @@ -211,14 +211,7 @@ tst-plt-rewrite2-ENV =3D GLIBC_TUNABLES=3Dglibc.cpu.= plt_rewrite=3D2 > $(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so > endif > > -# Check if ISA level is 3 or above. > -ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above))) > -valgrind-suppressions-tst-valgrind-smoke =3D \ > - --suppressions=3D$(..)sysdeps/x86_64/tst-valgrind-smoke.supp > -endif > - > test-internal-extras +=3D tst-gnu2-tls2mod1 > - > endif # $(subdir) =3D=3D elf > > ifeq ($(subdir),csu) > diff --git a/sysdeps/x86_64/tst-valgrind-smoke.supp b/sysdeps/x86_64/tst-= valgrind-smoke.supp > deleted file mode 100644 > index 533c2deaff..0000000000 > --- a/sysdeps/x86_64/tst-valgrind-smoke.supp > +++ /dev/null > @@ -1,17 +0,0 @@ > -{ > - False positive at strcmp-avx2.S:462 > - Memcheck:Cond > - fun:strcmp > - fun:_dl_name_match_p > - fun:_dl_map_object > - fun:map_doit > - fun:_dl_catch_exception > - fun:_dl_catch_error > - fun:do_preload > - fun:handle_preload_list > - fun:dl_main > - fun:_dl_sysdep_start > - fun:_dl_start_final > - fun:_dl_start > - obj:*/elf/ld.so > -} > > base-commit: ae7468a7b0bcf22e9cd5fcae42bb9e4f65de83ee > LGTM. Reviewed-by: H.J. Lu Thanks. --=20 H.J.