Skip to content

uvm: avoid over-reserving tracker entries #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LwhJesse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

uvm: avoid over-reserving tracker entries #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion kernel-open/nvidia-uvm/uvm_tracker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,11 @@ NV_STATUS uvm_tracker_add_tracker(uvm_tracker_t *dst, uvm_tracker_t *src)
if (uvm_tracker_is_empty(src))
return NV_OK;

status = uvm_tracker_reserve(dst, src->size);
if (dst->size + src->size > dst->max_size)
status = reserve_for_entries_from_tracker(dst, src);
else
status = NV_OK;

if (status == NV_ERR_NO_MEMORY) {
uvm_tracker_remove_completed(dst);
uvm_tracker_remove_completed(src);
Expand Down
7 changes: 7 additions & 0 deletions kernel-open/nvidia-uvm/uvm_tracker_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,13 @@ static NV_STATUS test_tracker_add_tracker(uvm_va_space_t *va_space)
TEST_CHECK_RET(uvm_tracker_get_entries(&dup_tracker)[0].channel == entry.channel);
TEST_CHECK_RET(uvm_tracker_get_entries(&dup_tracker)[0].value == entry.value);

status = uvm_tracker_add_tracker(&dup_tracker, &tracker);
TEST_CHECK_GOTO(status == NV_OK, done);
TEST_CHECK_RET(dup_tracker.size == 1);
TEST_CHECK_RET(dup_tracker.max_size == ARRAY_SIZE(dup_tracker.static_entries));
TEST_CHECK_RET(uvm_tracker_get_entries(&dup_tracker)[0].channel == entry.channel);
TEST_CHECK_RET(uvm_tracker_get_entries(&dup_tracker)[0].value == entry.value);

for_each_va_space_gpu(gpu, va_space) {
uvm_channel_pool_t *pool;

Expand Down