From owner-svn-src-head@freebsd.org Wed Oct 19 20:36:45 2016 Return-Path: Delivered-To: svn-src-head@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 69F0AC18A1E for ; Wed, 19 Oct 2016 20:36:45 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) (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 250C6BC0 for ; Wed, 19 Oct 2016 20:36:44 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt0-f171.google.com with SMTP id m5so34849749qtb.3 for ; Wed, 19 Oct 2016 13:36:44 -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=QIUePhRm8peZQ9kGZAv6AvA8nr0FLHN9R/QMOpNY/6Q=; b=u2FTgh4piVMhevBMe+q464oKAz6Xlr0vZdjd8yJoRbYX6oiydN1vJva4AnpJYNyXGM B4/LbYRk0EYlh+vBzIyS0xXMri37QQqnC5OYZojh6DXHsT/RephHlCw2lY04CVr/Abnj Zgyh0T/GdR3jbfs34Rrp+q3YHiptb2KOrAZ6oy2nhR+sepjrlmR7FJrpu02li+XN3HUp VZnzMJ0SC55tGF8V18SWwEBWVUgq/GFPrgZhmV9JI+lt7j7DOluqz6tdCFD5P2yIhbyg UPKyQ52Re65RzLp0jXLosZZjgr+MMMygxigoAnC5Vwj+YD/Ij9GzMxJvuqxqUavU29n5 0T0A== 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=QIUePhRm8peZQ9kGZAv6AvA8nr0FLHN9R/QMOpNY/6Q=; b=FCguet3zK66q9Jzz8nxH/WPMpWIU5pPy1DYV4TLXkCYs7qawtzR2LlwgDYdoBktQfP teejqtQ6gcVaQDqopVknVnuo7yydvKe6BeYgz+KH1PRaIKngiO+Oc/CuZDEypLn3+xyo N8V/qgXdOOelb7DmHajCtm/wgIrBGlZdXPi2oUrxekYPJx7IkFSh/Z+g0dKZ+ue9BmLd sbXt/m9kmJP/WJ0UASnGRZy1JPHRF122qcQJmUlWWq6QthmS5Dv1wX1WGMgit5FR1Nq/ dEGLB8AY7cz+Eb4wksW3iYE0jfmCWARA6xN0LWZZNQIDFvuVXgmb3VYsE2Lwd9VhNmu0 0zeA== X-Gm-Message-State: AA6/9RniEaffyu14bNYLMFNSfMz1pxRguWhV6ngQOlTtr9jxl+qSaIvm+iELFpv0aQZI0TJI X-Received: by 10.237.39.71 with SMTP id n65mr8330100qtd.9.1476909343587; Wed, 19 Oct 2016 13:35:43 -0700 (PDT) Received: from mutt-hardenedbsd ([63.88.83.66]) by smtp.gmail.com with ESMTPSA id f16sm10712207qta.9.2016.10.19.13.35.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Oct 2016 13:35:42 -0700 (PDT) Date: Wed, 19 Oct 2016 16:35:40 -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: <20161019203540.GC94803@mutt-hardenedbsd> References: <201610161413.u9GEDW91013522@repo.freebsd.org> <20161019162324.GA94803@mutt-hardenedbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GyRA7555PLgSTuth" Content-Disposition: inline In-Reply-To: <20161019162324.GA94803@mutt-hardenedbsd> 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2016 20:36:45 -0000 --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 =20 =20 +#include #include #include /* sockaddrs */ #include @@ -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--