Share one creatable-types read per VF in vendor VFIO profile listing

Author: yummybomb

lib/devices/vendor_vfio_linux.go

@@ -80,25 +80,27 @@ func (s vendorVFIOSysfs) discoverVFs() ([]VirtualFunction, error) {
 }
 
 func (s vendorVFIOSysfs) listProfiles(vfs []VirtualFunction) ([]GPUProfile, error) {
-	metadata, err := s.profileMetadata(vfs)
-	if err != nil {
-		return nil, err
-	}
-
-	availability := make(map[string]int, len(metadata))
+	profilesByType := make(map[string]profileMetadata)
+	availability := make(map[string]int)
 	for _, vf := range vfs {
-		if vf.Allocated {
-			continue
-		}
-		profiles, err := s.readCreatableProfiles(vf.PCIAddress)
+		creatable, err := s.readCreatableProfiles(vf.PCIAddress)
 		if err != nil {
 			return nil, err
 		}
-		for _, profile := range profiles {
-			availability[profile.TypeName]++
+		for _, profile := range creatable {
+			profilesByType[profile.TypeName] = profile
+			if !vf.Allocated {
+				availability[profile.TypeName]++
+			}
 		}
 	}
 
+	metadata := make([]profileMetadata, 0, len(profilesByType))
+	for _, profile := range profilesByType {
+		metadata = append(metadata, profile)
+	}
+	sort.Slice(metadata, func(i, j int) bool { return metadata[i].Name < metadata[j].Name })
+
 	profiles := make([]GPUProfile, 0, len(metadata))
 	for _, profile := range metadata {
 		profiles = append(profiles, GPUProfile{
@@ -263,6 +265,9 @@ func (s vendorVFIOSysfs) reconcile(ctx context.Context, protectedDevicePaths map
 				return fmt.Errorf("scan open VFIO handles: %w", err)
 			}
 		}
+		// destroyWithOpenPaths repeats this probe under the lock; the
+		// pre-check only keeps live VMs from being logged below as failed
+		// destroys.
 		inUse, err := s.vfioDeviceInUse(vf.PCIAddress, openPaths)
 		if err != nil {
 			log.WarnContext(ctx, "failed to check vendor VFIO vGPU usage", "vf", vf.PCIAddress, "error", err)