Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/kmod-6.1-nvidia-r570/grid-license-check.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=GRID License Check
RefuseManualStart=true
RefuseManualStop=true
After=nvidia-gridd.service
Requires=nvidia-gridd.service

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver grid
ExecStart=-/usr/bin/truncate /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/nvidia-smi -q
ExecStart=/usr/bin/grep -q "License Status.*: Licensed" /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
StandardOutput=append:/tmp/.nvidia-gridd-license

[Install]
WantedBy=nvidia-k8s-device-plugin.service
12 changes: 12 additions & 0 deletions packages/kmod-6.1-nvidia-r570/grid-license-check.timer
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=GRID License Check Timer
RefuseManualStart=true

[Timer]
Unit=grid-license-check.service
OnBootSec=5s
OnUnitActiveSec=2s
AccuracySec=1s

[Install]
WantedBy=timers.target
2 changes: 2 additions & 0 deletions packages/kmod-6.1-nvidia-r570/grid-license-file-check.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
ExecStartPre=/usr/bin/test -f /etc/drivers/.grid-licensed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConditionPathExists will fail the unit, I want systemd to retry. If the unit happens to get scheduled before we have placed this file, it would just mark it as failed. The ExecStartPre matches the rest of the services dependencies. See https://github.com/bottlerocket-os/bottlerocket-core-kit/blob/develop/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin.service for the other pre conditions.

14 changes: 13 additions & 1 deletion packages/kmod-6.1-nvidia-r570/kmod-6.1-nvidia-r570.spec
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ Source206: nvidia-persistenced.service
Source207: fabricmanager.env
Source208: gridd.conf
Source209: nvidia-gridd.service
Source210: grid-license-check.service
Source211: grid-license-check.timer
Source212: open-gpu-license-fallback.service
Source213: tesla-license-fallback.service
Source214: grid-license-file-check.conf

# NVIDIA tesla conf files from 300 to 399
Source300: nvidia-tesla-tmpfiles.conf
Expand Down Expand Up @@ -394,7 +399,9 @@ install kernel-open/nvidia-drm.ko %{buildroot}%{_cross_datadir}/nvidia/grid/driv
# Install nvidia-gridd and related files
install -m 755 nvidia-gridd %{buildroot}%{_cross_bindir}/nvidia-gridd
install -m 644 %{S:208} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
install -p -m 0644 %{S:209} %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:209} %{S:210} %{S:211} %{S:212} %{S:213} %{buildroot}%{_cross_unitdir}
install -d %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
install -p -m 0644 %{S:214} %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
popd
# End GRID driver
%endif
Expand Down Expand Up @@ -722,6 +729,11 @@ popd
%{_cross_bindir}/nvidia-gridd
%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
%{_cross_unitdir}/nvidia-gridd.service
%{_cross_unitdir}/grid-license-check.service
%{_cross_unitdir}/grid-license-check.timer
%{_cross_unitdir}/open-gpu-license-fallback.service
%{_cross_unitdir}/tesla-license-fallback.service
%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d/grid-license-file-check.conf

%{_cross_datadir}/nvidia/grid/drivers/nvidia.ko
%{_cross_datadir}/nvidia/grid/drivers/nvidia-uvm.ko
Expand Down
14 changes: 14 additions & 0 deletions packages/kmod-6.1-nvidia-r570/open-gpu-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Open GPU GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
14 changes: 14 additions & 0 deletions packages/kmod-6.1-nvidia-r570/tesla-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Tesla GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver tesla
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
19 changes: 19 additions & 0 deletions packages/kmod-6.1-nvidia-r580/grid-license-check.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=GRID License Check
RefuseManualStart=true
RefuseManualStop=true
After=nvidia-gridd.service
Requires=nvidia-gridd.service

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver grid
ExecStart=-/usr/bin/truncate /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/nvidia-smi -q
ExecStart=/usr/bin/grep -q "License Status.*: Licensed" /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
StandardOutput=append:/tmp/.nvidia-gridd-license

[Install]
WantedBy=nvidia-k8s-device-plugin.service
12 changes: 12 additions & 0 deletions packages/kmod-6.1-nvidia-r580/grid-license-check.timer
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=GRID License Check Timer
RefuseManualStart=true

[Timer]
Unit=grid-license-check.service
OnBootSec=5s
OnUnitActiveSec=2s
AccuracySec=1s

[Install]
WantedBy=timers.target
2 changes: 2 additions & 0 deletions packages/kmod-6.1-nvidia-r580/grid-license-file-check.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
ExecStartPre=/usr/bin/test -f /etc/drivers/.grid-licensed
14 changes: 13 additions & 1 deletion packages/kmod-6.1-nvidia-r580/kmod-6.1-nvidia-r580.spec
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ Source206: nvidia-persistenced.service
Source207: fabricmanager.env
Source208: gridd.conf
Source209: nvidia-gridd.service
Source210: grid-license-check.service
Source211: grid-license-check.timer
Source212: open-gpu-license-fallback.service
Source213: tesla-license-fallback.service
Source214: grid-license-file-check.conf

# NVIDIA tesla conf files from 300 to 399
Source300: nvidia-tesla-tmpfiles.conf
Expand Down Expand Up @@ -394,7 +399,9 @@ install kernel-open/nvidia-drm.ko %{buildroot}%{_cross_datadir}/nvidia/grid/driv
# Install nvidia-gridd and related files
install -m 755 nvidia-gridd %{buildroot}%{_cross_bindir}/nvidia-gridd
install -m 644 %{S:208} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
install -p -m 0644 %{S:209} %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:209} %{S:210} %{S:211} %{S:212} %{S:213} %{buildroot}%{_cross_unitdir}
install -d %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
install -p -m 0644 %{S:214} %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
popd
# End GRID driver
%endif
Expand Down Expand Up @@ -730,6 +737,11 @@ popd
%{_cross_bindir}/nvidia-gridd
%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
%{_cross_unitdir}/nvidia-gridd.service
%{_cross_unitdir}/grid-license-check.service
%{_cross_unitdir}/grid-license-check.timer
%{_cross_unitdir}/open-gpu-license-fallback.service
%{_cross_unitdir}/tesla-license-fallback.service
%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d/grid-license-file-check.conf

%{_cross_datadir}/nvidia/grid/drivers/nvidia.ko
%{_cross_datadir}/nvidia/grid/drivers/nvidia-uvm.ko
Expand Down
14 changes: 14 additions & 0 deletions packages/kmod-6.1-nvidia-r580/open-gpu-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Open GPU GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
14 changes: 14 additions & 0 deletions packages/kmod-6.1-nvidia-r580/tesla-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Tesla GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver tesla
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
19 changes: 19 additions & 0 deletions packages/kmod-6.12-nvidia-r570/grid-license-check.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=GRID License Check
RefuseManualStart=true
RefuseManualStop=true
After=nvidia-gridd.service
Requires=nvidia-gridd.service

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver grid
ExecStart=-/usr/bin/truncate /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/nvidia-smi -q
ExecStart=/usr/bin/grep -q "License Status.*: Licensed" /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
StandardOutput=append:/tmp/.nvidia-gridd-license

[Install]
WantedBy=nvidia-k8s-device-plugin.service
12 changes: 12 additions & 0 deletions packages/kmod-6.12-nvidia-r570/grid-license-check.timer
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=GRID License Check Timer
RefuseManualStart=true

[Timer]
Unit=grid-license-check.service
OnBootSec=5s
OnUnitActiveSec=2s
AccuracySec=1s

[Install]
WantedBy=timers.target
2 changes: 2 additions & 0 deletions packages/kmod-6.12-nvidia-r570/grid-license-file-check.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
ExecStartPre=/usr/bin/test -f /etc/drivers/.grid-licensed
14 changes: 13 additions & 1 deletion packages/kmod-6.12-nvidia-r570/kmod-6.12-nvidia-r570.spec
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ Source206: nvidia-persistenced.service
Source207: fabricmanager.env
Source208: gridd.conf
Source209: nvidia-gridd.service
Source210: grid-license-check.service
Source211: grid-license-check.timer
Source212: open-gpu-license-fallback.service
Source213: tesla-license-fallback.service
Source214: grid-license-file-check.conf

# NVIDIA tesla conf files from 300 to 399
Source300: nvidia-tesla-tmpfiles.conf
Expand Down Expand Up @@ -410,7 +415,9 @@ install kernel-open/nvidia-drm.ko %{buildroot}%{_cross_datadir}/nvidia/grid/driv
# Install nvidia-gridd and related files
install -m 755 nvidia-gridd %{buildroot}%{_cross_bindir}/nvidia-gridd
install -m 644 %{S:208} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
install -p -m 0644 %{S:209} %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:209} %{S:210} %{S:211} %{S:212} %{S:213} %{buildroot}%{_cross_unitdir}
install -d %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
install -p -m 0644 %{S:214} %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
popd
# End GRID driver
%endif
Expand Down Expand Up @@ -748,6 +755,11 @@ popd
%{_cross_bindir}/nvidia-gridd
%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
%{_cross_unitdir}/nvidia-gridd.service
%{_cross_unitdir}/grid-license-check.service
%{_cross_unitdir}/grid-license-check.timer
%{_cross_unitdir}/open-gpu-license-fallback.service
%{_cross_unitdir}/tesla-license-fallback.service
%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d/grid-license-file-check.conf

%{_cross_datadir}/nvidia/grid/drivers/nvidia.ko
%{_cross_datadir}/nvidia/grid/drivers/nvidia-uvm.ko
Expand Down
14 changes: 14 additions & 0 deletions packages/kmod-6.12-nvidia-r570/open-gpu-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Open GPU GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
14 changes: 14 additions & 0 deletions packages/kmod-6.12-nvidia-r570/tesla-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Tesla GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver tesla
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
19 changes: 19 additions & 0 deletions packages/kmod-6.12-nvidia-r580/grid-license-check.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=GRID License Check
RefuseManualStart=true
RefuseManualStop=true
After=nvidia-gridd.service
Requires=nvidia-gridd.service

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver grid
ExecStart=-/usr/bin/truncate /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/nvidia-smi -q
ExecStart=/usr/bin/grep -q "License Status.*: Licensed" /tmp/.nvidia-gridd-license
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
StandardOutput=append:/tmp/.nvidia-gridd-license

[Install]
WantedBy=nvidia-k8s-device-plugin.service
12 changes: 12 additions & 0 deletions packages/kmod-6.12-nvidia-r580/grid-license-check.timer
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=GRID License Check Timer
RefuseManualStart=true

[Timer]
Unit=grid-license-check.service
OnBootSec=5s
OnUnitActiveSec=2s
AccuracySec=1s

[Install]
WantedBy=timers.target
2 changes: 2 additions & 0 deletions packages/kmod-6.12-nvidia-r580/grid-license-file-check.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
ExecStartPre=/usr/bin/test -f /etc/drivers/.grid-licensed
14 changes: 13 additions & 1 deletion packages/kmod-6.12-nvidia-r580/kmod-6.12-nvidia-r580.spec
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ Source206: nvidia-persistenced.service
Source207: fabricmanager.env
Source208: gridd.conf
Source209: nvidia-gridd.service
Source210: grid-license-check.service
Source211: grid-license-check.timer
Source212: open-gpu-license-fallback.service
Source213: tesla-license-fallback.service
Source214: grid-license-file-check.conf

# NVIDIA tesla conf files from 300 to 399
Source300: nvidia-tesla-tmpfiles.conf
Expand Down Expand Up @@ -410,7 +415,9 @@ install kernel-open/nvidia-drm.ko %{buildroot}%{_cross_datadir}/nvidia/grid/driv
# Install nvidia-gridd and related files
install -m 755 nvidia-gridd %{buildroot}%{_cross_bindir}/nvidia-gridd
install -m 644 %{S:208} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
install -p -m 0644 %{S:209} %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:209} %{S:210} %{S:211} %{S:212} %{S:213} %{buildroot}%{_cross_unitdir}
install -d %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
install -p -m 0644 %{S:214} %{buildroot}%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d
popd
# End GRID driver
%endif
Expand Down Expand Up @@ -754,6 +761,11 @@ popd
%{_cross_bindir}/nvidia-gridd
%{_cross_factorydir}%{_cross_sysconfdir}/nvidia/gridd.conf
%{_cross_unitdir}/nvidia-gridd.service
%{_cross_unitdir}/grid-license-check.service
%{_cross_unitdir}/grid-license-check.timer
%{_cross_unitdir}/open-gpu-license-fallback.service
%{_cross_unitdir}/tesla-license-fallback.service
%{_cross_unitdir}/nvidia-k8s-device-plugin.service.d/grid-license-file-check.conf

%{_cross_datadir}/nvidia/grid/drivers/nvidia.ko
%{_cross_datadir}/nvidia/grid/drivers/nvidia-uvm.ko
Expand Down
14 changes: 14 additions & 0 deletions packages/kmod-6.12-nvidia-r580/open-gpu-license-fallback.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Open GPU GRID License Check Fallback
RefuseManualStart=true
RefuseManualStop=true

[Service]
Type=oneshot
ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu
ExecStart=/usr/bin/touch /etc/drivers/.grid-licensed
ExecStart=/usr/bin/systemctl stop grid-license-check.timer --no-block
RemainAfterExit=true

[Install]
WantedBy=nvidia-k8s-device-plugin.service
Loading