qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 09:30:07 -07:00
Code Releases Activity

cmd/asm: Fix EVEX RIP-relative addressing

Browse Source 
AVX-512 instructions that use RIP-relative addressing and require the
R bit of the EVEX prefix to be zero, i.e., instructions that use Z8-Z15 or
Z24-Z31, are incorrectly encoded by the assembler.  The reason is that
the location of the offset at which the relative address is to be written
is incorrectly computed when the R bit is clear.

For example,

VMOVUPS bInitX<>+0(SB), Z0

encodes correctly to

62 f1 7c 48 10 05 66 e9 02 00

whereas

VMOVUPS bInitX<>+0(SB), Z8

encodes incorrectly to

62 71 7c 48 10 05 00 56 e9 02 00

Note the extra zero byte between the ModR/M byte (05) and the relative
address starting with 56.  This error results in the first byte of the
following instruction being overwritten and typically, a program crash.

This commit fixes the issue in the same way that is fixed for VEX encoded
instructions, by simply not incrementing the offset for EVEX instructions.
Existing test code created for a similar VEX encoding issue (19518) has
been modified to also test for the issue addressed by this commit.

Fixes #31001

Change-Id: If84719ac22ebb5fb3c42ff96cd32b611ad497414
Reviewed-on: https://go-review.googlesource.com/c/go/+/168562
Run-TryBot: Ilya Tocar <ilya.tocar@intel.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ilya Tocar <ilya.tocar@intel.com>
This commit is contained in:
Mark Ryan 2019-03-18 15:48:34 +01:00 committed by Ilya Tocar
parent 3aacfce6cf
commit 4ebc6514fa
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/internal/obj/x86/asm6.go
View File

@ -5374,7 +5374,7 @@ func (ab *AsmBuf) asmins(ctxt *obj.Link, cursym *obj.LSym, p *obj.Prog) {
if int64(r.Off) < p.Pc { if int64(r.Off) < p.Pc {
break break
} }
if ab.rexflag != 0 && !ab.vexflag { if ab.rexflag != 0 && !ab.vexflag && !ab.evexflag {
r.Off++ r.Off++
} }
if r.Type == objabi.R_PCREL { if r.Type == objabi.R_PCREL {

33
src/cmd/internal/obj/x86/issue19518_test.go → src/cmd/internal/obj/x86/pcrelative_test.go
View File

@ -6,6 +6,7 @@ package x86_test
import ( import (
"bytes" "bytes"
"fmt"
"internal/testenv" "internal/testenv"
"io/ioutil" "io/ioutil"
"os" "os"
@ -17,7 +18,7 @@ import (
const asmData = ` const asmData = `
GLOBL zeros<>(SB),8,$64 GLOBL zeros<>(SB),8,$64
TEXT ·testASM(SB),4,$0 TEXT ·testASM(SB),4,$0
VMOVDQU zeros<>(SB), Y8 // PC relative relocation is off by 1, for Y8-15 VMOVUPS zeros<>(SB), %s // PC relative relocation is off by 1, for Y8-Y15, Z8-15 and Z24-Z31
RET RET
` `
@ -31,13 +32,13 @@ func main() {
} }
` `
func objdumpOutput(t *testing.T) []byte { func objdumpOutput(t *testing.T, mname, source string) []byte {
tmpdir, err := ioutil.TempDir("", "19518") tmpdir, err := ioutil.TempDir("", mname)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer os.RemoveAll(tmpdir) defer os.RemoveAll(tmpdir)
err = ioutil.WriteFile(filepath.Join(tmpdir, "go.mod"), []byte("module issue19518\n"), 0666) err = ioutil.WriteFile(filepath.Join(tmpdir, "go.mod"), []byte(fmt.Sprintf("module %s\n", mname)), 0666)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -46,7 +47,7 @@ func objdumpOutput(t *testing.T) []byte {
t.Fatal(err) t.Fatal(err)
} }
defer tmpfile.Close() defer tmpfile.Close()
_, err = tmpfile.WriteString(asmData) _, err = tmpfile.WriteString(source)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -85,17 +86,19 @@ func objdumpOutput(t *testing.T) []byte {
return objout return objout
} }
func TestVexPCrelative(t *testing.T) { func TestVexEvexPCrelative(t *testing.T) {
testenv.MustHaveGoBuild(t) testenv.MustHaveGoBuild(t)
objout := objdumpOutput(t) LOOP:
data := bytes.Split(objout, []byte("\n")) for _, reg := range []string{"Y0", "Y8", "Z0", "Z8", "Z16", "Z24"} {
for idx := len(data) - 1; idx >= 0; idx-- { asm := fmt.Sprintf(asmData, reg)
// OBJDUMP doesn't know about VMOVDQU, objout := objdumpOutput(t, "pcrelative", asm)
// so instead of checking that it was assembled correctly, data := bytes.Split(objout, []byte("\n"))
// check that RET wasn't overwritten. for idx := len(data) - 1; idx >= 0; idx-- {
if bytes.Index(data[idx], []byte("RET")) != -1 { // check that RET wasn't overwritten.
return if bytes.Index(data[idx], []byte("RET")) != -1 {
continue LOOP
}
} }
t.Errorf("VMOVUPS zeros<>(SB), %s overwrote RET", reg)
} }
t.Fatal("RET was overwritten")
} }