[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  19308587d4a4fd2886b0ca193ccfc6756d867cb1 (commit)
      from  97d37b85d4e1a218fdc61dbe0dff3e7c8ff36121 (commit)


- Log -----------------------------------------------------------------
commit 19308587d4a4fd2886b0ca193ccfc6756d867cb1
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Wed Feb 7 18:49:29 2018 +0100

    s390x assembly pack: implement OPENSSL_rdtsc as STCKF
    
    .. if avalable. STCK has an artificial delay to ensure uniqueness
    which can result in a performance penalty if used heavily
    concurrently.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5284)

-----------------------------------------------------------------------

Summary of changes:
 crypto/s390xcpuid.pl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crypto/s390xcpuid.pl b/crypto/s390xcpuid.pl
index 5f6ffc6..b0ed9e0 100755
--- a/crypto/s390xcpuid.pl
+++ b/crypto/s390xcpuid.pl
@@ -129,6 +129,14 @@ OPENSSL_s390x_facilities:
 .type	OPENSSL_rdtsc,\@function
 .align	16
 OPENSSL_rdtsc:
+	larl	%r4,OPENSSL_s390xcap_P
+	tm	S390X_STFLE+3(%r4),0x40	# check for store-clock-fast facility
+	jz	.Lstck
+
+	.long	0xb27cf010	# stckf 16($sp)
+	lg	%r2,16($sp)
+	br	$ra
+.Lstck:
 	stck	16($sp)
 	lg	%r2,16($sp)
 	br	$ra