feat: redefine numa avail

Signed-off-by: linzhecheng <[email protected]>

Author: cheney-lin

pkg/agent/sysadvisor/plugin/qosaware/resource/cpu/advisor_helper.go

@@ -161,11 +161,7 @@ func (cra *cpuResourceAdvisor) updateNumasAvailableResource() {
 		if cpuset, ok := reservePoolInfo.TopologyAwareAssignments[id]; ok {
 			reservePoolNuma = cpuset.Size()
 		}
-		reservedForReclaimNuma := 0
-		if v, ok := cra.reservedForReclaim[id]; ok {
-			reservedForReclaimNuma = v
-		}
-		cra.numaAvailable[id] = cpusPerNuma - reservePoolNuma - reservedForReclaimNuma
+		cra.numaAvailable[id] = cpusPerNuma - reservePoolNuma
 	}
 }
 
@@ -201,7 +197,7 @@ func (cra *cpuResourceAdvisor) getRegionMaxRequirement(r region.QoSRegion) float
 		res = general.MaxFloat64(1, res)
 	default:
 		for _, numaID := range r.GetBindingNumas().ToSliceInt() {
-			res += float64(cra.numaAvailable[numaID])
+			res += float64(cra.numaAvailable[numaID] - cra.reservedForReclaim[numaID])
 		}
 	}
 	return res

pkg/agent/sysadvisor/plugin/qosaware/resource/cpu/assembler/provisionassembler/assembler_common.go

@@ -124,9 +124,6 @@ func (pa *ProvisionAssemblerCommon) assembleShareNB(r region.QoSRegion, result *
 	// available = NUMA Size - Reserved - ReservedForReclaimed when allowSharedCoresOverlapReclaimedCores == false
 	// available = NUMA Size - Reserved when allowSharedCoresOverlapReclaimedCores == true
 	available := getNUMAsResource(*pa.numaAvailable, r.GetBindingNumas())
-	if *pa.allowSharedCoresOverlapReclaimedCores {
-		available += reservedForReclaim
-	}
 
 	isolationRequirements, err := pa.getIsolationRequirements(r)
 	if err != nil {
@@ -189,7 +186,6 @@ func (pa *ProvisionAssemblerCommon) assembleIsolationNB(r region.QoSRegion, resu
 		_, ok := result.GetPoolEntry(commonstate.PoolNameReclaim, regionNuma)
 		if !ok {
 			available := getNUMAsResource(*pa.numaAvailable, r.GetBindingNumas())
-			reservedForReclaim := getNUMAsResource(*pa.reservedForReclaim, r.GetBindingNumas())
 
 			isolationRegions := regionHelper.GetRegions(regionNuma, configapi.QoSRegionTypeIsolation)
 			isolationSizes := 0
@@ -200,7 +196,8 @@ func (pa *ProvisionAssemblerCommon) assembleIsolationNB(r region.QoSRegion, resu
 				}
 				isolationSizes += int(ck[configapi.ControlKnobNonReclaimedCPURequirementUpper].Value)
 			}
-			reclaimedCoresSize := general.Max(available-isolationSizes, 0) + reservedForReclaim
+			// todo
+			reclaimedCoresSize := general.Max(available-isolationSizes, 0)
 			result.SetPoolEntry(commonstate.PoolNameReclaim, regionNuma, reclaimedCoresSize, -1)
 		}
 	}
@@ -224,26 +221,25 @@ func (pa *ProvisionAssemblerCommon) assembleDedicatedNE(r region.QoSRegion, resu
 	reclaimedCoresQuota := float64(-1)
 
 	// fill in reclaim pool entry for dedicated numa exclusive regions
+	nonReclaimRequirement := int(controlKnob[configapi.ControlKnobNonReclaimedCPURequirement].Value)
 	if !r.EnableReclaim() {
-		if cgroups.IsCgroup2UnifiedMode() {
-			reclaimedCoresQuota = float64(reservedForReclaim)
-			reclaimedCoresSize = available + reservedForReclaim
-		} else {
-			reclaimedCoresSize = reservedForReclaim
+		nonReclaimRequirement = available
+	}
+	if cgroups.IsCgroup2UnifiedMode() {
+		reclaimedCoresSize = available
+		reclaimedCoresQuota = general.MaxFloat64(float64(reservedForReclaim), float64(available-nonReclaimRequirement))
+
+		if quota, ok := controlKnob[configapi.ControlKnobReclaimedCPUQuota]; ok {
+			reclaimedCoresQuota = general.MinFloat64(reclaimedCoresQuota, quota.Value)
 		}
 	} else {
-		nonReclaimRequirement := int(controlKnob[configapi.ControlKnobNonReclaimedCPURequirement].Value)
-		if cgroups.IsCgroup2UnifiedMode() {
-			reclaimedCoresSize = available + reservedForReclaim
-			reclaimedCoresQuota = float64(available + reservedForReclaim - nonReclaimRequirement)
-		} else {
-			reclaimedCoresSize = available + reservedForReclaim - nonReclaimRequirement
-		}
-
-		klog.InfoS("assemble info", "regionName", r.Name(), "reclaimedCoresSize", reclaimedCoresSize,
-			"available", available, "nonReclaimRequirement", nonReclaimRequirement,
-			"reservedForReclaim", reservedForReclaim)
+		reclaimedCoresSize = general.Max(reservedForReclaim, available-nonReclaimRequirement)
 	}
+
+	klog.InfoS("assembleDedicatedNE info", "regionName", r.Name(), "reclaimedCoresSize", reclaimedCoresSize,
+		"available", available, "nonReclaimRequirement", nonReclaimRequirement,
+		"reservedForReclaim", reservedForReclaim, "controlKnob", controlKnob)
+
 	result.SetPoolEntry(commonstate.PoolNameReclaim, regionNuma, reclaimedCoresSize, reclaimedCoresQuota)
 	return nil
 }
@@ -256,9 +252,6 @@ func (pa *ProvisionAssemblerCommon) assembleShare(sharePoolRequirements, sharePo
 	isolationUppers := general.SumUpMapValues(isolationUpperSizes)
 
 	shareAndIsolatedPoolAvailable := getNUMAsResource(*pa.numaAvailable, *pa.nonBindingNumas)
-	if *pa.allowSharedCoresOverlapReclaimedCores {
-		shareAndIsolatedPoolAvailable += getNUMAsResource(*pa.reservedForReclaim, *pa.nonBindingNumas)
-	}
 
 	isolationPoolSizes := isolationUpperSizes
 
@@ -385,6 +378,9 @@ func (pa *ProvisionAssemblerCommon) AssembleProvision() (types.InternalCPUCalcul
 			return types.InternalCPUCalculationResult{}, err
 		}
 
+		// nonReclaimRequirement和reclaim quota取个小的就行
+		// 如果canonical 没有返回值，rama会怎么处理？会直接使用rama的结果
+
 		switch r.Type() {
 		case configapi.QoSRegionTypeShare:
 			if r.IsNumaBinding() {