Project-HAMi
diff --git a/‎charts/hami/templates/device-plugin/daemonsetnvidia.yaml‎
Lines changed: 27 additions & 0 deletions b/‎charts/hami/templates/device-plugin/daemonsetnvidia.yaml‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎charts/hami/values.yaml‎
Lines changed: 17 additions & 0 deletions b/‎charts/hami/values.yaml‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎cmd/scheduler/main.go‎
Lines changed: 1 addition & 0 deletions b/‎cmd/scheduler/main.go‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎pkg/device-plugin/nvidiadevice/nvinternal/plugin/numa_refit_client.go‎
Lines changed: 221 additions & 0 deletions b/‎pkg/device-plugin/nvidiadevice/nvinternal/plugin/numa_refit_client.go‎
Lines changed: 221 additions & 0 deletions
@@ -122,6 +122,23 @@ spec:
             - name: ENABLE_TOPOLOGY_SCORE
               value: "true"
             {{- end }}
+            {{- with .Values.devicePlugin.numaRefit }}
+            {{- if .enabled }}
+            - name: HAMI_SCHEDULER_ENDPOINT
+              value: {{ .schedulerEndpoint | default (printf "https://%s.%s.svc:%v" (include "hami-vgpu.scheduler" $) (include "hami-vgpu.namespace" $) ($.Values.scheduler.service.httpPort | default 443)) | quote }}
+            {{- if .tlsInsecure }}
+            - name: HAMI_SCHEDULER_TLS_INSECURE
+              value: "true"
+            {{- end }}
+            {{- if .caFile }}
+            - name: HAMI_SCHEDULER_CA_FILE
+              value: {{ .caFile | quote }}
+            {{- else if .caSecret }}
+            - name: HAMI_SCHEDULER_CA_FILE
+              value: "/etc/hami/numa-refit-ca/ca.crt"
+            {{- end }}
+            {{- end }}
+            {{- end }}
             {{- with .Values.devicePlugin.extraEnvs }}
             {{- . | toYaml | nindent 12 }}
             {{- end }}
@@ -147,6 +164,11 @@ spec:
               subPath: device-config.yaml
             - name: cdi-root
               mountPath: /var/run/cdi
+            {{- if and .Values.devicePlugin.numaRefit .Values.devicePlugin.numaRefit.enabled .Values.devicePlugin.numaRefit.caSecret }}
+            - name: numa-refit-ca
+              mountPath: /etc/hami/numa-refit-ca
+              readOnly: true
+            {{- end }}
             {{- if typeIs "string" .Values.devicePlugin.nvidiaDriverRoot }}
             # We always mount the driver root at /driver-root in the container.
             # This is required for CDI detection to work correctly.
@@ -205,6 +227,11 @@ spec:
             - name: hosttmp
               mountPath: /tmp
       volumes:
+        {{- if and .Values.devicePlugin.numaRefit .Values.devicePlugin.numaRefit.enabled .Values.devicePlugin.numaRefit.caSecret }}
+        - name: numa-refit-ca
+          secret:
+            secretName: {{ .Values.devicePlugin.numaRefit.caSecret }}
+        {{- end }}
         - name: ctrs
           hostPath:
             path: {{ .Values.devicePlugin.monitor.ctrPath }}
 
@@ -351,6 +351,23 @@ devicePlugin:
   # TopologyManager can align CPU and GPU NUMA nodes. Opt-in because it changes
   # admission behavior when topologyManagerPolicy is single-numa-node.
   enableNumaTopology: false
+  # NUMA alignment refit (#2080): when enabled, the device plugin asks the
+  # scheduler to re-run its fit over the NUMA-restricted device set kubelet
+  # allows, keeping scheduler accounting authoritative. Requires
+  # enableNumaTopology plus the per-node enablegetpreferredallocation node
+  # configuration; pods opt in with the hami.io/numa-alignment annotation
+  # (best-effort or strict). Disabled by default: mismatches are only logged.
+  numaRefit:
+    enabled: false
+    # Scheduler base URL override. Defaults to the in-cluster scheduler
+    # service, https://<release>-scheduler.<namespace>.svc:<httpPort>.
+    schedulerEndpoint: ""
+    # The scheduler serves the admission webhook's self-signed certificate,
+    # so verification is skipped by default with the same posture as the
+    # extender configmap (tlsConfig.insecure). Set false to verify, and use
+    # caFile to point at a CA bundle mounted into the device plugin.
+    tlsInsecure: true
+    caFile: ""
   # Pre-configured device memory in MB for GPUs that don't support memory query (e.g., unified memory architecture GPUs like NVIDIA GB10/DGX Spark).
   # Set to 0 to use auto-detection (default). For unified memory GPUs, set to the total GPU memory (e.g., 131072 for 128GB).
   # Can be overridden per-node via nodeConfiguration.config.
 
@@ -145,6 +145,7 @@ func start() error {
 	router := httprouter.New()
 	router.POST("/filter", routes.PredicateRoute(sher))
 	router.POST("/bind", routes.Bind(sher))
+	router.POST("/refit", routes.NumaRefit(sher))
 	router.POST("/webhook", routes.WebHookRoute())
 	router.GET("/healthz", routes.HealthzRoute())
 	router.GET("/readyz", routes.ReadyzRoute(sher))
 
@@ -0,0 +1,221 @@
+/*
+Copyright 2026 The HAMi Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package plugin
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/klog/v2"
+	kubeletdevicepluginv1beta1 "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
+
+	"github.com/Project-HAMi/HAMi/pkg/device"
+	"github.com/Project-HAMi/HAMi/pkg/device/nvidia"
+	"github.com/Project-HAMi/HAMi/pkg/util"
+)
+
+const (
+	// SchedulerEndpointEnvName holds the HAMi scheduler base URL used for
+	// the NUMA refit, for example https://hami-scheduler.kube-system.svc:443.
+	// Empty disables the refit: mismatches are then only logged, exactly as
+	// before the refit existed.
+	SchedulerEndpointEnvName = "HAMI_SCHEDULER_ENDPOINT"
+	// SchedulerCAFileEnvName optionally points at a PEM bundle used to
+	// verify the scheduler endpoint's TLS certificate.
+	SchedulerCAFileEnvName = "HAMI_SCHEDULER_CA_FILE"
+	// SchedulerTLSInsecureEnvName set to true skips TLS verification of the
+	// scheduler endpoint. The scheduler serves the admission webhook's
+	// self-signed certificate, so the chart enables this by default with the
+	// same posture as the extender configmap (tlsConfig.insecure: true).
+	SchedulerTLSInsecureEnvName = "HAMI_SCHEDULER_TLS_INSECURE"
+
+	numaRefitPath = "/refit"
+
+	// numaRefitTimeout bounds one refit round trip. Kubelet applies no
+	// deadline of its own to GetPreferredAllocation and admits pods on a
+	// single serialized loop, so this client timeout is the node's only
+	// protection against a slow or unreachable scheduler.
+	numaRefitTimeout = 2 * time.Second
+)
+
+// numaRefitTLSConfig verifies the scheduler certificate by default, against
+// SchedulerCAFileEnvName when provided; SchedulerTLSInsecureEnvName is an
+// explicit operator opt-out for the self-signed webhook certificate.
+func numaRefitTLSConfig() *tls.Config {
+	config := &tls.Config{MinVersion: tls.VersionTLS12}
+	if caFile := os.Getenv(SchedulerCAFileEnvName); caFile != "" {
+		pem, err := os.ReadFile(caFile)
+		if err != nil {
+			klog.ErrorS(err, "cannot read scheduler CA bundle", "path", caFile)
+		} else if pool := x509.NewCertPool(); pool.AppendCertsFromPEM(pem) {
+			config.RootCAs = pool
+		} else {
+			klog.ErrorS(nil, "scheduler CA bundle contains no usable certificates", "path", caFile)
+		}
+	}
+	if insecure, err := strconv.ParseBool(os.Getenv(SchedulerTLSInsecureEnvName)); err == nil {
+		config.InsecureSkipVerify = insecure
+	}
+	return config
+}
+
+// numaRefitHTTPClient reaches the scheduler service.
+var numaRefitHTTPClient = &http.Client{
+	Timeout: numaRefitTimeout,
+	Transport: &http.Transport{
+		TLSClientConfig: numaRefitTLSConfig(),
+	},
+}
+
+// tryNumaRefit asks the scheduler to move this container's pending
+// allocation onto kubelet's allowed device set. It returns the preferred
+// replica IDs on success. A nil slice with a nil error means the refit did
+// not apply (disabled, pod not opted in, or best-effort failure); a non-nil
+// error means strict mode failed and the allocation must fail.
+func (plugin *NvidiaDevicePlugin) tryNumaRefit(ctx context.Context, pod *corev1.Pod, containerIndex int, req *kubeletdevicepluginv1beta1.ContainerPreferredAllocationRequest, cause error) ([]string, error) {
+	if pod == nil || plugin.operatingMode == nvidia.MigMode || !errors.Is(cause, errAnnotatedDeviceUnavailable) {
+		return nil, nil
+	}
+	mode, parseErr := util.GetNumaAlignmentModeByPod(pod)
+	if parseErr != nil || mode == util.NumaAlignmentNone {
+		return nil, nil
+	}
+	if os.Getenv(SchedulerEndpointEnvName) == "" {
+		return nil, nil
+	}
+
+	// When kubelet pins replicas via MustIncludeDeviceIDs, only their
+	// physical devices can satisfy the allocation, so restrict the refit to
+	// them; otherwise any available physical device is eligible.
+	allowedUUIDs := allowedPhysicalDeviceIDs(req.AvailableDeviceIDs)
+	if len(req.MustIncludeDeviceIDs) > 0 {
+		allowedUUIDs = allowedPhysicalDeviceIDs(req.MustIncludeDeviceIDs)
+	}
+	newDevices, err := plugin.requestNumaRefit(ctx, pod, containerIndex, allowedUUIDs)
+	if err == nil {
+		replicas, selectErr := plugin.selectPreferredDeviceIDsFromAnnotatedDevices(req.AvailableDeviceIDs, req.MustIncludeDeviceIDs, newDevices, int(req.AllocationSize))
+		if selectErr == nil {
+			klog.InfoS("NUMA refit succeeded", "pod", klog.KObj(pod), "container", containerIndex, "devices", replicas)
+			return replicas, nil
+		}
+		// The scheduler has already committed the move at this point.
+		// Falling back to kubelet's own selection would leave runtime and
+		// accounting divergent, so fail the allocation in both modes.
+		return nil, fmt.Errorf("numa refit committed but kubelet cannot honor the selection: %w", selectErr)
+	}
+
+	if mode == util.NumaAlignmentStrict {
+		return nil, fmt.Errorf("numa-alignment strict: %w", err)
+	}
+	klog.InfoS("NUMA refit failed; best-effort keeps kubelet's own selection", "pod", klog.KObj(pod), "container", containerIndex, "err", err)
+	return nil, nil
+}
+
+// requestNumaRefit performs one refit round trip against the scheduler.
+func (plugin *NvidiaDevicePlugin) requestNumaRefit(ctx context.Context, pod *corev1.Pod, containerIndex int, allowedUUIDs []string) (device.ContainerDevices, error) {
+	payload, err := json.Marshal(device.NumaRefitRequest{
+		PodUID:             string(pod.UID),
+		PodNamespace:       pod.Namespace,
+		PodName:            pod.Name,
+		NodeName:           os.Getenv(util.NodeNameEnvName),
+		ContainerIndex:     containerIndex,
+		ContainerName:      podContainerNameAt(pod, containerIndex),
+		DeviceType:         nvidia.NvidiaGPUDevice,
+		AllowedDeviceUUIDs: allowedUUIDs,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, numaRefitTimeout)
+	defer cancel()
+	url := strings.TrimSuffix(os.Getenv(SchedulerEndpointEnvName), "/") + numaRefitPath
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(payload))
+	if err != nil {
+		return nil, err
+	}
+	httpReq.Header.Set("Content-Type", "application/json")
+
+	httpResp, err := numaRefitHTTPClient.Do(httpReq)
+	if err != nil {
+		return nil, err
+	}
+	defer httpResp.Body.Close()
+	if httpResp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("scheduler refit returned status %d", httpResp.StatusCode)
+	}
+
+	var response device.NumaRefitResponse
+	if err := json.NewDecoder(io.LimitReader(httpResp.Body, 1<<20)).Decode(&response); err != nil {
+		return nil, err
+	}
+	if !response.Succeeded {
+		return nil, fmt.Errorf("scheduler refused refit: %s", response.FailureReason)
+	}
+	devices, err := device.DecodeContainerDevices(response.ContainerDevices)
+	if err != nil {
+		return nil, fmt.Errorf("cannot decode refit devices: %w", err)
+	}
+	if len(devices) == 0 {
+		return nil, errors.New("scheduler refit returned no devices")
+	}
+	return devices, nil
+}
+
+// podContainerNameAt returns the pod's container name at the PodDevices
+// position, counting init containers first, for the scheduler's cross-check.
+func podContainerNameAt(pod *corev1.Pod, index int) string {
+	if index < 0 {
+		return ""
+	}
+	if index < len(pod.Spec.InitContainers) {
+		return pod.Spec.InitContainers[index].Name
+	}
+	index -= len(pod.Spec.InitContainers)
+	if index >= 0 && index < len(pod.Spec.Containers) {
+		return pod.Spec.Containers[index].Name
+	}
+	return ""
+}
+
+// allowedPhysicalDeviceIDs maps kubelet's replica IDs to their unique
+// physical device UUIDs, preserving first-seen order.
+func allowedPhysicalDeviceIDs(available []string) []string {
+	seen := make(map[string]struct{}, len(available))
+	physical := make([]string, 0, len(available))
+	for _, id := range available {
+		p := physicalDeviceID(id)
+		if _, ok := seen[p]; ok {
+			continue
+		}
+		seen[p] = struct{}{}
+		physical = append(physical, p)
+	}
+	return physical
+}