kmod-6.18-nvidia-r580: add gdrcopy subpackage #462
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| From: Bottlerocket Kernel Kit <noreply@amazon.com> | ||
| Date: Mon, 02 Jun 2026 22:00:00 +0000 | ||
| Subject: [PATCH] gdrdrv: register as a misc device | ||
|
|
||
| Upstream gdrdrv uses register_chrdev() and relies on a user-space helper | ||
| to create /dev/gdrdrv via mknod after modprobe. On Bottlerocket the host | ||
| shell is minimal (no awk/grep/etc.) and the kit convention is to ship no | ||
| helper scripts. Switch the driver to misc_register() with a fixed mode of | ||
| 0666 so devtmpfs creates /dev/gdrdrv automatically when the module loads, | ||
| matching the IMEX "just provide it" pattern used elsewhere in the kit. | ||
|
|
||
| Signed-off-by: Bottlerocket Kernel Kit <noreply@amazon.com> | ||
| --- | ||
| src/gdrdrv/gdrdrv.c | 18 ++++++++++++------ | ||
| 1 file changed, 12 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/src/gdrdrv/gdrdrv.c b/src/gdrdrv/gdrdrv.c | ||
| --- a/src/gdrdrv/gdrdrv.c | ||
| +++ b/src/gdrdrv/gdrdrv.c | ||
| @@ -30,6 +30,7 @@ | ||
| #include <linux/string.h> | ||
| #include <linux/uaccess.h> | ||
| #include <linux/fs.h> | ||
| +#include <linux/miscdevice.h> | ||
| #include <linux/list.h> | ||
| #include <linux/mm.h> | ||
| #include <linux/io.h> | ||
| @@ -95,7 +96,6 @@ | ||
|
|
||
| //----------------------------------------------------------------------------- | ||
|
|
||
| -static int gdrdrv_major = 0; | ||
| static int gdrdrv_cpu_could_cache_gpu_mappings = 0; | ||
| static int gdrdrv_cpu_must_use_device_mapping = 0; | ||
|
|
||
| @@ -1880,21 +1880,27 @@ struct file_operations gdrdrv_fops = { | ||
| .mmap = gdrdrv_mmap | ||
| }; | ||
|
|
||
| +static struct miscdevice gdrdrv_misc_dev = { | ||
| + .minor = MISC_DYNAMIC_MINOR, | ||
| + .name = DEVNAME, | ||
| + .fops = &gdrdrv_fops, | ||
| + .mode = 0666, | ||
| +}; | ||
| + | ||
| //----------------------------------------------------------------------------- | ||
|
|
||
| static int __init gdrdrv_init(void) | ||
| { | ||
| int result; | ||
|
|
||
| - result = register_chrdev(gdrdrv_major, DEVNAME, &gdrdrv_fops); | ||
| + result = misc_register(&gdrdrv_misc_dev); | ||
| if (result < 0) { | ||
| - gdr_err("can't get major %d\n", gdrdrv_major); | ||
| + gdr_err("misc_register failed: %d\n", result); | ||
| return result; | ||
| } | ||
| - if (gdrdrv_major == 0) gdrdrv_major = result; /* dynamic */ | ||
|
|
||
| gdr_msg(KERN_INFO, "loading gdrdrv version %s built for %s NVIDIA driver\n", GDRDRV_VERSION_STRING, GDRDRV_BUILT_FOR_NVIDIA_FLAVOR_STRING); | ||
| - gdr_msg(KERN_INFO, "device registered with major number %d\n", gdrdrv_major); | ||
| + gdr_msg(KERN_INFO, "registered as misc device, minor %d\n", gdrdrv_misc_dev.minor); | ||
| gdr_msg(KERN_INFO, "dbg traces %s, info traces %s", dbg_enabled ? "enabled" : "disabled", info_enabled ? "enabled" : "disabled"); | ||
|
|
||
| #if defined(CONFIG_PPC64) && defined(PVR_POWER9) | ||
| @@ -1947,12 +1953,12 @@ void gdrdrv_procfs_cleanup(void) | ||
| static void __exit gdrdrv_cleanup(void) | ||
| { | ||
| int64_t last_nv_get_pages_refcount; | ||
| - gdr_msg(KERN_INFO, "unregistering major number %d\n", gdrdrv_major); | ||
| + gdr_msg(KERN_INFO, "unregistering misc device\n"); | ||
|
|
||
| gdrdrv_procfs_cleanup(); | ||
|
|
||
| /* cleanup_module is never called if registering failed */ | ||
| - unregister_chrdev(gdrdrv_major, DEVNAME); | ||
| + misc_deregister(&gdrdrv_misc_dev); | ||
|
|
||
| last_nv_get_pages_refcount = atomic64_read(&gdrdrv_nv_get_pages_refcount); | ||
| if (dbg_enabled) | ||
| -- | ||
| 2.49.0 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Unit] | ||
| Description=Copy GDRCopy kernel module (open-gpu) | ||
| RequiresMountsFor=PREFIX/lib/modules PREFIX/src/kernels | ||
| # Rerunning this service after the system is fully loaded will override | ||
| # the already linked kernel modules. This doesn't affect the running system, | ||
| # since kernel modules are linked early in the boot sequence, but we still | ||
| # disable manual restarts to prevent unnecessary kernel modules rewrites. | ||
| RefuseManualStart=true | ||
| RefuseManualStop=true | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu | ||
| ExecStart=/usr/bin/driverdog --modules-set nvidia-gdrcopy-open-gpu link-modules | ||
| RemainAfterExit=true | ||
| StandardError=journal+console | ||
|
|
||
| [Install] | ||
| RequiredBy=drivers.target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Unit] | ||
| Description=Copy GDRCopy kernel module (tesla) | ||
| RequiresMountsFor=PREFIX/lib/modules PREFIX/src/kernels | ||
| # Rerunning this service after the system is fully loaded will override | ||
| # the already linked kernel modules. This doesn't affect the running system, | ||
| # since kernel modules are linked early in the boot sequence, but we still | ||
| # disable manual restarts to prevent unnecessary kernel modules rewrites. | ||
| RefuseManualStart=true | ||
| RefuseManualStop=true | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecCondition=/usr/bin/ghostdog match-nvidia-driver tesla | ||
| ExecStart=/usr/bin/driverdog --modules-set nvidia-gdrcopy-tesla link-modules | ||
| RemainAfterExit=true | ||
| StandardError=journal+console | ||
|
|
||
| [Install] | ||
| RequiredBy=drivers.target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Unit] | ||
| Description=Load GDRCopy kernel module (open-gpu) | ||
| RequiresMountsFor=PREFIX/lib/modules PREFIX/src/kernels | ||
| After=copy-gdrcopy-open-gpu-kernel-module.service load-open-gpu-kernel-modules.service | ||
| Requires=copy-gdrcopy-open-gpu-kernel-module.service load-open-gpu-kernel-modules.service | ||
| # Disable manual restarts to prevent loading kernel modules | ||
| # that weren't linked by the running system | ||
| RefuseManualStart=true | ||
| RefuseManualStop=true | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecCondition=/usr/bin/ghostdog match-nvidia-driver open-gpu | ||
| ExecStart=/usr/bin/driverdog --modules-set nvidia-gdrcopy-open-gpu load-modules | ||
| RemainAfterExit=true | ||
| StandardError=journal+console | ||
|
|
||
| [Install] | ||
| RequiredBy=drivers.target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Unit] | ||
| Description=Load GDRCopy kernel module (tesla) | ||
| RequiresMountsFor=PREFIX/lib/modules PREFIX/src/kernels | ||
| After=copy-gdrcopy-tesla-kernel-module.service load-tesla-kernel-modules.service | ||
| Requires=copy-gdrcopy-tesla-kernel-module.service load-tesla-kernel-modules.service | ||
| # Disable manual restarts to prevent loading kernel modules | ||
| # that weren't linked by the running system | ||
| RefuseManualStart=true | ||
| RefuseManualStop=true | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecCondition=/usr/bin/ghostdog match-nvidia-driver tesla | ||
| ExecStart=/usr/bin/driverdog --modules-set nvidia-gdrcopy-tesla load-modules | ||
| RemainAfterExit=true | ||
| StandardError=journal+console | ||
|
|
||
| [Install] | ||
| RequiredBy=drivers.target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [nvidia-gdrcopy-open-gpu] | ||
| lib-modules-path = "kernel/drivers/extra/video/nvidia/gdrcopy/open-gpu" | ||
|
|
||
| [nvidia-gdrcopy-open-gpu.kernel-modules."gdrdrv.ko"] | ||
| copy-source = "__NVIDIA_MODULES__" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [nvidia-gdrcopy-tesla] | ||
| lib-modules-path = "kernel/drivers/extra/video/nvidia/gdrcopy/tesla" | ||
|
|
||
| [nvidia-gdrcopy-tesla.kernel-modules."gdrdrv.ko"] | ||
| copy-source = "__NVIDIA_MODULES__" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| C /etc/drivers/nvidia-gdrcopy-open-gpu.toml | ||
| C /etc/drivers/nvidia-gdrcopy-tesla.toml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand where are you coming from with this patch, but I'll prefer if we take a different approach just so that we don't carry-on a patch.
I think we can extend ghostdog to create the device and call it after we load the kernel module, as a subsequent
ExecStartcall. It will basically do what the insmod script does in the GDRCopy repo.