Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions pkg/device/enflame/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -391,20 +391,20 @@ func (enf *EnflameDevices) Fit(devices []*device.DeviceUsage, request device.Con
reason[common.ModeNotFit]++
return false, tmpDevs, common.GenReason(reason, len(devices))
}
requiredSlice := int32(profile.Size)
if requiredSlice <= 0 {
if profile.Size <= 0 || profile.Size > math.MaxInt32 {
reason[common.ModeNotFit]++
return false, tmpDevs, common.GenReason(reason, len(devices))
}
profileMemoryMiB := int32(profile.MemoryGB * 1024)
if profileMemoryMiB <= 0 {
if profile.MemoryGB <= 0 || profile.MemoryGB > math.MaxInt32/1024 {
reason[common.ModeNotFit]++
return false, tmpDevs, common.GenReason(reason, len(devices))
}
profileCorePercent := int32(profile.CorePercent)
if profileCorePercent <= 0 {
profileCorePercent = 1
if profile.CorePercent > math.MaxInt32 {
reason[common.ModeNotFit]++
return false, tmpDevs, common.GenReason(reason, len(devices))
}
profileMemoryMiB := int32(profile.MemoryGB * 1024)
profileCorePercent := int32(profile.CorePercent)
for i, v := range slices.Backward(devices) {
dev := v
klog.V(4).InfoS("scoring pod", "pod", klog.KObj(pod), "device", dev.ID, "Memreq", k.Memreq, "MemPercentagereq", k.MemPercentagereq, "Coresreq", k.Coresreq, "Nums", k.Nums, "device index", i)
Expand Down Expand Up @@ -660,7 +660,6 @@ func parseDRSCapacity(raw any) (int32, error) {
}
}

// clampToInt32 bounds v to the int32 range instead of letting the cast wrap silently.
func clampToInt32(v int) int32 {
if v > math.MaxInt32 {
return math.MaxInt32
Expand Down
40 changes: 39 additions & 1 deletion pkg/device/enflame/device_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ func TestAddResourceUsage_ClampsOnOverflow(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, n.Used, int32(math.MaxInt32))

// A second oversized slice must saturate, not wrap negative.
err = dev.AddResourceUsage(&corev1.Pod{}, n, ctr)
assert.NilError(t, err)
assert.Equal(t, n.Used, int32(math.MaxInt32))
Expand Down Expand Up @@ -421,3 +420,42 @@ func TestAddResourceUsage_ClampsOversizedSliceString(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, n.Used, int32(math.MaxInt32))
}

func TestFit_OversizedProfileRejected(t *testing.T) {
dev := InitEnflameDevice(EnflameConfig{ResourceNameDRSGCU: "enflame.com/drs-gcu"})
devices := []*device.DeviceUsage{
{
ID: "node-a-enflame-drs-0",
Index: 0,
Count: 6,
Used: 0,
Totalmem: 40960,
Type: EnflameVGCUDevice,
CustomInfo: map[string]any{
"minor": "0",
"index": "0",
"profiles": map[string]string{"4294967299g.4294967299gb": "0"},
},
},
}
req := device.ContainerDeviceRequest{Nums: 1, Type: EnflameVGCUDevice, Memreq: 3, MemPercentagereq: 101}
fit, result, _ := dev.Fit(devices, req, &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{}}}, &device.NodeInfo{}, &device.PodDevices{})
Comment thread
coderabbitai[bot] marked this conversation as resolved.
assert.Equal(t, fit, false)
assert.Equal(t, len(result[EnflameVGCUDevice]), 0)

devices[0].CustomInfo["profiles"] = map[string]string{"4294967299g.20gb": "0"}
fit, result, _ = dev.Fit(devices, req, &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{}}}, &device.NodeInfo{}, &device.PodDevices{})
assert.Equal(t, fit, false)
assert.Equal(t, len(result[EnflameVGCUDevice]), 0)

devices[0].CustomInfo["profiles"] = map[string]string{"2g.4294967299gb": "0"}
fit, result, _ = dev.Fit(devices, req, &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{}}}, &device.NodeInfo{}, &device.PodDevices{})
assert.Equal(t, fit, false)
assert.Equal(t, len(result[EnflameVGCUDevice]), 0)

devices[0].CustomInfo["maxSlice"] = "1"
devices[0].CustomInfo["profiles"] = map[string]string{"2147483647g.20gb": "0"}
fit, result, _ = dev.Fit(devices, req, &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{}}}, &device.NodeInfo{}, &device.PodDevices{})
assert.Equal(t, fit, false)
assert.Equal(t, len(result[EnflameVGCUDevice]), 0)
}
Loading