Skip to content

Commit

Permalink
runtime: add address sanitizer support for riscv64
Browse files Browse the repository at this point in the history
Updates golang#44853

Change-Id: I3ba6ec0cfc6c7f311b586deedb1cda0f87a637aa
Reviewed-on: https://go-review.googlesource.com/c/go/+/375256
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Joel Sing <[email protected]>
Run-TryBot: Zhuo Meng <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: David Chase <[email protected]>
  • Loading branch information
mengzhuo committed May 16, 2022
1 parent 335569b commit 9956996
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 3 deletions.
2 changes: 1 addition & 1 deletion misc/cgo/testsanitizers/cc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func mSanSupported(goos, goarch string) bool {
func aSanSupported(goos, goarch string) bool {
switch goos {
case "linux":
return goarch == "amd64" || goarch == "arm64"
return goarch == "amd64" || goarch == "arm64" || goarch == "riscv64"
default:
return false
}
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/internal/sys/supported.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func MSanSupported(goos, goarch string) bool {
func ASanSupported(goos, goarch string) bool {
switch goos {
case "linux":
return goarch == "arm64" || goarch == "amd64"
return goarch == "arm64" || goarch == "amd64" || goarch == "riscv64"
default:
return false
}
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/asan/asan.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build asan && linux && (arm64 || amd64)
//go:build asan && linux && (arm64 || amd64 || riscv64)

package asan

Expand Down
68 changes: 68 additions & 0 deletions src/runtime/asan_riscv64.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// Copyright 2022 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build asan

#include "go_asm.h"
#include "textflag.h"

// Called from instrumented code.
// func runtime·doasanread(addr unsafe.Pointer, sz, sp, pc uintptr)
TEXT runtime·doasanread(SB), NOSPLIT, $0-32
MOV addr+0(FP), X10
MOV sz+8(FP), X11
MOV sp+16(FP), X12
MOV pc+24(FP), X13
// void __asan_read_go(void *addr, uintptr_t sz);
MOV $__asan_read_go(SB), X14
JMP asancall<>(SB)

// func runtime·doasanwrite(addr unsafe.Pointer, sz, sp, pc uintptr)
TEXT runtime·doasanwrite(SB), NOSPLIT, $0-32
MOV addr+0(FP), X10
MOV sz+8(FP), X11
MOV sp+16(FP), X12
MOV pc+24(FP), X13
// void __asan_write_go(void *addr, uintptr_t sz);
MOV $__asan_write_go(SB), X14
JMP asancall<>(SB)

// func runtime·asanunpoison(addr unsafe.Pointer, sz uintptr)
TEXT runtime·asanunpoison(SB), NOSPLIT, $0-16
MOV addr+0(FP), X10
MOV sz+8(FP), X11
// void __asan_unpoison_go(void *addr, uintptr_t sz);
MOV $__asan_unpoison_go(SB), X14
JMP asancall<>(SB)

// func runtime·asanpoison(addr unsafe.Pointer, sz uintptr)
TEXT runtime·asanpoison(SB), NOSPLIT, $0-16
MOV addr+0(FP), X10
MOV sz+8(FP), X11
// void __asan_poison_go(void *addr, uintptr_t sz);
MOV $__asan_poison_go(SB), X14
JMP asancall<>(SB)

// func runtime·asanregisterglobals(addr unsafe.Pointer, n uintptr)
TEXT runtime·asanregisterglobals(SB), NOSPLIT, $0-16
MOV addr+0(FP), X10
MOV n+8(FP), X11
// void __asan_register_globals_go(void *addr, uintptr_t n);
MOV $__asan_register_globals_go(SB), X14
JMP asancall<>(SB)

// Switches SP to g0 stack and calls (X14). Arguments already set.
TEXT asancall<>(SB), NOSPLIT, $0-0
MOV X2, X8 // callee-saved
BEQZ g, g0stack // no g, still on a system stack
MOV g_m(g), X21
MOV m_g0(X21), X21
BEQ X21, g, g0stack

MOV (g_sched+gobuf_sp)(X21), X2

g0stack:
JALR RA, X14
MOV X8, X2
RET

0 comments on commit 9956996

Please sign in to comment.