renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached

Browse Source 
Since commit 8782fb61cc ("mm: pagewalk: Fix race between unmap and page
walker"), walk_page_range() on kernel ranges won't work anymore,
walk_page_range_novma() must be used instead.

Note: I don't have an openrisc development setup, so this is completely
untested.

Fixes: 8782fb61cc ("mm: pagewalk: Fix race between unmap and page walker")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Stafford Horne <shorne@gmail.com>
This commit is contained in:
Jann Horn 2022-10-06 20:33:01 +02:00 committed by Stafford Horne
parent f76349cf41
commit 28148a17c9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/openrisc/kernel/dma.c
View File

@ -74,10 +74,10 @@ void *arch_dma_set_uncached(void *cpu_addr, size_t size)
* We need to iterate through the pages, clearing the dcache for * We need to iterate through the pages, clearing the dcache for
* them and setting the cache-inhibit bit. * them and setting the cache-inhibit bit.
*/ */
mmap_read_lock(&init_mm); mmap_write_lock(&init_mm);
error = walk_page_range(&init_mm, va, va + size, &set_nocache_walk_ops, error = walk_page_range_novma(&init_mm, va, va + size,
NULL); &set_nocache_walk_ops, NULL, NULL);
mmap_read_unlock(&init_mm); mmap_write_unlock(&init_mm);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
@ -88,11 +88,11 @@ void arch_dma_clear_uncached(void *cpu_addr, size_t size)
{ {
unsigned long va = (unsigned long)cpu_addr; unsigned long va = (unsigned long)cpu_addr;
mmap_read_lock(&init_mm); mmap_write_lock(&init_mm);
/* walk_page_range shouldn't be able to fail here */ /* walk_page_range shouldn't be able to fail here */
WARN_ON(walk_page_range(&init_mm, va, va + size, WARN_ON(walk_page_range_novma(&init_mm, va, va + size,
&clear_nocache_walk_ops, NULL)); &clear_nocache_walk_ops, NULL, NULL));
mmap_read_unlock(&init_mm); mmap_write_unlock(&init_mm);
} }
void arch_sync_dma_for_device(phys_addr_t addr, size_t size, void arch_sync_dma_for_device(phys_addr_t addr, size_t size,