From owner-svn-src-user@freebsd.org Mon Oct 5 00:12:01 2015 Return-Path: Delivered-To: svn-src-user@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 F3647A0E010 for ; Mon, 5 Oct 2015 00:12:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0BA31E0C; Mon, 5 Oct 2015 00:12:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t950C1gO098889; Mon, 5 Oct 2015 00:12:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t950Bo3s098838; Mon, 5 Oct 2015 00:11:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510050011.t950Bo3s098838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 5 Oct 2015 00:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r288677 - in user/ngie/more-tests: . bin/cat games include lib/libc/net lib/libc/sys lib/libohash lib/libusb lib/libz sbin/ipf/ipftest sbin/ipfw share/dtrace share/man/man7 share/mk sys... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2015 00:12:02 -0000 Author: ngie Date: Mon Oct 5 00:11:49 2015 New Revision: 288677 URL: https://svnweb.freebsd.org/changeset/base/288677 Log: MFhead @ r281414 Added: user/ngie/more-tests/share/dtrace/blocking - copied unchanged from r288676, head/share/dtrace/blocking user/ngie/more-tests/usr.bin/caesar/ - copied from r288676, head/usr.bin/caesar/ user/ngie/more-tests/usr.bin/factor/ - copied from r288676, head/usr.bin/factor/ user/ngie/more-tests/usr.bin/fortune/ - copied from r288676, head/usr.bin/fortune/ user/ngie/more-tests/usr.bin/grdc/ - copied from r288676, head/usr.bin/grdc/ user/ngie/more-tests/usr.bin/morse/ - copied from r288676, head/usr.bin/morse/ user/ngie/more-tests/usr.bin/number/ - copied from r288676, head/usr.bin/number/ user/ngie/more-tests/usr.bin/pom/ - copied from r288676, head/usr.bin/pom/ user/ngie/more-tests/usr.bin/primes/ - copied from r288676, head/usr.bin/primes/ user/ngie/more-tests/usr.bin/random/ - copied from r288676, head/usr.bin/random/ user/ngie/more-tests/usr.bin/truss/aarch64-fbsd.c - copied unchanged from r288676, head/usr.bin/truss/aarch64-fbsd.c user/ngie/more-tests/usr.bin/truss/amd64-cloudabi64.c - copied unchanged from r288676, head/usr.bin/truss/amd64-cloudabi64.c user/ngie/more-tests/usr.bin/truss/amd64cloudabi64.conf - copied unchanged from r288676, head/usr.bin/truss/amd64cloudabi64.conf user/ngie/more-tests/usr.sbin/bhyve/fwctl.c - copied unchanged from r288676, head/usr.sbin/bhyve/fwctl.c user/ngie/more-tests/usr.sbin/bhyve/fwctl.h - copied unchanged from r288676, head/usr.sbin/bhyve/fwctl.h Deleted: user/ngie/more-tests/games/ Modified: user/ngie/more-tests/Makefile.inc1 user/ngie/more-tests/bin/cat/cat.c user/ngie/more-tests/include/Makefile user/ngie/more-tests/lib/libc/net/getaddrinfo.c user/ngie/more-tests/lib/libc/sys/posix_fadvise.2 user/ngie/more-tests/lib/libohash/ohash.h user/ngie/more-tests/lib/libusb/Makefile user/ngie/more-tests/lib/libz/Makefile user/ngie/more-tests/sbin/ipf/ipftest/Makefile user/ngie/more-tests/sbin/ipfw/ipfw2.c user/ngie/more-tests/share/dtrace/Makefile user/ngie/more-tests/share/man/man7/hier.7 user/ngie/more-tests/share/mk/bsd.sys.mk user/ngie/more-tests/share/mk/meta.stage.mk user/ngie/more-tests/sys/arm/arm/bcopy_page.S user/ngie/more-tests/sys/arm/arm/bcopyinout.S user/ngie/more-tests/sys/arm/arm/machdep.c user/ngie/more-tests/sys/arm/arm/vm_machdep.c user/ngie/more-tests/sys/arm/include/asm.h user/ngie/more-tests/sys/arm/include/atomic-v4.h user/ngie/more-tests/sys/arm/include/atomic-v6.h user/ngie/more-tests/sys/arm/include/atomic.h user/ngie/more-tests/sys/arm64/arm64/trap.c user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/ngie/more-tests/sys/dev/ath/if_ath_beacon.c user/ngie/more-tests/sys/dev/ath/if_ath_keycache.c user/ngie/more-tests/sys/dev/ath/if_ath_keycache.h user/ngie/more-tests/sys/dev/drm2/drmP.h user/ngie/more-tests/sys/dev/drm2/drm_crtc.c user/ngie/more-tests/sys/dev/drm2/drm_fops.c user/ngie/more-tests/sys/dev/drm2/drm_pci.c user/ngie/more-tests/sys/dev/drm2/drm_stub.c user/ngie/more-tests/sys/dev/drm2/i915/i915_dma.c user/ngie/more-tests/sys/dev/drm2/i915/i915_drv.c user/ngie/more-tests/sys/dev/drm2/i915/intel_opregion.c user/ngie/more-tests/sys/dev/if_ndis/if_ndis.c user/ngie/more-tests/sys/dev/mwl/if_mwl.c user/ngie/more-tests/sys/dev/ral/rt2560.c user/ngie/more-tests/sys/dev/ral/rt2661.c user/ngie/more-tests/sys/dev/ral/rt2860.c user/ngie/more-tests/sys/dev/usb/wlan/if_rum.c user/ngie/more-tests/sys/dev/usb/wlan/if_rumreg.h user/ngie/more-tests/sys/dev/usb/wlan/if_rumvar.h user/ngie/more-tests/sys/dev/usb/wlan/if_run.c user/ngie/more-tests/sys/dev/usb/wlan/if_runreg.h user/ngie/more-tests/sys/dev/usb/wlan/if_runvar.h user/ngie/more-tests/sys/dev/usb/wlan/if_upgt.c user/ngie/more-tests/sys/dev/usb/wlan/if_ural.c user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests/sys/dev/usb/wlan/if_zyd.c user/ngie/more-tests/sys/dev/wpi/if_wpi.c user/ngie/more-tests/sys/dev/wtap/if_wtap.c user/ngie/more-tests/sys/kern/subr_sbuf.c user/ngie/more-tests/sys/kern/vfs_bio.c user/ngie/more-tests/sys/mips/conf/WZR-300HP user/ngie/more-tests/sys/mips/conf/WZR-300HP.hints user/ngie/more-tests/sys/net/if_gif.c user/ngie/more-tests/sys/net/if_gre.c user/ngie/more-tests/sys/net/if_lagg.c user/ngie/more-tests/sys/net/if_lagg.h user/ngie/more-tests/sys/net/if_me.c user/ngie/more-tests/sys/net80211/ieee80211_crypto.c user/ngie/more-tests/sys/net80211/ieee80211_crypto.h user/ngie/more-tests/sys/net80211/ieee80211_crypto_ccmp.c user/ngie/more-tests/sys/net80211/ieee80211_crypto_none.c user/ngie/more-tests/sys/net80211/ieee80211_crypto_tkip.c user/ngie/more-tests/sys/net80211/ieee80211_crypto_wep.c user/ngie/more-tests/sys/net80211/ieee80211_ioctl.c user/ngie/more-tests/sys/net80211/ieee80211_output.c user/ngie/more-tests/sys/net80211/ieee80211_proto.h user/ngie/more-tests/sys/net80211/ieee80211_var.h user/ngie/more-tests/sys/netinet6/nd6.c user/ngie/more-tests/sys/netinet6/nd6.h user/ngie/more-tests/sys/netinet6/nd6_nbr.c user/ngie/more-tests/sys/netpfil/ipfw/ip_fw_sockopt.c user/ngie/more-tests/sys/vm/vm_page.c user/ngie/more-tests/sys/vm/vm_pageout.c user/ngie/more-tests/sys/vm/vm_pageout.h user/ngie/more-tests/targets/pseudo/userland/games/Makefile.depend user/ngie/more-tests/usr.bin/Makefile user/ngie/more-tests/usr.bin/truss/Makefile user/ngie/more-tests/usr.bin/truss/syscall.h user/ngie/more-tests/usr.bin/truss/syscalls.c user/ngie/more-tests/usr.sbin/bhyve/Makefile user/ngie/more-tests/usr.sbin/bhyve/bhyverun.c user/ngie/more-tests/usr.sbin/ctld/ctl.conf.5 user/ngie/more-tests/usr.sbin/ctld/ctld.c user/ngie/more-tests/usr.sbin/ctld/ctld.h user/ngie/more-tests/usr.sbin/kldxref/kldxref.c user/ngie/more-tests/usr.sbin/rpc.yppasswdd/yppasswdd_server.c user/ngie/more-tests/usr.sbin/rpcbind/rpcb_svc_com.c Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/include/ (props changed) user/ngie/more-tests/lib/libc/ (props changed) user/ngie/more-tests/lib/libz/ (props changed) user/ngie/more-tests/sbin/ (props changed) user/ngie/more-tests/sbin/ipfw/ (props changed) user/ngie/more-tests/share/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests/targets/ (props changed) user/ngie/more-tests/usr.sbin/bhyve/ (props changed) Modified: user/ngie/more-tests/Makefile.inc1 ============================================================================== --- user/ngie/more-tests/Makefile.inc1 Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/Makefile.inc1 Mon Oct 5 00:11:49 2015 (r288677) @@ -61,9 +61,6 @@ SUBDIR= ${SUBDIR_OVERRIDE} .else SUBDIR= lib libexec SUBDIR+=bin -.if ${MK_GAMES} != "no" -SUBDIR+=games -.endif .if ${MK_CDDL} != "no" SUBDIR+=cddl .endif @@ -1285,7 +1282,7 @@ legacy: _bt= _bootstrap-tools .if ${MK_GAMES} != "no" -_strfile= games/fortune/strfile +_strfile= usr.bin/fortune/strfile .endif .if ${MK_GCC} != "no" && ${MK_CXX} != "no" Modified: user/ngie/more-tests/bin/cat/cat.c ============================================================================== --- user/ngie/more-tests/bin/cat/cat.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/bin/cat/cat.c Mon Oct 5 00:11:49 2015 (r288677) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #endif #include @@ -167,6 +168,7 @@ scanfiles(char *argv[], int cooked) FILE *fp; i = 0; + fd = -1; while ((path = argv[i]) != NULL || i == 0) { if (path == NULL || strcmp(path, "-") == 0) { filename = "stdin"; @@ -302,31 +304,40 @@ raw_cat(int rfd) static int udom_open(const char *path, int flags) { - struct sockaddr_un sou; - int fd; - unsigned int len; - - bzero(&sou, sizeof(sou)); + struct addrinfo hints, *res, *res0; + char rpath[PATH_MAX]; + int fd = -1; + int error; /* - * Construct the unix domain socket address and attempt to connect + * Construct the unix domain socket address and attempt to connect. */ - fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (fd >= 0) { - sou.sun_family = AF_UNIX; - if ((len = strlcpy(sou.sun_path, path, - sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { - close(fd); - errno = ENAMETOOLONG; + bzero(&hints, sizeof(hints)); + hints.ai_family = AF_LOCAL; + if (realpath(path, rpath) == NULL) + return (-1); + error = getaddrinfo(rpath, NULL, &hints, &res0); + if (error) { + warn("%s", gai_strerror(error)); + errno = EINVAL; + return (-1); + } + for (res = res0; res != NULL; res = res->ai_next) { + fd = socket(res->ai_family, res->ai_socktype, + res->ai_protocol); + if (fd < 0) { + freeaddrinfo(res0); return (-1); } - len = offsetof(struct sockaddr_un, sun_path[len+1]); - - if (connect(fd, (void *)&sou, len) < 0) { + error = connect(fd, res->ai_addr, res->ai_addrlen); + if (error == 0) + break; + else { close(fd); fd = -1; } } + freeaddrinfo(res0); /* * handle the open flags by shutting down appropriate directions Modified: user/ngie/more-tests/include/Makefile ============================================================================== --- user/ngie/more-tests/include/Makefile Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/include/Makefile Mon Oct 5 00:11:49 2015 (r288677) @@ -166,7 +166,7 @@ compat: -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ -p ${DESTDIR}${INCLUDEDIR} > /dev/null .if ${MK_META_MODE} == "yes" - touch ${.TARGET} + @touch ${.TARGET} .endif copies: @@ -255,8 +255,7 @@ copies: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${DESTDIR}${INCLUDEDIR}/teken .if ${MK_META_MODE} == "yes" - cd ${.OBJDIR} - touch ${.TARGET} + @touch ${.OBJDIR}/${.TARGET} .endif symlinks: @@ -373,8 +372,7 @@ symlinks: ${DESTDIR}${INCLUDEDIR}/rpc; \ done .if ${MK_META_MODE} == "yes" - cd ${.OBJDIR} - touch ${.TARGET} + @touch ${.OBJDIR}/${.TARGET} .endif .if ${MACHINE} == "host" Modified: user/ngie/more-tests/lib/libc/net/getaddrinfo.c ============================================================================== --- user/ngie/more-tests/lib/libc/net/getaddrinfo.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/lib/libc/net/getaddrinfo.c Mon Oct 5 00:11:49 2015 (r288677) @@ -168,12 +168,6 @@ struct explore { }; static const struct explore explore[] = { - { PF_LOCAL, SOCK_DGRAM, ANY, - AF_ANY | PROTOCOL_ANY }, - { PF_LOCAL, SOCK_STREAM, ANY, - AF_ANY | PROTOCOL_ANY }, - { PF_LOCAL, SOCK_SEQPACKET, ANY, - AF_ANY | PROTOCOL_ANY }, #ifdef INET6 { PF_INET6, SOCK_DGRAM, IPPROTO_UDP, AF_ANY | SOCKTYPE_ANY | PROTOCOL_ANY }, @@ -200,6 +194,12 @@ static const struct explore explore[] = AF_ANY | SOCKTYPE_ANY }, { PF_INET, SOCK_RAW, ANY, AF_ANY | PROTOCOL_ANY }, + { PF_LOCAL, SOCK_DGRAM, ANY, + AF_ANY | SOCKTYPE_ANY | PROTOCOL_ANY }, + { PF_LOCAL, SOCK_STREAM, ANY, + AF_ANY | SOCKTYPE_ANY | PROTOCOL_ANY }, + { PF_LOCAL, SOCK_SEQPACKET, ANY, + AF_ANY | SOCKTYPE_ANY | PROTOCOL_ANY }, { -1, 0, 0, 0 }, }; @@ -1245,7 +1245,9 @@ explore_numeric(const struct addrinfo *p if (pai->ai_family == afd->a_af) { GET_AI(ai, afd, p); GET_PORT(ai, servname); - if ((pai->ai_flags & AI_CANONNAME)) { + if ((pai->ai_family == AF_INET || + pai->ai_family == AF_INET6) && + (pai->ai_flags & AI_CANONNAME)) { /* * Set the numeric address itself as the canonical * name, based on a clarification in RFC3493. Modified: user/ngie/more-tests/lib/libc/sys/posix_fadvise.2 ============================================================================== --- user/ngie/more-tests/lib/libc/sys/posix_fadvise.2 Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/lib/libc/sys/posix_fadvise.2 Mon Oct 5 00:11:49 2015 (r288677) @@ -28,7 +28,7 @@ .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd January 30, 2014 +.Dd October 3, 2015 .Dt POSIX_FADVISE 2 .Os .Sh NAME @@ -89,11 +89,13 @@ read or written. Future access to this data may require a read operation. .El .Sh RETURN VALUES -.Rv -std posix_fadvise -.Sh ERRORS -The +If successful, .Fn posix_fadvise -system call returns zero on success, and an error on failure: +returns zero. +It returns an error on failure, without setting +.Va errno . +.Sh ERRORS +Possible failure conditions: .Bl -tag -width Er .It Bq Er EBADF The Modified: user/ngie/more-tests/lib/libohash/ohash.h ============================================================================== --- user/ngie/more-tests/lib/libohash/ohash.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/lib/libohash/ohash.h Mon Oct 5 00:11:49 2015 (r288677) @@ -20,6 +20,8 @@ #ifndef OHASH_H #define OHASH_H +#include + /* Open hashing support. * Open hashing was chosen because it is much lighter than other hash * techniques, and more efficient in most cases. Modified: user/ngie/more-tests/lib/libusb/Makefile ============================================================================== --- user/ngie/more-tests/lib/libusb/Makefile Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/lib/libusb/Makefile Mon Oct 5 00:11:49 2015 (r288677) @@ -35,10 +35,10 @@ SRCS+= libusb10_io.c .if defined(COMPAT_32BIT) CFLAGS+= -DCOMPAT_32BIT -.else +.endif + FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc FILESDIR= ${LIBDATADIR}/pkgconfig -.endif # # Cross platform support Modified: user/ngie/more-tests/lib/libz/Makefile ============================================================================== --- user/ngie/more-tests/lib/libz/Makefile Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/lib/libz/Makefile Mon Oct 5 00:11:49 2015 (r288677) @@ -68,10 +68,8 @@ test: example minigzip (export LD_LIBRARY_PATH=. ; \ echo hello world | ./minigzip | ./minigzip -d ) -.ifndef COMPAT_32BIT FILES= zlib.pc FILESDIR= ${LIBDATADIR}/pkgconfig -.endif .include Modified: user/ngie/more-tests/sbin/ipf/ipftest/Makefile ============================================================================== --- user/ngie/more-tests/sbin/ipf/ipftest/Makefile Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sbin/ipf/ipftest/Makefile Mon Oct 5 00:11:49 2015 (r288677) @@ -32,15 +32,19 @@ CLEANFILES+= ipnat.tab.c ipnat.tab.h CLEANFILES+= ippool_y.c ippool_l.c CLEANFILES+= ippool.tab.c ippool.tab.h -ipnat_y.c: ipnat_y.y +ipnat.tab.c ipnat.tab.h: ipnat_y.y ${YACC} -b ipnat -d ${.ALLSRC} + +ipnat_y.c: ipnat.tab.c sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ ipnat.tab.c > ${.TARGET} + +ipnat_y.h: ipnat.tab.h sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ - ipnat.tab.h > ${.TARGET:.c=.h} + ipnat.tab.h > ${.TARGET} ipnat_y.h: ipnat_y.c @@ -54,13 +58,17 @@ ipnat_l.h: lexer.h sed -e 's/yy/ipnat_yy/g' \ ${.ALLSRC} > ${.TARGET} -ippool_y.c: ippool_y.y +ippool.tab.c ippool.tab.h: ippool_y.y ${YACC} -b ippool -d ${.ALLSRC} + +ippool_y.c: ippool.tab.c sed -e 's/yy/ippool_yy/g' \ -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ ippool.tab.c > ${.TARGET} + +ippool_y.h: ippool.tab.h sed -e 's/yy/ippool_yy/g' \ - ippool.tab.h > ${.TARGET:.c=.h} + ippool.tab.h > ${.TARGET} ippool_y.h: ippool_y.c @@ -74,13 +82,17 @@ ippool_l.h: lexer.h sed -e 's/yy/ippool_yy/g' \ ${.ALLSRC} > ${.TARGET} -ipf_y.c: ipf_y.y +ipf.tab.c ipf.tab.h: ipf_y.y ${YACC} -b ipf -d ${.ALLSRC} + +ipf_y.c: ipf.tab.c sed -e 's/yy/ipf_yy/g' \ -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ ipf.tab.c > ${.TARGET} + +ipf_y.h: ipf.tab.h sed -e 's/yy/ipf_yy/g' \ - ipf.tab.h > ${.TARGET:.c=.h} + ipf.tab.h > ${.TARGET} ipf_y.h: ipf_y.c Modified: user/ngie/more-tests/sbin/ipfw/ipfw2.c ============================================================================== --- user/ngie/more-tests/sbin/ipfw/ipfw2.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sbin/ipfw/ipfw2.c Mon Oct 5 00:11:49 2015 (r288677) @@ -3625,7 +3625,7 @@ compile_rule(char *av[], uint32_t *rbuf, action->opcode = O_NAT; action->len = F_INSN_SIZE(ipfw_insn_nat); CHECK_ACTLEN; - if (_substrcmp(*av, "global") == 0) { + if (*av != NULL && _substrcmp(*av, "global") == 0) { action->arg1 = 0; av++; break; Modified: user/ngie/more-tests/share/dtrace/Makefile ============================================================================== --- user/ngie/more-tests/share/dtrace/Makefile Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/share/dtrace/Makefile Mon Oct 5 00:11:49 2015 (r288677) @@ -12,7 +12,8 @@ SUBDIR= ${_toolkit} _toolkit= toolkit .endif -SCRIPTS= disklatency \ +SCRIPTS= blocking \ + disklatency \ disklatencycmd \ hotopen \ nfsattrstats \ Copied: user/ngie/more-tests/share/dtrace/blocking (from r288676, head/share/dtrace/blocking) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/share/dtrace/blocking Mon Oct 5 00:11:49 2015 (r288677, copy of r288676, head/share/dtrace/blocking) @@ -0,0 +1,57 @@ +#!/usr/sbin/dtrace -s +/*- + * Copyright (c) 2015 Pawel Jakub Dawidek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + * This little script is for use with programs that use event loop and should + * sleep only when waiting for events (eg. via kevent(2)). When a program is + * going to sleep in the kernel, the script will show its name, PID, kernel + * stack trace and userland stack trace. Sleeping in kevent(2) is ignored. + * + * usage: blocking + */ + +#pragma D option quiet + +syscall::kevent:entry +/execname == $$1/ +{ + self->inkevent = 1; +} + +fbt::sleepq_add:entry +/!self->inkevent && execname == $$1/ +{ + printf("\n%s(%d) is blocking...\n", execname, pid); + stack(); + ustack(); +} + +syscall::kevent:return +/execname == $$1/ +{ + self->inkevent = 0; +} Modified: user/ngie/more-tests/share/man/man7/hier.7 ============================================================================== --- user/ngie/more-tests/share/man/man7/hier.7 Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/share/man/man7/hier.7 Mon Oct 5 00:11:49 2015 (r288677) @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd January 14, 2015 +.Dd October 2, 2015 .Dt HIER 7 .Os .Sh NAME @@ -685,9 +685,6 @@ source code for contributed cryptography .It Pa etc/ source code for files in .Pa /etc -.It Pa games/ -source code for files in -.Pa /usr/games .It Pa gnu/ Utilities covered by the GNU General Public License .It Pa include/ Modified: user/ngie/more-tests/share/mk/bsd.sys.mk ============================================================================== --- user/ngie/more-tests/share/mk/bsd.sys.mk Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/share/mk/bsd.sys.mk Mon Oct 5 00:11:49 2015 (r288677) @@ -149,7 +149,7 @@ CXXFLAGS.clang+= -Wno-c++11-extensions .if ${MK_SSP} != "no" && \ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. -SSP_CFLAGS?= -fstack-protector +SSP_CFLAGS?= -fstack-protector-strong CFLAGS+= ${SSP_CFLAGS} .endif # SSP && !ARM && !MIPS Modified: user/ngie/more-tests/share/mk/meta.stage.mk ============================================================================== --- user/ngie/more-tests/share/mk/meta.stage.mk Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/share/mk/meta.stage.mk Mon Oct 5 00:11:49 2015 (r288677) @@ -237,10 +237,11 @@ stage_as.$s: .dirdep CLEANFILES += ${STAGE_TARGETS} stage_incs stage_includes # stage_*links usually needs to follow any others. -.for t in ${STAGE_TARGETS:N*links:O:u} -.ORDER: $t stage_links -.ORDER: $t stage_symlinks +.if !empty(STAGE_SETS) && !empty(STAGE_TARGETS:Nstage_links) +.for s in ${STAGE_SETS:O:u} +stage_links.$s: ${STAGE_TARGETS:Nstage_links:O:u} .endfor +.endif # make sure this exists staging: Modified: user/ngie/more-tests/sys/arm/arm/bcopy_page.S ============================================================================== --- user/ngie/more-tests/sys/arm/arm/bcopy_page.S Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/arm/bcopy_page.S Mon Oct 5 00:11:49 2015 (r288677) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); #endif /* ! COPY_CHUNK */ #ifndef SAVE_REGS -#define SAVE_REGS stmfd sp!, {r4-r8, lr} +#define SAVE_REGS stmfd sp!, {r4-r8, lr}; _SAVE({r4-r8, lr}) #define RESTORE_REGS ldmfd sp!, {r4-r8, pc} #endif @@ -134,6 +134,7 @@ END(bcopy_page) ENTRY(bzero_page) stmfd sp!, {r4-r8, lr} + _SAVE({r4-r8, lr}) #ifdef BIG_LOOPS mov r2, #(PAGE_SIZE >> 9) #else @@ -189,6 +190,7 @@ END(bzero_page) ENTRY(bcopy_page) pld [r0] stmfd sp!, {r4, r5} + _SAVE({r4, r5}) mov ip, #32 ldr r2, [r0], #0x04 /* 0x00 */ ldr r3, [r0], #0x04 /* 0x04 */ Modified: user/ngie/more-tests/sys/arm/arm/bcopyinout.S ============================================================================== --- user/ngie/more-tests/sys/arm/arm/bcopyinout.S Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/arm/bcopyinout.S Mon Oct 5 00:11:49 2015 (r288677) @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #endif -#define SAVE_REGS stmfd sp!, {r4-r11} +#define SAVE_REGS stmfd sp!, {r4-r11}; _SAVE({r4-r11}) #define RESTORE_REGS ldmfd sp!, {r4-r11} #if defined(_ARM_ARCH_5E) @@ -341,6 +341,7 @@ ENTRY(copyout) cmp r2, r3 blt .Lnormale stmfd sp!, {r0-r2, r4, lr} + _SAVE({r0-r2, r4, lr}) mov r3, r0 mov r0, r1 mov r1, r3 Modified: user/ngie/more-tests/sys/arm/arm/machdep.c ============================================================================== --- user/ngie/more-tests/sys/arm/arm/machdep.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/arm/machdep.c Mon Oct 5 00:11:49 2015 (r288677) @@ -1069,7 +1069,7 @@ init_proc0(vm_offset_t kstack) (thread0.td_kstack + kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_flags = 0; thread0.td_pcb->pcb_vfpcpu = -1; - thread0.td_pcb->pcb_vfpstate.fpscr = VFPSCR_DN | VFPSCR_FZ; + thread0.td_pcb->pcb_vfpstate.fpscr = VFPSCR_DN; thread0.td_frame = &proc0_tf; pcpup->pc_curpcb = thread0.td_pcb; } Modified: user/ngie/more-tests/sys/arm/arm/vm_machdep.c ============================================================================== --- user/ngie/more-tests/sys/arm/arm/vm_machdep.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/arm/vm_machdep.c Mon Oct 5 00:11:49 2015 (r288677) @@ -134,7 +134,7 @@ cpu_fork(register struct thread *td1, re pcb2->pcb_regs.sf_sp = STACKALIGN(td2->td_frame); pcb2->pcb_vfpcpu = -1; - pcb2->pcb_vfpstate.fpscr = VFPSCR_DN | VFPSCR_FZ; + pcb2->pcb_vfpstate.fpscr = VFPSCR_DN; tf = td2->td_frame; tf->tf_spsr &= ~PSR_C; Modified: user/ngie/more-tests/sys/arm/include/asm.h ============================================================================== --- user/ngie/more-tests/sys/arm/include/asm.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/include/asm.h Mon Oct 5 00:11:49 2015 (r288677) @@ -53,10 +53,12 @@ #define STOP_UNWINDING .cantunwind #define _FNSTART .fnstart #define _FNEND .fnend +#define _SAVE(...) .save __VA_ARGS__ #else #define STOP_UNWINDING #define _FNSTART #define _FNEND +#define _SAVE(...) #endif /* Modified: user/ngie/more-tests/sys/arm/include/atomic-v4.h ============================================================================== --- user/ngie/more-tests/sys/arm/include/atomic-v4.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/include/atomic-v4.h Mon Oct 5 00:11:49 2015 (r288677) @@ -439,4 +439,37 @@ atomic_subtract_long(volatile u_long *p, atomic_subtract_32((volatile uint32_t *)p, v); } +/* + * ARMv5 does not support SMP. For both kernel and user modes, only a + * compiler barrier is needed for fences, since CPU is always + * self-consistent. + */ +static __inline void +atomic_thread_fence_acq(void) +{ + + __compiler_membar(); +} + +static __inline void +atomic_thread_fence_rel(void) +{ + + __compiler_membar(); +} + +static __inline void +atomic_thread_fence_acq_rel(void) +{ + + __compiler_membar(); +} + +static __inline void +atomic_thread_fence_seq_cst(void) +{ + + __compiler_membar(); +} + #endif /* _MACHINE_ATOMIC_H_ */ Modified: user/ngie/more-tests/sys/arm/include/atomic-v6.h ============================================================================== --- user/ngie/more-tests/sys/arm/include/atomic-v6.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/include/atomic-v6.h Mon Oct 5 00:11:49 2015 (r288677) @@ -596,4 +596,32 @@ atomic_store_rel_long(volatile u_long *p #undef ATOMIC_ACQ_REL #undef ATOMIC_ACQ_REL_LONG +static __inline void +atomic_thread_fence_acq(void) +{ + + dmb(); +} + +static __inline void +atomic_thread_fence_rel(void) +{ + + dmb(); +} + +static __inline void +atomic_thread_fence_acq_rel(void) +{ + + dmb(); +} + +static __inline void +atomic_thread_fence_seq_cst(void) +{ + + dmb(); +} + #endif /* _MACHINE_ATOMIC_V6_H_ */ Modified: user/ngie/more-tests/sys/arm/include/atomic.h ============================================================================== --- user/ngie/more-tests/sys/arm/include/atomic.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm/include/atomic.h Mon Oct 5 00:11:49 2015 (r288677) @@ -82,34 +82,6 @@ atomic_store_long(volatile u_long *dst, *dst = src; } -static __inline void -atomic_thread_fence_acq(void) -{ - - dmb(); -} - -static __inline void -atomic_thread_fence_rel(void) -{ - - dmb(); -} - -static __inline void -atomic_thread_fence_acq_rel(void) -{ - - dmb(); -} - -static __inline void -atomic_thread_fence_seq_cst(void) -{ - - dmb(); -} - #define atomic_clear_ptr atomic_clear_32 #define atomic_set_ptr atomic_set_32 #define atomic_cmpset_ptr atomic_cmpset_32 Modified: user/ngie/more-tests/sys/arm64/arm64/trap.c ============================================================================== --- user/ngie/more-tests/sys/arm64/arm64/trap.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/arm64/arm64/trap.c Mon Oct 5 00:11:49 2015 (r288677) @@ -275,7 +275,7 @@ do_el1h_sync(struct trapframe *frame) */ KASSERT((esr & ESR_ELx_IL) == ESR_ELx_IL || (exception == EXCP_DATA_ABORT && ((esr & ISS_DATA_ISV) == 0)), - ("Invalid instruction length in exception")); + ("Invalid instruction length in exception, esr %lx", esr)); CTR4(KTR_TRAP, "do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", @@ -377,6 +377,11 @@ do_el0_sync(struct trapframe *frame) case EXCP_UNKNOWN: el0_excp_unknown(frame); break; + case EXCP_PC_ALIGN: + td = curthread; + call_trapsignal(td, SIGBUS, BUS_ADRALN, (void *)frame->tf_elr); + userret(td, frame); + break; case EXCP_BRK: td = curthread; call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_elr); Modified: user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c ============================================================================== --- user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 5 00:11:49 2015 (r288677) @@ -449,7 +449,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, } if ((flags & DMU_READ_NO_PREFETCH) == 0 && read && - length < zfetch_array_rd_sz) { + length <= zfetch_array_rd_sz) { dmu_zfetch(&dn->dn_zfetch, blkid, nblks); } rw_exit(&dn->dn_struct_rwlock); Modified: user/ngie/more-tests/sys/dev/ath/if_ath_beacon.c ============================================================================== --- user/ngie/more-tests/sys/dev/ath/if_ath_beacon.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/ath/if_ath_beacon.c Mon Oct 5 00:11:49 2015 (r288677) @@ -199,7 +199,7 @@ ath_beacon_alloc(struct ath_softc *sc, s * we assume the mbuf routines will return us something * with this alignment (perhaps should assert). */ - m = ieee80211_beacon_alloc(ni, &vap->iv_bcn_off); + m = ieee80211_beacon_alloc(ni); if (m == NULL) { device_printf(sc->sc_dev, "%s: cannot get mbuf\n", __func__); sc->sc_stats.ast_be_nombuf++; @@ -713,7 +713,7 @@ ath_beacon_generate(struct ath_softc *sc /* XXX lock mcastq? */ nmcastq = avp->av_mcastq.axq_depth; - if (ieee80211_beacon_update(bf->bf_node, &vap->iv_bcn_off, m, nmcastq)) { + if (ieee80211_beacon_update(bf->bf_node, m, nmcastq)) { /* XXX too conservative? */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); error = bus_dmamap_load_mbuf_sg(sc->sc_dmat, bf->bf_dmamap, m, @@ -829,7 +829,7 @@ ath_beacon_start_adhoc(struct ath_softc */ bf = avp->av_bcbuf; m = bf->bf_m; - if (ieee80211_beacon_update(bf->bf_node, &vap->iv_bcn_off, m, 0)) { + if (ieee80211_beacon_update(bf->bf_node, m, 0)) { /* XXX too conservative? */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); error = bus_dmamap_load_mbuf_sg(sc->sc_dmat, bf->bf_dmamap, m, Modified: user/ngie/more-tests/sys/dev/ath/if_ath_keycache.c ============================================================================== --- user/ngie/more-tests/sys/dev/ath/if_ath_keycache.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/ath/if_ath_keycache.c Mon Oct 5 00:11:49 2015 (r288677) @@ -527,8 +527,7 @@ ath_key_delete(struct ieee80211vap *vap, * slot(s) must already have been allocated by ath_key_alloc. */ int -ath_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, - const u_int8_t mac[IEEE80211_ADDR_LEN]) +ath_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) { struct ath_softc *sc = vap->iv_ic->ic_softc; Modified: user/ngie/more-tests/sys/dev/ath/if_ath_keycache.h ============================================================================== --- user/ngie/more-tests/sys/dev/ath/if_ath_keycache.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/ath/if_ath_keycache.h Mon Oct 5 00:11:49 2015 (r288677) @@ -35,8 +35,7 @@ extern int ath_key_alloc(struct ieee80211vap *, struct ieee80211_key *, ieee80211_keyix *, ieee80211_keyix *); extern int ath_key_delete(struct ieee80211vap *, const struct ieee80211_key *); -extern int ath_key_set(struct ieee80211vap *, const struct ieee80211_key *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); +extern int ath_key_set(struct ieee80211vap *, const struct ieee80211_key *); extern int ath_keyset(struct ath_softc *sc, struct ieee80211vap *vap, const struct ieee80211_key *k, struct ieee80211_node *bss); Modified: user/ngie/more-tests/sys/dev/drm2/drmP.h ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/drmP.h Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/drmP.h Mon Oct 5 00:11:49 2015 (r288677) @@ -1782,12 +1782,6 @@ void drm_driver_irq_preinstall(struct dr void drm_driver_irq_postinstall(struct drm_device *dev); void drm_driver_irq_uninstall(struct drm_device *dev); -/* AGP/PCI Express/GART support (drm_agpsupport.c) */ -void *drm_agp_allocate_memory(size_t pages, u32 type); -int drm_agp_free_memory(void *handle); -int drm_agp_bind_memory(void *handle, off_t start); -int drm_agp_unbind_memory(void *handle); - /* sysctl support (drm_sysctl.h) */ extern int drm_sysctl_init(struct drm_device *dev); extern int drm_sysctl_cleanup(struct drm_device *dev); Modified: user/ngie/more-tests/sys/dev/drm2/drm_crtc.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/drm_crtc.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/drm_crtc.c Mon Oct 5 00:11:49 2015 (r288677) @@ -663,7 +663,7 @@ int drm_plane_init(struct drm_device *de plane->dev = dev; plane->funcs = funcs; plane->format_types = malloc(sizeof(uint32_t) * format_count, - DRM_MEM_KMS, M_WAITOK); + DRM_MEM_KMS, M_NOWAIT); if (!plane->format_types) { DRM_DEBUG_KMS("out of memory when allocating plane\n"); drm_mode_object_put(dev, &plane->base); @@ -1010,7 +1010,7 @@ int drm_mode_group_init(struct drm_devic total_objects += dev->mode_config.num_encoder; group->id_list = malloc(total_objects * sizeof(uint32_t), - DRM_MEM_KMS, M_WAITOK | M_ZERO); + DRM_MEM_KMS, M_NOWAIT | M_ZERO); if (!group->id_list) return -ENOMEM; @@ -1998,7 +1998,7 @@ int drm_mode_setcrtc(struct drm_device * connector_set = malloc(crtc_req->count_connectors * sizeof(struct drm_connector *), - DRM_MEM_KMS, M_WAITOK); + DRM_MEM_KMS, M_NOWAIT); if (!connector_set) { ret = -ENOMEM; goto out; @@ -2523,7 +2523,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_de goto out_err1; } clips = malloc(num_clips * sizeof(*clips), DRM_MEM_KMS, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); if (!clips) { ret = -ENOMEM; goto out_err1; @@ -2774,13 +2774,13 @@ struct drm_property *drm_property_create int ret; property = malloc(sizeof(struct drm_property), DRM_MEM_KMS, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); if (!property) return NULL; if (num_values) { property->values = malloc(sizeof(uint64_t)*num_values, DRM_MEM_KMS, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); if (!property->values) goto fail; } @@ -2908,7 +2908,7 @@ int drm_property_add_enum(struct drm_pro } prop_enum = malloc(sizeof(struct drm_property_enum), DRM_MEM_KMS, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); if (!prop_enum) return -ENOMEM; @@ -3104,7 +3104,7 @@ static struct drm_property_blob *drm_pro return NULL; blob = malloc(sizeof(struct drm_property_blob)+length, DRM_MEM_KMS, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); if (!blob) return NULL; @@ -3434,7 +3434,7 @@ int drm_mode_crtc_set_gamma_size(struct crtc->gamma_size = gamma_size; crtc->gamma_store = malloc(gamma_size * sizeof(uint16_t) * 3, - DRM_MEM_KMS, M_WAITOK | M_ZERO); + DRM_MEM_KMS, M_NOWAIT | M_ZERO); if (!crtc->gamma_store) { crtc->gamma_size = 0; return -ENOMEM; @@ -3632,7 +3632,7 @@ int drm_mode_page_flip_ioctl(struct drm_ file_priv->event_space -= sizeof e->event; mtx_unlock(&dev->event_lock); - e = malloc(sizeof *e, DRM_MEM_KMS, M_WAITOK | M_ZERO); + e = malloc(sizeof *e, DRM_MEM_KMS, M_NOWAIT | M_ZERO); if (e == NULL) { mtx_lock(&dev->event_lock); file_priv->event_space += sizeof e->event; Modified: user/ngie/more-tests/sys/dev/drm2/drm_fops.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/drm_fops.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/drm_fops.c Mon Oct 5 00:11:49 2015 (r288677) @@ -136,7 +136,7 @@ int drm_open(struct cdev *kdev, int flag sx_xlock(&drm_global_mutex); /* - * FIXME Linux<->FreeBSD: On Linux, counter updated outisde + * FIXME Linux<->FreeBSD: On Linux, counter updated outside * global mutex. */ if (!dev->open_count++) Modified: user/ngie/more-tests/sys/dev/drm2/drm_pci.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/drm_pci.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/drm_pci.c Mon Oct 5 00:11:49 2015 (r288677) @@ -225,7 +225,7 @@ int drm_pci_set_unique(struct drm_device master->unique_len = u->unique_len; master->unique_size = u->unique_len + 1; - master->unique = malloc(master->unique_size, DRM_MEM_DRIVER, M_WAITOK); + master->unique = malloc(master->unique_size, DRM_MEM_DRIVER, M_NOWAIT); if (!master->unique) { ret = -ENOMEM; goto err; Modified: user/ngie/more-tests/sys/dev/drm2/drm_stub.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/drm_stub.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/drm_stub.c Mon Oct 5 00:11:49 2015 (r288677) @@ -94,9 +94,9 @@ static int drm_minor_get_id(struct drm_d if (type == DRM_MINOR_CONTROL) { new_id += 64; - } else if (type == DRM_MINOR_RENDER) { - new_id += 128; - } + } else if (type == DRM_MINOR_RENDER) { + new_id += 128; + } return new_id; } Modified: user/ngie/more-tests/sys/dev/drm2/i915/i915_dma.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/i915/i915_dma.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/i915/i915_dma.c Mon Oct 5 00:11:49 2015 (r288677) @@ -1452,6 +1452,8 @@ int i915_driver_load(struct drm_device * } } + pci_enable_busmaster(dev->dev); + intel_opregion_init(dev); callout_init(&dev_priv->hangcheck_timer, 1); Modified: user/ngie/more-tests/sys/dev/drm2/i915/i915_drv.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/i915/i915_drv.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/i915/i915_drv.c Mon Oct 5 00:11:49 2015 (r288677) @@ -894,6 +894,7 @@ int intel_gpu_reset(struct drm_device *d case 4: ret = i965_do_reset(dev); break; + case 3: case 2: ret = i8xx_do_reset(dev); break; Modified: user/ngie/more-tests/sys/dev/drm2/i915/intel_opregion.c ============================================================================== --- user/ngie/more-tests/sys/dev/drm2/i915/intel_opregion.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/drm2/i915/intel_opregion.c Mon Oct 5 00:11:49 2015 (r288677) @@ -533,11 +533,9 @@ void intel_opregion_fini(struct drm_devi opregion->vbt = NULL; } #else -int +void intel_opregion_init(struct drm_device *dev) { - - return (0); } void Modified: user/ngie/more-tests/sys/dev/if_ndis/if_ndis.c ============================================================================== --- user/ngie/more-tests/sys/dev/if_ndis/if_ndis.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/if_ndis/if_ndis.c Mon Oct 5 00:11:49 2015 (r288677) @@ -194,7 +194,7 @@ static void ndis_media_status (struct if static int ndis_set_cipher (struct ndis_softc *, int); static int ndis_set_wpa (struct ndis_softc *, void *, int); static int ndis_add_key (struct ieee80211vap *, - const struct ieee80211_key *, const u_int8_t []); + const struct ieee80211_key *); static int ndis_del_key (struct ieee80211vap *, const struct ieee80211_key *); static void ndis_setmulti (struct ndis_softc *); @@ -3070,8 +3070,7 @@ ndis_del_key(struct ieee80211vap *vap, c * set after initial authentication with the AP. */ static int -ndis_add_key(struct ieee80211vap *vap, const struct ieee80211_key *key, - const uint8_t mac[IEEE80211_ADDR_LEN]) +ndis_add_key(struct ieee80211vap *vap, const struct ieee80211_key *key) { struct ndis_softc *sc = vap->iv_ic->ic_softc; ndis_80211_key rkey; Modified: user/ngie/more-tests/sys/dev/mwl/if_mwl.c ============================================================================== --- user/ngie/more-tests/sys/dev/mwl/if_mwl.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/mwl/if_mwl.c Mon Oct 5 00:11:49 2015 (r288677) @@ -111,7 +111,10 @@ static int mwl_key_alloc(struct ieee8021 ieee80211_keyix *, ieee80211_keyix *); static int mwl_key_delete(struct ieee80211vap *, const struct ieee80211_key *); -static int mwl_key_set(struct ieee80211vap *, const struct ieee80211_key *, +static int mwl_key_set(struct ieee80211vap *, + const struct ieee80211_key *); +static int _mwl_key_set(struct ieee80211vap *, + const struct ieee80211_key *, const uint8_t mac[IEEE80211_ADDR_LEN]); static int mwl_mode_init(struct mwl_softc *); static void mwl_update_mcast(struct ieee80211com *); @@ -1604,7 +1607,13 @@ addgroupflags(MWL_HAL_KEYVAL *hk, const * slot(s) must already have been allocated by mwl_key_alloc. */ static int -mwl_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, +mwl_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) +{ + return (_mwl_key_set(vap, k, k->wk_macaddr)); +} + +static int +_mwl_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, const uint8_t mac[IEEE80211_ADDR_LEN]) { #define GRPXMIT (IEEE80211_KEY_XMIT | IEEE80211_KEY_GROUP) @@ -1834,10 +1843,9 @@ mwl_beacon_setup(struct ieee80211vap *va { struct mwl_hal_vap *hvap = MWL_VAP(vap)->mv_hvap; struct ieee80211_node *ni = vap->iv_bss; - struct ieee80211_beacon_offsets *bo = &vap->iv_bcn_off; struct mbuf *m; - m = ieee80211_beacon_alloc(ni, bo); + m = ieee80211_beacon_alloc(ni); if (m == NULL) return ENOBUFS; mwl_hal_setbeacon(hvap, mtod(m, const void *), m->m_len); @@ -3911,7 +3919,8 @@ mwl_setanywepkey(struct ieee80211vap *va IEEE80211_F_PRIVACY && vap->iv_def_txkey != IEEE80211_KEYIX_NONE && vap->iv_nw_keys[vap->iv_def_txkey].wk_keyix != IEEE80211_KEYIX_NONE) - (void) mwl_key_set(vap, &vap->iv_nw_keys[vap->iv_def_txkey], mac); + (void) _mwl_key_set(vap, &vap->iv_nw_keys[vap->iv_def_txkey], + mac); } static int @@ -3956,7 +3965,7 @@ mwl_setglobalkeys(struct ieee80211vap *v wk = &vap->iv_nw_keys[0]; for (; wk < &vap->iv_nw_keys[IEEE80211_WEP_NKID]; wk++) if (wk->wk_keyix != IEEE80211_KEYIX_NONE) - (void) mwl_key_set(vap, wk, vap->iv_myaddr); + (void) _mwl_key_set(vap, wk, vap->iv_myaddr); } /* Modified: user/ngie/more-tests/sys/dev/ral/rt2560.c ============================================================================== --- user/ngie/more-tests/sys/dev/ral/rt2560.c Mon Oct 5 00:02:58 2015 (r288676) +++ user/ngie/more-tests/sys/dev/ral/rt2560.c Mon Oct 5 00:11:49 2015 (r288677) @@ -768,7 +768,7 @@ rt2560_newstate(struct ieee80211vap *vap if (vap->iv_opmode == IEEE80211_M_HOSTAP || vap->iv_opmode == IEEE80211_M_IBSS || vap->iv_opmode == IEEE80211_M_MBSS) { - m = ieee80211_beacon_alloc(ni, &vap->iv_bcn_off); + m = ieee80211_beacon_alloc(ni); if (m == NULL) { device_printf(sc->sc_dev, "could not allocate beacon\n"); @@ -1286,7 +1286,6 @@ static void rt2560_beacon_expire(struct rt2560_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct rt2560_tx_data *data; if (ic->ic_opmode != IEEE80211_M_IBSS && @@ -1305,7 +1304,7 @@ rt2560_beacon_expire(struct rt2560_softc bus_dmamap_unload(sc->bcnq.data_dmat, data->map); /* XXX 1 =>'s mcast frames which means all PS sta's will wakeup! */ - ieee80211_beacon_update(data->ni, &vap->iv_bcn_off, data->m, 1); + ieee80211_beacon_update(data->ni, data->m, 1); rt2560_tx_bcn(sc, data->m, data->ni); Modified: user/ngie/more-tests/sys/dev/ral/rt2661.c ============================================================================== --- user/ngie/more-tests/sys/dev/ral/rt2661.c Mon Oct 5 00:02:58 2015 (r288676) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***