Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-04-25 08:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update add_gpu_vm.sh

Browse Source
This commit is contained in:
MacRimi
2026-04-06 21:50:46 +02:00
parent 109a4d7f54
commit 2174c04e4f
3 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/gpu_tpu/add_gpu_lxc.sh
View File

@@ -313,7 +313,7 @@ check_nvidia_ready() {
if ! $NVIDIA_READY; then if ! $NVIDIA_READY; then
dialog --colors --backtitle "ProxMenux" \ dialog --colors --backtitle "ProxMenux" \
--title "$(translate 'NVIDIA Drivers Not Found')" \ --title "$(translate 'NVIDIA Drivers Not Found')" \
--msgbox "\n$(translate 'NVIDIA drivers are not installed or not loaded on this host.')\n\n$(translate 'Please install the NVIDIA drivers first using the option:')\n\n \Zb$(translate 'Install NVIDIA Drivers on Host')\Zn\n\n$(translate 'available in this same GPU and TPU menu.')" \ --msgbox "\n\Z1\Zb$(translate 'NVIDIA drivers are not installed or not loaded on this host.')\Zn\n\n$(translate 'Please install the NVIDIA drivers first using the option:')\n\n \Z1\Zb$(translate 'Install NVIDIA Drivers on Host')\Zn\n\n$(translate 'available in this same GPU and TPU menu.')" \
14 72 14 72
exit 0 exit 0
fi fi
@@ -870,8 +870,8 @@ check_vfio_switch_mode() {
for i in "${!vfio_types[@]}"; do for i in "${!vfio_types[@]}"; do
msg+=" • ${vfio_names[$i]} (${vfio_pcis[$i]})\n" msg+=" • ${vfio_names[$i]} (${vfio_pcis[$i]})\n"
done done
msg+="\n$(translate 'To continue with Add GPU to LXC, first switch the host to GPU -> LXC mode and reboot.')\n" msg+="\n\Z1\Zb$(translate 'To continue with Add GPU to LXC, first switch the host to GPU -> LXC mode and reboot.')\Zn\n"
msg+="$(translate 'Do you want to open Switch GPU Mode now?')" msg+="\Z1\Zb$(translate 'Do you want to open Switch GPU Mode now?')\Zn"
dialog --backtitle "ProxMenux" --colors \ dialog --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU -> VM Mode Detected')" \ --title "$(translate 'GPU -> VM Mode Detected')" \
@@ -896,7 +896,7 @@ check_vfio_switch_mode() {
dialog --backtitle "ProxMenux" --colors \ dialog --backtitle "ProxMenux" --colors \
--title "$(translate 'Next Step Required')" \ --title "$(translate 'Next Step Required')" \
--msgbox "\n$(translate 'After switching mode, reboot the host if requested.')\n\n$(translate 'Then run this option again:')\n\n Add GPU to LXC\n\n$(translate 'This guarantees that device nodes are available before applying LXC GPU config.')" \ --msgbox "\n\Z1\Zb$(translate 'After switching mode, reboot the host if requested.')\Zn\n\n$(translate 'Then run this option again:')\n\n \Z1\ZbAdd GPU to LXC\Zn\n\n$(translate 'This guarantees that device nodes are available before applying LXC GPU config.')" \
12 84 12 84
exit 0 exit 0
} }

81
scripts/gpu_tpu/add_gpu_vm.sh
View File

@@ -83,6 +83,7 @@ SWITCH_FROM_LXC=false
SWITCH_LXC_LIST="" SWITCH_LXC_LIST=""
SWITCH_FROM_VM=false SWITCH_FROM_VM=false
SWITCH_VM_SRC="" SWITCH_VM_SRC=""
SWITCH_VM_ACTION="" # keep_gpu_disable_onboot | remove_gpu_keep_onboot
TARGET_VM_ALREADY_HAS_GPU=false TARGET_VM_ALREADY_HAS_GPU=false
VM_SWITCH_ALREADY_VFIO=false VM_SWITCH_ALREADY_VFIO=false
PREFLIGHT_HOST_REBOOT_REQUIRED=true PREFLIGHT_HOST_REBOOT_REQUIRED=true
@@ -181,6 +182,14 @@ _lxc_switch_action_label() {
esac esac
} }
_vm_switch_action_label() {
case "$SWITCH_VM_ACTION" in
keep_gpu_disable_onboot) echo "$(translate 'Keep GPU in source VM config + disable Start on boot if enabled')" ;;
remove_gpu_keep_onboot) echo "$(translate 'Remove GPU from source VM config + keep Start on boot unchanged')" ;;
*) echo "$(translate 'No specific VM action selected')" ;;
esac
}
_set_wizard_result() { _set_wizard_result() {
local result="$1" local result="$1"
[[ -z "${GPU_WIZARD_RESULT_FILE:-}" ]] && return 0 [[ -z "${GPU_WIZARD_RESULT_FILE:-}" ]] && return 0
@@ -666,7 +675,7 @@ warn_single_gpu() {
msg+=" • Proxmox Web UI (https)\n" msg+=" • Proxmox Web UI (https)\n"
msg+=" • Serial console\n\n" msg+=" • Serial console\n\n"
msg+="$(translate 'The VM guest will have exclusive access to the GPU.')\n\n" msg+="$(translate 'The VM guest will have exclusive access to the GPU.')\n\n"
msg+="\Z3$(translate 'Important: some GPUs may still fail in passthrough and can affect host stability or overall performance depending on hardware/firmware quality.')\Zn\n\n" msg+="\Z1$(translate 'Important: some GPUs may still fail in passthrough and can affect host stability or overall performance depending on hardware/firmware quality.')\Zn\n\n"
msg+="$(translate 'Make sure you have SSH or Web UI access before rebooting.')\n\n" msg+="$(translate 'Make sure you have SSH or Web UI access before rebooting.')\n\n"
msg+="$(translate 'Do you want to continue?')" msg+="$(translate 'Do you want to continue?')"
@@ -901,7 +910,7 @@ check_gpu_vm_compatibility() {
msg+=" • $(translate 'SoC-integrated GPU: tight coupling with other SoC components')\n" msg+=" • $(translate 'SoC-integrated GPU: tight coupling with other SoC components')\n"
msg+=" • $(translate 'Power state D3cold/D0 transitions may be inaccessible')\n" msg+=" • $(translate 'Power state D3cold/D0 transitions may be inaccessible')\n"
[[ "$power_state" == "D3cold" ]] && \ [[ "$power_state" == "D3cold" ]] && \
msg+=" • \Z3$(translate 'Current power state: D3cold (device currently inaccessible)')\Zn\n" msg+=" • \Z1$(translate 'Current power state: D3cold (device currently inaccessible)')\Zn\n"
msg+="\n$(translate 'Attempting passthrough with this GPU typically results in'):\n" msg+="\n$(translate 'Attempting passthrough with this GPU typically results in'):\n"
msg+=" — write error: Inappropriate ioctl for device\n" msg+=" — write error: Inappropriate ioctl for device\n"
msg+=" — Unable to change power state from D3cold to D0\n" msg+=" — Unable to change power state from D3cold to D0\n"
@@ -1028,7 +1037,7 @@ analyze_iommu_group() {
msg+="${display_lines}" msg+="${display_lines}"
if [[ $extra_devices -gt 0 ]]; then if [[ $extra_devices -gt 0 ]]; then
msg+="\n\Z3$(translate 'All devices in the same IOMMU group must be passed together.')\Zn" msg+="\n\Z1$(translate 'All devices in the same IOMMU group must be passed together.')\Zn"
fi fi
dialog --backtitle "ProxMenux" --colors \ dialog --backtitle "ProxMenux" --colors \
@@ -1210,10 +1219,10 @@ check_switch_mode() {
msg+="\n$(translate 'VM passthrough requires exclusive VFIO binding of the GPU.')\n" msg+="\n$(translate 'VM passthrough requires exclusive VFIO binding of the GPU.')\n"
msg+="$(translate 'Choose how to handle affected LXC containers before switching to VM mode.')\n\n" msg+="$(translate 'Choose how to handle affected LXC containers before switching to VM mode.')\n\n"
[[ "$running_count" -gt 0 ]] && \ [[ "$running_count" -gt 0 ]] && \
msg+="\Z3$(translate 'Running containers detected'): ${running_count}\Zn\n" msg+="\Z1$(translate 'Running containers detected'): ${running_count}\Zn\n"
[[ "$onboot_count" -gt 0 ]] && \ [[ "$onboot_count" -gt 0 ]] && \
msg+="\Z1\Zb$(translate 'Start on boot enabled (onboot=1)'): ${onboot_count}\Zn\n" msg+="\Z1\Zb$(translate 'Start on boot enabled (onboot=1)'): ${onboot_count}\Zn\n"
msg+="\n\Z3$(translate 'After this LXC → VM switch, reboot the host so the new binding state is applied cleanly.')\Zn" msg+="\n\Z1$(translate 'After this LXC → VM switch, reboot the host so the new binding state is applied cleanly.')\Zn"
action_choice=$(dialog --backtitle "ProxMenux" --colors \ action_choice=$(dialog --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU Used in LXC Containers')" \ --title "$(translate 'GPU Used in LXC Containers')" \
@@ -1267,6 +1276,7 @@ check_switch_mode() {
SWITCH_FROM_VM=true SWITCH_FROM_VM=true
SWITCH_VM_SRC="$vm_src_id" SWITCH_VM_SRC="$vm_src_id"
SWITCH_VM_ACTION="remove_gpu_keep_onboot"
local selected_driver local selected_driver
selected_driver=$(_get_pci_driver "$SELECTED_GPU_PCI") selected_driver=$(_get_pci_driver "$SELECTED_GPU_PCI")
if [[ "$selected_driver" == "vfio-pci" && "$SWITCH_FROM_LXC" != "true" ]]; then if [[ "$selected_driver" == "vfio-pci" && "$SWITCH_FROM_LXC" != "true" ]]; then
@@ -1283,22 +1293,32 @@ check_switch_mode() {
msg="\n$(translate 'The selected GPU is already configured for passthrough to:')\n\n" msg="\n$(translate 'The selected GPU is already configured for passthrough to:')\n\n"
msg+=" VM ${vm_src_id} (${vm_src_name:-VM-${vm_src_id}})\n\n" msg+=" VM ${vm_src_id} (${vm_src_name:-VM-${vm_src_id}})\n\n"
msg+="$(translate 'That VM is currently stopped, so the GPU can be reassigned now.')\n" msg+="$(translate 'That VM is currently stopped, so the GPU can be reassigned now.')\n"
msg+="\Z3$(translate 'Important: both VMs cannot be running at the same time with the same GPU.')\Zn\n\n" msg+="\Z1\Zb$(translate 'Important: both VMs cannot be running at the same time with the same GPU.')\Zn\n\n"
msg+="$(translate 'The existing hostpci entry will be removed from that VM and configured on'): " msg+="$(translate 'Target VM'): VM ${SELECTED_VMID} (${VM_NAME:-VM-${SELECTED_VMID}})\n"
msg+="VM ${SELECTED_VMID} (${VM_NAME:-VM-${SELECTED_VMID}})\n\n" msg+="$(translate 'Source VM'): VM ${vm_src_id} (${vm_src_name:-VM-${vm_src_id}})\n\n"
if [[ "$src_onboot" == "1" && "$target_onboot" == "1" ]]; then if [[ "$src_onboot" == "1" && "$target_onboot" == "1" ]]; then
msg+="\Z3$(translate 'Warning: both VMs have autostart enabled (onboot=1).')\Zn\n" msg+="\Z1\Zb$(translate 'Warning: both VMs have autostart enabled (onboot=1).')\Zn\n"
msg+="\Z3$(translate 'Disable autostart on one VM to avoid startup conflicts.')\Zn\n\n" msg+="\Z1\Zb$(translate 'Disable autostart on one VM to avoid startup conflicts.')\Zn\n\n"
fi fi
if [[ "$VM_SWITCH_ALREADY_VFIO" == "true" ]]; then if [[ "$VM_SWITCH_ALREADY_VFIO" == "true" ]]; then
msg+="$(translate 'Host GPU is already bound to vfio-pci. Host reconfiguration/reboot should not be required for this VM-to-VM reassignment.')\n\n" msg+="$(translate 'Host GPU is already bound to vfio-pci. Host reconfiguration/reboot should not be required for this VM-to-VM reassignment.')\n\n"
fi fi
msg+="$(translate 'Do you want to continue?')" msg+="$(translate 'Choose conflict policy for the source VM:')"
dialog --backtitle "ProxMenux" --colors \ local vm_action_choice
vm_action_choice=$(dialog --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU Already Assigned to Another VM')" \ --title "$(translate 'GPU Already Assigned to Another VM')" \
--yesno "$msg" 24 88 --default-item "1" \
[[ $? -ne 0 ]] && exit 0 --menu "$msg" 24 98 8 \
"1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \
"2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \
2>&1 >/dev/tty) || exit 0
case "$vm_action_choice" in
1) SWITCH_VM_ACTION="keep_gpu_disable_onboot" ;;
2) SWITCH_VM_ACTION="remove_gpu_keep_onboot" ;;
*) exit 0 ;;
esac
fi fi
} }
@@ -1349,14 +1369,22 @@ confirm_summary() {
[[ "$SELECTED_GPU" == "nvidia" ]] && \ [[ "$SELECTED_GPU" == "nvidia" ]] && \
msg+=" • $(translate 'NVIDIA KVM hiding (cpu hidden=1)')\n" msg+=" • $(translate 'NVIDIA KVM hiding (cpu hidden=1)')\n"
if [[ "$SWITCH_FROM_LXC" == "true" ]]; then if [[ "$SWITCH_FROM_LXC" == "true" ]]; then
msg+="\n \Z3• $(translate 'Affected LXC containers'): ${SWITCH_LXC_LIST}\Zn\n" msg+="\n \Z1• $(translate 'Affected LXC containers'): ${SWITCH_LXC_LIST}\Zn\n"
msg+=" \Z3• $(translate 'Selected LXC action'): $(_lxc_switch_action_label)\Zn\n" msg+=" \Z1• $(translate 'Selected LXC action'): $(_lxc_switch_action_label)\Zn\n"
if [[ "$LXC_SWITCH_ACTION" == "remove_gpu_keep_onboot" ]]; then if [[ "$LXC_SWITCH_ACTION" == "remove_gpu_keep_onboot" ]]; then
msg+=" \Z3• $(translate 'To use the GPU again in LXC, run Add GPU to LXC from GPUs and Coral-TPU Menu')\Zn\n" msg+=" \Z1• $(translate 'To use the GPU again in LXC, run Add GPU to LXC from GPUs and Coral-TPU Menu')\Zn\n"
fi fi
fi fi
[[ "$SWITCH_FROM_VM" == "true" ]] && \ if [[ "$SWITCH_FROM_VM" == "true" ]]; then
msg+="\n \Z3• $(translate 'GPU will be removed from VM') ${SWITCH_VM_SRC}\Zn\n" if [[ "$SWITCH_VM_ACTION" == "keep_gpu_disable_onboot" ]]; then
msg+="\n \Z1• $(translate 'GPU will remain configured in source VM'): ${SWITCH_VM_SRC}\Zn\n"
msg+=" \Z1• $(translate 'Start on boot will be disabled on source VM only if currently enabled')\Zn\n"
msg+=" \Z1• $(translate 'GPU guard hook will block concurrent start when another VM is already using this GPU')\Zn\n"
else
msg+="\n \Z1• $(translate 'GPU will be removed from source VM config'): ${SWITCH_VM_SRC}\Zn\n"
fi
msg+=" \Z1• $(translate 'Selected VM action'): $(_vm_switch_action_label)\Zn\n"
fi
msg+="\n$(translate 'Do you want to proceed?')" msg+="\n$(translate 'Do you want to proceed?')"
local run_title local run_title
@@ -1689,6 +1717,21 @@ cleanup_vm_config() {
local pci_slot="${SELECTED_GPU_PCI#0000:}" local pci_slot="${SELECTED_GPU_PCI#0000:}"
pci_slot="${pci_slot%.*}" # 01:00 pci_slot="${pci_slot%.*}" # 01:00
if [[ "$VM_SWITCH_ACTION" == "keep_gpu_disable_onboot" ]]; then
msg_info "$(translate 'Keeping GPU in source VM config') ${SWITCH_VM_SRC}..."
if _vm_onboot_enabled "$SWITCH_VM_SRC"; then
if qm set "$SWITCH_VM_SRC" -onboot 0 >>"$LOG_FILE" 2>&1; then
msg_warn "$(translate 'Start on boot disabled for VM') ${SWITCH_VM_SRC}" | tee -a "$screen_capture"
else
msg_error "$(translate 'Failed to disable Start on boot for VM') ${SWITCH_VM_SRC}" | tee -a "$screen_capture"
fi
else
msg_ok "$(translate 'Start on boot already disabled for VM') ${SWITCH_VM_SRC}" | tee -a "$screen_capture"
fi
msg_ok "$(translate 'GPU kept in source VM config') ${SWITCH_VM_SRC}" | tee -a "$screen_capture"
return 0
fi
local src_conf="/etc/pve/qemu-server/${SWITCH_VM_SRC}.conf" local src_conf="/etc/pve/qemu-server/${SWITCH_VM_SRC}.conf"
if [[ -f "$src_conf" ]]; then if [[ -f "$src_conf" ]]; then
msg_info "$(translate 'Removing GPU from VM') ${SWITCH_VM_SRC}..." msg_info "$(translate 'Removing GPU from VM') ${SWITCH_VM_SRC}..."

4
scripts/gpu_tpu/switch_gpu_mode.sh
View File

@@ -675,7 +675,7 @@ prompt_lxc_action_for_vm_mode() {
msg+=" • CT ${LXC_AFFECTED_CTIDS[$i]} (${LXC_AFFECTED_NAMES[$i]}) [${st}, ${ob}]\n" msg+=" • CT ${LXC_AFFECTED_CTIDS[$i]} (${LXC_AFFECTED_NAMES[$i]}) [${st}, ${ob}]\n"
done done
msg+="\n$(translate 'Switching to GPU -> VM mode requires exclusive VFIO binding.')\n" msg+="\n$(translate 'Switching to GPU -> VM mode requires exclusive VFIO binding.')\n"
[[ "$running_count" -gt 0 ]] && msg+="\Z3$(translate 'Running containers detected'): ${running_count}\Zn\n" [[ "$running_count" -gt 0 ]] && msg+="\Z1$(translate 'Running containers detected'): ${running_count}\Zn\n"
[[ "$onboot_count" -gt 0 ]] && msg+="\Z1\Zb$(translate 'Start on boot enabled'): ${onboot_count}\Zn\n" [[ "$onboot_count" -gt 0 ]] && msg+="\Z1\Zb$(translate 'Start on boot enabled'): ${onboot_count}\Zn\n"
msg+="\n$(translate 'Choose conflict policy:')" msg+="\n$(translate 'Choose conflict policy:')"
@@ -800,7 +800,7 @@ prompt_vm_action_for_lxc_mode() {
msg+=" • VM ${VM_AFFECTED_IDS[$i]} (${VM_AFFECTED_NAMES[$i]}) [${st}, ${ob}]\n" msg+=" • VM ${VM_AFFECTED_IDS[$i]} (${VM_AFFECTED_NAMES[$i]}) [${st}, ${ob}]\n"
done done
msg+="\n$(translate 'Switching to GPU -> LXC mode removes VFIO exclusivity.')\n" msg+="\n$(translate 'Switching to GPU -> LXC mode removes VFIO exclusivity.')\n"
[[ "$running_count" -gt 0 ]] && msg+="\Z3$(translate 'Running VM detected'): ${running_count}\Zn\n" [[ "$running_count" -gt 0 ]] && msg+="\Z1$(translate 'Running VM detected'): ${running_count}\Zn\n"
[[ "$onboot_count" -gt 0 ]] && msg+="\Z1\Zb$(translate 'Start on boot enabled'): ${onboot_count}\Zn\n" [[ "$onboot_count" -gt 0 ]] && msg+="\Z1\Zb$(translate 'Start on boot enabled'): ${onboot_count}\Zn\n"
msg+="\n$(translate 'Choose conflict policy:')" msg+="\n$(translate 'Choose conflict policy:')"