On Tue, May 09, 2023 at 04:01:02PM +0200, Greg KH wrote:
> > > mem = usb_alloc_coherent(ps->dev, size, GFP_USER | __GFP_NOWARN,
> > > &dma_handle);
> > > // ...
> > > if (hcd->localmem_pool || !hcd_uses_dma(hcd)) {
> > > if (remap_pfn_range(vma, vma->vm_start,
> > > virt_to_phys(usbm->mem) >> PAGE_SHIFT,
> >
> > usb_alloc_coherent and up in the DMA coherent allocator (usually
> > anyway), and you absolutely must never do a virt_to_phys or virt_to_page
> > on that return value. This code is a buggy as f**k.
>
> Odd, you gave it a reviewed-by: in commit a0e710a7def4 ("USB: usbfs: fix
> mmap dma mismatch") back in 2020 when it was merged as you said that was
> the way to fix this up. :)
>
> Do you have a better way to do it now that is more correct? Did some
> DMA changes happen that missed this codepath getting fixed up?
Sorry, I should not have shouted as quickly. The code is clearly
guarded by the same conditional that makes it not use the DMA API,
so from the DMA API POV this is actually correct, just ugly.
The fix for the actual remap_file_ranges thing is probably something
like this:
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index fbb087b728dc98..be56eba2558814 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -131,7 +131,7 @@ void *hcd_buffer_alloc(
/* some USB hosts just use PIO */
if (!hcd_uses_dma(hcd)) {
*dma = ~(dma_addr_t) 0;
- return kmalloc(size, mem_flags);
+ return (void *)__get_free_pages(get_order(size), mem_flags);
}
for (i = 0; i < HCD_BUFFER_POOLS; i++) {
@@ -160,7 +160,7 @@ void hcd_buffer_free(
}
if (!hcd_uses_dma(hcd)) {
- kfree(addr);
+ free_pages((unsigned long)addr, get_order(size));
return;
}
