Module Name: src
Committed By: martin
Date: Fri May 13 11:18:40 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1445):
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.98
bus_dmamem_unmap() before bus_dmamem_free(), otherwise we may give back meomry
which is still (and will stay) mapped.
Fixes one instance of "panic: HYPERVISOR_mmu_update failed" on Xen.
There may be others.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.8 -r1.54.2.9 src/sys/dev/pci/ixgbe/ix_txrx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.8 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.9
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.8 Wed Feb 2 14:25:49 2022
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri May 13 11:18:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.8 2022/02/02 14:25:49 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.9 2022/05/13 11:18:40 martin Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.8 2022/02/02 14:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.9 2022/05/13 11:18:40 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2321,6 +2321,7 @@ ixgbe_dma_free(struct adapter *adapter,
bus_dmamap_sync(dma->dma_tag->dt_dmat, dma->dma_map, 0, dma->dma_size,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
ixgbe_dmamap_unload(dma->dma_tag, dma->dma_map);
+ bus_dmamem_unmap(dma->dma_tag->dt_dmat, dma->dma_vaddr, dma->dma_size);
bus_dmamem_free(dma->dma_tag->dt_dmat, &dma->dma_seg, 1);
ixgbe_dma_tag_destroy(dma->dma_tag);
} /* ixgbe_dma_free */
