git: 4e24899efe31 - stable/13 - x86 bounce_bus_dmamem_alloc(): use malloc_aligned() only when possible
Konstantin Belousov
kib at FreeBSD.org
Fri Oct 1 00:33:35 UTC 2021
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=4e24899efe31ced394f8ce334d0725c416497363
commit 4e24899efe31ced394f8ce334d0725c416497363
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-09-24 17:46:47 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-10-01 00:32:24 +0000
x86 bounce_bus_dmamem_alloc(): use malloc_aligned() only when possible
(cherry picked from commit 24a3897c2c3205c2ec0cf323c555c403d3171e2c)
---
sys/x86/x86/busdma_bounce.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
index 75fdf4143b9b..26d1f1028d82 100644
--- a/sys/x86/x86/busdma_bounce.c
+++ b/sys/x86/x86/busdma_bounce.c
@@ -434,6 +434,7 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
/*
* Allocate the buffer from the malloc(9) allocator if...
* - It's small enough to fit into a single page.
+ * - Its alignment requirement is also smaller than the page size.
* - The low address requirement is fulfilled.
* - Default cache attributes are requested (WB).
* else allocate non-contiguous pages if...
@@ -448,6 +449,7 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
* Warn the user if malloc gets it wrong.
*/
if (dmat->common.maxsize <= PAGE_SIZE &&
+ dmat->common.alignment <= PAGE_SIZE &&
dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
attr == VM_MEMATTR_DEFAULT) {
*vaddr = malloc_domainset_aligned(dmat->common.maxsize,
More information about the dev-commits-src-all
mailing list