From owner-svn-src-user@freebsd.org Fri Mar 23 20:29:35 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0D53F6C095 for ; Fri, 23 Mar 2018 20:29:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6364D8AE1E; Fri, 23 Mar 2018 20:29:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E38B24B61; Fri, 23 Mar 2018 20:29:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2NKTZdF022550; Fri, 23 Mar 2018 20:29:35 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NKTYoA022545; Fri, 23 Mar 2018 20:29:34 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201803232029.w2NKTYoA022545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 23 Mar 2018 20:29:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r331461 - in user/markj/netdump/sys: kern netinet/netdump sys vm X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in user/markj/netdump/sys: kern netinet/netdump sys vm X-SVN-Commit-Revision: 331461 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 20:29:36 -0000 Author: markj Date: Fri Mar 23 20:29:34 2018 New Revision: 331461 URL: https://svnweb.freebsd.org/changeset/base/331461 Log: Address some but not all review feedback from cem. Modified: user/markj/netdump/sys/kern/kern_mbuf.c user/markj/netdump/sys/netinet/netdump/netdump_client.c user/markj/netdump/sys/sys/mbuf.h user/markj/netdump/sys/vm/uma_core.c Modified: user/markj/netdump/sys/kern/kern_mbuf.c ============================================================================== --- user/markj/netdump/sys/kern/kern_mbuf.c Fri Mar 23 20:20:04 2018 (r331460) +++ user/markj/netdump/sys/kern/kern_mbuf.c Fri Mar 23 20:29:34 2018 (r331461) @@ -381,11 +381,6 @@ mbuf_init(void *dummy) SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL); #ifdef NETDUMP -/* External functions invoked from the netdump code. */ -void netdump_mbuf_init(int, int); -void netdump_mbuf_drain(void); -void netdump_mbuf_dump(void); - static struct mbufq nd_mbufq; static struct mbufq nd_clustq; @@ -407,7 +402,6 @@ nd_buf_import(void *arg, void **store, int count, int m = mbufq_dequeue(q); if (m == NULL) break; - trash_init(m, q == &nd_mbufq ? MSIZE : MCLBYTES, flags); store[i] = m; } return (i); @@ -429,7 +423,7 @@ nd_buf_release(void *arg, void **store, int count) } static int -nd_pack_import(void *arg, void **store, int count, int domain __unused, +nd_pack_import(void *arg __unused, void **store, int count, int domain __unused, int flags __unused) { struct mbuf *m; @@ -446,14 +440,14 @@ nd_pack_import(void *arg, void **store, int count, int break; } - mb_ctor_clust(clust, MCLBYTES, m, M_NOWAIT); + mb_ctor_clust(clust, MCLBYTES, m, 0); store[i] = m; } return (i); } static void -nd_pack_release(void *arg, void **store, int count) +nd_pack_release(void *arg __unused, void **store, int count) { struct mbuf *m; void *clust; Modified: user/markj/netdump/sys/netinet/netdump/netdump_client.c ============================================================================== --- user/markj/netdump/sys/netinet/netdump/netdump_client.c Fri Mar 23 20:20:04 2018 (r331460) +++ user/markj/netdump/sys/netinet/netdump/netdump_client.c Fri Mar 23 20:29:34 2018 (r331461) @@ -92,11 +92,6 @@ __FBSDID("$FreeBSD$"); #define NETDDEBUGV_IF(i, f, ...) #endif -/* Defined in kern_mbuf.c. */ -void netdump_mbuf_init(int nmbuf, int nclust); -void netdump_mbuf_drain(void); -void netdump_mbuf_dump(void); - static int netdump_arp_gw(void); static void netdump_cleanup(void); static int netdump_configure(struct netdump_conf *); Modified: user/markj/netdump/sys/sys/mbuf.h ============================================================================== --- user/markj/netdump/sys/sys/mbuf.h Fri Mar 23 20:20:04 2018 (r331460) +++ user/markj/netdump/sys/sys/mbuf.h Fri Mar 23 20:29:34 2018 (r331461) @@ -1373,5 +1373,12 @@ mbuf_tstmp2timespec(struct mbuf *m, struct timespec *t } #endif +#ifdef NETDUMP +/* Invoked from the netdump client code. */ +void netdump_mbuf_init(int, int); +void netdump_mbuf_drain(void); +void netdump_mbuf_dump(void); +#endif + #endif /* _KERNEL */ #endif /* !_SYS_MBUF_H_ */ Modified: user/markj/netdump/sys/vm/uma_core.c ============================================================================== --- user/markj/netdump/sys/vm/uma_core.c Fri Mar 23 20:20:04 2018 (r331460) +++ user/markj/netdump/sys/vm/uma_core.c Fri Mar 23 20:29:34 2018 (r331461) @@ -1673,6 +1673,9 @@ zone_ctor(void *mem, int size, void *udata, int flags) } out: + KASSERT((arg->flags & (UMA_ZONE_MAXBUCKET | UMA_ZONE_NOBUCKET)) != + (UMA_ZONE_MAXBUCKET | UMA_ZONE_NOBUCKET), + ("Invalid zone flag combination")); if ((arg->flags & UMA_ZONE_MAXBUCKET) != 0) zone->uz_count = BUCKET_MAX; else if ((arg->flags & UMA_ZONE_NOBUCKET) != 0)