Skip to content

Commit 7799756

Browse files
committed
cmd/link: fix GC data reading from shared library (attempt 2)
When linking against a Go shared library, when a global variable in the main module has a type defined in the shared library, the linker needs to pull the GC data from the shared library to build the GC program for the global variable. Currently, this fails silently, as the shared library file is closed too early and the read failed (with no error check), causing a zero GC map emitted for the variable, which in turn causes the runtime to treat the variable as pointerless. For now, fix this by keeping the file open. In the future we may want to use mmap to read from the shared library instead. Also add error checking. And fix a (mostly harmless) mistake in size caluculation. Also remove an erroneous condition for ARM64. ARM64 used to have a special case to get the addend from the relocation on the gcdata field. That was removed, but the new code accidentally returned 0 unconditionally. It's no longer necessary to have any special case, since the addend is now applied directly to the gcdata field on ARM64, like on all the other platforms. Fixes #39927. This is the second attempt of CL 240462. And this reverts CL 240616. Change-Id: I01c82422b9f67e872d833336885935bc509bc91b Reviewed-on: https://go-review.googlesource.com/c/go/+/240621 Run-TryBot: Cherry Zhang <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Than McIntosh <[email protected]>
1 parent d7553d9 commit 7799756

File tree

5 files changed

+82
-9
lines changed

5 files changed

+82
-9
lines changed

misc/cgo/testshared/shared_test.go

+16
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ var testWork = flag.Bool("testwork", false, "if true, log and do not delete the
3838

3939
// run runs a command and calls t.Errorf if it fails.
4040
func run(t *testing.T, msg string, args ...string) {
41+
runWithEnv(t, msg, nil, args...)
42+
}
43+
44+
// runWithEnv runs a command under the given environment and calls t.Errorf if it fails.
45+
func runWithEnv(t *testing.T, msg string, env []string, args ...string) {
4146
c := exec.Command(args[0], args[1:]...)
47+
if len(env) != 0 {
48+
c.Env = append(os.Environ(), env...)
49+
}
4250
if output, err := c.CombinedOutput(); err != nil {
4351
t.Errorf("executing %s (%s) failed %s:\n%s", strings.Join(args, " "), msg, err, output)
4452
}
@@ -1034,3 +1042,11 @@ func TestGeneratedHash(t *testing.T) {
10341042
func TestPackageOrder(t *testing.T) {
10351043
goCmd(t, "install", "-buildmode=shared", "-linkshared", "./issue39777/a", "./issue39777/b")
10361044
}
1045+
1046+
// Test that GC data are generated correctly by the linker when it needs a type defined in
1047+
// a shared library. See issue 39927.
1048+
func TestGCData(t *testing.T) {
1049+
goCmd(t, "install", "-buildmode=shared", "-linkshared", "./gcdata/p")
1050+
goCmd(t, "build", "-linkshared", "./gcdata/main")
1051+
runWithEnv(t, "running gcdata/main", []string{"GODEBUG=clobberfree=1"}, "./main")
1052+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2020 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
// Test that GC data is generated correctly for global
6+
// variables with types defined in a shared library.
7+
// See issue 39927.
8+
9+
// This test run under GODEBUG=clobberfree=1. The check
10+
// *x[i] == 12345 depends on this debug mode to clobber
11+
// the value if the object is freed prematurely.
12+
13+
package main
14+
15+
import (
16+
"fmt"
17+
"runtime"
18+
"testshared/gcdata/p"
19+
)
20+
21+
var x p.T
22+
23+
func main() {
24+
for i := range x {
25+
x[i] = new(int)
26+
*x[i] = 12345
27+
}
28+
runtime.GC()
29+
runtime.GC()
30+
runtime.GC()
31+
for i := range x {
32+
if *x[i] != 12345 {
33+
fmt.Printf("x[%d] == %d, want 12345\n", i, *x[i])
34+
panic("FAIL")
35+
}
36+
}
37+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright 2020 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package p
6+
7+
type T [10]*int

src/cmd/link/internal/ld/decodesym.go

+19-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"cmd/link/internal/loader"
1111
"cmd/link/internal/sym"
1212
"debug/elf"
13+
"log"
1314
)
1415

1516
// Decoding the type.* symbols. This has to be in sync with
@@ -229,8 +230,15 @@ func decodetypeGcmask(ctxt *Link, s loader.Sym) []byte {
229230
ptrdata := decodetypePtrdata(ctxt.Arch, symData)
230231
sect := findShlibSection(ctxt, ctxt.loader.SymPkg(s), addr)
231232
if sect != nil {
232-
r := make([]byte, ptrdata/int64(ctxt.Arch.PtrSize))
233-
sect.ReadAt(r, int64(addr-sect.Addr))
233+
bits := ptrdata / int64(ctxt.Arch.PtrSize)
234+
r := make([]byte, (bits+7)/8)
235+
// ldshlibsyms avoids closing the ELF file so sect.ReadAt works.
236+
// If we remove this read (and the ones in decodetypeGcprog), we
237+
// can close the file.
238+
_, err := sect.ReadAt(r, int64(addr-sect.Addr))
239+
if err != nil {
240+
log.Fatal(err)
241+
}
234242
return r
235243
}
236244
Exitf("cannot find gcmask for %s", ctxt.loader.SymName(s))
@@ -251,9 +259,15 @@ func decodetypeGcprog(ctxt *Link, s loader.Sym) []byte {
251259
// A gcprog is a 4-byte uint32 indicating length, followed by
252260
// the actual program.
253261
progsize := make([]byte, 4)
254-
sect.ReadAt(progsize, int64(addr-sect.Addr))
262+
_, err := sect.ReadAt(progsize, int64(addr-sect.Addr))
263+
if err != nil {
264+
log.Fatal(err)
265+
}
255266
progbytes := make([]byte, ctxt.Arch.ByteOrder.Uint32(progsize))
256-
sect.ReadAt(progbytes, int64(addr-sect.Addr+4))
267+
_, err = sect.ReadAt(progbytes, int64(addr-sect.Addr+4))
268+
if err != nil {
269+
log.Fatal(err)
270+
}
257271
return append(progsize, progbytes...)
258272
}
259273
Exitf("cannot find gcmask for %s", ctxt.loader.SymName(s))
@@ -268,7 +282,7 @@ func decodetypeGcprog(ctxt *Link, s loader.Sym) []byte {
268282
func findShlibSection(ctxt *Link, path string, addr uint64) *elf.Section {
269283
for _, shlib := range ctxt.Shlibs {
270284
if shlib.Path == path {
271-
for _, sect := range shlib.File.Sections {
285+
for _, sect := range shlib.File.Sections[1:] { // skip the NULL section
272286
if sect.Addr <= addr && addr <= sect.Addr+sect.Size {
273287
return sect
274288
}
@@ -279,8 +293,5 @@ func findShlibSection(ctxt *Link, path string, addr uint64) *elf.Section {
279293
}
280294

281295
func decodetypeGcprogShlib(ctxt *Link, data []byte) uint64 {
282-
if ctxt.Arch.Family == sys.ARM64 {
283-
return 0
284-
}
285296
return decodeInuxi(ctxt.Arch, data[2*int32(ctxt.Arch.PtrSize)+8+1*int32(ctxt.Arch.PtrSize):], ctxt.Arch.PtrSize)
286297
}

src/cmd/link/internal/ld/lib.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,9 @@ func ldshlibsyms(ctxt *Link, shlib string) {
21262126
Errorf(nil, "cannot open shared library: %s", libpath)
21272127
return
21282128
}
2129-
defer f.Close()
2129+
// Keep the file open as decodetypeGcprog needs to read from it.
2130+
// TODO: fix. Maybe mmap the file.
2131+
//defer f.Close()
21302132

21312133
hash, err := readnote(f, ELF_NOTE_GO_NAME, ELF_NOTE_GOABIHASH_TAG)
21322134
if err != nil {

0 commit comments

Comments
 (0)