From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <skpgkp2@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7852)
 id 7B03F385829A; Tue, 19 Jul 2022 05:11:41 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B03F385829A
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Sunil Pandey <skpgkp2@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/release/2.34/master] x86:
 ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST expect no transactions
X-Act-Checkin: glibc
X-Git-Author: Noah Goldstein <goldstein.w.n@gmail.com>
X-Git-Refname: refs/heads/release/2.34/master
X-Git-Oldrev: 3c87383a20daff9a230439e31b778716bfed4d8b
X-Git-Newrev: 820504e3edd7276bf869d543ad5b57187ff9c9b6
Message-Id: <20220719051141.7B03F385829A@sourceware.org>
Date: Tue, 19 Jul 2022 05:11:41 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2022 05:11:41 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=820504e3edd7276bf869d543ad5b57187ff9c9b6

commit 820504e3edd7276bf869d543ad5b57187ff9c9b6
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date:   Fri Jun 3 18:52:37 2022 -0500

    x86: ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST expect no transactions
    
    Give fall-through path to `vzeroupper` and taken-path to `vzeroall`.
    
    Generally even on machines with RTM the expectation is the
    string-library functions will not be called in transactions.
    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
    
    (cherry picked from commit c28db9cb29a7d6cf3ce08fd8445e6b7dea03f35b)

Diff:
---
 sysdeps/x86_64/sysdep.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index 93e44be22e..04478b097c 100644
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -99,11 +99,11 @@ lose:									      \
    to avoid RTM abort triggered by VZEROUPPER inside transactionally.  */
 #define ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST \
 	xtest;							\
-	jz	1f;						\
-	vzeroall;						\
+	jnz	1f;						\
+	vzeroupper;						\
 	ret;							\
 1:								\
-	vzeroupper;						\
+	vzeroall;						\
 	ret
 
 /* Can be used to replace vzeroupper that is not directly before a