From owner-svn-src-user@freebsd.org Sat Mar 24 02:46:38 2018
Return-Path: <owner-svn-src-user@freebsd.org>
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 4B334F63723
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 24 Mar 2018 02:46:38 +0000 (UTC)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C6B4C72E27;
Sat, 24 Mar 2018 02:46:37 +0000 (UTC)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1])
by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w2O2kZ93033986;
Fri, 23 Mar 2018 19:46:35 -0700 (PDT)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: (from freebsd@localhost)
by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w2O2kZnB033985;
Fri, 23 Mar 2018 19:46:35 -0700 (PDT) (envelope-from freebsd)
From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net>
Message-Id: <201803240246.w2O2kZnB033985@pdx.rh.CN85.dnsmgr.net>
Subject: Re: svn commit: r331461 - in user/markj/netdump/sys: kern
netinet/netdump sys vm
In-Reply-To: <201803232029.w2NKTYoA022545@repo.freebsd.org>
To: Mark Johnston <markj@freebsd.org>
Date: Fri, 23 Mar 2018 19:46:35 -0700 (PDT)
CC: src-committers@freebsd.org, svn-src-user@freebsd.org
Reply-To: rgrimes@freebsd.org
X-Mailer: ELM [version 2.4ME+ PL121h (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
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" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Mar 2018 02:46:38 -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.
Please be detailed in what is changing, as the above
only tells us where it came from in a vague way as
no review number is even cited.
I know this is on a private branch, but when/if it
is merged this becomes part of the main line.
> 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)
>
>
--
Rod Grimes rgrimes@freebsd.org