Date: Wed, 19 Oct 2016 16:35:40 -0400 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Luigi Rizzo <luigi@FreeBSD.org> 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: <20161019203540.GC94803@mutt-hardenedbsd> In-Reply-To: <20161019162324.GA94803@mutt-hardenedbsd> References: <201610161413.u9GEDW91013522@repo.freebsd.org> <20161019162324.GA94803@mutt-hardenedbsd>
next in thread | previous in thread | raw e-mail | index | archive | help
--GyRA7555PLgSTuth Content-Type: multipart/mixed; boundary="mvpLiMfbWzRoNl4x" Content-Disposition: inline --mvpLiMfbWzRoNl4x Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 19, 2016 at 12:23:24PM -0400, Shawn Webb wrote: > 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, includ= ing: > > + fixes on monitor ports > > + the 'ptnet' virtual device driver, and ptnetmap backend, for > > high speed virtual passthrough on VMs (bhyve fixes in an upcoming c= ommit) > > + 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 >=20 > Looks like this broke VIMAGE builds: >=20 > /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclare= d identifier 'rd' > CURVNET_SET(TD_TO_VNET(rd)); > ^ > /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclare= d identifier 'rd' > /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclare= d identifier 'rd' > /usr/src/sys/dev/netmap/netmap_freebsd.c:1410:25: error: use of undeclare= d identifier 'rd' > 4 errors generated. > --- netmap_freebsd.o --- > *** [netmap_freebsd.o] Error code 1 The attached patch fixes the build. In case it doesn't make it to the list, it's also posted here: http://ix.io/1xFU 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 --mvpLiMfbWzRoNl4x Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="2016-10-19_netmap.patch.txt" Content-Transfer-Encoding: quoted-printable diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebs= d.c index 50e2d0f..a3ad322 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -48,6 +48,7 @@ #include <vm/uma.h> =20 =20 +#include <sys/jail.h> #include <sys/malloc.h> #include <sys/socket.h> /* sockaddrs */ #include <sys/selinfo.h> @@ -1407,7 +1408,7 @@ freebsd_netmap_ioctl(struct cdev *dev __unused, u_lon= g cmd, caddr_t data, int error; struct netmap_priv_d *priv; =20 - CURVNET_SET(TD_TO_VNET(rd)); + CURVNET_SET(TD_TO_VNET(td)); error =3D devfs_get_cdevpriv((void **)&priv); if (error) { /* XXX ENOENT should be impossible, since the priv --mvpLiMfbWzRoNl4x-- --GyRA7555PLgSTuth Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYB9kaAAoJEGqEZY9SRW7uHL8P/i/c1AXw028FgoqFA+bWut9f 70q5EPIY2J426CVyMjZ3WYAN9tEmueTg4ImCWMMtu0xr344jUo7JEGehWcOEZiii jZb12H3QKA61Y7+8GyJO9N0FpGTbmNzq/qilZhq2JaG+mu8SFYfYJ36EAMAiIKzu HwVgbRcvlYrj6I1uWPgof24uBoyJSf/3rJ2QX+z8T9pBBETGm1ul070Eq9st/kAB gxzygZJyIu5pAh3GRgnyh3u9QlBpiNYiBcDOSSGM6dFuyGQH4SWIY7VF+D3pfEQl RI23MglT2baSjSVcTKnms3w7ZoHCxrxUZ11ww+yf+6WHtbthDUKXExIEWL6scIYu dxiNjO5yHa6jrDiW/iPyAYoumLmuet8tkXasWgTn6oYLcW3fDh2QGuJnCjvhFPkW K3LdMiWkSZJto9YHuSoKFrJUGFNW4BVtF/4IINWgYxFW3BtcJPvXJJpwmOeMCN35 aXG8xuASFJB4pgkHcawQOYwSYi+nyH2qVwBeMYEeXjOIQl0vQtodGOYMNR3ZlTD1 jVlqVn//Im8f4kDJtjU+wW3h7p8ZLAH1VtgoKJScyN6S2zF3cnAoNaowW/2CB357 ISHV1xSYX4cMG0u61DbiqmlHMx3HeSSMedPjfgmyteGwapmA5Y32QZ9zrobaKMkC eI9VWMvyDRo9MGamnY4B =49f7 -----END PGP SIGNATURE----- --GyRA7555PLgSTuth--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161019203540.GC94803>