From: Noah Goldstein <goldstein.w.n@gmail.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: GNU C Library <libc-alpha@sourceware.org>,
"Carlos O'Donell" <carlos@systemhalted.org>
Subject: Re: [PATCH v1] x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896]
Date: Thu, 17 Feb 2022 23:02:10 -0600 [thread overview]
Message-ID: <CAFUsyfLBJRjyctc7yPqZOQiVkbk0GOgEKvKoe4y6k0YudRuJJw@mail.gmail.com> (raw)
In-Reply-To: <CAMe9rOpWW47F+KiTW=bW_y=2PSEptAa_EnxP2Xt-spKdY4Xawg@mail.gmail.com>
On Thu, Feb 17, 2022 at 9:58 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Thu, Feb 17, 2022 at 7:54 PM H.J. Lu <hjl.tools@gmail.com> wrote:
> >
> > On Thu, Feb 17, 2022 at 7:37 PM Noah Goldstein <goldstein.w.n@gmail.com> 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 | 4 +++-
> > > sysdeps/x86/tst-strncmp-rtm.c | 33 ++++++++++++++++++++++++---------
> > > sysdeps/x86/tst-wcsncmp-rtm.c | 20 ++++++++++++++++++++
> > > 3 files changed, 47 insertions(+), 10 deletions(-)
> > > create mode 100644 sysdeps/x86/tst-wcsncmp-rtm.c
> > >
> > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
> > > index d110f7b7f2..b13b556425 100644
> > > --- a/sysdeps/x86/Makefile
> > > +++ b/sysdeps/x86/Makefile
> > > @@ -99,7 +99,8 @@ tests += \
> > > tst-strcpy-rtm \
> > > tst-strlen-rtm \
> > > tst-strncmp-rtm \
> > > - tst-strrchr-rtm
> > > + tst-strrchr-rtm \
> > > + tst-wcsncmp-rtm
>
> Also change it to
>
> tst-wcsncmp-rtm \
> # tests
Fixed in v2
>
> > > CFLAGS-tst-memchr-rtm.c += -mrtm
> > > CFLAGS-tst-memcmp-rtm.c += -mrtm
> > > @@ -111,6 +112,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..5c6f40e5aa 100644
> > > --- a/sysdeps/x86/tst-strncmp-rtm.c
> > > +++ b/sysdeps/x86/tst-strncmp-rtm.c
> > > @@ -17,20 +17,35 @@
> > > <https://www.gnu.org/licenses/>. */
> > >
> > > #include <stdint.h>
> > > +#include <wchar.h>
> > > #include <tst-string-rtm.h>
> > >
> > > +#ifdef WIDE
> >
> > Move #include <wchar.h> here.
> >
Fixed in v2.
> > > +# 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 +55,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 +65,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 +74,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..86f97e4035
> > > --- /dev/null
> > > +++ b/sysdeps/x86/tst-wcsncmp-rtm.c
> > > @@ -0,0 +1,20 @@
> > > +/* Test case for wcsncmp inside a transactionally executing RTM region.
> > > + Copyright (C) 2021-2022 Free Software Foundation, Inc.
> > ^^^^^ Just 2022
> > > + 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
> > > + <https://www.gnu.org/licenses/>. */
> > > +
> > > +#define WIDE 1
> > > +#include "tst-strncmp-rtm.c"
> > > --
> > > 2.25.1
> > >
> >
> > Thanks.
> >
> > --
> > H.J.
>
>
>
> --
> H.J.
next prev parent reply other threads:[~2022-02-18 5:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 3:37 Noah Goldstein
2022-02-18 3:54 ` H.J. Lu
2022-02-18 3:58 ` H.J. Lu
2022-02-18 5:02 ` Noah Goldstein [this message]
2022-02-18 5:01 ` Noah Goldstein
2022-02-18 13:13 ` H.J. Lu
2022-02-18 19:59 ` Noah Goldstein
2022-02-18 19:59 ` [PATCH v3] " Noah Goldstein
2022-02-18 20:14 ` H.J. Lu
2022-02-18 20:23 ` Noah Goldstein
2022-02-18 20:19 ` [PATCH v4] " Noah Goldstein
2022-02-18 20:28 ` H.J. Lu
2022-02-18 22:45 ` Noah Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFUsyfLBJRjyctc7yPqZOQiVkbk0GOgEKvKoe4y6k0YudRuJJw@mail.gmail.com \
--to=goldstein.w.n@gmail.com \
--cc=carlos@systemhalted.org \
--cc=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).