Date: Thu, 10 Dec 2015 07:38:56 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292054 - in user/ngie/more-tests2: . contrib/ofed/usr.bin/ibaddr contrib/ofed/usr.bin/ibnetdiscover contrib/ofed/usr.bin/ibping contrib/ofed/usr.bin/ibportstate contrib/ofed/usr.bin/ib... Message-ID: <201512100738.tBA7cujp011579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Dec 10 07:38:56 2015 New Revision: 292054 URL: https://svnweb.freebsd.org/changeset/base/292054 Log: MFhead @ r292053 Modified: user/ngie/more-tests2/MAINTAINERS (contents, props changed) user/ngie/more-tests2/contrib/ofed/usr.bin/ibaddr/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibnetdiscover/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibping/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibportstate/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibroute/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibsendtrap/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibstat/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibsysstat/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/ibtracert/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/opensm/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/osmtest/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/perfquery/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/saquery/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/sminfo/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/smpdump/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/smpquery/Makefile user/ngie/more-tests2/contrib/ofed/usr.bin/vendstat/Makefile user/ngie/more-tests2/lib/libc/rpc/svc_vc.c user/ngie/more-tests2/lib/libc/stdio/open_memstream.c user/ngie/more-tests2/lib/libc/stdio/open_wmemstream.c user/ngie/more-tests2/lib/libopenbsd/Makefile user/ngie/more-tests2/lib/libopenbsd/imsg.c user/ngie/more-tests2/sbin/devd/devd.cc user/ngie/more-tests2/sbin/geom/class/multipath/geom_multipath.c user/ngie/more-tests2/sbin/sysctl/sysctl.8 user/ngie/more-tests2/sbin/sysctl/sysctl.c user/ngie/more-tests2/share/man/man4/ioat.4 user/ngie/more-tests2/share/man/man4/isp.4 user/ngie/more-tests2/share/man/man9/BUS_DESCRIBE_INTR.9 user/ngie/more-tests2/share/mk/bsd.libnames.mk user/ngie/more-tests2/share/mk/src.libnames.mk user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_logging.c user/ngie/more-tests2/sys/dev/ioat/ioat.c user/ngie/more-tests2/sys/dev/ioat/ioat.h user/ngie/more-tests2/sys/dev/ioat/ioat_internal.h user/ngie/more-tests2/sys/dev/ioat/ioat_test.c user/ngie/more-tests2/sys/dev/ioat/ioat_test.h user/ngie/more-tests2/sys/dev/isp/isp.c user/ngie/more-tests2/sys/dev/isp/isp_pci.c user/ngie/more-tests2/sys/dev/sfxge/common/efx.h user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.c user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h user/ngie/more-tests2/sys/dev/sfxge/common/hunt_ev.c user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/more-tests2/sys/netinet/cc/cc_cubic.c user/ngie/more-tests2/sys/netinet/cc/cc_newreno.c user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/in_mcast.c user/ngie/more-tests2/sys/netinet/ip_icmp.c user/ngie/more-tests2/sys/netinet/ip_input.c user/ngie/more-tests2/sys/netinet/ip_options.c user/ngie/more-tests2/sys/netinet/ip_var.h user/ngie/more-tests2/sys/netinet/tcp_var.h user/ngie/more-tests2/sys/netinet6/icmp6.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/in6_fib.c user/ngie/more-tests2/sys/netinet6/in6_gif.c user/ngie/more-tests2/sys/netinet6/in6_mcast.c user/ngie/more-tests2/sys/netinet6/in6_src.c user/ngie/more-tests2/tools/tools/ioat/ioatcontrol.8 user/ngie/more-tests2/tools/tools/ioat/ioatcontrol.c user/ngie/more-tests2/usr.bin/clang/lldb/Makefile user/ngie/more-tests2/usr.sbin/iostat/iostat.c user/ngie/more-tests2/usr.sbin/pmcstudy/pmcstudy.8 user/ngie/more-tests2/usr.sbin/pmcstudy/pmcstudy.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) Modified: user/ngie/more-tests2/MAINTAINERS ============================================================================== --- user/ngie/more-tests2/MAINTAINERS Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/MAINTAINERS Thu Dec 10 07:38:56 2015 (r292054) @@ -70,6 +70,9 @@ sys/dev/ixgbe erj Pre-commit phabricator sys/dev/ixl erj Pre-commit phabricator review requested. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +pmcstudy(8) rrs Pre-commit review requested. +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibaddr/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibaddr/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibaddr/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibaddr SRCS= ibaddr.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= ibaddr.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibnetdiscover/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibnetdiscover/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibnetdiscover/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,8 +5,8 @@ PROG= ibnetdiscover SRCS= ibnetdiscover.c grouping.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -pthread -I${DIAGPATH}/include +LIBADD= ibumad ibcommon ibmad osmcomp pthread +CFLAGS+= -I${DIAGPATH}/include MAN= ibnetdiscover.8 WARNS?= 1 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibping/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibping/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibping/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibping SRCS= ibping.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= ibping.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibportstate/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibportstate/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibportstate/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibportstate SRCS= ibportstate.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= ibportstate.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibroute/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibroute/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibroute/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,8 +5,8 @@ PROG= ibroute SRCS= ibroute.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -pthread -I${DIAGPATH}/include +LIBADD= ibumad ibcommon ibmad osmcomp pthread +CFLAGS+= -I${DIAGPATH}/include MAN= ibroute.8 WARNS?= 1 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibsendtrap/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibsendtrap/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibsendtrap/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibsendtrap SRCS= ibsendtrap.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibstat/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibstat/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibstat/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibstat SRCS= ibstat.c -LDADD= -libumad -libcommon +LIBADD= ibumad ibcommon CFLAGS+= -I${DIAGPATH}/include MAN= ibstat.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibsysstat/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibsysstat/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibsysstat/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= ibsysstat SRCS= ibsysstat.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= ibsysstat.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/ibtracert/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/ibtracert/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/ibtracert/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,8 +5,8 @@ PROG= ibtracert SRCS= ibtracert.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -pthread -I${DIAGPATH}/include +LIBADD= ibumad ibcommon ibmad osmcomp pthread +CFLAGS+= -I${DIAGPATH}/include MAN= ibtracert.8 WARNS?= 1 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/opensm/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/opensm/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/opensm/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -29,8 +29,7 @@ SRCS+= osm_vl_arb_rcv.c st.c osm_perfmgr SRCS+= osm_dump.c osm_ucast_cache.c osm_qos_parser_y.y osm_qos_parser_l.l SRCS+= osm_qos_policy.c -LDADD= -lopensm -losmvendor -losmcomp -libmad -libumad -libcommon -CFLAGS+= -pthread +LIBADD= opensm osmvendor osmcomp ibmad ibumad ibcommon pthread CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP MAN= opensm.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/osmtest/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/osmtest/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/osmtest/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -16,14 +16,7 @@ SRCS= main.c \ osmt_slvl_vl_arb.c \ osmtest.c -LDADD= -libcommon \ - -libmad \ - -libumad \ - -losmvendor \ - -losmcomp \ - -lopensm \ - -LIBADD+= pthread +LIBADD= ibcommon ibmad ibumad osmvendor osmcomp opensm pthread CFLAGS= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \ -I${OPENSM}/osmtest/include Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/perfquery/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/perfquery/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/perfquery/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= perfquery SRCS= perfquery.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= perfquery.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/saquery/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/saquery/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/saquery/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,10 +5,9 @@ PROG= saquery SRCS= saquery.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad -losmcomp -losmvendor -lopensm +LIBADD= ibumad ibcommon ibmad osmcomp osmvendor opensm pthread CFLAGS+= -I${DIAGPATH}/include CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP -CFLAGS+= -pthread MAN= saquery.8 WARNS?= 1 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/sminfo/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/sminfo/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/sminfo/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= sminfo SRCS= sminfo.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= sminfo.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/smpdump/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/smpdump/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/smpdump/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= smpdump SRCS= smpdump.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= smpdump.8 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/smpquery/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/smpquery/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/smpquery/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,8 +5,8 @@ PROG= smpquery SRCS= smpquery.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad -losmcomp -CFLAGS+= -pthread -I${DIAGPATH}/include +LIBADD= ibumad ibcommon ibmad osmcomp pthread +CFLAGS+= -I${DIAGPATH}/include MAN= smpquery.8 WARNS?= 1 Modified: user/ngie/more-tests2/contrib/ofed/usr.bin/vendstat/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/ofed/usr.bin/vendstat/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/contrib/ofed/usr.bin/vendstat/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -5,7 +5,7 @@ PROG= vendstat SRCS= vendstat.c ibdiag_common.c -LDADD= -libumad -libcommon -libmad +LIBADD= ibumad ibcommon ibmad CFLAGS+= -I${DIAGPATH}/include MAN= vendstat.8 Modified: user/ngie/more-tests2/lib/libc/rpc/svc_vc.c ============================================================================== --- user/ngie/more-tests2/lib/libc/rpc/svc_vc.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/lib/libc/rpc/svc_vc.c Thu Dec 10 07:38:56 2015 (r292054) @@ -281,8 +281,8 @@ rendezvous_request(SVCXPRT *xprt, struct int sock, flags; struct cf_rendezvous *r; struct cf_conn *cd; - struct sockaddr_storage addr; - socklen_t len; + struct sockaddr_storage addr, sslocal; + socklen_t len, slen; struct __rpc_sockinfo si; SVCXPRT *newxprt; fd_set cleanfds; @@ -347,6 +347,20 @@ again: __xdrrec_setnonblock(&cd->xdrs, cd->maxrec); } else cd->nonblock = FALSE; + slen = sizeof(struct sockaddr_storage); + if(_getsockname(sock, (struct sockaddr *)(void *)&sslocal, &slen) < 0) { + warnx("svc_vc_create: could not retrieve local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = sslocal.ss_len; + newxprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len); + if (newxprt->xp_ltaddr.buf == NULL) { + warnx("svc_vc_create: no mem for local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + memcpy(newxprt->xp_ltaddr.buf, &sslocal, (size_t)sslocal.ss_len); + } + } gettimeofday(&cd->last_recv_time, NULL); Modified: user/ngie/more-tests2/lib/libc/stdio/open_memstream.c ============================================================================== --- user/ngie/more-tests2/lib/libc/stdio/open_memstream.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/lib/libc/stdio/open_memstream.c Thu Dec 10 07:38:56 2015 (r292054) @@ -31,10 +31,10 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include <assert.h> #include <errno.h> +#include <limits.h> #ifdef DEBUG -#include <inttypes.h> +#include <stdint.h> #endif -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: user/ngie/more-tests2/lib/libc/stdio/open_wmemstream.c ============================================================================== --- user/ngie/more-tests2/lib/libc/stdio/open_wmemstream.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/lib/libc/stdio/open_wmemstream.c Thu Dec 10 07:38:56 2015 (r292054) @@ -31,10 +31,10 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include <assert.h> #include <errno.h> +#include <limits.h> #ifdef DEBUG -#include <inttypes.h> +#include <stdint.h> #endif -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: user/ngie/more-tests2/lib/libopenbsd/Makefile ============================================================================== --- user/ngie/more-tests2/lib/libopenbsd/Makefile Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/lib/libopenbsd/Makefile Thu Dec 10 07:38:56 2015 (r292054) @@ -11,5 +11,4 @@ CFLAGS+= -I${.CURDIR} WARNS= 3 -NO_WERROR= .include <bsd.lib.mk> Modified: user/ngie/more-tests2/lib/libopenbsd/imsg.c ============================================================================== --- user/ngie/more-tests2/lib/libopenbsd/imsg.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/lib/libopenbsd/imsg.c Thu Dec 10 07:38:56 2015 (r292054) @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.10 2015/07/19 07:18:59 nicm Exp $ */ +/* $OpenBSD: imsg.c,v 1.13 2015/12/09 11:54:12 tb Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -74,7 +74,7 @@ imsg_read(struct imsgbuf *ibuf) again: if (getdtablecount() + imsg_fd_overhead + - (CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int) + (int)((CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int)) >= getdtablesize()) { errno = EAGAIN; free(ifd); @@ -82,11 +82,9 @@ again: } if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) { - if (errno == EMSGSIZE) - goto fail; - if (errno != EINTR && errno != EAGAIN) - goto fail; - goto again; + if (errno == EINTR) + goto again; + goto fail; } ibuf->r.wpos += n; @@ -120,8 +118,7 @@ again: } fail: - if (ifd) - free(ifd); + free(ifd); return (n); } Modified: user/ngie/more-tests2/sbin/devd/devd.cc ============================================================================== --- user/ngie/more-tests2/sbin/devd/devd.cc Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sbin/devd/devd.cc Thu Dec 10 07:38:56 2015 (r292054) @@ -108,15 +108,26 @@ __FBSDID("$FreeBSD$"); /* * Since the client socket is nonblocking, we must increase its send buffer to * handle brief event storms. On FreeBSD, AF_UNIX sockets don't have a receive - * buffer, so the client can't increate the buffersize by itself. + * buffer, so the client can't increase the buffersize by itself. * * For example, when creating a ZFS pool, devd emits one 165 character - * resource.fs.zfs.statechange message for each vdev in the pool. A 64k - * buffer has enough space for almost 400 drives, which would be very large but - * not impossibly large pool. A 128k buffer has enough space for 794 drives, - * which is more than can fit in a rack with modern technology. + * resource.fs.zfs.statechange message for each vdev in the pool. The kernel + * allocates a 4608B mbuf for each message. Modern technology places a limit of + * roughly 450 drives/rack, and it's unlikely that a zpool will ever be larger + * than that. + * + * 450 drives * 165 bytes / drive = 74250B of data in the sockbuf + * 450 drives * 4608B / drive = 2073600B of mbufs in the sockbuf + * + * We can't directly set the sockbuf's mbuf limit, but we can do it indirectly. + * The kernel sets it to the minimum of a hard-coded maximum value and sbcc * + * kern.ipc.sockbuf_waste_factor, where sbcc is the socket buffer size set by + * the user. The default value of kern.ipc.sockbuf_waste_factor is 8. If we + * set the bufsize to 256k and use the kern.ipc.sockbuf_waste_factor, then the + * kernel will set the mbuf limit to 2MB, which is just large enough for 450 + * drives. It also happens to be the same as the hardcoded maximum value. */ -#define CLIENT_BUFSIZE 131072 +#define CLIENT_BUFSIZE 262144 using namespace std; Modified: user/ngie/more-tests2/sbin/geom/class/multipath/geom_multipath.c ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/multipath/geom_multipath.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sbin/geom/class/multipath/geom_multipath.c Thu Dec 10 07:38:56 2015 (r292054) @@ -221,17 +221,15 @@ mp_label(struct gctl_req *req) /* * Allocate a sector to write as metadata. */ - sector = malloc(secsize); + sector = calloc(1, secsize); if (sector == NULL) { gctl_error(req, "unable to allocate metadata buffer"); return; } - memset(sector, 0, secsize); rsector = malloc(secsize); if (rsector == NULL) { - free(sector); gctl_error(req, "unable to allocate metadata buffer"); - return; + goto done; } /* @@ -246,7 +244,7 @@ mp_label(struct gctl_req *req) error = g_metadata_store(name, sector, secsize); if (error != 0) { gctl_error(req, "cannot store metadata on %s: %s.", name, strerror(error)); - return; + goto done; } /* @@ -274,6 +272,9 @@ mp_label(struct gctl_req *req) name2, name); } } +done: + free(rsector); + free(sector); } Modified: user/ngie/more-tests2/sbin/sysctl/sysctl.8 ============================================================================== --- user/ngie/more-tests2/sbin/sysctl/sysctl.8 Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sbin/sysctl/sysctl.8 Thu Dec 10 07:38:56 2015 (r292054) @@ -28,7 +28,7 @@ .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd February 12, 2015 +.Dd December 10, 2015 .Dt SYSCTL 8 .Os .Sh NAME @@ -36,13 +36,13 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm -.Op Fl bdehiNnoRTqx +.Op Fl bdehiNnoRTtqx .Op Fl B Ar bufsize .Op Fl f Ar filename .Ar name Ns Op = Ns Ar value .Ar ... .Nm -.Op Fl bdehNnoRTqx +.Op Fl bdehNnoRTtqx .Op Fl B Ar bufsize .Fl a .Sh DESCRIPTION @@ -140,6 +140,8 @@ Suppress some warnings generated by to standard error. .It Fl T Display only variables that are settable via loader (CTLFLAG_TUN). +.It Fl t +Print the type of the variable. .It Fl W Display only writable variables that are not statistical. Useful for determining the set of runtime tunable sysctls. Modified: user/ngie/more-tests2/sbin/sysctl/sysctl.c ============================================================================== --- user/ngie/more-tests2/sbin/sysctl/sysctl.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sbin/sysctl/sysctl.c Thu Dec 10 07:38:56 2015 (r292054) @@ -72,7 +72,7 @@ static const char rcsid[] = static const char *conffile; static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag; -static int Nflag, nflag, oflag, qflag, Tflag, Wflag, xflag; +static int Nflag, nflag, oflag, qflag, tflag, Tflag, Wflag, xflag; static int oidfmt(int *, int, char *, u_int *); static int parsefile(const char *); @@ -120,6 +120,9 @@ static const char *ctl_typename[CTLTYPE+ [CTLTYPE_S16] = "int16_t", [CTLTYPE_S32] = "int32_t", [CTLTYPE_S64] = "int64_t", + [CTLTYPE_NODE] = "node", + [CTLTYPE_STRING] = "string", + [CTLTYPE_OPAQUE] = "opaque", }; static void @@ -127,8 +130,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdehiNnoqTWx] [ -B <bufsize> ] [-f filename] name[=value] ...", - " sysctl [-bdehNnoqTWx] [ -B <bufsize> ] -a"); + "usage: sysctl [-bdehiNnoqTtWx] [ -B <bufsize> ] [-f filename] name[=value] ...", + " sysctl [-bdehNnoqTtWx] [ -B <bufsize> ] -a"); exit(1); } @@ -142,7 +145,7 @@ main(int argc, char **argv) setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "AabB:def:hiNnoqTwWxX")) != -1) { + while ((ch = getopt(argc, argv, "AabB:def:hiNnoqtTwWxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -184,6 +187,9 @@ main(int argc, char **argv) case 'q': qflag = 1; break; + case 't': + tflag = 1; + break; case 'T': Tflag = 1; break; @@ -856,7 +862,7 @@ show_var(int *oid, int nlen) { u_char buf[BUFSIZ], *val, *oval, *p; char name[BUFSIZ], fmt[BUFSIZ]; - const char *sep, *sep1; + const char *sep, *sep1, *prntype; int qoid[CTL_MAXNAME+2]; uintmax_t umv; intmax_t mv; @@ -902,12 +908,23 @@ show_var(int *oid, int nlen) else sep = ": "; - if (dflag) { /* just print description */ + ctltype = (kind & CTLTYPE); + if (tflag || dflag) { + if (!nflag) + printf("%s%s", name, sep); + if (ctl_typename[ctltype] != NULL) + prntype = ctl_typename[ctltype]; + else + prntype = "unknown"; + if (tflag && dflag) + printf("%s%s", prntype, sep); + else if (tflag) { + printf("%s", prntype); + return (0); + } qoid[1] = 5; j = sizeof(buf); i = sysctl(qoid, nlen + 2, buf, &j, 0, 0); - if (!nflag) - printf("%s%s", name, sep); printf("%s", buf); return (0); } @@ -925,7 +942,6 @@ show_var(int *oid, int nlen) warnx("malloc failed"); return (1); } - ctltype = (kind & CTLTYPE); len = j; i = sysctl(oid, nlen, val, &len, 0, 0); if (i != 0 || (len == 0 && ctltype != CTLTYPE_STRING)) { Modified: user/ngie/more-tests2/share/man/man4/ioat.4 ============================================================================== --- user/ngie/more-tests2/share/man/man4/ioat.4 Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/share/man/man4/ioat.4 Thu Dec 10 07:38:56 2015 (r292054) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 31, 2015 +.Dd December 9, 2015 .Dt IOAT 4 .Os .Sh NAME @@ -78,6 +78,17 @@ In .Fa "uint32_t flags" .Fc .Ft struct bus_dmadesc * +.Fo ioat_copy_8k_aligned +.Fa "bus_dmaengine_t dmaengine" +.Fa "bus_addr_t dst1" +.Fa "bus_addr_t dst2" +.Fa "bus_addr_t src1" +.Fa "bus_addr_t src2" +.Fa "bus_dmaengine_callback_t callback_fn" +.Fa "void *callback_arg" +.Fa "uint32_t flags" +.Fc +.Ft struct bus_dmadesc * .Fo ioat_blockfill .Fa "bus_dmaengine_t dmaengine" .Fa "bus_addr_t dst" @@ -150,7 +161,7 @@ Then, they will submit one or more opera .Fn ioat_copy , or .Fn ioat_null . -After queueing one or more individual DMA operations, they will +After queuing one or more individual DMA operations, they will .Fn ioat_release the .Ar bus_dmaengine_t Modified: user/ngie/more-tests2/share/man/man4/isp.4 ============================================================================== --- user/ngie/more-tests2/share/man/man4/isp.4 Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/share/man/man4/isp.4 Thu Dec 10 07:38:56 2015 (r292054) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 22, 2015 +.Dd December 9, 2015 .Dt ISP 4 .Os .Sh NAME @@ -107,10 +107,12 @@ Optical 2Gb Fibre Channel PCIe cards. Dell branded version of the QLogic 2312. .It Qlogic 2422 Optical 4Gb Fibre Channel PCI cards. -.It Qlogic 2432 +.It Qlogic 246x (aka 2432) Optical 4Gb Fibre Channel PCIe cards. -.It Qlogic 2532 +.It Qlogic 256x (aka 2532) Optical 8Gb Fibre Channel PCIe cards. +.It Qlogic 267x/836x (aka 2031/8031) +Optical 16Gb FC/FCoE PCIe cards. .El .Sh CONFIGURATION OPTIONS Target mode support for Fibre Channel adapters may be enabled with the @@ -127,12 +129,6 @@ They are: .It Va hint.isp.0.fwload_disable A hint value to disable loading of firmware .Xr ispfw 4 . -.It Va hint.isp.0.prefer_memmap -A hint value to use PCI memory space instead of I/O space -access for. -.It Va hint.isp.0.prefer_iomap -A hint value to use PCI I/O space instead of Memory space -access for. .It Va hint.isp.0.ignore_nvram A hint value to ignore board NVRAM settings for. Otherwise use NVRAM settings. Modified: user/ngie/more-tests2/share/man/man9/BUS_DESCRIBE_INTR.9 ============================================================================== --- user/ngie/more-tests2/share/man/man9/BUS_DESCRIBE_INTR.9 Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/share/man/man9/BUS_DESCRIBE_INTR.9 Thu Dec 10 07:38:56 2015 (r292054) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 14, 2009 +.Dd December 9, 2015 .Dt BUS_DESCRIBE_INTR 9 .Os .Sh NAME @@ -38,7 +38,7 @@ .In sys/param.h .In sys/bus.h .Ft int -.Fo BUS_BIND_INTR +.Fo BUS_DESCRIBE_INTR .Fa "device_t dev" "device_t child" "struct resource *irq" "void *cookie" .Fa "const char *descr" .Fc Modified: user/ngie/more-tests2/share/mk/bsd.libnames.mk ============================================================================== --- user/ngie/more-tests2/share/mk/bsd.libnames.mk Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/share/mk/bsd.libnames.mk Thu Dec 10 07:38:56 2015 (r292054) @@ -27,22 +27,23 @@ LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxm LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a -LIBCXXRT?= ${DESTDIR}${LIBDIR}/libcxxrt.a -LIBCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libc++.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a -LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a LIBCAPSICUM?= ${DESTDIR}${LIBDIR}/libcapsicum.a LIBCASPER?= ${DESTDIR}${LIBDIR}/libcasper.a -LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a LIBCOMPILER_RT?=${DESTDIR}${LIBDIR}/libcompiler_rt.a +LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a +LIBCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libc++.a LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a LIBCUSE?= ${DESTDIR}${LIBDIR}/libcuse.a +LIBCXGB4?= ${DESTDIR}${LIBDIR}/libcxgb4.a +LIBCXXRT?= ${DESTDIR}${LIBDIR}/libcxxrt.a +LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a LIBDEVCTL?= ${DESTDIR}${LIBDIR}/libdevctl.a LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a @@ -59,9 +60,9 @@ LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpa LIBFL?= "don't use LIBFL, use LIBL" LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -LIBGPIO?= ${DESTDIR}${LIBDIR}/libgpio.a LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a +LIBGPIO?= ${DESTDIR}${LIBDIR}/libgpio.a LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a @@ -69,6 +70,12 @@ LIBHEIMBASE?= ${DESTDIR}${LIBDIR}/libhei LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a LIBHEIMSQLITE?= ${DESTDIR}${LIBDIR}/libheimsqlite.a LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a +LIBIBCM?= ${DESTDIR}${LIBDIR}/libibcm.a +LIBIBCOMMON?= ${DESTDIR}${LIBDIR}/libibcommon.a +LIBIBMAD?= ${DESTDIR}${LIBDIR}/libibmad.a +LIBIBSDP?= ${DESTDIR}${LIBDIR}/libibsdp.a +LIBIBUMAD?= ${DESTDIR}${LIBDIR}/libibumad.a +LIBIBVERBS?= ${DESTDIR}${LIBDIR}/libibverbs.a LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a LIBJAIL?= ${DESTDIR}${LIBDIR}/libjail.a LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a @@ -88,8 +95,10 @@ LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a LIBMEMSTAT?= ${DESTDIR}${LIBDIR}/libmemstat.a LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a +LIBMLX4?= ${DESTDIR}${LIBDIR}/libmlx4.a LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a LIBMT?= ${DESTDIR}${LIBDIR}/libmt.a +LIBMTHCA?= ${DESTDIR}${LIBDIR}/libmthca.a LIBNANDFS?= ${DESTDIR}${LIBDIR}/libnandfs.a LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a @@ -97,7 +106,10 @@ LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnet LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a LIBNV?= ${DESTDIR}${LIBDIR}/libnv.a LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a +LIBOPENSM?= ${DESTDIR}${LIBDIR}/libopensm.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a +LIBOSMCOMP?= ${DESTDIR}${LIBDIR}/libosmcomp.a +LIBOSMVENDOR?= ${DESTDIR}${LIBDIR}/libosmvendor.a LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a LIBPANELW?= ${DESTDIR}${LIBDIR}/libpanelw.a @@ -108,9 +120,10 @@ LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a LIBPROCSTAT?= ${DESTDIR}${LIBDIR}/libprocstat.a LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a +LIBRDMACM?= ${DESTDIR}${LIBDIR}/librdmacm.a LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a -LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBRPCSEC_GSS?= ${DESTDIR}${LIBDIR}/librpcsec_gss.a +LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBRT?= ${DESTDIR}${LIBDIR}/librt.a LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a @@ -128,18 +141,18 @@ LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES" LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a +LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a -LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a -LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a +LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a LIBUUTIL?= ${DESTDIR}${LIBDIR}/libuutil.a LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmapi.a LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a -LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a LIBXO?= ${DESTDIR}${LIBDIR}/libxo.a +LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a LIBY?= ${DESTDIR}${LIBDIR}/liby.a LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a LIBZ?= ${DESTDIR}${LIBDIR}/libz.a Modified: user/ngie/more-tests2/share/mk/src.libnames.mk ============================================================================== --- user/ngie/more-tests2/share/mk/src.libnames.mk Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/share/mk/src.libnames.mk Thu Dec 10 07:38:56 2015 (r292054) @@ -169,6 +169,23 @@ _LIBRARIES= \ zfs \ zpool \ +.if ${MK_OFED} != "no" +_LIBRARIES+= \ + cxgb4 \ + ibcm \ + ibcommon \ + ibmad \ + ibsdp \ + ibumad \ + ibverbs \ + mlx4 \ + mthca \ + opensm \ + osmcomp \ + osmvendor \ + rdmacm \ + +.endif # Each library's LIBADD needs to be duplicated here for static linkage of # 2nd+ order consumers. Auto-generating this would be better. @@ -416,6 +433,19 @@ LIBUUTILDIR= ${OBJTOP}/cddl/lib/libuutil LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool +LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libcxgb4 +LIBIBCMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcm +LIBIBCOMMONDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcommon +LIBIBMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibmad +LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibumad +LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibverbs +LIBMLX4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libmlx4 +LIBMTHCADIR= ${OBJTOP}/contrib/ofed/usr.lib/libmthca +LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libopensm +LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmcomp +LIBOSMVENDORDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmvendor +LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/usr.lib/librdmacm +LIBIBSDPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libsdp LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp @@ -453,8 +483,6 @@ LIBMENUDIR= ${OBJTOP}/lib/ncurses/menu LIBMENULIBWDIR= ${OBJTOP}/lib/ncurses/menuw LIBNCURSESDIR= ${OBJTOP}/lib/ncurses/ncurses LIBNCURSESWDIR= ${OBJTOP}/lib/ncurses/ncursesw -LIBTERMCAPDIR= ${LIBNCURSESDIR} -LIBTERMCAPWDIR= ${LIBNCURSESWDIR} LIBPANELDIR= ${OBJTOP}/lib/ncurses/panel LIBPANELWDIR= ${OBJTOP}/lib/ncurses/panelw LIBCRYPTODIR= ${OBJTOP}/secure/lib/libcrypto @@ -464,6 +492,9 @@ LIBTEKENDIR= ${OBJTOP}/sys/teken/libteke LIBEGACYDIR= ${OBJTOP}/tools/build LIBLNDIR= ${OBJTOP}/usr.bin/lex/lib +LIBTERMCAPDIR= ${LIBNCURSESDIR} +LIBTERMCAPWDIR= ${LIBNCURSESWDIR} + # Default other library directories to lib/libNAME. .for lib in ${_LIBRARIES} LIB${lib:tu}DIR?= ${OBJTOP}/lib/lib${lib} Modified: user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_logging.c ============================================================================== --- user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_logging.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_logging.c Thu Dec 10 07:38:56 2015 (r292054) @@ -70,6 +70,9 @@ SYSCTL_DECL(_kern_hwpmc); */ static int pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; +#if (__FreeBSD_version < 1100000) +TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "logbuffersize", &pmclog_buffer_size); +#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, &pmclog_buffer_size, 0, "size of log buffers in kilobytes"); @@ -78,6 +81,9 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuf */ static int pmc_nlogbuffers = PMC_NLOGBUFFERS; +#if (__FreeBSD_version < 1100000) +TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nbuffers", &pmc_nlogbuffers); +#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers, CTLFLAG_RDTUN, &pmc_nlogbuffers, 0, "number of global log buffers"); Modified: user/ngie/more-tests2/sys/dev/ioat/ioat.c ============================================================================== --- user/ngie/more-tests2/sys/dev/ioat/ioat.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sys/dev/ioat/ioat.c Thu Dec 10 07:38:56 2015 (r292054) @@ -219,6 +219,17 @@ static struct _pcsid { 0x6f528086, "BDXDE IOAT Ch2" }, { 0x6f538086, "BDXDE IOAT Ch3" }, + { 0x6f208086, "BDX IOAT Ch0" }, + { 0x6f218086, "BDX IOAT Ch1" }, + { 0x6f228086, "BDX IOAT Ch2" }, + { 0x6f238086, "BDX IOAT Ch3" }, + { 0x6f248086, "BDX IOAT Ch4" }, + { 0x6f258086, "BDX IOAT Ch5" }, + { 0x6f268086, "BDX IOAT Ch6" }, + { 0x6f278086, "BDX IOAT Ch7" }, + { 0x6f2e8086, "BDX IOAT Ch0 (RAID)" }, + { 0x6f2f8086, "BDX IOAT Ch1 (RAID)" }, + { 0x00000000, NULL } }; @@ -833,6 +844,51 @@ ioat_copy(bus_dmaengine_t dmaengine, bus } struct bus_dmadesc * +ioat_copy_8k_aligned(bus_dmaengine_t dmaengine, bus_addr_t dst1, + bus_addr_t dst2, bus_addr_t src1, bus_addr_t src2, + bus_dmaengine_callback_t callback_fn, void *callback_arg, uint32_t flags) +{ + struct ioat_dma_hw_descriptor *hw_desc; + struct ioat_descriptor *desc; + struct ioat_softc *ioat; + + CTR0(KTR_IOAT, __func__); + ioat = to_ioat_softc(dmaengine); + + if (((src1 | src2 | dst1 | dst2) & (0xffffull << 48)) != 0) { + ioat_log_message(0, "%s: High 16 bits of src/dst invalid\n", + __func__); + return (NULL); + } + if (((src1 | src2 | dst1 | dst2) & PAGE_MASK) != 0) { + ioat_log_message(0, "%s: Addresses must be page-aligned\n", + __func__); + return (NULL); + } + + desc = ioat_op_generic(ioat, IOAT_OP_COPY, 2 * PAGE_SIZE, src1, dst1, + callback_fn, callback_arg, flags); + if (desc == NULL) + return (NULL); + + hw_desc = desc->u.dma; + if (src2 != src1 + PAGE_SIZE) { + hw_desc->u.control.src_page_break = 1; + hw_desc->next_src_addr = src2; + } + if (dst2 != dst1 + PAGE_SIZE) { + hw_desc->u.control.dest_page_break = 1; + hw_desc->next_dest_addr = dst2; + } + + if (g_ioat_debug_level >= 3) + dump_descriptor(hw_desc); + + ioat_submit_single(ioat); + return (&desc->bus_dmadesc); +} + +struct bus_dmadesc * ioat_blockfill(bus_dmaengine_t dmaengine, bus_addr_t dst, uint64_t fillpattern, bus_size_t len, bus_dmaengine_callback_t callback_fn, void *callback_arg, uint32_t flags) Modified: user/ngie/more-tests2/sys/dev/ioat/ioat.h ============================================================================== --- user/ngie/more-tests2/sys/dev/ioat/ioat.h Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sys/dev/ioat/ioat.h Thu Dec 10 07:38:56 2015 (r292054) @@ -84,6 +84,19 @@ struct bus_dmadesc *ioat_copy(bus_dmaeng void *callback_arg, uint32_t flags); /* + * Issue a copy data operation, with constraints: + * - src1, src2, dst1, dst2 are all page-aligned addresses + * - The quantity to copy is exactly 2 pages; + * - src1 -> dst1, src2 -> dst2 + * + * Why use this instead of normal _copy()? You can copy two non-contiguous + * pages (src, dst, or both) with one descriptor. + */ +struct bus_dmadesc *ioat_copy_8k_aligned(bus_dmaengine_t dmaengine, + bus_addr_t dst1, bus_addr_t dst2, bus_addr_t src1, bus_addr_t src2, + bus_dmaengine_callback_t callback_fn, void *callback_arg, uint32_t flags); + +/* * Issues a null operation. This issues the operation to the hardware, but the * hardware doesn't do anything with it. */ Modified: user/ngie/more-tests2/sys/dev/ioat/ioat_internal.h ============================================================================== --- user/ngie/more-tests2/sys/dev/ioat/ioat_internal.h Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sys/dev/ioat/ioat_internal.h Thu Dec 10 07:38:56 2015 (r292054) @@ -175,8 +175,8 @@ struct ioat_dma_hw_descriptor { uint64_t src_addr; uint64_t dest_addr; uint64_t next; - uint64_t reserved; - uint64_t reserved2; + uint64_t next_src_addr; + uint64_t next_dest_addr; uint64_t user1; uint64_t user2; }; Modified: user/ngie/more-tests2/sys/dev/ioat/ioat_test.c ============================================================================== --- user/ngie/more-tests2/sys/dev/ioat/ioat_test.c Thu Dec 10 07:35:38 2015 (r292053) +++ user/ngie/more-tests2/sys/dev/ioat/ioat_test.c Thu Dec 10 07:38:56 2015 (r292054) @@ -84,11 +84,17 @@ static inline void _ioat_test_log(int ve static void ioat_test_transaction_destroy(struct test_transaction *tx) { + struct ioat_test *test; int i; + test = tx->test; + for (i = 0; i < IOAT_MAX_BUFS; i++) { if (tx->buf[i] != NULL) { - contigfree(tx->buf[i], tx->length, M_IOAT_TEST); + if (test->testkind == IOAT_TEST_DMA_8K) + free(tx->buf[i], M_IOAT_TEST); + else + contigfree(tx->buf[i], tx->length, M_IOAT_TEST); tx->buf[i] = NULL; } } @@ -97,8 +103,8 @@ ioat_test_transaction_destroy(struct tes } static struct -test_transaction *ioat_test_transaction_create(unsigned num_buffers, - uint32_t buffer_size) +test_transaction *ioat_test_transaction_create(struct ioat_test *test, + unsigned num_buffers) { struct test_transaction *tx; unsigned i; @@ -107,11 +113,16 @@ test_transaction *ioat_test_transaction_ if (tx == NULL) return (NULL); - tx->length = buffer_size; + tx->length = test->buffer_size; for (i = 0; i < num_buffers; i++) { - tx->buf[i] = contigmalloc(buffer_size, M_IOAT_TEST, M_NOWAIT, - 0, BUS_SPACE_MAXADDR, PAGE_SIZE, 0); + if (test->testkind == IOAT_TEST_DMA_8K) + tx->buf[i] = malloc(test->buffer_size, M_IOAT_TEST, + M_NOWAIT); + else + tx->buf[i] = contigmalloc(test->buffer_size, + M_IOAT_TEST, M_NOWAIT, 0, BUS_SPACE_MAXADDR, + PAGE_SIZE, 0); if (tx->buf[i] == NULL) { ioat_test_transaction_destroy(tx); @@ -197,8 +208,7 @@ ioat_test_prealloc_memory(struct ioat_te struct test_transaction *tx; for (i = 0; i < test->transactions; i++) { - tx = ioat_test_transaction_create(test->chain_depth * 2, - test->buffer_size); + tx = ioat_test_transaction_create(test, test->chain_depth * 2); if (tx == NULL) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512100738.tBA7cujp011579>