mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

x11-drivers/nvidia-drivers: make service re-entrant

Browse Source 
Currently the setup-nvidia script fails when re-executed. It should work in
cases when the driver is already built and just needs to be loaded, or when it
needs to be rebuilt for a new kernel (but driver version may not have changed).

To make this work, several changes where necessary:

* `./nvidia*.run -x -s` fails when already unpacked. Allow it so that we can
  rebuild
* there are several module dependencies for nvidia modules that are implicit,
  related to i2c/ipmi. Probe those explicitly.
* `[ -f /dev/nvidia* ]` fails because those are character devices, so need a
  `[ -c ...]` check.
* `nvidia-modprobe` previously always failed, because it doesn't actually know
  the location of the modules and can only call modprobe (modprobe looks into
  /lib/modules/). We now explicitly probe the important modules, at that point
  nvidia-modprobe just creates additional device nodes.
* `is_nvidia_installation_required` checks whether building and loading is needed.
  Factor out the loading check so that we can reload the module after an update.
This commit is contained in:
Jeremi Piotrowski 2022-04-25 12:35:29 +02:00
parent 67bf5476c3
commit d01ecae74c
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia vendored
View File

@ -63,7 +63,7 @@ function extract_nvidia_installer() {
pushd "${FLATCAR_ROOT_WORKDIR}/${NVIDIA_WORKDIR}" pushd "${FLATCAR_ROOT_WORKDIR}/${NVIDIA_WORKDIR}"
chmod +x "${NVIDIA_DRIVER_BASENAME}.run" chmod +x "${NVIDIA_DRIVER_BASENAME}.run"
"./${NVIDIA_DRIVER_BASENAME}.run" -x -s "./${NVIDIA_DRIVER_BASENAME}.run" -x -s || true
popd popd
} }
@ -89,14 +89,17 @@ function copy_nvidia_build_artifacts() {
} }
function install_and_load() { function install_and_load() {
modprobe -a i2c_core ipmi_msghandler ipmi_devintf
insmod "/opt/nvidia/${NVIDIA_CURRENT_INSTALLATION}/lib64/modules/$(uname -r)/video/nvidia.ko" insmod "/opt/nvidia/${NVIDIA_CURRENT_INSTALLATION}/lib64/modules/$(uname -r)/video/nvidia.ko"
insmod "/opt/nvidia/${NVIDIA_CURRENT_INSTALLATION}/lib64/modules/$(uname -r)/video/nvidia-modeset.ko"
insmod "/opt/nvidia/${NVIDIA_CURRENT_INSTALLATION}/lib64/modules/$(uname -r)/video/nvidia-uvm.ko"
if [ ! -f /dev/nvidiactl ] if [ ! -c /dev/nvidiactl ]
then then
mknod -m 666 /dev/nvidiactl c 195 255 mknod -m 666 /dev/nvidiactl c 195 255
fi fi
if [ ! -f /dev/nvidia0 ] if [ ! -c /dev/nvidia0 ]
then then
mknod -m 666 /dev/nvidia0 c 195 0 mknod -m 666 /dev/nvidia0 c 195 0
fi fi
@ -108,11 +111,18 @@ function install_and_load() {
function verify_installation() { function verify_installation() {
nvidia-smi nvidia-smi
nvidia-modprobe -u -m -c 0 nvidia-modprobe -u -m -c 0 || echo "nvidia-modprobe failed!"
}
function is_nvidia_probe_required() {
if [[ -z "$(lspci | grep -i "${NVIDIA_PRODUCT_TYPE}")" ]]; then
return 1
fi
return 0
} }
function is_nvidia_installation_required() { function is_nvidia_installation_required() {
if [[ -z "$(lspci | grep -i "${NVIDIA_PRODUCT_TYPE}")" ]]; then if ! is_nvidia_probe_required; then
return 1 return 1
fi fi
@ -142,3 +152,8 @@ then
setup "$@" setup "$@"
exit 0 exit 0
fi fi
if is_nvidia_probe_required
then
install_and_load
verify_installation
fi