Date: Mon, 17 Oct 2016 15:07:40 -0700 From: John Baldwin <jhb@freebsd.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: <2315348.5F9GHXx3dh@ralph.baldwin.cx> In-Reply-To: <201610161413.u9GEDW91013522@repo.freebsd.org> References: <201610161413.u9GEDW91013522@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sunday, October 16, 2016 02:13:32 PM Luigi Rizzo wrote: > Author: luigi > Date: Sun Oct 16 14:13:32 2016 > New Revision: 307394 > URL: https://svnweb.freebsd.org/changeset/base/307394 > > Log: > Import the current version of netmap, aligned with the one on github. > > This commit, long overdue, contains contributions in the last 2 years > from Stefano Garzarella, Giuseppe Lettieri, Vincenzo Maffione, including: > + fixes on monitor ports > + the 'ptnet' virtual device driver, and ptnetmap backend, for > high speed virtual passthrough on VMs (bhyve fixes in an upcoming commit) > + 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) > > We also include an additional tool, nmreplay, which is functionally > equivalent to tcpreplay but operating on netmap ports. FYI, this broke the build of the following kernel configs from 'make tinderbox': sparc64 LINT kernel failed, check _.sparc64.LINT for details i386 LINT-NOINET kernel failed, check _.i386.LINT-NOINET for details i386 LINT kernel failed, check _.i386.LINT for details pc98 LINT kernel failed, check _.pc98.LINT for details i386 LINT-NOINET6 kernel failed, check _.i386.LINT-NOINET6 for details i386 LINT-NOIP kernel failed, check _.i386.LINT-NOIP for details i386 LINT-VIMAGE kernel failed, check _.i386.LINT-VIMAGE for details amd64 LINT kernel failed, check _.amd64.LINT for details amd64 LINT-NOINET kernel failed, check _.amd64.LINT-NOINET for details powerpc LINT kernel failed, check _.powerpc.LINT for details powerpc LINT64 kernel failed, check _.powerpc.LINT64 for details amd64 LINT-NOINET6 kernel failed, check _.amd64.LINT-NOINET6 for details amd64 LINT-NOIP kernel failed, check _.amd64.LINT-NOIP for details amd64 LINT-VIMAGE kernel failed, check _.amd64.LINT-VIMAGE for details arm LINT kernel failed, check _.arm.LINT for details Some of the errors: (1) In file included from /zoo/jhb/git/freebsd/sys/modules/em/../../dev/e1000/if_lem .c:343: /zoo/jhb/git/freebsd/sys/dev/netmap/if_lem_netmap.h:42: warning: redundant redec laration of 'netmap_adaptive_io' [-Wredundant-decls] /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_kern.h:1529: warning: previous declar (2) /zoo/jhb/git/freebsd/sys/dev/netmap/if_ptnet.c:347:15: error: shift count >= wid th of type [-Werror,-Wshift-count-overflow] (paddr >> 32) & 0xffffffff); ^ ~~ /zoo/jhb/git/freebsd/sys/sys/bus.h:882:59: note: expanded from macro 'bus_write_4' bus_space_write_4((r)->r_bustag, (r)->r_bushandle, (o), (v)) ^ For this one I think 'paddr' should be 'uint64_t' instead of 'vm_paddr_t' which should fix the build on 32-bit platforms. (3) /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_pt.c:72:9: error: 'DEBUG' macro redefined [-Werror,-Wmacro-redefined] #define DEBUG /* Enables communication debugging. */ ^ ./opt_global.h:40:9: note: previous definition is here #define DEBUG 1 ^ (4) /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_freebsd.c:671:4: error: format specif ies type 'unsigned long' but the argument has type 'vm_paddr_t' (aka 'unsigned i nt') [-Werror,-Wformat] *nm_paddr, ^~~~~~~~~ /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_kern.h:249:29: note: expanded from ma cro 'D' __LINE__, __FUNCTION__, ##__VA_ARGS__); \ ^~~~~~~~~~~ /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_freebsd.c:672:4: error: format specif ies type 'unsigned long' but the argument has type 'rman_res_t' (aka 'unsigned l ong long') [-Werror,-Wformat] rman_get_size(ptn_dev->pci_mem), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /zoo/jhb/git/freebsd/sys/dev/netmap/netmap_kern.h:249:29: note: expanded from ma cro 'D' __LINE__, __FUNCTION__, ##__VA_ARGS__); \ ^~~~~~~~~~~ -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2315348.5F9GHXx3dh>