From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 2FEA03851C2A for ; Fri, 18 Feb 2022 23:27:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2FEA03851C2A Received: by mail-pf1-x435.google.com with SMTP id y11so3524042pfa.6 for ; Fri, 18 Feb 2022 15:27:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GgsCHqdFDDm8D5KxO26EaFRnYJlndZZW3o/6u5Tg/Xo=; b=gnVmatFSoZ1auRsS3unGsP0JuRHCoI0Aw+U4a19yUPsOLo7w2NkXkFUuVb0ypy78H2 Ni0naamcxqoi7SU5E2rYvOC4+4aDI/pq5dbmeG19psX+b9K2hkPaBpwNGqklRpLkTPnK PbpdAyC2348cbdR2i8KY4GfURobsjShUw85kSSpSUv08X13CShV2xCXmjTB5lt7CWNre CWYrmROC4kqIjug/68eG/n0/37EBterUeJohpxALlVV2KpiZ/J7KxdnTnFGUjxkuZBw3 NNju0OimQI+ytAIJLg/+VwcwRdcdyQYSSIS776t7eBx+H8+aE4PetQ9ohkF7MmzC2iRb h6mQ== X-Gm-Message-State: AOAM533l0VAfb9N9UyHqNRzFH2byaVQ2irWisfxORhQqGqy4prRd6Qfs B/UnJTa/DImHputjQb/WlovEy4RG+Ckh3wEhTDyd7BTk X-Google-Smtp-Source: ABdhPJzfcYr2SM01KA5PhMmCZPonR7xCBNjntppecVcWMU6SaZJkaesCsvKtnx+/Qm0pECzgv6j1413BATQ9jEI5Aak= X-Received: by 2002:a63:4a44:0:b0:372:db13:5583 with SMTP id j4-20020a634a44000000b00372db135583mr7937213pgl.210.1645226819804; Fri, 18 Feb 2022 15:26:59 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: "H.J. Lu" Date: Fri, 18 Feb 2022 15:26:24 -0800 Message-ID: Subject: Re: [Backport PATCH 2/2] x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896] To: Noah Goldstein Cc: Stable GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3026.9 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Feb 2022 23:27:03 -0000 On Fri, Feb 18, 2022 at 3:01 PM Noah Goldstein wrote: > > On Fri, Feb 18, 2022 at 4:56 PM H.J. Lu wrote: > > > > In the overflow fallback strncmp-avx2-rtm and wcsncmp-avx2-rtm would > > call strcmp-avx2 and wcscmp-avx2 respectively. This would have > > not checks around vzeroupper and would trigger spurious > > aborts. This commit fixes that. > > > > test-strcmp, test-strncmp, test-wcscmp, and test-wcsncmp all pass on > > AVX2 machines with and without RTM. > > Reviewed-by: H.J. Lu > > > > (cherry picked from commit 7835d611af0854e69a0c71e3806f8fe379282d6f) > > --- > > sysdeps/x86/Makefile | 5 ++++- > > sysdeps/x86/tst-strncmp-rtm.c | 32 +++++++++++++++++++++++--------- > > sysdeps/x86/tst-wcsncmp-rtm.c | 21 +++++++++++++++++++++ > > 3 files changed, 48 insertions(+), 10 deletions(-) > > create mode 100644 sysdeps/x86/tst-wcsncmp-rtm.c > > > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile > > index d110f7b7f2..c6bee981f8 100644 > > --- a/sysdeps/x86/Makefile > > +++ b/sysdeps/x86/Makefile > > @@ -99,7 +99,9 @@ tests += \ > > tst-strcpy-rtm \ > > tst-strlen-rtm \ > > tst-strncmp-rtm \ > > - tst-strrchr-rtm > > + tst-strrchr-rtm \ > > + tst-wcsncmp-rtm \ > > +# tests > > > > CFLAGS-tst-memchr-rtm.c += -mrtm > > CFLAGS-tst-memcmp-rtm.c += -mrtm > > @@ -111,6 +113,7 @@ CFLAGS-tst-strcpy-rtm.c += -mrtm > > CFLAGS-tst-strlen-rtm.c += -mrtm > > CFLAGS-tst-strncmp-rtm.c += -mrtm -Wno-error > > CFLAGS-tst-strrchr-rtm.c += -mrtm > > +CFLAGS-tst-wcsncmp-rtm.c += -mrtm -Wno-error > > endif > > > > ifneq ($(enable-cet),no) > > diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c > > index 9e20abaacc..b50c11e8d4 100644 > > --- a/sysdeps/x86/tst-strncmp-rtm.c > > +++ b/sysdeps/x86/tst-strncmp-rtm.c > > @@ -19,18 +19,32 @@ > > #include > > #include > > > > +#ifdef WIDE > > +# define CHAR wchar_t > > +# define MEMSET wmemset > > +# define STRNCMP wcsncmp > > +# define TEST_NAME wcsncmp > > This is not a string > > +#else /* !WIDE */ > > +# define CHAR char > > +# define MEMSET memset > > +# define STRNCMP strncmp > > +# define TEST_NAME strncmp > > This is not a string > > Please apply: > https://patchwork.sourceware.org/project/glibc/patch/20220218230025.3505625-1-goldstein.w.n@gmail.com/ I am backporting it now. Thanks. > > +#endif /* !WIDE */ > > + > > + > > + > > #define LOOP 3000 > > #define STRING_SIZE 1024 > > -char string1[STRING_SIZE]; > > -char string2[STRING_SIZE]; > > +CHAR string1[STRING_SIZE]; > > +CHAR string2[STRING_SIZE]; > > > > __attribute__ ((noinline, noclone)) > > static int > > prepare (void) > > { > > - memset (string1, 'a', STRING_SIZE - 1); > > - memset (string2, 'a', STRING_SIZE - 1); > > - if (strncmp (string1, string2, STRING_SIZE) == 0) > > + MEMSET (string1, 'a', STRING_SIZE - 1); > > + MEMSET (string2, 'a', STRING_SIZE - 1); > > + if (STRNCMP (string1, string2, STRING_SIZE) == 0) > > return EXIT_SUCCESS; > > else > > return EXIT_FAILURE; > > @@ -40,7 +54,7 @@ __attribute__ ((noinline, noclone)) > > static int > > function (void) > > { > > - if (strncmp (string1, string2, STRING_SIZE) == 0) > > + if (STRNCMP (string1, string2, STRING_SIZE) == 0) > > return 0; > > else > > return 1; > > @@ -50,7 +64,7 @@ __attribute__ ((noinline, noclone)) > > static int > > function_overflow (void) > > { > > - if (strncmp (string1, string2, SIZE_MAX) == 0) > > + if (STRNCMP (string1, string2, SIZE_MAX) == 0) > > return 0; > > else > > return 1; > > @@ -59,9 +73,9 @@ function_overflow (void) > > static int > > do_test (void) > > { > > - int status = do_test_1 ("strncmp", LOOP, prepare, function); > > + int status = do_test_1 (TEST_NAME, LOOP, prepare, function); > > if (status != EXIT_SUCCESS) > > return status; > > - status = do_test_1 ("strncmp", LOOP, prepare, function_overflow); > > + status = do_test_1 (TEST_NAME, LOOP, prepare, function_overflow); > > return status; > > } > > diff --git a/sysdeps/x86/tst-wcsncmp-rtm.c b/sysdeps/x86/tst-wcsncmp-rtm.c > > new file mode 100644 > > index 0000000000..bad3b86378 > > --- /dev/null > > +++ b/sysdeps/x86/tst-wcsncmp-rtm.c > > @@ -0,0 +1,21 @@ > > +/* Test case for wcsncmp inside a transactionally executing RTM region. > > + Copyright (C) 2022 Free Software Foundation, Inc. > > + This file is part of the GNU C Library. > > + > > + The GNU C Library is free software; you can redistribute it and/or > > + modify it under the terms of the GNU Lesser General Public > > + License as published by the Free Software Foundation; either > > + version 2.1 of the License, or (at your option) any later version. > > + > > + The GNU C Library is distributed in the hope that it will be useful, > > + but WITHOUT ANY WARRANTY; without even the implied warranty of > > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + Lesser General Public License for more details. > > + > > + You should have received a copy of the GNU Lesser General Public > > + License along with the GNU C Library; if not, see > > + . */ > > + > > +#define WIDE 1 > > +#include > > +#include "tst-strncmp-rtm.c" > > -- > > 2.35.1 > > -- H.J.