Module Name: src
Committed By: snj
Date: Fri Dec 23 05:57:40 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: if_vioif.c virtio.c
Log Message:
Pull up following revision(s) (requested by bsiegert in ticket #1337):
sys/dev/pci/if_vioif.c: revision 1.21
sys/dev/pci/virtio.c: revision 1.14
PR/50636: Ryo ONODERA: Fix incorrect kmem_free()
--
PR/50636: Ryo ONODERA: Reduce memory use
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/dev/pci/virtio.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/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.7.2.2 src/sys/dev/pci/if_vioif.c:1.7.2.3
--- src/sys/dev/pci/if_vioif.c:1.7.2.2 Sun Sep 18 05:57:00 2016
+++ src/sys/dev/pci/if_vioif.c Fri Dec 23 05:57:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $ */
+/* $NetBSD: if_vioif.c,v 1.7.2.3 2016/12/23 05:57:40 snj Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.3 2016/12/23 05:57:40 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -397,7 +397,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
C_L1(txhdr_dmamaps[i], tx_hdrs[i],
sizeof(struct virtio_net_hdr), 1,
WRITE, "tx header");
- C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 256 /* XXX */, 0,
+ C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 16 /* XXX */, 0,
"tx payload");
}
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.6 src/sys/dev/pci/virtio.c:1.6.2.1
--- src/sys/dev/pci/virtio.c:1.6 Tue Jul 22 01:55:54 2014
+++ src/sys/dev/pci/virtio.c Fri Dec 23 05:57:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $ */
+/* $NetBSD: virtio.c,v 1.6.2.1 2016/12/23 05:57:40 snj Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.6.2.1 2016/12/23 05:57:40 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -686,7 +686,7 @@ virtio_free_vq(struct virtio_softc *sc,
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
VIRTIO_CONFIG_QUEUE_ADDRESS, 0);
- kmem_free(vq->vq_entries, vq->vq_bytesize);
+ kmem_free(vq->vq_entries, sizeof(*vq->vq_entries) * vq->vq_num);
bus_dmamap_unload(sc->sc_dmat, vq->vq_dmamap);
bus_dmamap_destroy(sc->sc_dmat, vq->vq_dmamap);
bus_dmamem_unmap(sc->sc_dmat, vq->vq_vaddr, vq->vq_bytesize);
