Module Name: src
Committed By: ozaki-r
Date: Mon Aug 19 03:23:30 UTC 2019
Modified Files:
src/sys/net: rtsock_shared.c
src/sys/netinet: if_arp.c
Log Message:
Initialize dom_mowner for MBUFTRACE
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.282 -r1.283 src/sys/netinet/if_arp.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/net/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.9 src/sys/net/rtsock_shared.c:1.10
--- src/sys/net/rtsock_shared.c:1.9 Fri May 3 02:10:58 2019
+++ src/sys/net/rtsock_shared.c Mon Aug 19 03:23:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.10 2019/08/19 03:23:30 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.10 2019/08/19 03:23:30 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1646,6 +1646,10 @@ COMPATNAME(route_init)(void)
ri->ri_sih = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
COMPATNAME(route_intr), NULL);
IFQ_LOCK_INIT(&ri->ri_intrq);
+
+#ifdef MBUFTRACE
+ MOWNER_ATTACH(&COMPATNAME(routedomain).dom_mowner);
+#endif
}
/*
@@ -1698,4 +1702,7 @@ struct domain COMPATNAME(routedomain) =
.dom_protosw = COMPATNAME(route_protosw),
.dom_protoswNPROTOSW =
&COMPATNAME(route_protosw)[__arraycount(COMPATNAME(route_protosw))],
+#ifdef MBUFTRACE
+ .dom_mowner = MOWNER_INIT("route", "rtm"),
+#endif
};
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.282 src/sys/netinet/if_arp.c:1.283
--- src/sys/netinet/if_arp.c:1.282 Mon Apr 29 16:12:30 2019
+++ src/sys/netinet/if_arp.c Mon Aug 19 03:23:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.282 2019/04/29 16:12:30 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.283 2019/08/19 03:23:30 ozaki-r Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.282 2019/04/29 16:12:30 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.283 2019/08/19 03:23:30 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -247,6 +247,9 @@ struct domain arpdomain = {
.dom_name = "arp",
.dom_protosw = arpsw,
.dom_protoswNPROTOSW = &arpsw[__arraycount(arpsw)],
+#ifdef MBUFTRACE
+ .dom_mowner = MOWNER_INIT("internet", "arp"),
+#endif
};
static void sysctl_net_inet_arp_setup(struct sysctllog **);
@@ -258,6 +261,10 @@ arp_init(void)
sysctl_net_inet_arp_setup(NULL);
arpstat_percpu = percpu_alloc(sizeof(uint64_t) * ARP_NSTATS);
IFQ_LOCK_INIT(&arpintrq);
+
+#ifdef MBUFTRACE
+ MOWNER_ATTACH(&arpdomain.dom_mowner);
+#endif
}
static void
