[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by b...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74f63c6663f1
branches:  netbsd-7
changeset: 800089:74f63c6663f1
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Dec 23 05:57:40 2016 +0000

description:
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

diffstat:

 sys/dev/pci/if_vioif.c |  6 +++---
 sys/dev/pci/virtio.c   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 0b848bd07b14 -r 74f63c6663f1 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Tue Dec 20 07:48:04 2016 +0000
+++ b/sys/dev/pci/if_vioif.c    Fri Dec 23 05:57:40 2016 +0000
@@ -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 @@
                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");
        }
 
diff -r 0b848bd07b14 -r 74f63c6663f1 sys/dev/pci/virtio.c
--- a/sys/dev/pci/virtio.c      Tue Dec 20 07:48:04 2016 +0000
+++ b/sys/dev/pci/virtio.c      Fri Dec 23 05:57:40 2016 +0000
@@ -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 @@
        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);