From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id E9E8C38376E6; Wed, 25 May 2022 19:52:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E9E8C38376E6 Received: by mail-oi1-x234.google.com with SMTP id w130so26309601oig.0; Wed, 25 May 2022 12:52:17 -0700 (PDT) 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=sBY3+VnNyJQSZeMbNrlTh9M1KMWYRW1d6zHSFhnAVkc=; b=HAheV1868daTZSSppMwtkn14EMlnKY56FmeFNy4o/0G6OJeOZj14SLECwYcyLpdWWI 1u79iWHKIbTYFUZawz4wd5Ujg07qZgcX+81hkLp7xKi1RXxIOLyaZ1TNlyNEceEFR0df L1jVMSqCuu6/yUfjwZok/eRRsOpaBHAPwT1KGeteLL3Jl+Y2nhdVpjIZuN0IYzGNqxTf +PBqV+E6AgYazt4R2RSGnHIEyVR7m4p9nJ3oJPFzxknnEDNQulHZFEJDX6luE6OHMuzU fI55tmszVevUPjmQeEo5ldQfX7m65w5tujUDn6wos7IZpybS3smdMGPnU0+kBQc3DlQc j4Rg== X-Gm-Message-State: AOAM530Dd+WjhcZNGH5x4fEpqxT2jgLR69F0C0lOEMEh++Oj1EJ7vJjP tVSMl77ssouNBafmaJ1PajS/0/gd0ybuLhpuc+OFeumuS1Q= X-Google-Smtp-Source: ABdhPJyZfwGhOE94QV/drYYIL+XGIukApfuDqv/omS+5cN9hb2LLxRi2uFBW3KbxZ14cqFkOSNtmHz2C700e1AdtGSg= X-Received: by 2002:a54:4e92:0:b0:325:224c:8ff7 with SMTP id c18-20020a544e92000000b00325224c8ff7mr5928651oiy.154.1653508337267; Wed, 25 May 2022 12:52:17 -0700 (PDT) MIME-Version: 1.0 References: <20220215162751.281955-1-goldstein.w.n@gmail.com> <20220217191524.2961663-1-goldstein.w.n@gmail.com> In-Reply-To: From: Sunil Pandey Date: Wed, 25 May 2022 12:51:41 -0700 Message-ID: Subject: Re: [PATCH v5] x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #28896] To: "H.J. Lu" , Libc-stable Mailing List Cc: Noah Goldstein , GNU C Library Content-Type: multipart/mixed; boundary="0000000000001385ba05dfdb69f4" X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Wed, 25 May 2022 19:52:19 -0000 --0000000000001385ba05dfdb69f4 Content-Type: text/plain; charset="UTF-8" On Thu, Feb 17, 2022 at 11:21 AM H.J. Lu via Libc-alpha wrote: > > On Thu, Feb 17, 2022 at 11:15 AM Noah Goldstein wrote: > > > > In the overflow fallback strncmp-avx2-rtm and wcsncmp-avx2-rtm would > > call strcmp-avx2 and wcsncmp-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. > > > > Co-authored-by: H.J. Lu > > --- > > sysdeps/x86/Makefile | 2 +- > > sysdeps/x86/tst-strncmp-rtm.c | 17 ++++++++++++++++- > > sysdeps/x86_64/multiarch/strcmp-avx2.S | 8 ++------ > > sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S | 1 + > > sysdeps/x86_64/multiarch/strncmp-avx2.S | 1 + > > sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S | 2 +- > > sysdeps/x86_64/multiarch/wcsncmp-avx2.S | 2 +- > > 7 files changed, 23 insertions(+), 10 deletions(-) > > > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile > > index 6cf708335c..d110f7b7f2 100644 > > --- a/sysdeps/x86/Makefile > > +++ b/sysdeps/x86/Makefile > > @@ -109,7 +109,7 @@ CFLAGS-tst-memset-rtm.c += -mrtm > > CFLAGS-tst-strchr-rtm.c += -mrtm > > CFLAGS-tst-strcpy-rtm.c += -mrtm > > CFLAGS-tst-strlen-rtm.c += -mrtm > > -CFLAGS-tst-strncmp-rtm.c += -mrtm > > +CFLAGS-tst-strncmp-rtm.c += -mrtm -Wno-error > > CFLAGS-tst-strrchr-rtm.c += -mrtm > > endif > > > > diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c > > index 09ed6fa0d6..9e20abaacc 100644 > > --- a/sysdeps/x86/tst-strncmp-rtm.c > > +++ b/sysdeps/x86/tst-strncmp-rtm.c > > @@ -16,6 +16,7 @@ > > License along with the GNU C Library; if not, see > > . */ > > > > +#include > > #include > > > > #define LOOP 3000 > > @@ -45,8 +46,22 @@ function (void) > > return 1; > > } > > > > +__attribute__ ((noinline, noclone)) > > +static int > > +function_overflow (void) > > +{ > > + if (strncmp (string1, string2, SIZE_MAX) == 0) > > + return 0; > > + else > > + return 1; > > +} > > + > > static int > > do_test (void) > > { > > - return do_test_1 ("strncmp", LOOP, prepare, function); > > + int status = do_test_1 ("strncmp", LOOP, prepare, function); > > + if (status != EXIT_SUCCESS) > > + return status; > > + status = do_test_1 ("strncmp", LOOP, prepare, function_overflow); > > + return status; > > } > > diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S > > index 07a5a2c889..52ff5ad724 100644 > > --- a/sysdeps/x86_64/multiarch/strcmp-avx2.S > > +++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S > > @@ -193,10 +193,10 @@ L(ret_zero): > > .p2align 4,, 5 > > L(one_or_less): > > jb L(ret_zero) > > -# ifdef USE_AS_WCSCMP > > /* 'nbe' covers the case where length is negative (large > > unsigned). */ > > - jnbe __wcscmp_avx2 > > + jnbe OVERFLOW_STRCMP > > +# ifdef USE_AS_WCSCMP > > movl (%rdi), %edx > > xorl %eax, %eax > > cmpl (%rsi), %edx > > @@ -205,10 +205,6 @@ L(one_or_less): > > negl %eax > > orl $1, %eax > > # else > > - /* 'nbe' covers the case where length is negative (large > > - unsigned). */ > > - > > - jnbe __strcmp_avx2 > > movzbl (%rdi), %eax > > movzbl (%rsi), %ecx > > subl %ecx, %eax > > diff --git a/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S b/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S > > index 37d1224bb9..68bad365ba 100644 > > --- a/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S > > +++ b/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S > > @@ -1,3 +1,4 @@ > > #define STRCMP __strncmp_avx2_rtm > > #define USE_AS_STRNCMP 1 > > +#define OVERFLOW_STRCMP __strcmp_avx2_rtm > > #include "strcmp-avx2-rtm.S" > > diff --git a/sysdeps/x86_64/multiarch/strncmp-avx2.S b/sysdeps/x86_64/multiarch/strncmp-avx2.S > > index 1678bcc235..f138e9f1fd 100644 > > --- a/sysdeps/x86_64/multiarch/strncmp-avx2.S > > +++ b/sysdeps/x86_64/multiarch/strncmp-avx2.S > > @@ -1,3 +1,4 @@ > > #define STRCMP __strncmp_avx2 > > #define USE_AS_STRNCMP 1 > > +#define OVERFLOW_STRCMP __strcmp_avx2 > > #include "strcmp-avx2.S" > > diff --git a/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S b/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S > > index 4e88c70cc6..f467582cbe 100644 > > --- a/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S > > +++ b/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S > > @@ -1,5 +1,5 @@ > > #define STRCMP __wcsncmp_avx2_rtm > > #define USE_AS_STRNCMP 1 > > #define USE_AS_WCSCMP 1 > > - > > +#define OVERFLOW_STRCMP __wcscmp_avx2_rtm > > #include "strcmp-avx2-rtm.S" > > diff --git a/sysdeps/x86_64/multiarch/wcsncmp-avx2.S b/sysdeps/x86_64/multiarch/wcsncmp-avx2.S > > index 4fa1de4d3f..e9ede522b8 100644 > > --- a/sysdeps/x86_64/multiarch/wcsncmp-avx2.S > > +++ b/sysdeps/x86_64/multiarch/wcsncmp-avx2.S > > @@ -1,5 +1,5 @@ > > #define STRCMP __wcsncmp_avx2 > > #define USE_AS_STRNCMP 1 > > #define USE_AS_WCSCMP 1 > > - > > +#define OVERFLOW_STRCMP __wcscmp_avx2 > > #include "strcmp-avx2.S" > > -- > > 2.25.1 > > > > LGTM. > > Reviewed-by: H.J. Lu > > Thanks. > > -- > H.J. I would like to backport this patch to release branches. Any comments or objections? Patch attached, it fixes BZ# 29127. --Sunil --0000000000001385ba05dfdb69f4 Content-Type: application/octet-stream; name="0001-x86-Fallback-str-wcs-cmp-RTM-in-the-ncmp-overflow-ca.patch" Content-Disposition: attachment; filename="0001-x86-Fallback-str-wcs-cmp-RTM-in-the-ncmp-overflow-ca.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l3m03x7i0 RnJvbSAzZmZiNTBjMmZkYmZhYmNjMDk4Mjg5ZDg2M2JlMTNkMjUwODk4YWNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb2FoIEdvbGRzdGVpbiA8Z29sZHN0ZWluLncubkBnbWFpbC5j b20+CkRhdGU6IFR1ZSwgMTUgRmViIDIwMjIgMDg6MTg6MTUgLTA2MDAKU3ViamVjdDogW1BBVENI XSB4ODY6IEZhbGxiYWNrIHtzdHJ8d2NzfWNtcCBSVE0gaW4gdGhlIG5jbXAgb3ZlcmZsb3cgY2Fz ZSBbQloKICMyOTEyN10KClJlLWNoZXJyeS1waWNrIGNvbW1pdCBjNjI3MjA5ODMyIGZvciBzdHJj bXAtYXZ4Mi5TIGNoYW5nZSB3aGljaCB3YXMKb21pdHRlZCBpbiBpbnRpYWwgY2hlcnJ5IHBpY2sg YmVjYXVzZSBhdCB0aGUgdGltZSB0aGlzIGJ1ZyB3YXMgbm90CnByZXNlbnQgb24gcmVsZWFzZSBi cmFuY2guCgpGaXhlcyBCWiAjMjkxMjcuCgpJbiB0aGUgb3ZlcmZsb3cgZmFsbGJhY2sgc3RybmNt cC1hdngyLXJ0bSBhbmQgd2NzbmNtcC1hdngyLXJ0bSB3b3VsZApjYWxsIHN0cmNtcC1hdngyIGFu ZCB3Y3NjbXAtYXZ4MiByZXNwZWN0aXZlbHkuIFRoaXMgd291bGQgaGF2ZQpub3QgY2hlY2tzIGFy b3VuZCB2emVyb3VwcGVyIGFuZCB3b3VsZCB0cmlnZ2VyIHNwdXJpb3VzCmFib3J0cy4gVGhpcyBj b21taXQgZml4ZXMgdGhhdC4KCnRlc3Qtc3RyY21wLCB0ZXN0LXN0cm5jbXAsIHRlc3Qtd2NzY21w LCBhbmQgdGVzdC13Y3NuY21wIGFsbCBwYXNzIG9uCkFWWDIgbWFjaGluZXMgd2l0aCBhbmQgd2l0 aG91dCBSVE0uCgpDby1hdXRob3JlZC1ieTogSC5KLiBMdSA8aGpsLnRvb2xzQGdtYWlsLmNvbT4K KGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgYzYyNzIwOTgzMjMxNTNkYjM3M2YyOTg2YzY3Nzg2 ZWE4Yzg1ZjFjZikKLS0tCiBzeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21wLWF2eDIuUyB8 IDggKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNtcC1hdngyLlMg Yi9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21wLWF2eDIuUwppbmRleCAzMzY2ZDBiMDgz Li44ZGEwOWJkODZkIDEwMDY0NAotLS0gYS9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21w LWF2eDIuUworKysgYi9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21wLWF2eDIuUwpAQCAt MzQ1LDEwICszNDUsMTAgQEAgTChvbmVfb3JfbGVzcyk6CiAJbW92cQklTE9DQUxFX1JFRywgJXJk eAogIyAgZW5kaWYKIAlqYglMKHJldF96ZXJvKQotIyAgaWZkZWYgVVNFX0FTX1dDU0NNUAogCS8q ICduYmUnIGNvdmVycyB0aGUgY2FzZSB3aGVyZSBsZW5ndGggaXMgbmVnYXRpdmUgKGxhcmdlCiAJ ICAgdW5zaWduZWQpLiAgKi8KLQlqbmJlCV9fd2NzY21wX2F2eDIKKwlqbmJlCU9WRVJGTE9XX1NU UkNNUAorIyAgaWZkZWYgVVNFX0FTX1dDU0NNUAogCW1vdmwJKCVyZGkpLCAlZWR4CiAJeG9ybAkl ZWF4LCAlZWF4CiAJY21wbAkoJXJzaSksICVlZHgKQEAgLTM1NywxMCArMzU3LDYgQEAgTChvbmVf b3JfbGVzcyk6CiAJbmVnbAklZWF4CiAJb3JsCSQxLCAlZWF4CiAjICBlbHNlCi0JLyogJ25iZScg Y292ZXJzIHRoZSBjYXNlIHdoZXJlIGxlbmd0aCBpcyBuZWdhdGl2ZSAobGFyZ2UKLQkgICB1bnNp Z25lZCkuICAqLwotCi0Jam5iZQlfX3N0cmNtcF9hdngyCiAJbW92emJsCSglcmRpKSwgJWVheAog CW1vdnpibAkoJXJzaSksICVlY3gKIAlUT0xPV0VSX2dwciAoJXJheCwgJWVheCkKLS0gCjIuMzUu MwoK --0000000000001385ba05dfdb69f4--