diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2021-11-16 15:23:45 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2021-12-03 12:32:03 +0100 |
| commit | 13755fbbcd4209129926f34a9e1c884dcaee2259 (patch) | |
| tree | fff4ef3c21c557edade16b3f363a19902049b448 /pkg/osutil/osutil_unix.go | |
| parent | 9e332771aeaa54eed13a59574a21368f52da604c (diff) | |
pkg/osutil: use memfd_create on Linux
Mmapping plain files as shared memory leads to extra burden on the
system being fuzzed, because the OS will periodically sync that data to
the disk.
On Linux, use memfd_create to obtain a file handle for the shared memory
region. Experiments have demonstrated than it leads to 5-10% increase in
the fuzzing performance.
Diffstat (limited to 'pkg/osutil/osutil_unix.go')
| -rw-r--r-- | pkg/osutil/osutil_unix.go | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go index 0ab5dfd05..33cb09e40 100644 --- a/pkg/osutil/osutil_unix.go +++ b/pkg/osutil/osutil_unix.go @@ -96,33 +96,28 @@ func LongPipe() (io.ReadCloser, io.WriteCloser, error) { return r, w, err } +// ProcessExitStatus returns process exit status. +// This is here only because of fuchsia that does not implement WaitStatus. +func ProcessExitStatus(ps *os.ProcessState) int { + return ps.Sys().(syscall.WaitStatus).ExitStatus() +} + // CreateMemMappedFile creates a temp file with the requested size and maps it into memory. func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { - f, err = ioutil.TempFile("./", "syzkaller-shm") + f, err = CreateSharedMemFile(size) if err != nil { - err = fmt.Errorf("failed to create temp file: %v", err) return } if err = f.Truncate(int64(size)); err != nil { - err = fmt.Errorf("failed to truncate shm file: %v", err) - f.Close() - os.Remove(f.Name()) - return - } - f.Close() - fname := f.Name() - f, err = os.OpenFile(f.Name(), os.O_RDWR, DefaultFilePerm) - if err != nil { - err = fmt.Errorf("failed to open shm file: %v", err) - os.Remove(fname) + err = fmt.Errorf("failed to truncate shared mem file: %v", err) + CloseSharedMemFile(f) return } + mem, err = syscall.Mmap(int(f.Fd()), 0, size, syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED) if err != nil { err = fmt.Errorf("failed to mmap shm file: %v", err) - f.Close() - os.Remove(f.Name()) - return + CloseSharedMemFile(f) } return } @@ -130,22 +125,13 @@ func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { // CloseMemMappedFile destroys memory mapping created by CreateMemMappedFile. func CloseMemMappedFile(f *os.File, mem []byte) error { err1 := syscall.Munmap(mem) - err2 := f.Close() - err3 := os.Remove(f.Name()) + err2 := CloseSharedMemFile(f) switch { case err1 != nil: return err1 case err2 != nil: return err2 - case err3 != nil: - return err3 default: return nil } } - -// ProcessExitStatus returns process exit status. -// This is here only because of fuchsia that does not implement WaitStatus. -func ProcessExitStatus(ps *os.ProcessState) int { - return ps.Sys().(syscall.WaitStatus).ExitStatus() -} |
