From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 587443858402 for ; Fri, 18 Feb 2022 22:45:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 587443858402 Received: by mail-pl1-x635.google.com with SMTP id m11so4691635pls.5 for ; Fri, 18 Feb 2022 14:45:52 -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=7CGIMc3tbj1/04emw2R0mu+Ovs8u16N98p3omHBqJ00=; b=qKW2DmvqGDqpIW2fcn1Zl1426hWiw/ywInJqc8ZTBuCo7YXBB0kwdvNZzIRpvnYmCI 5jliQoaFCmWLfjkpIP539qyODo4ghFJDMJtqY0le5GaFL95J96x4h3KXxFnTwPdbiJPw VJ/BHXxye6cw84m1vI7iY/WYOYjTHPW7aOhhMcJKqywgTaR3zJgQdDRCEA7CqhjNEpI6 uugh/AtsFvJbx0xWV3zxMj+lFvaOXYmQ4Oqjd7IZrrDLKks6o0tYO/h0Paa+UApfjhfj /Ua9TE7ZN6kpMbqFlYITCGPLhkhNd8ccdFQNTbRAxD9wr7Gb9AI2Zm6jol8smFe5MTJv ZPKw== X-Gm-Message-State: AOAM531Jp75wxE/caz0ErIV/WEUnHHCfRayrM9g+dIBciHHbvZNsVF44 hNLbxRiQxPThLxe2heZRpztvwgw6Lj0OuRssx/4= X-Google-Smtp-Source: ABdhPJyN5MMetyte6OJth7Ua1wXQIPOEiPEy3FymD+n6lKu6jR8y3G3BlAoVeoW/c834nRi8BH69A1aXHhECwhWPitM= X-Received: by 2002:a17:90a:c7cf:b0:1b9:a07d:beb with SMTP id gf15-20020a17090ac7cf00b001b9a07d0bebmr14678069pjb.87.1645224351410; Fri, 18 Feb 2022 14:45:51 -0800 (PST) MIME-Version: 1.0 References: <20220218033735.1429857-1-goldstein.w.n@gmail.com> <20220218201915.237091-1-goldstein.w.n@gmail.com> In-Reply-To: From: Noah Goldstein Date: Fri, 18 Feb 2022 16:45:40 -0600 Message-ID: Subject: Re: [PATCH v4] x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896] To: "H.J. Lu" Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.4 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-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-List-Received-Date: Fri, 18 Feb 2022 22:45:54 -0000 On Fri, Feb 18, 2022 at 2:29 PM H.J. Lu wrote: > > On Fri, Feb 18, 2022 at 12:19 PM Noah Goldstein 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. > > --- > > 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 > > +#else /* !WIDE */ > > +# define CHAR char > > +# define MEMSET memset > > +# define STRNCMP strncmp > > +# define TEST_NAME strncmp > > +#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.25.1 > > > > LGTM. > > Reviewed-by: H.J. Lu Thanks pushed. > > Thanks. > > -- > H.J.