Skip to content

nv-vm: skip unallocated pages during sysmem OOM cleanup #1278

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
plopresti wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −3
Open

nv-vm: skip unallocated pages during sysmem OOM cleanup #1278

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
22 changes: 19 additions & 3 deletions kernel-open/nvidia/nv-vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ static inline void nv_set_memory_type(nv_alloc_t *at, NvU32 type)

if (at->flags.contig)
{
nv_set_contig_memory_type(&at->page_table[0], at->num_pages, type);
// Skip if the (single) allocation never happened (e.g. OOM cleanup).
if (at->page_table[0].virt_addr != 0)
nv_set_contig_memory_type(&at->page_table[0], at->num_pages, type);
return;
}

Expand Down Expand Up @@ -197,18 +199,27 @@ static inline void nv_set_memory_type(nv_alloc_t *at, NvU32 type)
for (i = 0; i < at->num_pages; i++)
{
page_ptr = &at->page_table[i];
// Stop at the first unallocated slot. On a partial-allocation
// failure the tail of page_table is zeroed; touching those slots
// would call set_memory_wb() on PFN 0 ("freeing invalid memtype
// [mem 0x0-0xfff]") once per slot -- a huge loop under the RM lock.
if (page_ptr->virt_addr == 0)
break;
page = NV_GET_PAGE_STRUCT(page_ptr->phys_addr);
#if defined(NV_SET_MEMORY_ARRAY_UC_PRESENT)
pages[i] = (unsigned long)page_address(page);
#elif defined(NV_SET_PAGES_ARRAY_UC_PRESENT)
pages[i] = page;
#endif
}
if (i > 0)
{
#if defined(NV_SET_MEMORY_ARRAY_UC_PRESENT)
nv_set_memory_array_type(pages, at->num_pages, type);
nv_set_memory_array_type(pages, i, type);
#elif defined(NV_SET_PAGES_ARRAY_UC_PRESENT)
nv_set_pages_array_type(pages, at->num_pages, type);
nv_set_pages_array_type(pages, i, type);
#endif
}
os_free_mem(pages);
}

Expand All @@ -220,7 +231,12 @@ static inline void nv_set_memory_type(nv_alloc_t *at, NvU32 type)
else
{
for (i = 0; i < at->num_pages; i++)
{
// Stop at the first unallocated slot (see comment above).
if (at->page_table[i].virt_addr == 0)
break;
nv_set_contig_memory_type(&at->page_table[i], 1, type);
}
}
}

Expand Down