attempt2

Signed-off-by: Kirtana Ashok <[email protected]>
kiashok · Jun 12, 2024 · bf85e4f · bf85e4f
1 parent a952a6a
commit bf85e4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/internal/hcsoci/create.go b/internal/hcsoci/create.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"unsafe"
 
 	"github.com/Microsoft/go-winio/pkg/guid"
 	"github.com/Microsoft/hcsshim/internal/cow"
@@ -331,7 +330,8 @@ func setCPUAffinityOnJobObject(ctx context.Context, spec *specs.Spec, computeSys
 	info := make([]winapi.JOBOBJECT_CPU_GROUP_AFFINITY, len(spec.Windows.Resources.CPU.AffinityCPUs))
 
 	for i, cpu := range spec.Windows.Resources.CPU.AffinityCPUs {
-		info[i].CpuMask = (uintptr)(unsafe.Pointer(&cpu.CPUMask))
+		info[i].CpuMask = cpu.CPUMask
+		//(uintptr)(unsafe.Pointer(&cpu.CPUMask))
 		info[i].CpuGroup = (uint16)(cpu.CPUGroup)
 		//info[i].Reserved = [3]uint32{0, 0, 0}
 	}

diff --git a/internal/jobobject/jobobject.go b/internal/jobobject/jobobject.go
@@ -543,15 +543,14 @@ func isJobSilo(h windows.Handle) bool {
 }
 
 func (job *JobObject) SetInformationJobObject(affinityCPUs []winapi.JOBOBJECT_CPU_GROUP_AFFINITY) error {
-	//len := len(affinityCPUs)
-	//sizeOfGroupAffinity := unsafe.Sizeof(winapi.JOBOBJECT_CPU_GROUP_AFFINITY{})
+	len := len(affinityCPUs)
+	sizeOfGroupAffinity := unsafe.Sizeof(winapi.JOBOBJECT_CPU_GROUP_AFFINITY{})
 	_, err := windows.SetInformationJobObject(
 		job.handle,
 		winapi.JobObjectGroupInformationEx,
 		//uintptr(unsafe.Pointer(affinityCPUs)),
 		uintptr(unsafe.Pointer(&affinityCPUs[0])),
-		//uint32(unsafe.Sizeof(affinityCPUs)),
-		uint32(unsafe.Sizeof(affinityCPUs)*2),
+		uint32(uintptr(len)*sizeOfGroupAffinity),
 	)
 
 	if err != nil {

diff --git a/internal/winapi/jobobject.go b/internal/winapi/jobobject.go
@@ -163,7 +163,7 @@ type JOBOBJECT_ASSOCIATE_COMPLETION_PORT struct {
 
 // https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-group_affinity
 type JOBOBJECT_CPU_GROUP_AFFINITY struct {
-	CpuMask  uintptr
+	CpuMask  uint64
 	CpuGroup uint16
 	Reserved [3]uint16
 }