From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) by sourceware.org (Postfix) with ESMTPS id D01D43849AEF for ; Sat, 13 Apr 2024 14:59:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D01D43849AEF 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 D01D43849AEF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b2e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713020359; cv=none; b=oWGegZtSLpjjWw+r3l7fs1AvuVYO+BiSFpVfWqhDcbYyjRQgA04Tffv4ALmtIXW4JnTfqHhdwMX8vw+r9qefKShnaK73/YazK7ilyY8DMAanSmcysvO5LjgJB1Np62BnZlOpjZbF1xvSuUgasSEWUb9FxFv0T0WvpnjHup3uFW4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713020359; c=relaxed/simple; bh=OCxU7MGZ3CwmIqQTbnHMVfdDSVyUnNy6HOp75afFX6g=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=nUWWAHZcOCuFVzbFqjoN47EIvYBsW25jXNZCXoYp7ayRgXOJVuE5GQfR2wq3Yg17NNJkCZHCO/13b9UTqmDN6isOkE1gbSPWsfyedLLNQ968swyt2oCA8ZvzGrdzAIwe/FCAEl3IaeGmKMH+s/oIWjQ7Jpsc3KaTlfi99Q9L1HM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb2e.google.com with SMTP id 3f1490d57ef6-dc6dcd9124bso1832132276.1 for ; Sat, 13 Apr 2024 07:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713020356; x=1713625156; 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=YXmtVdUyRcFJNi+SPXTqrV7iLTnRr7s/3VxeqoCp2ng=; b=jG3/HHo3A1cytO6V5sH+ye8S3P3R7NIcbtp23ntYQD6tMWunAFtaHLxUo57DabGCMm akY4LcHDuUvao4SG4aG5xrnj6l/TtF3vaALYjdT5EMvnZmkE10u6n1nV/IjLTW35I3nE 3h3SjpMIl9SEmgqB1btZ4w6tOdyR63j7VpcZNsIENeOkFJVYY27GkvbrQGpXSOCat0om jsmGGKrUiz4J9UKwJeuG46Zmp5saSP//YuO7moVSU/u/7vxa8DFlXorIicLt9VKhJ0qb v0M97qQyqjShjVLoFMn9oQ7V6Fj9IJOZmZGgCHa1+nO874+QlGSHeSmeBCemlDw0xwGI ZJWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713020356; x=1713625156; 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=YXmtVdUyRcFJNi+SPXTqrV7iLTnRr7s/3VxeqoCp2ng=; b=QUA8pnes/5MGCrczNC/cVI+k6sR6g5iVAdskPmv3EP+Qar8BO6kjT46J5EeKiFIx7H mY+mVh8rnC9hYALbFtjul5fbaJebpSHx77VWyOq6viOxCbe0HsKzo6BCM59NcbfFpla+ xa2J0YK88BwS8kA4FY0ORbWtBGb01OHmPP2Q+2rwAtLMJtf1/OLPwv4lRT1lvOnhGrbl Hcj/xQxH9d+IS01IIIQkf8SvYFr54pxd0L/k16lnl5RQ9Cv7ZMIO86zTsExS111gxUac e1MnmII7CwfovBB2+cYEidkdBh+cXPds8GJFhQCZ5UMW2UhGs2lukui/n5Onzxkq+A5L XqKw== X-Gm-Message-State: AOJu0YyuKxzZZKEvZ5Cc0YG1bqEnsm0IeHYOmerO2Utr/It1z8yR70z5 4yOgtwaXsMnlQurk0noAeQn/oLXdOJHN69SKmhaJ0YW0w4Agv3oezOfJIvN87w6bv/BYOLor8eJ 067ZGnn45lu9PNYLBv8d1p/GACdQ= X-Google-Smtp-Source: AGHT+IEkktlUFmBRUb52aMc66AqTMdZVxIhc4PVQ9cmvgDVU0tTDlWHnC5FNB5RrZULXJh7vPHMj7eFauFIlJ5ohuUs= X-Received: by 2002:a25:dc0b:0:b0:dc7:4a05:ca33 with SMTP id y11-20020a25dc0b000000b00dc74a05ca33mr4554781ybe.64.1713020356009; Sat, 13 Apr 2024 07:59:16 -0700 (PDT) MIME-Version: 1.0 References: <87a5lx2u9a.fsf@oldenburg.str.redhat.com> In-Reply-To: <87a5lx2u9a.fsf@oldenburg.str.redhat.com> From: "H.J. Lu" Date: Sat, 13 Apr 2024 07:58: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.2 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 7:49=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 valgrind fix addresses the observed > test failure as well. > > Upstream bug: > > Tested on x86_64-linux-gnu with and without CC=3D"gcc -march=3Dx86-64-v3"= . > The elf/tst-valgrind-smoke tests again fails with an unpatched valgrind, > and the proposed upstream patch fixes it. (Apparently, valgrind > matches on soname, and not the file name, which is ld.so in the test.) Please clarify that your patch fixes the glibc valgrind test by not using strcmp-avx2.S in the valgrind test. > --- > 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 > --=20 H.J.