Module Name: src
Committed By: jakllsch
Date: Tue Feb 9 15:05:49 UTC 2021
Modified Files:
src/sys/dev/pci: if_iavf.c if_ixl.c
Log Message:
Zero interrupt handles upon allocation.
Might prevent detach-time bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_iavf.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/if_ixl.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_iavf.c
diff -u src/sys/dev/pci/if_iavf.c:1.11 src/sys/dev/pci/if_iavf.c:1.12
--- src/sys/dev/pci/if_iavf.c:1.11 Thu Dec 10 04:03:00 2020
+++ src/sys/dev/pci/if_iavf.c Tue Feb 9 15:05:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iavf.c,v 1.11 2020/12/10 04:03:00 yamaguchi Exp $ */
+/* $NetBSD: if_iavf.c,v 1.12 2021/02/09 15:05:49 jakllsch Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.11 2020/12/10 04:03:00 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.12 2021/02/09 15:05:49 jakllsch Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1789,7 +1789,7 @@ iavf_setup_interrupts(struct iavf_softc
num = counts[PCI_INTR_TYPE_MSIX];
}
- sc->sc_ihs = kmem_alloc(sizeof(sc->sc_ihs[0]) * num, KM_NOSLEEP);
+ sc->sc_ihs = kmem_zalloc(sizeof(sc->sc_ihs[0]) * num, KM_NOSLEEP);
if (sc->sc_ihs == NULL) {
IAVF_LOG(sc, LOG_ERR,
"couldn't allocate memory for interrupts\n");
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.75 src/sys/dev/pci/if_ixl.c:1.76
--- src/sys/dev/pci/if_ixl.c:1.75 Tue Sep 8 10:05:47 2020
+++ src/sys/dev/pci/if_ixl.c Tue Feb 9 15:05:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.75 2020/09/08 10:05:47 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.76 2021/02/09 15:05:49 jakllsch Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.75 2020/09/08 10:05:47 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.76 2021/02/09 15:05:49 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -5925,7 +5925,7 @@ ixl_setup_interrupts(struct ixl_softc *s
PCI_INTR_MPSAFE, true);
}
- sc->sc_ihs = kmem_alloc(sizeof(sc->sc_ihs[0]) * sc->sc_nintrs,
+ sc->sc_ihs = kmem_zalloc(sizeof(sc->sc_ihs[0]) * sc->sc_nintrs,
KM_SLEEP);
if (intr_type == PCI_INTR_TYPE_MSIX) {
