From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id E312A3858402 for ; Fri, 18 Feb 2022 23:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E312A3858402 Received: by mail-pf1-x433.google.com with SMTP id i6so3477311pfc.9 for ; Fri, 18 Feb 2022 15:01:50 -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=SIM2H4mp37s9RiUJYKaakqf4IDFVWCY6bkQt3LIzesQ=; b=RPESbyw5shqhvPOKQNDIdCEA8adHpLBwSVjBz0p2zyG7R6iAzPV/PT0VNOcpW077Hi yZuGmMT/r4bRhlYEkyLFL0LxpdWI0u0XkjAemO9qBqwy5mCbAzIPz5Yg7Z5IPavWur91 oQyFoMwFN9X5glee5R9831JWIAY8hSSjlbk/Sl+ohnXYiz1lwVsdb3XWTDFDtAdN35cc a2vEwS0rmo5Phil+npDxZ0o8RXd4MJUGgBSD0omQ+0Pte/J09xyPJUuMFb6upuPOqnw1 ySrD8CNzyF9MCJsHuBcu/cpbL7+ZtyCgt+oUn5aIpqpxooC3fHPc5ZXmYFtG5iDba//q hlNA== X-Gm-Message-State: AOAM532nk0FSsA70e4EyxkFIdkHCyjKv3035Us3C2To74uW+JuI/hHYp /Qh8OZok5hvGDSan0SDuwlBcQRlwxsw5f5dfBrEg9iw6e60= X-Google-Smtp-Source: ABdhPJwRWQnBn6wp1MNu7Kf2GW+tRe8VcNBkBqtczlFF3ZetbIxgdFNxevc/unrCOZMccCxyKN/SUaFGKvDws/m1f0c= X-Received: by 2002:a63:e50c:0:b0:363:96b8:4334 with SMTP id r12-20020a63e50c000000b0036396b84334mr8011844pgh.18.1645225309795; Fri, 18 Feb 2022 15:01:49 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Noah Goldstein Date: Fri, 18 Feb 2022 17:01:38 -0600 Message-ID: Subject: Re: [Backport PATCH 2/2] x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896] To: "H.J. Lu" Cc: Stable GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 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:01:53 -0000 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/ > +#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 >