mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/asm: fix the KMCTR instruction encoding and argument passing 

KMCTR encoding arguments incorrect way, which leading illegal instruction wherver we call KMCTR instruction.IBM z13 machine test's TestAESGCM test using gcmASM implementation, which uses KMCTR instruction to encrypt using AES in counter mode and the KIMD instruction for GHASH. z14+ machines onwards uses gcmKMA implementation for the same.

Fixes #63387

Change-Id: I86aeb99573c3f636a71908c99e06a9530655aa5d
Reviewed-on: https://go-review.googlesource.com/c/go/+/535675
Reviewed-by: Vishwanatha HD <vishwanatha.hd@ibm.com>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Keith Randall <khr@golang.org>
This commit is contained in:
Srinivas Pokala 2023-10-16 11:18:50 +02:00 committed by Keith Randall
parent 5f7a408563
commit b06f59e75c
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/asm/internal/asm/testdata/s390x.s vendored
View File

@ -419,9 +419,9 @@ TEXT main·foo(SB),DUPOK|NOSPLIT,$16-0 // TEXT main.foo(SB), DUPOK|NOSPLIT, $16-
KMC R2, R6 // b92f0026
KLMD R2, R8 // b93f0028
KIMD R0, R4 // b93e0004
KDSA R0, R8 // b93a0008
KMA R6, R2, R4 // b9296024
KMCTR R6, R2, R4 // b92d6024
KDSA R0, R8 // b93a0008
KMA R2, R6, R4 // b9296024
KMCTR R2, R6, R4 // b92d6024
// vector add and sub instructions
VAB V3, V4, V4 // e743400000f3

7
src/cmd/internal/obj/s390x/asmz.go
View File

@ -4434,7 +4434,7 @@ func (c *ctxtz) asmout(p *obj.Prog, asm *[]byte) {
}
zRRE(op_KDSA, uint32(p.From.Reg), uint32(p.To.Reg), asm)
case 126: // KMA and KMCTR - CIPHER MESSAGE WITH AUTHENTICATION; CIPHER MESSAGE WITH
case 126: // KMA and KMCTR - CIPHER MESSAGE WITH AUTHENTICATION; CIPHER MESSAGE WITH COUNTER
var opcode uint32
switch p.As {
default:
@ -4458,16 +4458,13 @@ func (c *ctxtz) asmout(p *obj.Prog, asm *[]byte) {
if p.Reg&1 != 0 {
c.ctxt.Diag("third argument must be even register in %v", p)
}
if p.Reg == p.To.Reg || p.Reg == p.From.Reg {
c.ctxt.Diag("third argument must not be input or output argument registers in %v", p)
}
if p.As == AKMA {
opcode = op_KMA
} else if p.As == AKMCTR {
opcode = op_KMCTR
}
}
zRRF(opcode, uint32(p.From.Reg), 0, uint32(p.Reg), uint32(p.To.Reg), asm)
zRRF(opcode, uint32(p.Reg), 0, uint32(p.From.Reg), uint32(p.To.Reg), asm)
}
}

4
src/crypto/aes/asm_s390x.s
View File

@ -127,7 +127,7 @@ crypt:
MOVD src_base+56(FP), R6 // src
MOVD src_len+64(FP), R7 // len
loop:
KMCTR R6, R2, R4 // cipher message with counter (KMCTR)
KMCTR R4, R2, R6 // cipher message with counter (KMCTR)
BVS loop // branch back if interrupted
RET
crash:
@ -180,7 +180,7 @@ TEXT ·kmaGCM(SB),NOSPLIT,$112-120
MVC $8, 24(R8), 104(R1)
kma:
KMA R6, R2, R4 // Cipher Message with Authentication
KMA R2, R6, R4 // Cipher Message with Authentication
BVS kma
MOVD tag+104(FP), R2

4
src/internal/cpu/cpu_s390x.s
View File

@ -30,14 +30,14 @@ TEXT ·kmcQuery(SB), NOSPLIT|NOFRAME, $0-16
TEXT ·kmctrQuery(SB), NOSPLIT|NOFRAME, $0-16
MOVD $0, R0 // set function code to 0 (KMCTR-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
KMCTR R6, R2, R4 // cipher message with counter (KMCTR)
KMCTR R2, R4, R4 // cipher message with counter (KMCTR)
RET
// func kmaQuery() queryResult
TEXT ·kmaQuery(SB), NOSPLIT|NOFRAME, $0-16
MOVD $0, R0 // set function code to 0 (KMA-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
KMA R6, R2, R4 // cipher message with authentication (KMA)
KMA R2, R6, R4 // cipher message with authentication (KMA)
RET
// func kimdQuery() queryResult