From 246a61992401eb0a9407d1da6e8dfd9fc67d5604 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Wed, 23 May 2018 17:00:05 +0000 Subject: [PATCH] epoch: allow for conditionally asserting that the epoch context fields are unused by zeroing on INVARIANTS builds --- sys/netinet/ip_divert.c | 2 +- sys/netinet/raw_ip.c | 2 +- sys/netinet/tcp_subr.c | 2 +- sys/netinet/udp_usrreq.c | 2 +- sys/sys/epoch.h | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 61920ae45061..72f0d94e209a 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -670,7 +670,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS) if (error) return error; - il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_EPOCH_CALL_WAITOK); inp_list = il->il_inp_list; INP_INFO_RLOCK(&V_divcbinfo); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index dbe84e357d13..6c90418e7573 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -1056,7 +1056,7 @@ rip_pcblist(SYSCTL_HANDLER_ARGS) if (error) return (error); - il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_EPOCH_CALL_WAITOK); inp_list = il->il_inp_list; INP_INFO_RLOCK(&V_ripcbinfo); diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 6719c0cf1802..98b5ea47d8f1 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2151,7 +2151,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS) if (error) return (error); - il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_EPOCH_CALL_WAITOK); inp_list = il->il_inp_list; INP_INFO_WLOCK(&V_tcbinfo); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index dd8985a1d034..cba7e063a179 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -874,7 +874,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) return (error); - il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_EPOCH_CALL_WAITOK); inp_list = il->il_inp_list; INP_INFO_RLOCK(&V_udbinfo); diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h index b2874c7b4536..a3683e9e7f2c 100644 --- a/sys/sys/epoch.h +++ b/sys/sys/epoch.h @@ -64,6 +64,14 @@ int in_epoch(void); DPCPU_DECLARE(int, epoch_cb_count); DPCPU_DECLARE(struct grouptask, epoch_cb_task); +#ifdef INVARIANTS +#define M_EPOCH_CALL_NOWAIT (M_NOWAIT|M_ZERO) +#define M_EPOCH_CALL_WAITOK (M_WAITOK|M_ZERO) +#else +#define M_EPOCH_CALL_NOWAIT M_NOWAIT +#define M_EPOCH_CALL_WAITOK M_WAITOK +#endif + static __inline void epoch_enter_preempt(epoch_t epoch) {