Cleanup

Author: ValentaTomas

packages/orchestrator/internal/sandbox/uffd/mapping/firecracker.go

@@ -11,14 +11,14 @@ type GuestRegionUffdMapping struct {
 	PageSize uintptr `json:"page_size_kib"`
 }
 
-func (m *GuestRegionUffdMapping) relativeOffset(addr uintptr) uint64 {
-	return uint64(m.Offset + addr - m.BaseHostVirtAddr)
+func (m *GuestRegionUffdMapping) relativeOffset(addr uintptr) int64 {
+	return int64(m.Offset + addr - m.BaseHostVirtAddr)
 }
 
 type FcMappings []GuestRegionUffdMapping
 
 // Returns the relative offset and the page size of the mapped range for a given address
-func (m FcMappings) GetRange(addr uintptr) (uint64, uint64, error) {
+func (m FcMappings) GetRange(addr uintptr) (int64, uint64, error) {
 	for _, m := range m {
 		if addr < m.BaseHostVirtAddr || m.BaseHostVirtAddr+m.Size <= addr {
 			// Outside of this mapping

packages/orchestrator/internal/sandbox/uffd/mapping/mapping.go

@@ -1,5 +1,5 @@
 package mapping
 
 type Mappings interface {
-	GetRange(addr uintptr) (offset uint64, pagesize uint64, err error)
+	GetRange(addr uintptr) (offset int64, pagesize uint64, err error)
 }

packages/orchestrator/internal/sandbox/uffd/userfaultfd/constants.go

@@ -28,7 +28,6 @@ const (
 
 	UFFDIO_REGISTER_MODE_MISSING = C.UFFDIO_REGISTER_MODE_MISSING
 	UFFDIO_REGISTER_MODE_WP      = C.UFFDIO_REGISTER_MODE_WP
-	UFFDIO_REGISTER_MODE_MINOR   = C.UFFDIO_REGISTER_MODE_MINOR
 
 	UFFDIO_WRITEPROTECT_MODE_WP = C.UFFDIO_WRITEPROTECT_MODE_WP
 	UFFDIO_COPY_MODE_WP         = C.UFFDIO_COPY_MODE_WP

packages/orchestrator/internal/sandbox/uffd/userfaultfd/mocks_test.go

@@ -26,11 +26,11 @@ func newMockMappings(start uintptr, size, pagesize uint64) *mockMappings {
 	}
 }
 
-func (m *mockMappings) GetRange(addr uintptr) (uint64, uint64, error) {
+func (m *mockMappings) GetRange(addr uintptr) (int64, uint64, error) {
 	offset := addr - m.start
 	pagesize := m.pagesize
 
-	return uint64(offset), pagesize, nil
+	return int64(offset), pagesize, nil
 }
 
 type mockSlicer struct {

packages/orchestrator/internal/sandbox/uffd/userfaultfd/serve.go

@@ -41,7 +41,7 @@ func (u *userfaultfd) Serve(
 
 	var eg errgroup.Group
 
-	missingChunksBeingHandled := map[uint64]struct{}{}
+	missingChunksBeingHandled := map[int64]struct{}{}
 
 outerLoop:
 	for {
@@ -156,8 +156,6 @@ outerLoop:
 				return nil
 			})
 
-			fmt.Fprintf(os.Stderr, "wp trigger %d %d\n", addr, offset/pagesize)
-
 			continue
 		}
 
@@ -187,7 +185,7 @@ outerLoop:
 
 			var copyMode CULong
 
-			b, sliceErr := src.Slice(int64(offset), int64(pagesize))
+			b, sliceErr := src.Slice(offset, int64(pagesize))
 			if sliceErr != nil {
 				signalErr := fdExit.SignalExit()
 

packages/orchestrator/internal/sandbox/uffd/userfaultfd/userfaultfd.go

@@ -92,25 +92,6 @@ func (u *userfaultfd) copy(addr uintptr, data []byte, pagesize uint64, mode CULo
 	return nil
 }
 
-// Wake wakes up the faulting thread(s) waiting on the given address range.
-func (u *userfaultfd) Wake(addr uintptr, size uint64) error {
-	type uffdioWake struct {
-		addr  CULong
-		len   CULong
-		flags CULong
-	}
-	wake := uffdioWake{
-		addr:  CULong(addr),
-		len:   CULong(size),
-		flags: 0,
-	}
-
-	if _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, u.fd, UFFDIO_WAKE, uintptr(unsafe.Pointer(&wake))); errno != 0 {
-		return errno
-	}
-	return nil
-}
-
 func (u *userfaultfd) Close() error {
 	return syscall.Close(int(u.fd))
 }