feat(host): support Hygon DCU HAMI vdev core allocation (#25274)

Author: zexi

cmd/climc/shell/llm/llm_router_agent.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"yunion.io/x/jsonutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/llm"

pkg/aiproxy/chatlog/chatlog.go

@@ -30,6 +30,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+
 	"yunion.io/x/log"
 )
 

pkg/aiproxy/extensions/visual/messages.go

@@ -21,10 +21,10 @@ import (
 	"strings"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/onecloud/pkg/mcclient/auth"
 
 	"yunion.io/x/onecloud/pkg/aiproxy/models"
 	"yunion.io/x/onecloud/pkg/aiproxy/providers/openai"
+	"yunion.io/x/onecloud/pkg/mcclient/auth"
 )
 
 var ErrVisualStreamingUnsupported = fmt.Errorf("visual extension does not support streaming")

pkg/aiproxy/extensions/visual/responses.go

@@ -19,10 +19,10 @@ import (
 	"fmt"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/onecloud/pkg/mcclient/auth"
 
 	"yunion.io/x/onecloud/pkg/aiproxy/models"
 	"yunion.io/x/onecloud/pkg/aiproxy/providers/openai"
+	"yunion.io/x/onecloud/pkg/mcclient/auth"
 )
 
 // ShouldHandle reports whether the Responses visual orchestration path should run.

pkg/aiproxy/ft/interactive.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"golang.org/x/term"
+
 	"yunion.io/x/pkg/errors"
 )
 

pkg/aiproxy/models/ai_providers_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"yunion.io/x/jsonutils"
+
 	api "yunion.io/x/onecloud/pkg/apis/aiproxy"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 )

pkg/aiproxy/providers/registry.go

@@ -19,15 +19,13 @@ import (
 	"sync"
 
 	"yunion.io/x/onecloud/pkg/aiproxy/providerapi"
-	api "yunion.io/x/onecloud/pkg/apis/aiproxy"
-	// "yunion.io/x/onecloud/pkg/aiproxy/providers/aliyun" // uncommon
-	"yunion.io/x/onecloud/pkg/aiproxy/providers/anthropic"
-	// "yunion.io/x/onecloud/pkg/aiproxy/providers/azure" // uncommon
+	"yunion.io/x/onecloud/pkg/aiproxy/providers/anthropic" // "yunion.io/x/onecloud/pkg/aiproxy/providers/azure" // uncommon
 	// "yunion.io/x/onecloud/pkg/aiproxy/providers/baidu" // uncommon
 	// "yunion.io/x/onecloud/pkg/aiproxy/providers/cohere" // uncommon
 	"yunion.io/x/onecloud/pkg/aiproxy/providers/gemini"
 	"yunion.io/x/onecloud/pkg/aiproxy/providers/openai"
 	"yunion.io/x/onecloud/pkg/aiproxy/providers/vllm"
+	api "yunion.io/x/onecloud/pkg/apis/aiproxy" // "yunion.io/x/onecloud/pkg/aiproxy/providers/aliyun" // uncommon
 )
 
 var (

pkg/hostman/guestman/pod.go

@@ -57,6 +57,7 @@ import (
 	"yunion.io/x/onecloud/pkg/hostman/hostinfo"
 	"yunion.io/x/onecloud/pkg/hostman/hostutils"
 	"yunion.io/x/onecloud/pkg/hostman/isolated_device"
+	"yunion.io/x/onecloud/pkg/hostman/isolated_device/container_device"
 	_ "yunion.io/x/onecloud/pkg/hostman/isolated_device/container_device/cdi"
 	"yunion.io/x/onecloud/pkg/hostman/options"
 	"yunion.io/x/onecloud/pkg/hostman/storageman"
@@ -2253,7 +2254,11 @@ func (s *sPodGuestInstance) createContainer(ctx context.Context, userCred mcclie
 			}
 			ctrCfg.Devices = append(ctrCfg.Devices, ctrDevs...)
 		}
-		if err := s.getIsolatedDeviceExtraConfig(spec, ctrCfg); err != nil {
+		if err := func() error {
+			container_device.SetHygonContainerContext(s.GetId(), input.Name)
+			defer container_device.ClearHygonContainerContext()
+			return s.getIsolatedDeviceExtraConfig(spec, ctrCfg)
+		}(); err != nil {
 			return "", err
 		}
 	} else {
@@ -2447,6 +2452,38 @@ func (s *sPodGuestInstance) getIsolatedDeviceExtraConfig(spec *hostapi.Container
 	return nil
 }
 
+func (s *sPodGuestInstance) releaseIsolatedContainerDevices(devs []*hostapi.ContainerDevice) {
+	devsByMan := map[isolated_device.IContainerDeviceManager][]*hostapi.ContainerDevice{}
+	manOrder := []isolated_device.IContainerDeviceManager{}
+	for i := range devs {
+		dev := devs[i]
+		if dev.IsolatedDevice == nil {
+			continue
+		}
+		devType := dev.IsolatedDevice.DeviceType
+		if devType != computeapi.GPU_TYPE && devType != computeapi.NPU_TYPE {
+			continue
+		}
+		if dev.IsolatedDevice.IsCDIUsed() || len(dev.IsolatedDevice.OnlyEnv) > 0 {
+			continue
+		}
+		iDev := hostinfo.Instance().IsolatedDeviceMan.GetDeviceByCloudId(dev.IsolatedDevice.Id)
+		if iDev == nil {
+			continue
+		}
+		devMan := iDev.GetContainerDeviceManager()
+		if _, ok := devsByMan[devMan]; !ok {
+			manOrder = append(manOrder, devMan)
+		}
+		devsByMan[devMan] = append(devsByMan[devMan], dev)
+	}
+	for _, devMan := range manOrder {
+		if rel, ok := devMan.(isolated_device.IContainerDeviceReleaseManager); ok {
+			rel.ReleaseContainerDevices(devsByMan[devMan])
+		}
+	}
+}
+
 func (s *sPodGuestInstance) getContainerSystemCpusDir(ctrId string) string {
 	rootFsPath, _ := s.GetRootFsMountPath(ctrId)
 	if rootFsPath != "" {
@@ -2607,6 +2644,9 @@ func (s *sPodGuestInstance) ensureContainerSystemCpufreqHostDir(cpuDir, hostCpuP
 }
 
 func (s *sPodGuestInstance) DeleteContainer(ctx context.Context, userCred mcclient.TokenCredential, ctrId string) (jsonutils.JSONObject, error) {
+	if ctr := s.GetContainerById(ctrId); ctr != nil {
+		s.releaseIsolatedContainerDevices(ctr.Spec.Devices)
+	}
 	criId, err := s.getContainerCRIId(ctrId)
 	if err != nil && errors.Cause(err) != errors.ErrNotFound {
 		return nil, errors.Wrap(err, "getContainerCRIId")

pkg/hostman/hostinfo/hostinfo.go

@@ -2347,7 +2347,7 @@ func (h *SHostInfo) probeSyncIsolatedDevices() (*jsonutils.JSONArray, error) {
 		options.HostOptions.HostType, h.IsContainerHost(), h.IsKvmSupport())
 	log.Infof("==== probeSyncIsolatedDevices hygon config: enableDCU=%v enableHAMI=%v hySmiPath=%s hyhalPath=%s dtkPath=%s",
 		options.HostOptions.EnableContainerHygonDCU,
-		options.HostOptions.EnableContainerHygonDCUHAMI,
+		options.HostOptions.EnableContainerHygonDCUHami,
 		options.HostOptions.HygonHySmiPath,
 		options.HostOptions.HygonHyhalPath,
 		options.HostOptions.HygonDtkPath,
@@ -2361,7 +2361,7 @@ func (h *SHostInfo) probeSyncIsolatedDevices() (*jsonutils.JSONArray, error) {
 		EnableContainerAscendNpu:     options.HostOptions.EnableContainerAscendNPU,
 		EnableContainerAscendNpuHAMI: options.HostOptions.EnableContainerAscendNPUHami,
 		EnableContainerHygonDCU:      options.HostOptions.EnableContainerHygonDCU,
-		EnableContainerHygonDCUHAMI:  options.HostOptions.EnableContainerHygonDCUHAMI,
+		EnableContainerHygonDCUHAMI:  options.HostOptions.EnableContainerHygonDCUHami,
 		EnableWhitelist:              options.HostOptions.EnableIsolatedDeviceWhitelist,
 		SriovNics:                    sriovNics,
 		OvsOffloadNics:               offloadNics,

pkg/hostman/isolated_device/container_device.go

@@ -100,6 +100,11 @@ type IContainerDeviceManager interface {
 	GetContainerExtraConfigures(devs []*hostapi.ContainerDevice) ([]*runtimeapi.KeyValue, []*runtimeapi.Mount)
 }
 
+// IContainerDeviceReleaseManager is implemented by device managers that need cleanup on container delete.
+type IContainerDeviceReleaseManager interface {
+	ReleaseContainerDevices(devs []*hostapi.ContainerDevice)
+}
+
 type IContainerCDIManager interface {
 	GetKind() apis.ContainerCDIKind
 	GetSpecFilePath() string