From 9c1b4ad5792a13724c2decb3759741cd1cad4868 Mon Sep 17 00:00:00 2001 From: mmacy Date: Thu, 24 May 2018 01:04:56 +0000 Subject: [PATCH] convert allocations to INVARIANTS M_ZERO --- 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, 4 insertions(+), 12 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index faf9aa0b558f..5f6d2dd0de0b 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -672,7 +672,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS) if (error) return error; - il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_EPOCH_CALL_WAITOK); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO_INVARIANTS); 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 d56003bd0170..350c46b76384 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_EPOCH_CALL_WAITOK); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO_INVARIANTS); 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 98b5ea47d8f1..5ce496a7adc6 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_EPOCH_CALL_WAITOK); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO_INVARIANTS); 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 9565efbd3f64..9ddb79361f91 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_EPOCH_CALL_WAITOK); + il = malloc(sizeof(struct in_pcblist) + n * sizeof(struct inpcb *), M_TEMP, M_WAITOK|M_ZERO_INVARIANTS); inp_list = il->il_inp_list; INP_INFO_RLOCK(&V_udbinfo); diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h index a3683e9e7f2c..b2874c7b4536 100644 --- a/sys/sys/epoch.h +++ b/sys/sys/epoch.h @@ -64,14 +64,6 @@ 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) { -- 2.41.0