From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7852) id 7AE5C384858E; Thu, 5 May 2022 06:23:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7AE5C384858E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sunil Pandey To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] x86: Fix fallback for wcsncmp_avx2 in strcmp-avx2.S [BZ #28896] X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 676f7bcf11ad0bdae098a45fd7d48c1040cde4e1 X-Git-Newrev: 059e36d9ed5f5c3c6fc1ab8e12cd0cf226dd3e0a Message-Id: <20220505062318.7AE5C384858E@sourceware.org> Date: Thu, 5 May 2022 06:23:18 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 06:23:18 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=059e36d9ed5f5c3c6fc1ab8e12cd0cf226dd3e0a commit 059e36d9ed5f5c3c6fc1ab8e12cd0cf226dd3e0a Author: Noah Goldstein Date: Thu Mar 24 15:50:33 2022 -0500 x86: Fix fallback for wcsncmp_avx2 in strcmp-avx2.S [BZ #28896] Overflow case for __wcsncmp_avx2_rtm should be __wcscmp_avx2_rtm not __wcscmp_avx2. commit ddf0992cf57a93200e0c782e2a94d0733a5a0b87 Author: Noah Goldstein Date: Sun Jan 9 16:02:21 2022 -0600 x86: Fix __wcsncmp_avx2 in strcmp-avx2.S [BZ# 28755] Set the wrong fallback function for `__wcsncmp_avx2_rtm`. It was set to fallback on to `__wcscmp_avx2` instead of `__wcscmp_avx2_rtm` which can cause spurious aborts. This change will need to be backported. All string/memory tests pass. Reviewed-by: H.J. Lu (cherry picked from commit 9fef7039a7d04947bc89296ee0d187bc8d89b772) Diff: --- sysdeps/x86/tst-strncmp-rtm.c | 15 +++++++++++++++ sysdeps/x86_64/multiarch/strcmp-avx2.S | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c index 300bc8c281..a3b14e72ff 100644 --- a/sysdeps/x86/tst-strncmp-rtm.c +++ b/sysdeps/x86/tst-strncmp-rtm.c @@ -70,6 +70,16 @@ function_overflow (void) return 1; } +__attribute__ ((noinline, noclone)) +static int +function_overflow2 (void) +{ + if (STRNCMP (string1, string2, SIZE_MAX >> 4) == 0) + return 0; + else + return 1; +} + static int do_test (void) { @@ -77,5 +87,10 @@ do_test (void) if (status != EXIT_SUCCESS) return status; status = do_test_1 (TEST_NAME, LOOP, prepare, function_overflow); + if (status != EXIT_SUCCESS) + return status; + status = do_test_1 (TEST_NAME, LOOP, prepare, function_overflow2); + if (status != EXIT_SUCCESS) + return status; return status; } diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S index 07a5a2c889..b94fc5c39a 100644 --- a/sysdeps/x86_64/multiarch/strcmp-avx2.S +++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S @@ -122,7 +122,7 @@ ENTRY(STRCMP) are cases where length is large enough that it can never be a bound on valid memory so just use wcscmp. */ shrq $56, %rcx - jnz __wcscmp_avx2 + jnz OVERFLOW_STRCMP leaq (, %rdx, 4), %rdx # endif