From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id 7BF183858C74 for ; Tue, 15 Feb 2022 16:28:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BF183858C74 Received: by mail-il1-x12b.google.com with SMTP id f13so15222014ilq.5 for ; Tue, 15 Feb 2022 08:28:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tZBWmCq0sbPvIVETXFtT1Pd3PZMD0ZS27YBN+0EthD8=; b=LECUP4YrQbpPy6caPyxy2Y8DA2DFV3JIsnnDZni8/2WxD2zP9GOUhq9Odn0kcrKERt ZrhV1Pps5MJFVl/HEhzbTO9THSm73k6Sl1XQnjgDdm6yOpTkbOL7XHeD+s9Ftmi/ckbv kx54RTfYDkJ0aK0vmfsENSWQijYqIcde0IjJj6HZsfiCn6w/kT042d+oTWh4IKw6mt88 kXD0tbrFNg7f8udUcZy93BhNceQlFgGNQ29RpUXLxjmQSm2rsmgRu5hgzDv0JJyHwC34 gtS1mL+/MLrc3jDP4iH7P0O+RnyScKWfVvsnU+BUXMHqbwW4uaiIZGlOt64PT/NZBuI2 A+Pg== X-Gm-Message-State: AOAM530bjC7lH6pIZBWponcJ5AKz4JCkEJGlzvKPFcF6z9KEK7cfO1Le fv0xVL85F1AtJtrADm+2IlHgpHEvM8Q= X-Google-Smtp-Source: ABdhPJxysRqZ2BddD5Rk/pNhdKgb4+5vE1YIyjB+CsN8498Z6plh4lgC2Wse4vf0d2ETHbpNiH7F2A== X-Received: by 2002:a05:6e02:1489:: with SMTP id n9mr2955609ilk.49.1644942480636; Tue, 15 Feb 2022 08:28:00 -0800 (PST) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id t2sm18127735ilp.49.2022.02.15.08.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Feb 2022 08:27:59 -0800 (PST) From: Noah Goldstein To: libc-alpha@sourceware.org Subject: [PATCH v1] x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #28896] Date: Tue, 15 Feb 2022 10:27:51 -0600 Message-Id: <20220215162751.281955-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNWANTED_LANGUAGE_BODY 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: Tue, 15 Feb 2022 16:28:03 -0000 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. Note not tested on a machine that supports RTM (non available). --- 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 +- 5 files changed, 6 insertions(+), 8 deletions(-) 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