Merge branch 'mount_sysfs_memory_online' into 'master'

Add sysfs mount to enable auto-onlining of memory See merge request nvidia/kubernetes/gpu-operator!952
NVIDIA · Nov 16, 2023 · f49e1ab · f49e1ab
2 parents ace6403 + 54befe3
commit f49e1ab
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 12 deletions.
diff --git a/assets/state-driver/0500_daemonset.yaml b/assets/state-driver/0500_daemonset.yaml
@@ -141,6 +141,8 @@ spec:
           - name: run-mellanox-drivers
             mountPath: /run/mellanox/drivers
             mountPropagation: HostToContainer
+          - name: sysfs-memory-online
+            mountPath: /sys/devices/system/memory/auto_online_blocks
           - name: firmware-search-path
             mountPath: /sys/module/firmware_class/parameters/path
           - name: nv-firmware
@@ -305,7 +307,9 @@ spec:
         - name: firmware-search-path
           hostPath:
             path: /sys/module/firmware_class/parameters/path
-            type: FileOrCreate
+        - name: sysfs-memory-online
+          hostPath:
+            path: /sys/devices/system/memory/auto_online_blocks
         - name: nv-firmware
           hostPath:
             path: /run/nvidia/driver/lib/firmware

diff --git a/internal/state/driver_test.go b/internal/state/driver_test.go
@@ -733,7 +733,14 @@ func getDriverVolumes() []corev1.Volume {
 			VolumeSource: corev1.VolumeSource{
 				HostPath: &corev1.HostPathVolumeSource{
 					Path: "/sys/module/firmware_class/parameters/path",
-					Type: newHostPathType(corev1.HostPathFileOrCreate),
+				},
+			},
+		},
+		{
+			Name: "sysfs-memory-online",
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: "/sys/devices/system/memory/auto_online_blocks",
 				},
 			},
 		},

diff --git a/internal/state/testdata/golden/driver-additional-configs.yaml b/internal/state/testdata/golden/driver-additional-configs.yaml
@@ -206,6 +206,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
         - mountPath: /opt/config/test-file
@@ -306,8 +308,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-full-spec.yaml b/internal/state/testdata/golden/driver-full-spec.yaml
@@ -222,6 +222,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       hostPID: true
@@ -332,8 +334,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-gds.yaml b/internal/state/testdata/golden/driver-gds.yaml
@@ -206,6 +206,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       - args:
@@ -349,8 +351,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-minimal.yaml b/internal/state/testdata/golden/driver-minimal.yaml
@@ -206,6 +206,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       hostPID: true
@@ -302,8 +304,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-openshift-drivertoolkit.yaml b/internal/state/testdata/golden/driver-openshift-drivertoolkit.yaml
@@ -276,6 +276,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
         - mountPath: /mnt/shared-nvidia-driver-toolkit
@@ -408,8 +410,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-precompiled.yaml b/internal/state/testdata/golden/driver-precompiled.yaml
@@ -208,6 +208,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       hostPID: true
@@ -305,8 +307,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-rdma-hostmofed.yaml b/internal/state/testdata/golden/driver-rdma-hostmofed.yaml
@@ -210,6 +210,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       - args:
@@ -360,8 +362,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-rdma.yaml b/internal/state/testdata/golden/driver-rdma.yaml
@@ -208,6 +208,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       - args:
@@ -354,8 +356,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/internal/state/testdata/golden/driver-vgpu-host-manager.yaml b/internal/state/testdata/golden/driver-vgpu-host-manager.yaml
@@ -192,6 +192,8 @@ spec:
           name: run-mellanox-drivers
         - mountPath: /sys/module/firmware_class/parameters/path
           name: firmware-search-path
+        - mountPath: /sys/devices/system/memory/auto_online_blocks
+          name: sysfs-memory-online
         - mountPath: /lib/firmware
           name: nv-firmware
       hostPID: true
@@ -294,8 +296,10 @@ spec:
         name: host-sys
       - hostPath:
           path: /sys/module/firmware_class/parameters/path
-          type: FileOrCreate
         name: firmware-search-path
+      - hostPath:
+          path: /sys/devices/system/memory/auto_online_blocks
+        name: sysfs-memory-online
       - hostPath:
           path: /run/nvidia/driver/lib/firmware
           type: DirectoryOrCreate

diff --git a/manifests/state-driver/0500_daemonset.yaml b/manifests/state-driver/0500_daemonset.yaml
@@ -275,6 +275,8 @@ spec:
             mountPropagation: HostToContainer
           - name: firmware-search-path
             mountPath: /sys/module/firmware_class/parameters/path
+          - name: sysfs-memory-online
+            mountPath: /sys/devices/system/memory/auto_online_blocks
           - name: nv-firmware
             mountPath: /lib/firmware
           {{- if and .AdditionalConfigs .AdditionalConfigs.VolumeMounts }}
@@ -529,7 +531,9 @@ spec:
         - name: firmware-search-path
           hostPath:
             path: /sys/module/firmware_class/parameters/path
-            type: FileOrCreate
+        - name: sysfs-memory-online
+          hostPath:
+            path: /sys/devices/system/memory/auto_online_blocks
         - name: nv-firmware
           hostPath:
             path: /run/nvidia/driver/lib/firmware