From owner-svn-src-all@freebsd.org Wed Oct 19 16:23:29 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22658C1830D for ; Wed, 19 Oct 2016 16:23:29 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CAA94FE9 for ; Wed, 19 Oct 2016 16:23:28 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk0-x231.google.com with SMTP id o68so44602937qkf.3 for ; Wed, 19 Oct 2016 09:23:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=opn8KNIMBVPC/fkcW2TQ4CSux44wGRjk5Iba5RX/kZs=; b=FzhG1Eq74kU7Mxb7r6KK9oxf+vtrWUqiqA5bhASXIxk7ThNZGCtWiTul30WqSswNk8 +9QQINC3CyvAp/B/GjFRgEQZlRpph6rmSQeYEx6LmqBBW8ITR+vw7fRHUriKBuLjQVYg sFG0/vYx+MKK3nPdL8w/GLsO8hrdcJhTQORAw/azIvSkjtWVFeaOsMmZo0fwd+f63Hs6 rhp8D4H7XgJnkZXWP9C0U165XypXsI2sMItEX8B+Yo3wwUsbiBNZbpxAE8uGYN2TueQ8 luTpeNsz3MHe2ClHy6tra2VIkM8Uwys/r+03iSw0NmMFl1O8+U3idBB8rfYm/tyVsf4J 0PIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=opn8KNIMBVPC/fkcW2TQ4CSux44wGRjk5Iba5RX/kZs=; b=ZoitHto9rMUH7x/XZ0qEAIRoCa3wNbGVD7eSKqu9/+rxkGFUVQpisDB0usJxEy1qOI SI70V+GAamzZ+dVrpWT4OERwCV3RD/yH4JMwzo64GJiuFt6sJroWfSUUp30MgRVuKkQv nTJVAvljjBuMk/4rW/jFyRBOCjEJg2RjVPyRv4CY47uCVGnkHGpiNiIr5FlIFPhxYyC8 7CyhO940uy0x4qlkVD/tDOPWvyLV4ppJEFIgHFrASLK4TB62c41EqkNb004pzf1EV5Mu bY/YCZjqR3GgsKggMM4hVqbwppzA622rGSGQuTW+xkSHrHuN/h7zAWd/g6h6LEShp01s ncng== X-Gm-Message-State: ABUngvcqgSZ0d8GGIPR5Qjd3+ftMNSjJsoLR8FYHVu0b8U2wVtsCvm3SR+I2jUpcyTquc6vh X-Received: by 10.55.212.85 with SMTP id l82mr6983360qki.214.1476894207878; Wed, 19 Oct 2016 09:23:27 -0700 (PDT) Received: from mutt-hardenedbsd ([63.88.83.66]) by smtp.gmail.com with ESMTPSA id x35sm21137769qte.40.2016.10.19.09.23.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Oct 2016 09:23:26 -0700 (PDT) Date: Wed, 19 Oct 2016 12:23:24 -0400 From: Shawn Webb To: Luigi Rizzo Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r307394 - in head: share/man/man4 sys/conf sys/dev/netmap sys/modules/netmap sys/net tools/tools/netmap Message-ID: <20161019162324.GA94803@mutt-hardenedbsd> References: <201610161413.u9GEDW91013522@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ZPt4rx8FFjLCG7dd" Content-Disposition: inline In-Reply-To: <201610161413.u9GEDW91013522@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hardenedbsd 12.0-CURRENT-HBSD FreeBSD 12.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6A84658F52456EEE User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2016 16:23:29 -0000 --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 16, 2016 at 02:13:32PM +0000, Luigi Rizzo wrote: > Author: luigi > Date: Sun Oct 16 14:13:32 2016 > New Revision: 307394 > URL: https://svnweb.freebsd.org/changeset/base/307394 >=20 > Log: > Import the current version of netmap, aligned with the one on github. > =20 > This commit, long overdue, contains contributions in the last 2 years > from Stefano Garzarella, Giuseppe Lettieri, Vincenzo Maffione, includin= g: > + fixes on monitor ports > + the 'ptnet' virtual device driver, and ptnetmap backend, for > high speed virtual passthrough on VMs (bhyve fixes in an upcoming com= mit) > + improved emulated netmap mode > + more robust error handling > + removal of stale code > + various fixes to code and documentation (some mixup between RX and TX > parameters, and private and public variables) > =20 > We also include an additional tool, nmreplay, which is functionally > equivalent to tcpreplay but operating on netmap ports. >=20 > Added: > head/tools/tools/netmap/ctrs.h (contents, props changed) > head/tools/tools/netmap/nmreplay.8 (contents, props changed) > head/tools/tools/netmap/nmreplay.c (contents, props changed) > Modified: > head/share/man/man4/netmap.4 > head/sys/conf/files > head/sys/dev/netmap/if_ixl_netmap.h > head/sys/dev/netmap/if_lem_netmap.h > head/sys/dev/netmap/ixgbe_netmap.h > head/sys/dev/netmap/netmap.c > head/sys/dev/netmap/netmap_freebsd.c > head/sys/dev/netmap/netmap_generic.c > head/sys/dev/netmap/netmap_kern.h > head/sys/dev/netmap/netmap_mbq.c > head/sys/dev/netmap/netmap_mbq.h > head/sys/dev/netmap/netmap_mem2.c > head/sys/dev/netmap/netmap_mem2.h > head/sys/dev/netmap/netmap_monitor.c > head/sys/dev/netmap/netmap_offloadings.c > head/sys/dev/netmap/netmap_pipe.c > head/sys/dev/netmap/netmap_vale.c > head/sys/modules/netmap/Makefile > head/sys/net/netmap.h > head/sys/net/netmap_user.h > head/tools/tools/netmap/Makefile > head/tools/tools/netmap/bridge.c > head/tools/tools/netmap/pkt-gen.c > head/tools/tools/netmap/vale-ctl.c Looks like this broke VIMAGE builds: /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclared = identifier 'rd' CURVNET_SET(TD_TO_VNET(rd)); ^ /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclared = identifier 'rd' /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclared = identifier 'rd' /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclared = identifier 'rd' 4 errors generated. --- netmap_freebsd.o --- *** [netmap_freebsd.o] Error code 1 Thanks, --=20 Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --ZPt4rx8FFjLCG7dd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYB536AAoJEGqEZY9SRW7u5lIP/3wxJ1MjsM+GbBUYTQMv2pAW RHY8f+hqAq1B9KEenx8HomCmwrgmfId24/QFFr62LL6McG5Q3//d63W2gMIyGqj8 a7gOn+ZK79lCedsiYckPARY8CpkJ3q4X+qtDKJYWTvWzBkJsYnhRmNVm7yRP+c3W phE0DQQg+PIQMZyGxoWN+A0+Hir8u0RH4Xl1FfW2BnpaZvMLFQ2HnYh7xMaS3emS PR4II140aOn2SLvGhy04NY01HetMc4dZ8PdLspaeJYAQrH5qF/RB+KB8PUISJQPf RD21Bws1rAsahddQNv49iGtw7rit+CbP3992EYAM8xOkc0WLGFKOe5OmyBElW2Z7 r0l6Vml+JtYoLB++2TbnStJD76mk0PTMxvxwXPqK74N5uRDEB13ju7LNRlnuL8YG +3Pzv9jNG4g6ribIPF7Xz3D4tbB459Gl3UBqr4Ji4jtlVQKpDQqXzTR3JpFtukes AM0GiirOWd4q1kIBPqoc5bXk3OK1AnMwb3sdFHabtTLEBQD8Cxjys41DeZsq4Drg yWXXF3y/R7msDF8giiVFxzv9CL3cO6pY7OuSh8xgkkMuI/sCiBEwwLEaDu4bj794 5xAoJ7Ii/E671b5mAVskCiPHFn2qXR6tZFbzfP8aDwB01PVqvrcByGkNkpkX2R6l pphGFf4D9pq05ZvBYE/e =9Qvk -----END PGP SIGNATURE----- --ZPt4rx8FFjLCG7dd--