Skip to content

Commit daa2394

Browse files
ncrucesgopherbot
authored andcommitted
unix: add unsafe mmap, munmap, mremap
Fixes golang/go#56123 Change-Id: I63a7a6fb3a5b1bb556ac19d76a1e0b04a03ebcfa GitHub-Last-Rev: 39dbc8e GitHub-Pull-Request: #197 Reviewed-on: https://go-review.googlesource.com/c/sys/+/592415 Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 7670087 commit daa2394

File tree

4 files changed

+67
-0
lines changed

4 files changed

+67
-0
lines changed

unix/mmap_unix_test.go

+23
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package unix_test
99
import (
1010
"runtime"
1111
"testing"
12+
"unsafe"
1213

1314
"golang.org/x/sys/unix"
1415
)
@@ -49,3 +50,25 @@ func TestMmap(t *testing.T) {
4950
t.Fatalf("Munmap: %v", err)
5051
}
5152
}
53+
54+
func TestMmapPtr(t *testing.T) {
55+
mmapProt := unix.PROT_NONE
56+
mmapPtrProt := unix.PROT_READ | unix.PROT_WRITE
57+
b, err := unix.Mmap(-1, 0, 2*unix.Getpagesize(), mmapProt, unix.MAP_ANON|unix.MAP_PRIVATE)
58+
if err != nil {
59+
t.Fatalf("Mmap: %v", err)
60+
}
61+
if _, err := unix.MmapPtr(-1, 0, unsafe.Pointer(&b[0]), uintptr(unix.Getpagesize()),
62+
mmapPtrProt, unix.MAP_ANON|unix.MAP_PRIVATE|unix.MAP_FIXED); err != nil {
63+
t.Fatalf("MmapPtr: %v", err)
64+
}
65+
66+
b[0] = 42
67+
68+
if err := unix.MunmapPtr(unsafe.Pointer(&b[0]), uintptr(unix.Getpagesize())); err != nil {
69+
t.Fatalf("MunmapPtr: %v", err)
70+
}
71+
if err := unix.Munmap(b); err != nil {
72+
t.Fatalf("Munmap: %v", err)
73+
}
74+
}

unix/mremap.go

+5
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@ func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data [
5050
func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
5151
return mapper.Mremap(oldData, newLength, flags)
5252
}
53+
54+
func MremapPtr(oldAddr unsafe.Pointer, oldSize uintptr, newAddr unsafe.Pointer, newSize uintptr, flags int) (ret unsafe.Pointer, err error) {
55+
xaddr, err := mapper.mremap(uintptr(oldAddr), oldSize, newSize, flags, uintptr(newAddr))
56+
return unsafe.Pointer(xaddr), err
57+
}

unix/mremap_test.go

+30
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package unix_test
88

99
import (
1010
"testing"
11+
"unsafe"
1112

1213
"golang.org/x/sys/unix"
1314
)
@@ -44,3 +45,32 @@ func TestMremap(t *testing.T) {
4445
t.Fatalf("remapping to a fixed address; got %v, want %v", err, unix.EINVAL)
4546
}
4647
}
48+
49+
func TestMremapPtr(t *testing.T) {
50+
mmapProt := unix.PROT_NONE
51+
mmapPtrProt := unix.PROT_READ | unix.PROT_WRITE
52+
b, err := unix.Mmap(-1, 0, 2*unix.Getpagesize(), mmapProt, unix.MAP_ANON|unix.MAP_PRIVATE)
53+
if err != nil {
54+
t.Fatalf("Mmap: %v", err)
55+
}
56+
if _, err := unix.MmapPtr(-1, 0, unsafe.Pointer(&b[0]), uintptr(unix.Getpagesize()),
57+
mmapPtrProt, unix.MAP_ANON|unix.MAP_PRIVATE|unix.MAP_FIXED); err != nil {
58+
t.Fatalf("MmapPtr: %v", err)
59+
}
60+
61+
b[0] = 42
62+
63+
if _, err := unix.MremapPtr(
64+
unsafe.Pointer(&b[0]), uintptr(unix.Getpagesize()),
65+
unsafe.Pointer(&b[unix.Getpagesize()]), uintptr(unix.Getpagesize()),
66+
unix.MremapFixed|unix.MremapMaymove); err != nil {
67+
t.Fatalf("MremapPtr: %v", err)
68+
}
69+
if got := b[unix.Getpagesize()]; got != 42 {
70+
t.Errorf("got %d, want 42", got)
71+
}
72+
73+
if err := unix.Munmap(b); err != nil {
74+
t.Fatalf("Munmap: %v", err)
75+
}
76+
}

unix/syscall_unix.go

+9
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,15 @@ func Munmap(b []byte) (err error) {
154154
return mapper.Munmap(b)
155155
}
156156

157+
func MmapPtr(fd int, offset int64, addr unsafe.Pointer, length uintptr, prot int, flags int) (ret unsafe.Pointer, err error) {
158+
xaddr, err := mapper.mmap(uintptr(addr), length, prot, flags, fd, offset)
159+
return unsafe.Pointer(xaddr), err
160+
}
161+
162+
func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) {
163+
return mapper.munmap(uintptr(addr), length)
164+
}
165+
157166
func Read(fd int, p []byte) (n int, err error) {
158167
n, err = read(fd, p)
159168
if raceenabled {

0 commit comments

Comments
 (0)