From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 1 22:14:50 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2C89B8C; Wed, 1 Jan 2014 22:14:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C288519B0; Wed, 1 Jan 2014 22:14:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01MEofF059767; Wed, 1 Jan 2014 22:14:50 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01MEncP059761; Wed, 1 Jan 2014 22:14:49 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401012214.s01MEncP059761@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 22:14:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260170 - in stable/9/sys: fs/nfsclient nfsclient X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:14:51 -0000 Author: rmacklem Date: Wed Jan 1 22:14:49 2014 New Revision: 260170 URL: http://svnweb.freebsd.org/changeset/base/260170 Log: MFC: r259084 For software builds, the NFS client does many small synchronous (with FILE_SYNC) writes because non-contiguous byte ranges in the same buffer cache block are being written. This patch adds a new mount option "noncontigwr" which allows the non-contiguous byte ranges to be combined, with the dirty byte range becoming the superset of the bytes that are dirty, if the file has not been file locked. This reduces the number of writes significantly for software builds. The only case where this change might break existing applications is where an application is writing non-overlapping byte ranges within the same buffer cache block of a file from multiple clients concurrently. Since such an application would normally do file locking on the file, avoiding the byte range merge for files that have been file locked should be sufficient for most (maybe all?) cases. Modified: stable/9/sys/fs/nfsclient/nfs_clbio.c stable/9/sys/fs/nfsclient/nfs_clvfsops.c stable/9/sys/fs/nfsclient/nfs_clvnops.c stable/9/sys/fs/nfsclient/nfsnode.h stable/9/sys/nfsclient/nfsargs.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- stable/9/sys/fs/nfsclient/nfs_clbio.c Wed Jan 1 21:48:04 2014 (r260169) +++ stable/9/sys/fs/nfsclient/nfs_clbio.c Wed Jan 1 22:14:49 2014 (r260170) @@ -873,7 +873,7 @@ ncl_write(struct vop_write_args *ap) struct vattr vattr; struct nfsmount *nmp = VFSTONFS(vp->v_mount); daddr_t lbn; - int bcount; + int bcount, noncontig_write, obcount; int bp_cached, n, on, error = 0, error1; size_t orig_resid, local_resid; off_t orig_size, tmp_off; @@ -1036,7 +1036,15 @@ again: * unaligned buffer size. */ mtx_lock(&np->n_mtx); - if (uio->uio_offset == np->n_size && n) { + if ((np->n_flag & NHASBEENLOCKED) == 0 && + (nmp->nm_flag & NFSMNT_NONCONTIGWR) != 0) + noncontig_write = 1; + else + noncontig_write = 0; + if ((uio->uio_offset == np->n_size || + (noncontig_write != 0 && + lbn == (np->n_size / biosize) && + uio->uio_offset + n > np->n_size)) && n) { mtx_unlock(&np->n_mtx); /* * Get the buffer (in its pre-append state to maintain @@ -1044,8 +1052,8 @@ again: * nfsnode after we have locked the buffer to prevent * readers from reading garbage. */ - bcount = on; - bp = nfs_getcacheblk(vp, lbn, bcount, td); + obcount = np->n_size - (lbn * biosize); + bp = nfs_getcacheblk(vp, lbn, obcount, td); if (bp != NULL) { long save; @@ -1057,9 +1065,12 @@ again: mtx_unlock(&np->n_mtx); save = bp->b_flags & B_CACHE; - bcount += n; + bcount = on + n; allocbuf(bp, bcount); bp->b_flags |= save; + if (noncontig_write != 0 && on > obcount) + vfs_bio_bzero_buf(bp, obcount, on - + obcount); } } else { /* @@ -1158,19 +1169,23 @@ again: * area, just update the b_dirtyoff and b_dirtyend, * otherwise force a write rpc of the old dirty area. * + * If there has been a file lock applied to this file + * or vfs.nfs.old_noncontig_writing is set, do the following: * While it is possible to merge discontiguous writes due to * our having a B_CACHE buffer ( and thus valid read data * for the hole), we don't because it could lead to * significant cache coherency problems with multiple clients, * especially if locking is implemented later on. * - * As an optimization we could theoretically maintain - * a linked list of discontinuous areas, but we would still - * have to commit them separately so there isn't much - * advantage to it except perhaps a bit of asynchronization. + * If vfs.nfs.old_noncontig_writing is not set and there has + * not been file locking done on this file: + * Relax coherency a bit for the sake of performance and + * expand the current dirty region to contain the new + * write even if it means we mark some non-dirty data as + * dirty. */ - if (bp->b_dirtyend > 0 && + if (noncontig_write == 0 && bp->b_dirtyend > 0 && (on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) { if (bwrite(bp) == EINTR) { error = EINTR; Modified: stable/9/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- stable/9/sys/fs/nfsclient/nfs_clvfsops.c Wed Jan 1 21:48:04 2014 (r260169) +++ stable/9/sys/fs/nfsclient/nfs_clvfsops.c Wed Jan 1 22:14:49 2014 (r260170) @@ -713,7 +713,7 @@ static const char *nfs_opts[] = { "from" "retrans", "acregmin", "acregmax", "acdirmin", "acdirmax", "resvport", "readahead", "hostname", "timeout", "addr", "fh", "nfsv3", "sec", "principal", "nfsv4", "gssname", "allgssname", "dirpath", - "nametimeo", "negnametimeo", "nocto", "wcommitsize", + "nametimeo", "negnametimeo", "nocto", "noncontigwr", "wcommitsize", NULL }; /* @@ -833,6 +833,8 @@ nfs_mount(struct mount *mp) args.flags |= NFSMNT_ALLGSSNAME; if (vfs_getopt(mp->mnt_optnew, "nocto", NULL, NULL) == 0) args.flags |= NFSMNT_NOCTO; + if (vfs_getopt(mp->mnt_optnew, "noncontigwr", NULL, NULL) == 0) + args.flags |= NFSMNT_NONCONTIGWR; if (vfs_getopt(mp->mnt_optnew, "readdirsize", (void **)&opt, NULL) == 0) { if (opt == NULL) { vfs_mount_error(mp, "illegal readdirsize"); @@ -1703,6 +1705,8 @@ void nfscl_retopts(struct nfsmount *nmp, &blen); nfscl_printopt(nmp, (nmp->nm_flag & NFSMNT_NOCTO) != 0, ",nocto", &buf, &blen); + nfscl_printopt(nmp, (nmp->nm_flag & NFSMNT_NONCONTIGWR) != 0, + ",noncontigwr", &buf, &blen); nfscl_printopt(nmp, (nmp->nm_flag & (NFSMNT_NOLOCKD | NFSMNT_NFSV4)) == 0, ",lockd", &buf, &blen); nfscl_printopt(nmp, (nmp->nm_flag & (NFSMNT_NOLOCKD | NFSMNT_NFSV4)) == Modified: stable/9/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- stable/9/sys/fs/nfsclient/nfs_clvnops.c Wed Jan 1 21:48:04 2014 (r260169) +++ stable/9/sys/fs/nfsclient/nfs_clvnops.c Wed Jan 1 22:14:49 2014 (r260170) @@ -3054,6 +3054,10 @@ nfs_advlock(struct vop_advlock_args *ap) np->n_change = va.va_filerev; } } + /* Mark that a file lock has been acquired. */ + mtx_lock(&np->n_mtx); + np->n_flag |= NHASBEENLOCKED; + mtx_unlock(&np->n_mtx); } NFSVOPUNLOCK(vp, 0); return (0); @@ -3073,6 +3077,12 @@ nfs_advlock(struct vop_advlock_args *ap) error = ENOLCK; } } + if (error == 0 && ap->a_op == F_SETLK) { + /* Mark that a file lock has been acquired. */ + mtx_lock(&np->n_mtx); + np->n_flag |= NHASBEENLOCKED; + mtx_unlock(&np->n_mtx); + } } return (error); } Modified: stable/9/sys/fs/nfsclient/nfsnode.h ============================================================================== --- stable/9/sys/fs/nfsclient/nfsnode.h Wed Jan 1 21:48:04 2014 (r260169) +++ stable/9/sys/fs/nfsclient/nfsnode.h Wed Jan 1 22:14:49 2014 (r260170) @@ -158,6 +158,7 @@ struct nfsnode { #define NREMOVEWANT 0x00004000 /* Want notification that remove is done */ #define NLOCK 0x00008000 /* Sleep lock the node */ #define NLOCKWANT 0x00010000 /* Want the sleep lock */ +#define NHASBEENLOCKED 0x00080000 /* Has been file locked. */ /* * Convert between nfsnode pointers and vnode pointers Modified: stable/9/sys/nfsclient/nfsargs.h ============================================================================== --- stable/9/sys/nfsclient/nfsargs.h Wed Jan 1 21:48:04 2014 (r260169) +++ stable/9/sys/nfsclient/nfsargs.h Wed Jan 1 22:14:49 2014 (r260170) @@ -98,5 +98,6 @@ struct nfs_args { #define NFSMNT_ALLGSSNAME 0x08000000 /* Use principal for all accesses */ #define NFSMNT_STRICT3530 0x10000000 /* Adhere strictly to RFC3530 */ #define NFSMNT_NOCTO 0x20000000 /* Don't flush attrcache on open */ +#define NFSMNT_NONCONTIGWR 0x80000000 /* Enable non-contiguous writes */ #endif From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 1 22:22:01 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72E0FE71; Wed, 1 Jan 2014 22:22:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F33E1A3D; Wed, 1 Jan 2014 22:22:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01MM1v3063263; Wed, 1 Jan 2014 22:22:01 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01MM198063262; Wed, 1 Jan 2014 22:22:01 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401012222.s01MM198063262@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 22:22:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260171 - stable/9/sbin/mount_nfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:22:01 -0000 Author: rmacklem Date: Wed Jan 1 22:22:00 2014 New Revision: 260171 URL: http://svnweb.freebsd.org/changeset/base/260171 Log: MFC: r259089 Document the noncontigwr NFS mount option. This is a content change. Modified: stable/9/sbin/mount_nfs/mount_nfs.8 Directory Properties: stable/9/sbin/mount_nfs/ (props changed) Modified: stable/9/sbin/mount_nfs/mount_nfs.8 ============================================================================== --- stable/9/sbin/mount_nfs/mount_nfs.8 Wed Jan 1 22:14:49 2014 (r260170) +++ stable/9/sbin/mount_nfs/mount_nfs.8 Wed Jan 1 22:22:00 2014 (r260171) @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd May 3, 2011 +.Dd December 7, 2013 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -221,6 +221,19 @@ servers on the client. Note that this option will only be honored when performing the initial mount, it will be silently ignored if used while updating the mount options. +.It Cm noncontigwr +This mount option allows the NFS client to +combine non-contiguous byte ranges being written +such that the dirty byte range becomes a superset of the bytes +that are dirty. +This reduces the number of writes significantly for software +builds. +The merging of byte ranges isn't done if the file has been file +locked, since most applications modifying a file from multiple +clients will use file locking. +As such, this option could result in a corrupted file for the +rare case of an application modifying the file from multiple +clients concurrently without using file locking. .It Cm principal For the RPCSEC_GSS security flavors, such as krb5, krb5i and krb5p, this option sets the name of the host based principal name expected From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 1 22:35:12 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D980E1CA; Wed, 1 Jan 2014 22:35:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AA38A1AE8; Wed, 1 Jan 2014 22:35:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01MZCra067287; Wed, 1 Jan 2014 22:35:12 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01MZCeO067285; Wed, 1 Jan 2014 22:35:12 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401012235.s01MZCeO067285@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 22:35:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260172 - in stable/9/sys/fs: nfs nfsclient X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:35:12 -0000 Author: rmacklem Date: Wed Jan 1 22:35:11 2014 New Revision: 260172 URL: http://svnweb.freebsd.org/changeset/base/260172 Log: MFC: r259801 The NFSv4 client was passing both the p and cred arguments to nfsv4_fillattr() as NULLs for the Getattr callback. This caused nfsv4_fillattr() to not fill in the Change attribute for the reply. I believe this was a violation of the RFC, but had little effect on server behaviour. This patch passes a non-NULL p argument to fix this. Modified: stable/9/sys/fs/nfs/nfs_commonsubs.c stable/9/sys/fs/nfsclient/nfs_clstate.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- stable/9/sys/fs/nfs/nfs_commonsubs.c Wed Jan 1 22:22:00 2014 (r260171) +++ stable/9/sys/fs/nfs/nfs_commonsubs.c Wed Jan 1 22:35:11 2014 (r260172) @@ -1992,7 +1992,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd * First, set the bits that can be filled and get fsinfo. */ NFSSET_ATTRBIT(retbitp, attrbitp); - /* If p and cred are NULL, it is a client side call */ + /* + * If both p and cred are NULL, it is a client side setattr call. + * If both p and cred are not NULL, it is a server side reply call. + * If p is not NULL and cred is NULL, it is a client side callback + * reply call. + */ if (p == NULL && cred == NULL) { NFSCLRNOTSETABLE_ATTRBIT(retbitp); aclp = saclp; Modified: stable/9/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- stable/9/sys/fs/nfsclient/nfs_clstate.c Wed Jan 1 22:22:00 2014 (r260171) +++ stable/9/sys/fs/nfsclient/nfs_clstate.c Wed Jan 1 22:35:11 2014 (r260172) @@ -3093,7 +3093,7 @@ nfscl_docb(struct nfsrv_descript *nd, NF NFSATTRBIT_CHANGE); } (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, - NULL, 0, &rattrbits, NULL, NULL, 0, 0, 0, 0, + NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, (uint64_t)0); if (!ret) vrele(vp); From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 1 22:43:17 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 608FB580; Wed, 1 Jan 2014 22:43:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 323631C98; Wed, 1 Jan 2014 22:43:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01MhH2E070875; Wed, 1 Jan 2014 22:43:17 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01MhHcS070874; Wed, 1 Jan 2014 22:43:17 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401012243.s01MhHcS070874@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 22:43:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260173 - stable/9/sys/fs/nfsserver X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:43:17 -0000 Author: rmacklem Date: Wed Jan 1 22:43:16 2014 New Revision: 260173 URL: http://svnweb.freebsd.org/changeset/base/260173 Log: MFC: r259845 An intermittent problem with NFSv4 exporting of ZFS snapshots was reported to the freebsd-fs mailing list. I believe the problem was caused by the Readdir operation using VFS_VGET() for a snapshot file entry instead of VOP_LOOKUP(). This would not occur for NFSv3, since it will do a VFS_VGET() of "." which fails with ENOTSUPP at the beginning of the directory, whereas NFSv4 does not check "." or "..". This patch adds a call to VFS_VGET() for the directory being read to check for ENOTSUPP. I also observed that the mount_on_fileid and fsid attributes were not correct at the snapshot's auto mountpoints when looking at packet traces for the Readdir. This patch fixes the attributes by doing a check for different v_mount structure, even if the vnode v_mountedhere is not set. Modified: stable/9/sys/fs/nfsserver/nfs_nfsdport.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- stable/9/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 22:35:11 2014 (r260172) +++ stable/9/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 22:43:16 2014 (r260173) @@ -1985,6 +1985,27 @@ again: } /* + * Check to see if entries in this directory can be safely acquired + * via VFS_VGET() or if a switch to VOP_LOOKUP() is required. + * ZFS snapshot directories need VOP_LOOKUP(), so that any + * automount of the snapshot directory that is required will + * be done. + * This needs to be done here for NFSv4, since NFSv4 never does + * a VFS_VGET() for "." or "..". + */ + if (not_zfs == 0) { + r = VFS_VGET(mp, at.na_fileid, LK_SHARED, &nvp); + if (r == EOPNOTSUPP) { + usevget = 0; + cn.cn_nameiop = LOOKUP; + cn.cn_lkflags = LK_SHARED | LK_RETRY; + cn.cn_cred = nd->nd_cred; + cn.cn_thread = p; + } else if (r == 0) + vput(nvp); + } + + /* * Save this position, in case there is an error before one entry * is created. */ @@ -2122,6 +2143,22 @@ again: if (!r) r = nfsvno_getattr(nvp, nvap, nd->nd_cred, p, 1); + if (r == 0 && not_zfs == 0 && + nfsrv_enable_crossmntpt != 0 && + (nd->nd_flag & ND_NFSV4) != 0 && + nvp->v_type == VDIR && + vp->v_mount != nvp->v_mount) { + /* + * For a ZFS snapshot, there is a + * pseudo mount that does not set + * v_mountedhere, so it needs to + * be detected via a different + * mount structure. + */ + at_root = 1; + if (new_mp == mp) + new_mp = nvp->v_mount; + } } } else { nvp = NULL; From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 1 22:49:38 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B4E46E6; Wed, 1 Jan 2014 22:49:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C7641CB2; Wed, 1 Jan 2014 22:49:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01Mnbs8071664; Wed, 1 Jan 2014 22:49:37 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01MnbCI071661; Wed, 1 Jan 2014 22:49:37 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401012249.s01MnbCI071661@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 22:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260174 - in stable/9/sys/fs: nfs nfsserver X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:49:38 -0000 Author: rmacklem Date: Wed Jan 1 22:49:37 2014 New Revision: 260174 URL: http://svnweb.freebsd.org/changeset/base/260174 Log: MFC: r259854 The NFSv4 server would call VOP_SETATTR() with a shared locked vnode when a Getattr for a file is done by a client other than the one that holds the file's delegation. This would only happen when delegations are enabled and the problem is fixed by this patch. Modified: stable/9/sys/fs/nfs/nfs_var.h stable/9/sys/fs/nfsserver/nfs_nfsdport.c stable/9/sys/fs/nfsserver/nfs_nfsdstate.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/nfs/nfs_var.h ============================================================================== --- stable/9/sys/fs/nfs/nfs_var.h Wed Jan 1 22:43:16 2014 (r260173) +++ stable/9/sys/fs/nfs/nfs_var.h Wed Jan 1 22:49:37 2014 (r260174) @@ -561,7 +561,7 @@ void nfsvno_open(struct nfsrv_descript * nfsv4stateid_t *, struct nfsstate *, int *, struct nfsvattr *, int32_t *, int, NFSACL_T *, nfsattrbit_t *, struct ucred *, NFSPROC_T *, struct nfsexstuff *, vnode_t *); -void nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *, +int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *, NFSPROC_T *); int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, Modified: stable/9/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- stable/9/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 22:43:16 2014 (r260173) +++ stable/9/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 22:49:37 2014 (r260174) @@ -1470,8 +1470,9 @@ nfsvno_open(struct nfsrv_descript *nd, s * Updates the file rev and sets the mtime and ctime * to the current clock time, returning the va_filerev and va_Xtime * values. + * Return ESTALE to indicate the vnode is VI_DOOMED. */ -void +int nfsvno_updfilerev(struct vnode *vp, struct nfsvattr *nvap, struct ucred *cred, struct thread *p) { @@ -1479,8 +1480,14 @@ nfsvno_updfilerev(struct vnode *vp, stru VATTR_NULL(&va); vfs_timestamp(&va.va_mtime); + if (NFSVOPISLOCKED(vp) != LK_EXCLUSIVE) { + NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); + if ((vp->v_iflag & VI_DOOMED) != 0) + return (ESTALE); + } (void) VOP_SETATTR(vp, &va, cred); (void) nfsvno_getattr(vp, nvap, cred, p, 1); + return (0); } /* Modified: stable/9/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/9/sys/fs/nfsserver/nfs_nfsdstate.c Wed Jan 1 22:43:16 2014 (r260173) +++ stable/9/sys/fs/nfsserver/nfs_nfsdstate.c Wed Jan 1 22:49:37 2014 (r260174) @@ -4852,15 +4852,15 @@ nfsrv_checkgetattr(struct nfsrv_descript nva.na_filerev > delegfilerev) || (NFSVNO_ISSETSIZE(&nva) && nva.na_size != nvap->na_size)) { - nfsvno_updfilerev(vp, nvap, cred, p); + error = nfsvno_updfilerev(vp, nvap, cred, p); if (NFSVNO_ISSETSIZE(&nva)) nvap->na_size = nva.na_size; } - } + } else + error = 0; /* Ignore callback errors for now. */ } else { NFSUNLOCKSTATE(); } - error = 0; out: NFSEXITCODE2(error, nd); From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 2 16:27:31 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C612A7D; Thu, 2 Jan 2014 16:27:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC22E18B6; Thu, 2 Jan 2014 16:27:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02GRUuV077401; Thu, 2 Jan 2014 16:27:30 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02GRUqc077400; Thu, 2 Jan 2014 16:27:30 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021627.s02GRUqc077400@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 16:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260197 - stable/9/usr.sbin/crashinfo X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 16:27:31 -0000 Author: pluknet Date: Thu Jan 2 16:27:30 2014 New Revision: 260197 URL: http://svnweb.freebsd.org/changeset/base/260197 Log: MFC r259870: Do not truncate the ``command'' column in ``ps'' output. Modified: stable/9/usr.sbin/crashinfo/crashinfo.sh Directory Properties: stable/9/usr.sbin/crashinfo/ (props changed) Modified: stable/9/usr.sbin/crashinfo/crashinfo.sh ============================================================================== --- stable/9/usr.sbin/crashinfo/crashinfo.sh Thu Jan 2 15:43:23 2014 (r260196) +++ stable/9/usr.sbin/crashinfo/crashinfo.sh Thu Jan 2 16:27:30 2014 (r260197) @@ -181,9 +181,9 @@ fi echo echo "------------------------------------------------------------------------" -echo "ps -axl" +echo "ps -axlww" echo -ps -M $VMCORE -N $KERNEL -axl +ps -M $VMCORE -N $KERNEL -axlww echo echo "------------------------------------------------------------------------" From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 2 16:39:12 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 750CD175; Thu, 2 Jan 2014 16:39:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 606C119AB; Thu, 2 Jan 2014 16:39:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02GdC4q081455; Thu, 2 Jan 2014 16:39:12 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02GdCCm081454; Thu, 2 Jan 2014 16:39:12 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021639.s02GdCCm081454@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 16:39:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260199 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 16:39:12 -0000 Author: pluknet Date: Thu Jan 2 16:39:11 2014 New Revision: 260199 URL: http://svnweb.freebsd.org/changeset/base/260199 Log: MFC r259872: The compile time constant limit on number of swap devices was removed in 5.2. As such, remove the EINVAL error saying so. Currently the vm.nswapdev sysctl just represents the number of added swap devices. Modified: stable/9/lib/libc/sys/swapon.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/swapon.2 ============================================================================== --- stable/9/lib/libc/sys/swapon.2 Thu Jan 2 16:37:23 2014 (r260198) +++ stable/9/lib/libc/sys/swapon.2 Thu Jan 2 16:39:11 2014 (r260199) @@ -28,7 +28,7 @@ .\" @(#)swapon.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd October 4, 2013 .Dt SWAPON 2 .Os .Sh NAME @@ -98,10 +98,6 @@ Additionally, .Fn swapon can fail for the following reasons: .Bl -tag -width Er -.It Bq Er EINVAL -The system has reached the boot-time limit on the number of -swap devices, -.Va vm.nswapdev . .It Bq Er ENOTBLK The .Fa special From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 2 16:50:26 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B05997C3; Thu, 2 Jan 2014 16:50:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9BF021A79; Thu, 2 Jan 2014 16:50:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02GoQRM086073; Thu, 2 Jan 2014 16:50:26 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02GoQB1086072; Thu, 2 Jan 2014 16:50:26 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021650.s02GoQB1086072@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 16:50:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260202 - stable/9/sys/netinet X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 16:50:26 -0000 Author: pluknet Date: Thu Jan 2 16:50:26 2014 New Revision: 260202 URL: http://svnweb.freebsd.org/changeset/base/260202 Log: MFC r259906: Draft-ietf-tcpm-initcwnd-05 became RFC6928. Modified: stable/9/sys/netinet/tcp_input.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/tcp_input.c ============================================================================== --- stable/9/sys/netinet/tcp_input.c Thu Jan 2 16:48:08 2014 (r260201) +++ stable/9/sys/netinet/tcp_input.c Thu Jan 2 16:50:26 2014 (r260202) @@ -164,7 +164,7 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, exp VNET_DEFINE(int, tcp_do_initcwnd10) = 1; SYSCTL_VNET_INT(_net_inet_tcp_experimental, OID_AUTO, initcwnd10, CTLFLAG_RW, &VNET_NAME(tcp_do_initcwnd10), 0, - "Enable draft-ietf-tcpm-initcwnd-05 (Increasing initial CWND to 10)"); + "Enable RFC 6928 (Increasing initial CWND to 10)"); VNET_DEFINE(int, tcp_do_rfc3465) = 1; SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, rfc3465, CTLFLAG_RW, @@ -354,7 +354,7 @@ cc_conn_init(struct tcpcb *tp) * * RFC5681 Section 3.1 specifies the default conservative values. * RFC3390 specifies slightly more aggressive values. - * Draft-ietf-tcpm-initcwnd-05 increases it to ten segments. + * RFC6928 increases it to ten segments. * * If a SYN or SYN/ACK was lost and retransmitted, we have to * reduce the initial CWND to one segment as congestion is likely From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 2 21:57:08 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44927897; Thu, 2 Jan 2014 21:57:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D6601760; Thu, 2 Jan 2014 21:57:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02Lv82n008095; Thu, 2 Jan 2014 21:57:08 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02Lv3nS008068; Thu, 2 Jan 2014 21:57:03 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201401022157.s02Lv3nS008068@svn.freebsd.org> From: John Baldwin Date: Thu, 2 Jan 2014 21:57:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260208 - in stable/9: lib/libc/sys sys/compat/freebsd32 sys/kern sys/sys sys/vm usr.bin usr.bin/kdump usr.bin/protect usr.bin/truss X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 21:57:08 -0000 Author: jhb Date: Thu Jan 2 21:57:03 2014 New Revision: 260208 URL: http://svnweb.freebsd.org/changeset/base/260208 Log: MFC 255708,255711,255731: Extend the support for exempting processes from being killed when swap is exhausted. - Add a new protect(1) command that can be used to set or revoke protection from arbitrary processes. Similar to ktrace it can apply a change to all existing descendants of a process as well as future descendants. - Add a new procctl(2) system call that provides a generic interface for control operations on processes (as opposed to the debugger-specific operations provided by ptrace(2)). procctl(2) uses a combination of idtype_t and an id to identify the set of processes on which to operate similar to wait6(). - Add a PROC_SPROTECT control operation to manage the protection status of a set of processes. MADV_PROTECT still works for backwards compatability. - Add a p_flag2 to struct proc (and a corresponding ki_flag2 to kinfo_proc) the first bit of which is used to track if P_PROTECT should be inherited by new child processes. Added: stable/9/lib/libc/sys/procctl.2 - copied, changed from r255708, head/lib/libc/sys/procctl.2 stable/9/sys/sys/procctl.h - copied unchanged from r255708, head/sys/sys/procctl.h - copied from r255708, head/usr.bin/protect/ Directory Properties: stable/9/usr.bin/protect/ (props changed) Modified: stable/9/lib/libc/sys/Makefile.inc stable/9/lib/libc/sys/Symbol.map stable/9/sys/compat/freebsd32/freebsd32.h stable/9/sys/compat/freebsd32/freebsd32_misc.c stable/9/sys/compat/freebsd32/syscalls.master stable/9/sys/kern/init_main.c stable/9/sys/kern/kern_fork.c stable/9/sys/kern/kern_proc.c stable/9/sys/kern/sys_process.c stable/9/sys/kern/syscalls.master stable/9/sys/sys/proc.h stable/9/sys/sys/syscallsubr.h stable/9/sys/sys/user.h stable/9/sys/vm/vm_mmap.c stable/9/usr.bin/Makefile stable/9/usr.bin/kdump/kdump.c stable/9/usr.bin/kdump/mksubr stable/9/usr.bin/protect/protect.1 stable/9/usr.bin/truss/syscall.h stable/9/usr.bin/truss/syscalls.c Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) stable/9/usr.bin/ (props changed) stable/9/usr.bin/kdump/ (props changed) stable/9/usr.bin/truss/ (props changed) Modified: stable/9/lib/libc/sys/Makefile.inc ============================================================================== --- stable/9/lib/libc/sys/Makefile.inc Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/lib/libc/sys/Makefile.inc Thu Jan 2 21:57:03 2014 (r260208) @@ -101,7 +101,7 @@ MAN+= abort2.2 accept.2 access.2 acct.2 msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \ msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \ pathconf.2 pdfork.2 pipe.2 poll.2 posix_fadvise.2 posix_fallocate.2 \ - posix_openpt.2 profil.2 \ + posix_openpt.2 procctl.2 profil.2 \ pselect.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 Modified: stable/9/lib/libc/sys/Symbol.map ============================================================================== --- stable/9/lib/libc/sys/Symbol.map Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/lib/libc/sys/Symbol.map Thu Jan 2 21:57:03 2014 (r260208) @@ -381,6 +381,7 @@ FBSD_1.2 { FBSD_1.3 { clock_getcpuclockid2; posix_fadvise; + procctl; wait6; }; @@ -806,6 +807,8 @@ FBSDprivate_1.0 { __sys_poll; _preadv; __sys_preadv; + _procctl; + __sys_procctl; _profil; __sys_profil; _pselect; Copied and modified: stable/9/lib/libc/sys/procctl.2 (from r255708, head/lib/libc/sys/procctl.2) ============================================================================== --- head/lib/libc/sys/procctl.2 Thu Sep 19 18:53:42 2013 (r255708, copy source) +++ stable/9/lib/libc/sys/procctl.2 Thu Jan 2 21:57:03 2014 (r260208) @@ -54,7 +54,7 @@ to control as many of the selected possi An error is only returned if no selected processes successfully complete the request. The following identifier types are supported: -.Bl -tag -width Dv P_PGID +.Bl -tag -width "Dv P_PGID" .It Dv P_PID Control the process with the process ID .Fa id . @@ -67,7 +67,7 @@ The control request to perform is specif .Fa cmd argument. The following commands are supported: -.Bl -tag -width Dv PROC_SPROTECT +.Bl -tag -width "Dv PROC_SPROTECT" .It Dv PROC_SPROTECT Set process protection state. This is used to mark a process as protected from being killed if the system @@ -77,7 +77,7 @@ The parameter must point to an integer containing an operation and zero or more optional flags. The following operations are supported: -.Bl -tag -width Dv PPROT_CLEAR +.Bl -tag -width "Dv PPROT_CLEAR" .It Dv PPROT_SET Mark the selected processes as protected. .It Dv PPROT_CLEAR @@ -85,7 +85,7 @@ Clear the protected state of selected pr .El .Pp The following optional flags are supported: -.Bl -tag -width Dv PPROT_DESCEND +.Bl -tag -width "Dv PPROT_DESCE" .It Dv PPROT_DESCEND Apply the requested operation to all child processes of each selected process in addition to each selected process. Modified: stable/9/sys/compat/freebsd32/freebsd32.h ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32.h Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/compat/freebsd32/freebsd32.h Thu Jan 2 21:57:03 2014 (r260208) @@ -334,6 +334,8 @@ struct kinfo_proc32 { char ki_loginclass[LOGINCLASSLEN+1]; char ki_sparestrings[50]; int ki_spareints[KI_NSPARE_INT]; + int ki_flag2; + int ki_fibnum; u_int ki_cr_flags; int ki_jid; int ki_numthreads; Modified: stable/9/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_misc.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/compat/freebsd32/freebsd32_misc.c Thu Jan 2 21:57:03 2014 (r260208) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2990,3 +2991,23 @@ convert_sigevent32(struct sigevent32 *si } return (0); } + +int +freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap) +{ + void *data; + int error, flags; + + switch (uap->com) { + case PROC_SPROTECT: + error = copyin(PTRIN(uap->data), &flags, sizeof(flags)); + if (error) + return (error); + data = &flags; + break; + default: + return (EINVAL); + } + return (kern_procctl(td, uap->idtype, PAIR32TO64(id_t, uap->id), + uap->com, data)); +} Modified: stable/9/sys/compat/freebsd32/syscalls.master ============================================================================== --- stable/9/sys/compat/freebsd32/syscalls.master Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/compat/freebsd32/syscalls.master Thu Jan 2 21:57:03 2014 (r260208) @@ -1027,3 +1027,23 @@ struct wrusage32 *wrusage, \ siginfo_t *info); } #endif +533 AUE_NULL UNIMPL cap_rights_limit +534 AUE_NULL UNIMPL cap_ioctls_limit +535 AUE_NULL UNIMPL cap_ioctls_get +536 AUE_NULL UNIMPL cap_fcntls_limit +537 AUE_NULL UNIMPL cap_fcntls_get +538 AUE_NULL UNIMPL bindat +539 AUE_NULL UNIMPL connectat +540 AUE_NULL UNIMPL chflagsat +541 AUE_NULL UNIMPL accept4 +542 AUE_NULL UNIMPL pipe2 +543 AUE_NULL UNIMPL aio_mlock +#ifdef PAD64_REQUIRED +544 AUE_NULL STD { int freebsd32_procctl(int idtype, int pad, \ + uint32_t id1, uint32_t id2, int com, \ + void *data); } +#else +544 AUE_NULL STD { int freebsd32_procctl(int idtype, \ + uint32_t id1, uint32_t id2, int com, \ + void *data); } +#endif Modified: stable/9/sys/kern/init_main.c ============================================================================== --- stable/9/sys/kern/init_main.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/kern/init_main.c Thu Jan 2 21:57:03 2014 (r260208) @@ -476,6 +476,7 @@ proc0_init(void *dummy __unused) p->p_sysent = &null_sysvec; p->p_flag = P_SYSTEM | P_INMEM; + p->p_flag2 = 0; p->p_state = PRS_NORMAL; knlist_init_mtx(&p->p_klist, &p->p_mtx); STAILQ_INIT(&p->p_ktr); Modified: stable/9/sys/kern/kern_fork.c ============================================================================== --- stable/9/sys/kern/kern_fork.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/kern/kern_fork.c Thu Jan 2 21:57:03 2014 (r260208) @@ -494,6 +494,7 @@ do_fork(struct thread *td, int flags, st * Increase reference counts on shared objects. */ p2->p_flag = P_INMEM; + p2->p_flag2 = 0; p2->p_swtick = ticks; if (p1->p_flag & P_PROFIL) startprofclock(p2); @@ -517,6 +518,11 @@ do_fork(struct thread *td, int flags, st p2->p_fd = fd; p2->p_fdtol = fdtol; + if (p1->p_flag2 & P2_INHERIT_PROTECTED) { + p2->p_flag |= P_PROTECTED; + p2->p_flag2 |= P2_INHERIT_PROTECTED; + } + /* * p_limit is copy-on-write. Bump its refcount. */ Modified: stable/9/sys/kern/kern_proc.c ============================================================================== --- stable/9/sys/kern/kern_proc.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/kern/kern_proc.c Thu Jan 2 21:57:03 2014 (r260208) @@ -803,6 +803,7 @@ fill_kinfo_proc_only(struct proc *p, str kp->ki_fd = p->p_fd; kp->ki_vmspace = p->p_vmspace; kp->ki_flag = p->p_flag; + kp->ki_flag2 = p->p_flag2; cred = p->p_ucred; if (cred) { kp->ki_uid = cred->cr_uid; @@ -1161,6 +1162,8 @@ freebsd32_kinfo_proc_out(const struct ki bcopy(ki->ki_comm, ki32->ki_comm, COMMLEN + 1); bcopy(ki->ki_emul, ki32->ki_emul, KI_EMULNAMELEN + 1); bcopy(ki->ki_loginclass, ki32->ki_loginclass, LOGINCLASSLEN + 1); + CP(*ki, *ki32, ki_flag2); + CP(*ki, *ki32, ki_fibnum); CP(*ki, *ki32, ki_cr_flags); CP(*ki, *ki32, ki_jid); CP(*ki, *ki32, ki_numthreads); Modified: stable/9/sys/kern/sys_process.c ============================================================================== --- stable/9/sys/kern/sys_process.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/kern/sys_process.c Thu Jan 2 21:57:03 2014 (r260208) @@ -41,7 +41,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include #include @@ -1242,3 +1244,196 @@ stopevent(struct proc *p, unsigned int e msleep(&p->p_step, &p->p_mtx, PWAIT, "stopevent", 0); } while (p->p_step); } + +static int +protect_setchild(struct thread *td, struct proc *p, int flags) +{ + + PROC_LOCK_ASSERT(p, MA_OWNED); + if (p->p_flag & P_SYSTEM || p_cansee(td, p) != 0) + return (0); + if (flags & PPROT_SET) { + p->p_flag |= P_PROTECTED; + if (flags & PPROT_INHERIT) + p->p_flag2 |= P2_INHERIT_PROTECTED; + } else { + p->p_flag &= ~P_PROTECTED; + p->p_flag2 &= ~P2_INHERIT_PROTECTED; + } + return (1); +} + +static int +protect_setchildren(struct thread *td, struct proc *top, int flags) +{ + struct proc *p; + int ret; + + p = top; + ret = 0; + sx_assert(&proctree_lock, SX_LOCKED); + for (;;) { + ret |= protect_setchild(td, p, flags); + PROC_UNLOCK(p); + /* + * If this process has children, descend to them next, + * otherwise do any siblings, and if done with this level, + * follow back up the tree (but not past top). + */ + if (!LIST_EMPTY(&p->p_children)) + p = LIST_FIRST(&p->p_children); + else for (;;) { + if (p == top) { + PROC_LOCK(p); + return (ret); + } + if (LIST_NEXT(p, p_sibling)) { + p = LIST_NEXT(p, p_sibling); + break; + } + p = p->p_pptr; + } + PROC_LOCK(p); + } +} + +static int +protect_set(struct thread *td, struct proc *p, int flags) +{ + int error, ret; + + switch (PPROT_OP(flags)) { + case PPROT_SET: + case PPROT_CLEAR: + break; + default: + return (EINVAL); + } + + if ((PPROT_FLAGS(flags) & ~(PPROT_DESCEND | PPROT_INHERIT)) != 0) + return (EINVAL); + + error = priv_check(td, PRIV_VM_MADV_PROTECT); + if (error) + return (error); + + if (flags & PPROT_DESCEND) + ret = protect_setchildren(td, p, flags); + else + ret = protect_setchild(td, p, flags); + if (ret == 0) + return (EPERM); + return (0); +} + +#ifndef _SYS_SYSPROTO_H_ +struct procctl_args { + idtype_t idtype; + id_t id; + int com; + void *data; +}; +#endif +/* ARGSUSED */ +int +sys_procctl(struct thread *td, struct procctl_args *uap) +{ + int error, flags; + void *data; + + switch (uap->com) { + case PROC_SPROTECT: + error = copyin(uap->data, &flags, sizeof(flags)); + if (error) + return (error); + data = &flags; + break; + default: + return (EINVAL); + } + + return (kern_procctl(td, uap->idtype, uap->id, uap->com, data)); +} + +static int +kern_procctl_single(struct thread *td, struct proc *p, int com, void *data) +{ + + PROC_LOCK_ASSERT(p, MA_OWNED); + switch (com) { + case PROC_SPROTECT: + return (protect_set(td, p, *(int *)data)); + default: + return (EINVAL); + } +} + +int +kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) +{ + struct pgrp *pg; + struct proc *p; + int error, first_error, ok; + + sx_slock(&proctree_lock); + switch (idtype) { + case P_PID: + p = pfind(id); + if (p == NULL) { + error = ESRCH; + break; + } + if (p->p_state == PRS_NEW) + error = ESRCH; + else + error = p_cansee(td, p); + if (error == 0) + error = kern_procctl_single(td, p, com, data); + PROC_UNLOCK(p); + break; + case P_PGID: + /* + * Attempt to apply the operation to all members of the + * group. Ignore processes in the group that can't be + * seen. Ignore errors so long as at least one process is + * able to complete the request successfully. + */ + pg = pgfind(id); + if (pg == NULL) { + error = ESRCH; + break; + } + PGRP_UNLOCK(pg); + ok = 0; + first_error = 0; + LIST_FOREACH(p, &pg->pg_members, p_pglist) { + PROC_LOCK(p); + if (p->p_state == PRS_NEW || p_cansee(td, p) != 0) { + PROC_UNLOCK(p); + continue; + } + error = kern_procctl_single(td, p, com, data); + PROC_UNLOCK(p); + if (error == 0) + ok = 1; + else if (first_error == 0) + first_error = error; + } + if (ok) + error = 0; + else if (first_error != 0) + error = first_error; + else + /* + * Was not able to see any processes in the + * process group. + */ + error = ESRCH; + break; + default: + error = EINVAL; + break; + } + sx_sunlock(&proctree_lock); + return (error); +} Modified: stable/9/sys/kern/syscalls.master ============================================================================== --- stable/9/sys/kern/syscalls.master Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/kern/syscalls.master Thu Jan 2 21:57:03 2014 (r260208) @@ -953,5 +953,18 @@ int *status, int options, \ struct __wrusage *wrusage, \ siginfo_t *info); } +533 AUE_NULL UNIMPL cap_rights_limit +534 AUE_NULL UNIMPL cap_ioctls_limit +535 AUE_NULL UNIMPL cap_ioctls_get +536 AUE_NULL UNIMPL cap_fcntls_limit +537 AUE_NULL UNIMPL cap_fcntls_get +538 AUE_NULL UNIMPL bindat +539 AUE_NULL UNIMPL connectat +540 AUE_NULL UNIMPL chflagsat +541 AUE_NULL UNIMPL accept4 +542 AUE_NULL UNIMPL pipe2 +543 AUE_NULL UNIMPL aio_mlock +544 AUE_NULL STD { int procctl(idtype_t idtype, id_t id, \ + int com, void *data); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master Modified: stable/9/sys/sys/proc.h ============================================================================== --- stable/9/sys/sys/proc.h Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/sys/proc.h Thu Jan 2 21:57:03 2014 (r260208) @@ -493,11 +493,8 @@ struct proc { struct callout p_limco; /* (c) Limit callout handle */ struct sigacts *p_sigacts; /* (x) Signal actions, state (CPU). */ - /* - * The following don't make too much sense. - * See the td_ or ke_ versions of the same flags. - */ int p_flag; /* (c) P_* flags. */ + int p_flag2; /* (c) P2_* flags. */ enum { PRS_NEW = 0, /* In creation */ PRS_NORMAL, /* threads can be run. */ @@ -643,6 +640,9 @@ struct proc { #define P_SHOULDSTOP(p) ((p)->p_flag & P_STOPPED) #define P_KILLED(p) ((p)->p_flag & P_WKILLED) +/* These flags are kept in p_flag2. */ +#define P2_INHERIT_PROTECTED 0x00000001 /* New children get P_PROTECTED. */ + /* * These were process status values (p_stat), now they are only used in * legacy conversion code. Copied: stable/9/sys/sys/procctl.h (from r255708, head/sys/sys/procctl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/sys/sys/procctl.h Thu Jan 2 21:57:03 2014 (r260208, copy of r255708, head/sys/sys/procctl.h) @@ -0,0 +1,55 @@ +/*- + * Copyright (c) 2013 Advanced Computing Technologies LLC + * Written by: John H. Baldwin + * 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 AUTHOR 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 AUTHOR 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$ + */ + +#ifndef _SYS_PROCCTL_H_ +#define _SYS_PROCCTL_H_ + +#define PROC_SPROTECT 1 /* set protected state */ + +/* Operations for PROC_SPROTECT (passed in integer arg). */ +#define PPROT_OP(x) ((x) & 0xf) +#define PPROT_SET 1 +#define PPROT_CLEAR 2 + +/* Flags for PROC_SPROTECT (ORed in with operation). */ +#define PPROT_FLAGS(x) ((x) & ~0xf) +#define PPROT_DESCEND 0x10 +#define PPROT_INHERIT 0x20 + +#ifndef _KERNEL +#include +#include + +__BEGIN_DECLS +int procctl(idtype_t, id_t, int, void *); +__END_DECLS + +#endif + +#endif /* !_SYS_PROCCTL_H_ */ Modified: stable/9/sys/sys/syscallsubr.h ============================================================================== --- stable/9/sys/sys/syscallsubr.h Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/sys/syscallsubr.h Thu Jan 2 21:57:03 2014 (r260208) @@ -161,6 +161,8 @@ int kern_posix_fadvise(struct thread *td int advice); int kern_posix_fallocate(struct thread *td, int fd, off_t offset, off_t len); +int kern_procctl(struct thread *td, enum idtype idtype, id_t id, int com, + void *data); int kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset); int kern_pselect(struct thread *td, int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tvp, sigset_t *uset, int abi_nfdbits); Modified: stable/9/sys/sys/user.h ============================================================================== --- stable/9/sys/sys/user.h Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/sys/user.h Thu Jan 2 21:57:03 2014 (r260208) @@ -83,7 +83,7 @@ * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and * function kvm_proclist in lib/libkvm/kvm_proc.c . */ -#define KI_NSPARE_INT 9 +#define KI_NSPARE_INT 7 #define KI_NSPARE_LONG 12 #define KI_NSPARE_PTR 6 @@ -186,6 +186,8 @@ struct kinfo_proc { */ char ki_sparestrings[50]; /* spare string space */ int ki_spareints[KI_NSPARE_INT]; /* spare room for growth */ + int ki_flag2; /* P2_* flags */ + int ki_fibnum; /* Default FIB number */ u_int ki_cr_flags; /* Credential flags */ int ki_jid; /* Process jail ID */ int ki_numthreads; /* XXXKSE number of threads in total */ Modified: stable/9/sys/vm/vm_mmap.c ============================================================================== --- stable/9/sys/vm/vm_mmap.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/sys/vm/vm_mmap.c Thu Jan 2 21:57:03 2014 (r260208) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -724,23 +726,18 @@ sys_madvise(td, uap) { vm_offset_t start, end; vm_map_t map; - struct proc *p; - int error; + int flags; /* * Check for our special case, advising the swap pager we are * "immortal." */ if (uap->behav == MADV_PROTECT) { - error = priv_check(td, PRIV_VM_MADV_PROTECT); - if (error == 0) { - p = td->td_proc; - PROC_LOCK(p); - p->p_flag |= P_PROTECTED; - PROC_UNLOCK(p); - } - return (error); + flags = PPROT_SET; + return (kern_procctl(td, P_PID, td->td_proc->p_pid, + PROC_SPROTECT, &flags)); } + /* * Check for illegal behavior */ Modified: stable/9/usr.bin/Makefile ============================================================================== --- stable/9/usr.bin/Makefile Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/usr.bin/Makefile Thu Jan 2 21:57:03 2014 (r260208) @@ -127,6 +127,7 @@ SUBDIR= alias \ printenv \ printf \ procstat \ + protect \ rctl \ renice \ rev \ Modified: stable/9/usr.bin/kdump/kdump.c ============================================================================== --- stable/9/usr.bin/kdump/kdump.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/usr.bin/kdump/kdump.c Thu Jan 2 21:57:03 2014 (r260208) @@ -1031,6 +1031,18 @@ ktrsyscall(struct ktr_syscall *ktr, u_in ip++; narg--; break; + case SYS_procctl: + putchar('('); + idtypename(*ip, decimal); + c = ','; + ip++; + narg--; + print_number(ip, narg, c); + putchar(','); + procctlcmdname(*ip); + ip++; + narg--; + break; } } while (narg > 0) { Modified: stable/9/usr.bin/kdump/mksubr ============================================================================== --- stable/9/usr.bin/kdump/mksubr Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/usr.bin/kdump/mksubr Thu Jan 2 21:57:03 2014 (r260208) @@ -169,6 +169,7 @@ cat <<_EOF_ #include #include #include +#include #include #include #include @@ -438,6 +439,7 @@ auto_or_type "mountflagsname" " auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" auto_or_type "nfssvcname" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" +auto_switch_type "procctlcmdname" "PROC_[A-Z]+[[:space:]]+[0-9]" "sys/procctl.h" auto_switch_type "ptraceopname" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" auto_switch_type "quotactlname" "Q_[A-Z]+[[:space:]]+0x[0-9]+" "ufs/ufs/quota.h" auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h" Modified: stable/9/usr.bin/protect/protect.1 ============================================================================== --- head/usr.bin/protect/protect.1 Thu Sep 19 18:53:42 2013 (r255708) +++ stable/9/usr.bin/protect/protect.1 Thu Jan 2 21:57:03 2014 (r260208) @@ -46,7 +46,7 @@ The kernel does not kill protected proce Note that this protected state is not inherited by child processes by default. .Pp The options are: -.Bl -tag -width indent +.Bl -tag -width XXXXXXXXXX .It Fl c Remove protection from the specified processes. .It Fl d @@ -74,16 +74,16 @@ flags may be specified when adjusting th Mark the Xorg server as protected: .Pp .Dl "pgrep Xorg | xargs protect -p" +.Pp Protect all ssh sessions and their child processes: .Pp .Dl "pgrep sshd | xargs protect -dip" +.Pp Remove protection from all current and future processes: .Pp .Dl "protect -cdi -p 1" .Sh SEE ALSO -.Xr pprotect 2 +.Xr procctl 2 .Sh BUGS If you protect a runaway process that allocates all memory the system will deadlock. -.Pp -Inheritance of the protected state is not yet implemented. Modified: stable/9/usr.bin/truss/syscall.h ============================================================================== --- stable/9/usr.bin/truss/syscall.h Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/usr.bin/truss/syscall.h Thu Jan 2 21:57:03 2014 (r260208) @@ -40,7 +40,7 @@ enum Argtype { None = 1, Hex, Octal, Int Fd_set, Sigaction, Fcntl, Mprot, Mmapflags, Whence, Readlinkres, Umtx, Sigset, Sigprocmask, Kevent, Sockdomain, Socktype, Open, Fcntlflag, Rusage, BinString, Shutdown, Resource, Rlimit, Timeval2, - Pathconf, Rforkflags, ExitStatus, Waitoptions, Idtype }; + Pathconf, Rforkflags, ExitStatus, Waitoptions, Idtype, Procctl }; #define ARG_MASK 0xff #define OUT 0x100 Modified: stable/9/usr.bin/truss/syscalls.c ============================================================================== --- stable/9/usr.bin/truss/syscalls.c Thu Jan 2 21:30:59 2014 (r260207) +++ stable/9/usr.bin/truss/syscalls.c Thu Jan 2 21:57:03 2014 (r260208) @@ -41,6 +41,7 @@ static const char rcsid[] = #include #include +#include #include #include #include @@ -270,6 +271,8 @@ struct syscall syscalls[] = { { .name = "wait6", .ret_type = 1, .nargs = 6, .args = { { Idtype, 0 }, { Int, 1 }, { ExitStatus | OUT, 2 }, { Waitoptions, 3 }, { Rusage | OUT, 4 }, { Ptr, 5 } } }, + { .name = "procctl", .ret_type = 1, .nargs = 4, + .args = { { Idtype, 0 }, { Int, 1 }, { Procctl, 2 }, { Ptr, 3 } } }, { .name = 0 }, }; @@ -395,6 +398,10 @@ static struct xlat idtype_arg[] = { X(P_CTID) X(P_CPUID) X(P_PSETID) XEND }; +static struct xlat procctl_arg[] = { + X(PROC_SPROTECT) XEND +}; + #undef X #undef XEND @@ -1194,6 +1201,9 @@ print_arg(struct syscall_args *sc, unsig case Idtype: tmp = strdup(xlookup(idtype_arg, args[sc->offset])); break; + case Procctl: + tmp = strdup(xlookup(procctl_arg, args[sc->offset])); + break; default: errx(1, "Invalid argument type %d\n", sc->type & ARG_MASK); } From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 3 08:31:45 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CE85B3B; Fri, 3 Jan 2014 08:31:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 46BFB162D; Fri, 3 Jan 2014 08:31:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s038VjkQ055757; Fri, 3 Jan 2014 08:31:45 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s038Vhm1055742; Fri, 3 Jan 2014 08:31:43 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401030831.s038Vhm1055742@svn.freebsd.org> From: Sergey Kandaurov Date: Fri, 3 Jan 2014 08:31:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260221 - in stable/9/sys: compat/freebsd32 kern sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 08:31:45 -0000 Author: pluknet Date: Fri Jan 3 08:31:42 2014 New Revision: 260221 URL: http://svnweb.freebsd.org/changeset/base/260221 Log: Regen. Modified: stable/9/sys/compat/freebsd32/freebsd32_proto.h stable/9/sys/compat/freebsd32/freebsd32_syscall.h stable/9/sys/compat/freebsd32/freebsd32_syscalls.c stable/9/sys/compat/freebsd32/freebsd32_sysent.c stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c stable/9/sys/kern/init_sysent.c stable/9/sys/kern/syscalls.c stable/9/sys/kern/systrace_args.c stable/9/sys/sys/syscall.h stable/9/sys/sys/syscall.mk stable/9/sys/sys/sysproto.h Modified: stable/9/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_proto.h Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/compat/freebsd32/freebsd32_proto.h Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 254664 2013-08-22 17:30:01Z kib + * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -14,6 +14,7 @@ #include #include #include +#include #include @@ -652,6 +653,24 @@ struct freebsd32_wait6_args { char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; #endif +#ifdef PAD64_REQUIRED +struct freebsd32_procctl_args { + char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)]; + char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; +#else +struct freebsd32_procctl_args { + char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)]; + char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)]; + char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; +#endif #if !defined(PAD64_REQUIRED) && defined(__powerpc__) #define PAD64_REQUIRED #endif @@ -775,6 +794,11 @@ int freebsd32_posix_fallocate(struct thr int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *); int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *); #endif +#ifdef PAD64_REQUIRED +int freebsd32_procctl(struct thread *, struct freebsd32_procctl_args *); +#else +int freebsd32_procctl(struct thread *, struct freebsd32_procctl_args *); +#endif #ifdef COMPAT_43 @@ -846,6 +870,9 @@ struct ofreebsd32_getdirentries_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int ofreebsd32_lseek(struct thread *, struct ofreebsd32_lseek_args *); int ofreebsd32_stat(struct thread *, struct ofreebsd32_stat_args *); int ofreebsd32_lstat(struct thread *, struct ofreebsd32_lstat_args *); @@ -914,6 +941,9 @@ struct freebsd4_freebsd32_sigreturn_args #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *); int freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *); int freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *); @@ -984,6 +1014,9 @@ struct freebsd6_freebsd32_ftruncate_args #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *); int freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *); int freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *); @@ -1024,6 +1057,9 @@ struct freebsd7_freebsd32_shmctl_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *); int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); @@ -1172,6 +1208,8 @@ int freebsd7_freebsd32_shmctl(struct thr #define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_wait6 AUE_WAIT6 +#define FREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL #undef PAD_ #undef PADL_ Modified: stable/9/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_syscall.h Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/compat/freebsd32/freebsd32_syscall.h Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 254664 2013-08-22 17:30:01Z kib + * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -435,4 +435,6 @@ #define FREEBSD32_SYS_freebsd32_posix_fallocate 530 #define FREEBSD32_SYS_freebsd32_posix_fadvise 531 #define FREEBSD32_SYS_freebsd32_wait6 532 -#define FREEBSD32_SYS_MAXSYSCALL 533 +#define FREEBSD32_SYS_freebsd32_procctl 544 +#define FREEBSD32_SYS_freebsd32_procctl 544 +#define FREEBSD32_SYS_MAXSYSCALL 545 Modified: stable/9/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 254664 2013-08-22 17:30:01Z kib + * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ const char *freebsd32_syscallnames[] = { @@ -562,4 +562,20 @@ const char *freebsd32_syscallnames[] = { "freebsd32_posix_fadvise", /* 531 = freebsd32_posix_fadvise */ "freebsd32_wait6", /* 532 = freebsd32_wait6 */ #endif + "#533", /* 533 = cap_rights_limit */ + "#534", /* 534 = cap_ioctls_limit */ + "#535", /* 535 = cap_ioctls_get */ + "#536", /* 536 = cap_fcntls_limit */ + "#537", /* 537 = cap_fcntls_get */ + "#538", /* 538 = bindat */ + "#539", /* 539 = connectat */ + "#540", /* 540 = chflagsat */ + "#541", /* 541 = accept4 */ + "#542", /* 542 = pipe2 */ + "#543", /* 543 = aio_mlock */ +#ifdef PAD64_REQUIRED + "freebsd32_procctl", /* 544 = freebsd32_procctl */ +#else + "freebsd32_procctl", /* 544 = freebsd32_procctl */ +#endif }; Modified: stable/9/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_sysent.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/compat/freebsd32/freebsd32_sysent.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 254664 2013-08-22 17:30:01Z kib + * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #include "opt_compat.h" @@ -599,4 +599,20 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ { AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */ #endif + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 533 = cap_rights_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 534 = cap_ioctls_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 535 = cap_ioctls_get */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 536 = cap_fcntls_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 537 = cap_fcntls_get */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 538 = bindat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 539 = connectat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 540 = chflagsat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 541 = accept4 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 542 = pipe2 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = aio_mlock */ +#ifdef PAD64_REQUIRED + { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ +#else + { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ +#endif }; Modified: stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3152,6 +3152,32 @@ systrace_args(int sysnum, void *params, break; } #endif +#ifdef PAD64_REQUIRED + /* freebsd32_procctl */ + case 544: { + struct freebsd32_procctl_args *p = params; + iarg[0] = p->idtype; /* int */ + iarg[1] = p->pad; /* int */ + uarg[2] = p->id1; /* uint32_t */ + uarg[3] = p->id2; /* uint32_t */ + iarg[4] = p->com; /* int */ + uarg[5] = (intptr_t) p->data; /* void * */ + *n_args = 6; + break; + } +#else + /* freebsd32_procctl */ + case 544: { + struct freebsd32_procctl_args *p = params; + iarg[0] = p->idtype; /* int */ + uarg[1] = p->id1; /* uint32_t */ + uarg[2] = p->id2; /* uint32_t */ + iarg[3] = p->com; /* int */ + uarg[4] = (intptr_t) p->data; /* void * */ + *n_args = 5; + break; + } +#endif default: *n_args = 0; break; @@ -8438,6 +8464,56 @@ systrace_setargdesc(int sysnum, int ndx, }; break; #endif +#ifdef PAD64_REQUIRED + /* freebsd32_procctl */ + case 544: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "uint32_t"; + break; + case 3: + p = "uint32_t"; + break; + case 4: + p = "int"; + break; + case 5: + p = "void *"; + break; + default: + break; + }; + break; +#else + /* freebsd32_procctl */ + case 544: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "uint32_t"; + break; + case 2: + p = "uint32_t"; + break; + case 3: + p = "int"; + break; + case 4: + p = "void *"; + break; + default: + break; + }; + break; +#endif default: break; }; Modified: stable/9/sys/kern/init_sysent.c ============================================================================== --- stable/9/sys/kern/init_sysent.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/kern/init_sysent.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/kern/syscalls.master 258106 2013-11-13 22:31:56Z jhb + * created from FreeBSD: stable/9/sys/kern/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #include "opt_compat.h" @@ -567,4 +567,16 @@ struct sysent sysent[] = { { AS(posix_fallocate_args), (sy_call_t *)sys_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = posix_fallocate */ { AS(posix_fadvise_args), (sy_call_t *)sys_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = posix_fadvise */ { AS(wait6_args), (sy_call_t *)sys_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = wait6 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 533 = cap_rights_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 534 = cap_ioctls_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 535 = cap_ioctls_get */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 536 = cap_fcntls_limit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 537 = cap_fcntls_get */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 538 = bindat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 539 = connectat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 540 = chflagsat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 541 = accept4 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 542 = pipe2 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = aio_mlock */ + { AS(procctl_args), (sy_call_t *)sys_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = procctl */ }; Modified: stable/9/sys/kern/syscalls.c ============================================================================== --- stable/9/sys/kern/syscalls.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/kern/syscalls.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/kern/syscalls.master 258106 2013-11-13 22:31:56Z jhb + * created from FreeBSD: stable/9/sys/kern/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ const char *syscallnames[] = { @@ -540,4 +540,16 @@ const char *syscallnames[] = { "posix_fallocate", /* 530 = posix_fallocate */ "posix_fadvise", /* 531 = posix_fadvise */ "wait6", /* 532 = wait6 */ + "#533", /* 533 = cap_rights_limit */ + "#534", /* 534 = cap_ioctls_limit */ + "#535", /* 535 = cap_ioctls_get */ + "#536", /* 536 = cap_fcntls_limit */ + "#537", /* 537 = cap_fcntls_get */ + "#538", /* 538 = bindat */ + "#539", /* 539 = connectat */ + "#540", /* 540 = chflagsat */ + "#541", /* 541 = accept4 */ + "#542", /* 542 = pipe2 */ + "#543", /* 543 = aio_mlock */ + "procctl", /* 544 = procctl */ }; Modified: stable/9/sys/kern/systrace_args.c ============================================================================== --- stable/9/sys/kern/systrace_args.c Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/kern/systrace_args.c Fri Jan 3 08:31:42 2014 (r260221) @@ -3265,6 +3265,16 @@ systrace_args(int sysnum, void *params, *n_args = 6; break; } + /* procctl */ + case 544: { + struct procctl_args *p = params; + iarg[0] = p->idtype; /* idtype_t */ + iarg[1] = p->id; /* id_t */ + iarg[2] = p->com; /* int */ + uarg[3] = (intptr_t) p->data; /* void * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8694,6 +8704,25 @@ systrace_setargdesc(int sysnum, int ndx, break; }; break; + /* procctl */ + case 544: + switch(ndx) { + case 0: + p = "idtype_t"; + break; + case 1: + p = "id_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "void *"; + break; + default: + break; + }; + break; default: break; }; Modified: stable/9/sys/sys/syscall.h ============================================================================== --- stable/9/sys/sys/syscall.h Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/sys/syscall.h Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/kern/syscalls.master 258106 2013-11-13 22:31:56Z jhb + * created from FreeBSD: stable/9/sys/kern/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #define SYS_syscall 0 @@ -449,4 +449,5 @@ #define SYS_posix_fallocate 530 #define SYS_posix_fadvise 531 #define SYS_wait6 532 -#define SYS_MAXSYSCALL 533 +#define SYS_procctl 544 +#define SYS_MAXSYSCALL 545 Modified: stable/9/sys/sys/syscall.mk ============================================================================== --- stable/9/sys/sys/syscall.mk Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/sys/syscall.mk Fri Jan 3 08:31:42 2014 (r260221) @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: stable/9/sys/kern/syscalls.master 258106 2013-11-13 22:31:56Z jhb +# created from FreeBSD: stable/9/sys/kern/syscalls.master 260208 2014-01-02 21:57:03Z jhb MIASM = \ syscall.o \ exit.o \ @@ -397,4 +397,5 @@ MIASM = \ rctl_remove_rule.o \ posix_fallocate.o \ posix_fadvise.o \ - wait6.o + wait6.o \ + procctl.o Modified: stable/9/sys/sys/sysproto.h ============================================================================== --- stable/9/sys/sys/sysproto.h Fri Jan 3 06:02:08 2014 (r260220) +++ stable/9/sys/sys/sysproto.h Fri Jan 3 08:31:42 2014 (r260221) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: stable/9/sys/kern/syscalls.master 258106 2013-11-13 22:31:56Z jhb + * created from FreeBSD: stable/9/sys/kern/syscalls.master 260208 2014-01-02 21:57:03Z jhb */ #ifndef _SYS_SYSPROTO_H_ @@ -1753,6 +1753,12 @@ struct wait6_args { char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)]; char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; +struct procctl_args { + char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)]; + char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2132,6 +2138,7 @@ int sys_rctl_remove_rule(struct thread * int sys_posix_fallocate(struct thread *, struct posix_fallocate_args *); int sys_posix_fadvise(struct thread *, struct posix_fadvise_args *); int sys_wait6(struct thread *, struct wait6_args *); +int sys_procctl(struct thread *, struct procctl_args *); #ifdef COMPAT_43 @@ -2825,6 +2832,7 @@ int freebsd7_shmctl(struct thread *, str #define SYS_AUE_posix_fallocate AUE_NULL #define SYS_AUE_posix_fadvise AUE_NULL #define SYS_AUE_wait6 AUE_WAIT6 +#define SYS_AUE_procctl AUE_NULL #undef PAD_ #undef PADL_ From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 3 14:30:25 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5177136D; Fri, 3 Jan 2014 14:30:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CFAF11BA; Fri, 3 Jan 2014 14:30:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03EUPSl089188; Fri, 3 Jan 2014 14:30:25 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03EUOnb089185; Fri, 3 Jan 2014 14:30:24 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201401031430.s03EUOnb089185@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 3 Jan 2014 14:30:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260227 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 14:30:25 -0000 Author: jilles Date: Fri Jan 3 14:30:24 2014 New Revision: 260227 URL: http://svnweb.freebsd.org/changeset/base/260227 Log: MFC r258281: Fix siginfo_t.si_status for wait6/waitid/SIGCHLD. Per POSIX, si_status should contain the value passed to exit() for si_code==CLD_EXITED and the signal number for other si_code. This was incorrect for CLD_EXITED and CLD_DUMPED. This is still not fully POSIX-compliant (Austin group issue #594 says that the full value passed to exit() shall be returned via si_status, not just the low 8 bits) but is sufficient for a si_status-related test in libnih (upstart, Debian/kFreeBSD). PR: kern/184002 Modified: stable/9/sys/kern/kern_exit.c stable/9/sys/kern/kern_sig.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_exit.c ============================================================================== --- stable/9/sys/kern/kern_exit.c Fri Jan 3 12:28:33 2014 (r260226) +++ stable/9/sys/kern/kern_exit.c Fri Jan 3 14:30:24 2014 (r260227) @@ -978,16 +978,19 @@ proc_to_reap(struct thread *td, struct p * This is still a rough estimate. We will fix the * cases TRAPPED, STOPPED, and CONTINUED later. */ - if (WCOREDUMP(p->p_xstat)) + if (WCOREDUMP(p->p_xstat)) { siginfo->si_code = CLD_DUMPED; - else if (WIFSIGNALED(p->p_xstat)) + siginfo->si_status = WTERMSIG(p->p_xstat); + } else if (WIFSIGNALED(p->p_xstat)) { siginfo->si_code = CLD_KILLED; - else + siginfo->si_status = WTERMSIG(p->p_xstat); + } else { siginfo->si_code = CLD_EXITED; + siginfo->si_status = WEXITSTATUS(p->p_xstat); + } siginfo->si_pid = p->p_pid; siginfo->si_uid = p->p_ucred->cr_uid; - siginfo->si_status = p->p_xstat; /* * The si_addr field would be useful additional Modified: stable/9/sys/kern/kern_sig.c ============================================================================== --- stable/9/sys/kern/kern_sig.c Fri Jan 3 12:28:33 2014 (r260226) +++ stable/9/sys/kern/kern_sig.c Fri Jan 3 14:30:24 2014 (r260227) @@ -2951,7 +2951,7 @@ sigparent(struct proc *p, int reason, in } static void -childproc_jobstate(struct proc *p, int reason, int status) +childproc_jobstate(struct proc *p, int reason, int sig) { struct sigacts *ps; @@ -2971,7 +2971,7 @@ childproc_jobstate(struct proc *p, int r mtx_lock(&ps->ps_mtx); if ((ps->ps_flag & PS_NOCLDSTOP) == 0) { mtx_unlock(&ps->ps_mtx); - sigparent(p, reason, status); + sigparent(p, reason, sig); } else mtx_unlock(&ps->ps_mtx); } @@ -2979,6 +2979,7 @@ childproc_jobstate(struct proc *p, int r void childproc_stopped(struct proc *p, int reason) { + /* p_xstat is a plain signal number, not a full wait() status here. */ childproc_jobstate(p, reason, p->p_xstat); } @@ -2992,13 +2993,15 @@ void childproc_exited(struct proc *p) { int reason; - int status = p->p_xstat; /* convert to int */ + int xstat = p->p_xstat; /* convert to int */ + int status; - reason = CLD_EXITED; - if (WCOREDUMP(status)) - reason = CLD_DUMPED; - else if (WIFSIGNALED(status)) - reason = CLD_KILLED; + if (WCOREDUMP(xstat)) + reason = CLD_DUMPED, status = WTERMSIG(xstat); + else if (WIFSIGNALED(xstat)) + reason = CLD_KILLED, status = WTERMSIG(xstat); + else + reason = CLD_EXITED, status = WEXITSTATUS(xstat); /* * XXX avoid calling wakeup(p->p_pptr), the work is * done in exit1(). From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 3 15:06:15 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75D23DF2; Fri, 3 Jan 2014 15:06:15 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4AF4314DF; Fri, 3 Jan 2014 15:06:15 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id D02E3B94F; Fri, 3 Jan 2014 10:06:13 -0500 (EST) From: John Baldwin To: Sergey Kandaurov Subject: Re: svn commit: r260221 - in stable/9/sys: compat/freebsd32 kern sys Date: Fri, 3 Jan 2014 09:53:32 -0500 User-Agent: KMail/1.13.7 (FreeBSD/9.2-PRERELEASE; KDE/4.8.4; amd64; ; ) References: <201401030831.s038Vhm1055742@svn.freebsd.org> In-Reply-To: <201401030831.s038Vhm1055742@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201401030953.33017.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 03 Jan 2014 10:06:13 -0500 (EST) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 15:06:15 -0000 On Friday, January 03, 2014 03:31:42 AM Sergey Kandaurov wrote: > Author: pluknet > Date: Fri Jan 3 08:31:42 2014 > New Revision: 260221 > URL: http://svnweb.freebsd.org/changeset/base/260221 > > Log: > Regen. Ugh. I'm sorry. :( I had done all my pre-commit testing with a regen in place and had reverted it to commit so I could commit the regen after the MFC was committed. -- John Baldwin From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 3 15:55:21 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECC047DB; Fri, 3 Jan 2014 15:55:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D742918E4; Fri, 3 Jan 2014 15:55:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03FtLFe024265; Fri, 3 Jan 2014 15:55:21 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03FtLr4024262; Fri, 3 Jan 2014 15:55:21 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201401031555.s03FtLr4024262@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Fri, 3 Jan 2014 15:55:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260231 - in stable/9/contrib/gcc: . cp X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 15:55:22 -0000 Author: pfg Date: Fri Jan 3 15:55:20 2014 New Revision: 260231 URL: http://svnweb.freebsd.org/changeset/base/260231 Log: MFC r259655 (partial), r259944 gcc: merge small upstream changes. Fix for PR c++/29928 Backport from mainline: 2007-04-24 Hui-May Chang * reload1.c (merge_assigned_reloads) : Do not merge a RELOAD_OTHER instruction with a RELOAD_FOR_OPERAND_ADDRESS instruction. Obtained from: gcc 4.3 (rev. r124115, 124724: GPLv2) Modified: stable/9/contrib/gcc/ChangeLog.gcc43 stable/9/contrib/gcc/cp/rtti.c stable/9/contrib/gcc/reload1.c Directory Properties: stable/9/ (props changed) stable/9/contrib/gcc/ (props changed) Modified: stable/9/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- stable/9/contrib/gcc/ChangeLog.gcc43 Fri Jan 3 15:54:12 2014 (r260230) +++ stable/9/contrib/gcc/ChangeLog.gcc43 Fri Jan 3 15:55:20 2014 (r260231) @@ -139,6 +139,11 @@ alignment for amdfam10 architecture. Increasing the max loop alignment to 24 bytes. +2007-04-24 Hui-May Chang (r124115) + + * reload1.c (merge_assigned_reloads) : Do not merge a RELOAD_OTHER + instruction with a RELOAD_FOR_OPERAND_ADDRESS instruction. + 2007-04-16 Lawrence Crowl (r123909) * doc/invoke.texi (Debugging Options): Add documentation for the Modified: stable/9/contrib/gcc/cp/rtti.c ============================================================================== --- stable/9/contrib/gcc/cp/rtti.c Fri Jan 3 15:54:12 2014 (r260230) +++ stable/9/contrib/gcc/cp/rtti.c Fri Jan 3 15:55:20 2014 (r260231) @@ -238,7 +238,7 @@ get_tinfo_decl_dynamic (tree exp) /* Peel off cv qualifiers. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, exp); if (!type) @@ -430,7 +430,7 @@ get_typeid (tree type) that is the operand of typeid are always ignored. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, NULL_TREE); if (!type) Modified: stable/9/contrib/gcc/reload1.c ============================================================================== --- stable/9/contrib/gcc/reload1.c Fri Jan 3 15:54:12 2014 (r260230) +++ stable/9/contrib/gcc/reload1.c Fri Jan 3 15:55:20 2014 (r260231) @@ -6236,15 +6236,23 @@ merge_assigned_reloads (rtx insn) transfer_replacements (i, j); } - /* If this is now RELOAD_OTHER, look for any reloads that load - parts of this operand and set them to RELOAD_FOR_OTHER_ADDRESS - if they were for inputs, RELOAD_OTHER for outputs. Note that - this test is equivalent to looking for reloads for this operand - number. */ - /* We must take special care with RELOAD_FOR_OUTPUT_ADDRESS; it may - share registers with a RELOAD_FOR_INPUT, so we can not change it - to RELOAD_FOR_OTHER_ADDRESS. We should never need to, since we - do not modify RELOAD_FOR_OUTPUT. */ + /* If this is now RELOAD_OTHER, look for any reloads that + load parts of this operand and set them to + RELOAD_FOR_OTHER_ADDRESS if they were for inputs, + RELOAD_OTHER for outputs. Note that this test is + equivalent to looking for reloads for this operand + number. + + We must take special care with RELOAD_FOR_OUTPUT_ADDRESS; + it may share registers with a RELOAD_FOR_INPUT, so we can + not change it to RELOAD_FOR_OTHER_ADDRESS. We should + never need to, since we do not modify RELOAD_FOR_OUTPUT. + + It is possible that the RELOAD_FOR_OPERAND_ADDRESS + instruction is assigned the same register as the earlier + RELOAD_FOR_OTHER_ADDRESS instruction. Merging these two + instructions will cause the RELOAD_FOR_OTHER_ADDRESS + instruction to be deleted later on. */ if (rld[i].when_needed == RELOAD_OTHER) for (j = 0; j < n_reloads; j++) @@ -6252,6 +6260,7 @@ merge_assigned_reloads (rtx insn) && rld[j].when_needed != RELOAD_OTHER && rld[j].when_needed != RELOAD_FOR_OTHER_ADDRESS && rld[j].when_needed != RELOAD_FOR_OUTPUT_ADDRESS + && rld[j].when_needed != RELOAD_FOR_OPERAND_ADDRESS && (! conflicting_input || rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS || rld[j].when_needed == RELOAD_FOR_INPADDR_ADDRESS) From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 3 20:02:59 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C25BB21C; Fri, 3 Jan 2014 20:02:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ADEB71EE2; Fri, 3 Jan 2014 20:02:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03K2xK2021384; Fri, 3 Jan 2014 20:02:59 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03K2xwo021383; Fri, 3 Jan 2014 20:02:59 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201401032002.s03K2xwo021383@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 3 Jan 2014 20:02:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260241 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 20:02:59 -0000 Author: kib Date: Fri Jan 3 20:02:59 2014 New Revision: 260241 URL: http://svnweb.freebsd.org/changeset/base/260241 Log: MFC r259953: Fix accounting for the negative cache entries when reusing v_cache_dd. Modified: stable/9/sys/kern/vfs_cache.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/vfs_cache.c ============================================================================== --- stable/9/sys/kern/vfs_cache.c Fri Jan 3 20:02:30 2014 (r260240) +++ stable/9/sys/kern/vfs_cache.c Fri Jan 3 20:02:59 2014 (r260241) @@ -749,16 +749,20 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp ncp->nc_flag & NCF_ISDOTDOT) { KASSERT(ncp->nc_dvp == dvp, ("wrong isdotdot parent")); - if (ncp->nc_vp != NULL) + if (ncp->nc_vp != NULL) { TAILQ_REMOVE(&ncp->nc_vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_REMOVE(&ncneg, ncp, nc_dst); - if (vp != NULL) + numneg--; + } + if (vp != NULL) { TAILQ_INSERT_HEAD(&vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); + numneg++; + } ncp->nc_vp = vp; CACHE_WUNLOCK(); return; @@ -894,6 +898,8 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp } if (numneg * ncnegfactor > numcache) { ncp = TAILQ_FIRST(&ncneg); + KASSERT(ncp->nc_vp == NULL, ("ncp %p vp %p on ncneg", + ncp, ncp->nc_vp)); zap = 1; } if (hold) From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 04:49:00 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA1BEC1B; Sat, 4 Jan 2014 04:49:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C29C61145; Sat, 4 Jan 2014 04:49:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s044n0CR026139; Sat, 4 Jan 2014 04:49:00 GMT (envelope-from edavis@svn.freebsd.org) Received: (from edavis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s044mwsF026117; Sat, 4 Jan 2014 04:48:58 GMT (envelope-from edavis@svn.freebsd.org) Message-Id: <201401040448.s044mwsF026117@svn.freebsd.org> From: Eric Davis Date: Sat, 4 Jan 2014 04:48:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260252 - in stable/9: share/man/man4 sys/amd64/conf sys/conf sys/dev/bxe sys/i386/conf sys/modules/bxe X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 04:49:00 -0000 Author: edavis Date: Sat Jan 4 04:48:58 2014 New Revision: 260252 URL: http://svnweb.freebsd.org/changeset/base/260252 Log: MFC Broadcom 10Gb bxe driver Merged r255736, r255861, r256299, r256341, r258187, r259928, r260113 Approved by: davidch (mentor) Added: stable/9/sys/dev/bxe/57710_init_values.c - copied unchanged from r255736, head/sys/dev/bxe/57710_init_values.c stable/9/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r255736, head/sys/dev/bxe/57710_int_offsets.h stable/9/sys/dev/bxe/57711_init_values.c - copied unchanged from r255736, head/sys/dev/bxe/57711_init_values.c stable/9/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r255736, head/sys/dev/bxe/57711_int_offsets.h stable/9/sys/dev/bxe/57712_init_values.c - copied unchanged from r255736, head/sys/dev/bxe/57712_init_values.c stable/9/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r255736, head/sys/dev/bxe/57712_int_offsets.h stable/9/sys/dev/bxe/bxe.c - copied, changed from r255736, head/sys/dev/bxe/bxe.c stable/9/sys/dev/bxe/bxe.h - copied, changed from r255736, head/sys/dev/bxe/bxe.h stable/9/sys/dev/bxe/bxe_dcb.h - copied unchanged from r255736, head/sys/dev/bxe/bxe_dcb.h stable/9/sys/dev/bxe/bxe_debug.c - copied unchanged from r255736, head/sys/dev/bxe/bxe_debug.c stable/9/sys/dev/bxe/bxe_elink.c - copied, changed from r255736, head/sys/dev/bxe/bxe_elink.c stable/9/sys/dev/bxe/bxe_elink.h - copied unchanged from r255736, head/sys/dev/bxe/bxe_elink.h stable/9/sys/dev/bxe/bxe_stats.c - copied, changed from r255736, head/sys/dev/bxe/bxe_stats.c stable/9/sys/dev/bxe/bxe_stats.h - copied unchanged from r255736, head/sys/dev/bxe/bxe_stats.h stable/9/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r255736, head/sys/dev/bxe/ecore_fw_defs.h stable/9/sys/dev/bxe/ecore_hsi.h - copied, changed from r255736, head/sys/dev/bxe/ecore_hsi.h stable/9/sys/dev/bxe/ecore_init.h - copied, changed from r255736, head/sys/dev/bxe/ecore_init.h stable/9/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r255736, head/sys/dev/bxe/ecore_init_ops.h stable/9/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r255736, head/sys/dev/bxe/ecore_mfw_req.h stable/9/sys/dev/bxe/ecore_reg.h - copied, changed from r255736, head/sys/dev/bxe/ecore_reg.h stable/9/sys/dev/bxe/ecore_sp.c - copied, changed from r255736, head/sys/dev/bxe/ecore_sp.c stable/9/sys/dev/bxe/ecore_sp.h - copied, changed from r255736, head/sys/dev/bxe/ecore_sp.h Deleted: stable/9/sys/dev/bxe/bxe_debug.h stable/9/sys/dev/bxe/bxe_fw_defs.h stable/9/sys/dev/bxe/bxe_hsi.h stable/9/sys/dev/bxe/bxe_include.h stable/9/sys/dev/bxe/bxe_init.h stable/9/sys/dev/bxe/bxe_init_values_e1.h stable/9/sys/dev/bxe/bxe_init_values_e1h.h stable/9/sys/dev/bxe/bxe_link.c stable/9/sys/dev/bxe/bxe_link.h stable/9/sys/dev/bxe/bxe_reg.h stable/9/sys/dev/bxe/bxe_self_test.h stable/9/sys/dev/bxe/dump_e1.h stable/9/sys/dev/bxe/dump_e1h.h stable/9/sys/dev/bxe/hw_dump_reg_st.h stable/9/sys/dev/bxe/if_bxe.c stable/9/sys/dev/bxe/if_bxe.h Modified: stable/9/share/man/man4/altq.4 stable/9/share/man/man4/bxe.4 stable/9/share/man/man4/vlan.4 stable/9/sys/amd64/conf/GENERIC stable/9/sys/amd64/conf/NOTES stable/9/sys/conf/NOTES stable/9/sys/conf/files stable/9/sys/conf/files.amd64 stable/9/sys/conf/files.i386 stable/9/sys/conf/options stable/9/sys/i386/conf/GENERIC stable/9/sys/i386/conf/NOTES stable/9/sys/modules/bxe/Makefile Directory Properties: stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/sys/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/share/man/man4/altq.4 ============================================================================== --- stable/9/share/man/man4/altq.4 Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/share/man/man4/altq.4 Sat Jan 4 04:48:58 2014 (r260252) @@ -126,6 +126,7 @@ They have been applied to the following .Xr bce 4 , .Xr bfe 4 , .Xr bge 4 , +.Xr bxe 4 , .Xr cas 4 , .Xr cxgbe 4 , .Xr dc 4 , Modified: stable/9/share/man/man4/bxe.4 ============================================================================== --- stable/9/share/man/man4/bxe.4 Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/share/man/man4/bxe.4 Sat Jan 4 04:48:58 2014 (r260252) @@ -1,35 +1,38 @@ -.\" Copyright (c) 2012 Edward Tomasz Napierala -.\" All rights reserved. +.\" Copyright (c) 2013 Broadcom Corporation. 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. +.\" 3. Neither the name of Broadcom Corporation nor the name of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written consent. .\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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. +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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$ .\" -.Dd June 25, 2012 +.Dd April 29, 2012 .Dt BXE 4 .Os .Sh NAME .Nm bxe -.Nd "Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet adapter driver" +.Nd Broadcom NetXtreme II Ethernet 10Gb PCIe adapter driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -38,8 +41,8 @@ kernel configuration file: .Cd "device bxe" .Ed .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +Alternatively, to load the driver as a module at boot time, place the +following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_bxe_load="YES" @@ -47,77 +50,276 @@ if_bxe_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for PCIe 10GbE Ethernet adapters based on -BCM5771x chips. -The driver supports Jumbo Frames, VLAN tagging, IP, UDP and TCP checksum -offload, MSI-X, TCP Segmentation Offload (TSO), Large Receive Offload (LRO), -and Receive Side Steering (RSS). -.Pp -For more information on configuring this device, see -.Xr ifconfig 8 . +driver provides support for PCIe 10Gb Ethernet adapters based on the Broadcom +NetXtreme II family of 10Gb chips. +The driver supports Jumbo Frames, VLAN +tagging, checksum offload (IPv4, TCP, UDP, IPv6-TCP, IPv6-UDP), MSI-X +interrupts, TCP Segmentation Offload (TSO), Large Receive Offload (LRO), and +Receive Side Scaling (RSS). .Sh HARDWARE The .Nm -driver provides support for various NICs based on the Broadcom BCM5771x -family of 10GbE Ethernet controller chips, including the -following: +driver provides support for various NICs based on the Broadcom NetXtreme II +family of 10Gb Ethernet controller chips, including the following: .Pp .Bl -bullet -compact .It -Broadcom NetXtreme II BCM57710 10GbE +Broadcom NetXtreme II BCM57710 10Gb +.It +Broadcom NetXtreme II BCM57711 10Gb +.It +Broadcom NetXtreme II BCM57711E 10Gb +.It +Broadcom NetXtreme II BCM57712 10Gb +.It +Broadcom NetXtreme II BCM57712-MF 10Gb +.It +Broadcom NetXtreme II BCM57800 10Gb .It -Broadcom NetXtreme II BCM57711 10GbE +Broadcom NetXtreme II BCM57800-MF 10Gb .It -Broadcom NetXtreme II BCM57711E 10GbE +Broadcom NetXtreme II BCM57810 10Gb +.It +Broadcom NetXtreme II BCM57810-MF 10Gb +.It +Broadcom NetXtreme II BCM57840 10Gb / 20Gb +.It +Broadcom NetXtreme II BCM57840-MF 10Gb .El -.Sh SYSCTL VARIABLES -The following variables are available as both -.Xr sysctl 8 -variables and -.Xr loader 8 -tunables: +.Sh CONFIGURATION +There a number of configuration parameters that can be set to tweak the +driver's behavior. +These parameters can be set via the +.Xr loader.conf 5 +file to take affect during the next system boot. +The following parameters affect +ALL instances of the driver. .Bl -tag -width indent -.It Va hw.bxe.dcc_enable -Enable HP Flex-10 support. -Allowed values are 0 to disable and 1 to enable. -The default value is 0. -.It Va hw.bxe.tso_enable -Enable TCP Segmentation Offload. -The default value is 1. -.It Va hw.bxe.int_mode -Set interrupt mode. -Allowed values are 0 for IRQ, 1 for MSI/IRQ and 2 for MSI-X/MSI/IRQ. -The default value is 2. +.It Va hw.bxe.debug +DEFAULT = 0 +.br +Sets the default logging level of the driver. +See the Diagnostics and Debugging +section below for more details. +.It Va hw.bxe.interrupt_mode +DEFAULT = 2 +.br +Sets the default interrupt mode: 0=IRQ, 1=MSI, 2=MSIX. +If set to MSIX and +allocation fails, the driver will roll back and attempt MSI allocation. +If MSI +allocation fails, the driver will roll back and attempt fixed level IRQ +allocation. +If IRQ allocation fails, then the driver load fails. +With MSI/MSIX, +the driver attempts to allocate a vector for each queue in addition to one more +for default processing. .It Va hw.bxe.queue_count -Specify the number of queues that will be used when a multi-queue -RSS mode is selected using bxe_multi_mode. -Allowed values are 0 for Auto or 1 to 16 for fixed number of queues. -The default value is 0. -.It Va hw.bxe.multi_mode -Enable Receive Side Steering. -Allowed values are 0, which disables all multi-queue/packet sorting -algorithms, and 1, which assigns incoming frames to receive queues -according to RSS. -The default value is 0. -.It Va hw.bxe.rx_ticks -Control interrupt coalescing for received frames. -The first frame always causes an interrupt, but subsequent frames -are coalesced until the RX/TX ticks timer value expires and another -interrupt occurs. -The default value is 25. -.It Va hw.bxe.tx_ticks -Control interrupt coalescing for trasmitted frames. -The first frame always causes an interrupt, but subsequent frames -are coalesced until the RX/TX ticks timer value expires and another -interrupt occurs. -The default value is 50. +DEFAULT = 4 +.br +Sets the default number of fast path packet processing queues. +Note that one +MSI/MSIX interrupt vector is allocated per-queue. +.It Va hw.bxe.max_rx_bufs +DEFAULT = 0 +.br +Sets the maximum number of receive buffers to allocate per-queue. +Zero(0) means +to allocate a receive buffer for every buffer descriptor. +By default this +equates to 4080 buffers per-queue which is the maximum value for this config +parameter. +.It Va hw.bxe.hc_rx_ticks +DEFAULT = 25 +.br +Sets the number of ticks for host interrupt coalescing in the receive path. +.It Va hw.bxe.hc_tx_ticks +DEFAULT = 50 +.br +Sets the number of ticks for host interrupt coalescing in the transmit path. +.It Va hw.bxe.rx_budget +DEFAULT = 0xffffffff +.br +Sets the maximum number of receive packets to process in an interrupt. +If the +budget is reached then the remaining/pending packets will be processed in a +scheduled taskqueue. +.It Va hw.bxe.max_aggregation_size +DEFAULT = 32768 +.br +Sets the maximum LRO aggregration byte size. +The higher the value the more +packets the hardware will aggregate. +Maximum is 65K. .It Va hw.bxe.mrrs -Allows to set the PCIe maximum read request size. -Allowed values are -1 for Auto, 0 for 128B, 1 for 256B, 2 for 512B, -and 3 for 1kB. -The default value is -1. +DEFAULT = -1 +.br +Sets the PCI MRRS: -1=Auto, 0=128B, 1=256B, 2=512B, 3=1KB +.It Va hw.bxe.autogreeen +DEFAULT = 0 +.br +Set AutoGrEEEN: 0=HW_DEFAULT, 1=FORCE_ON, 2=FORCE_OFF +.It Va hw.bxe.udp_rss +DEFAULT = 0 +.br +Enable/Disable 4-tuple RSS for UDP: 0=DISABLED, 1=ENABLED .El +.Pp +Special care must be taken when modifying the number of queues and receive +buffers. +FreeBSD imposes a limit on the maximum number of +.Xr mbuf 9 +allocations. +If buffer allocations fail, the interface initialization will fail +and the interface will not be usable. +The driver does not make a best effort +for buffer allocations. +It is an all or nothing effort. +.Pp +You can tweak the +.Xr mbuf 9 +allocation limit using +.Xr sysctl 8 +and view the current usage with +.Xr netstat 1 +as follows: +.Bd -literal -offset indent +# netstat -m +# sysctl kern.ipc.nmbclusters +# sysctl kern.ipc.nmbclusters=<#> +.Ed +.Pp +There are additional configuration parameters that can be set on a per-instance +basis to dynamically override the default configuration. +The '#' below must be +replaced with the driver instance / interface unit number: +.Bl -tag -width indent +.It Va dev.bxe.#.debug +DEFAULT = 0 +.br +Sets the default logging level of the driver instance. +See +.Va hw.bxe.debug +above and +the Diagnostics and Debugging section below for more details. +.It Va dev.bxe.#.rx_budget +DEFAULT = 0xffffffff +.br +Sets the maximum number of receive packets to process in an interrupt for the +driver instance. +See +.Va hw.bxe.rx_budget +above for more details. +.El +.Pp +Additional items can be configured using +.Xr ifconfig 8 : +.Bl -tag -width indent +.It Va MTU - Maximum Transmission Unit +DEFAULT = 1500 +.br +RANGE = 46-9184 +.br +# ifconfig bxe# mtu +.It Va Promiscuous Mode +DEFAULT = OFF +.br +# ifconfig bxe# [ promisc | -promisc ] +.It Va Rx/Tx Checksum Offload +DEFAULT = RX/TX CSUM ON +.br +Note that the Rx and Tx settings are not independent. +.br +# ifconfig bxe# [ rxcsum | -rxcsum | txcsum | -txcsum ] +.It Va TSO - TCP Segmentation Offload +DEFAULT = ON +.br +# ifconfig bxe# [ tso | -tso | tso6 | -tso6 ] +.It Va LRO - TCP Large Receive Offload +DEFAULT = ON +.br +# ifconfig bxe# [ lro | -lro ] +.El +.Sh DIAGNOSTICS AND DEBUGGING +There are many statistics exposed by +.Nm +via +.Xr sysctl 8 . +.Pp +To dump the default driver configuration: +.Bd -literal -offset indent +# sysctl -a | grep hw.bxe +.Ed +.Pp +To dump every instance's configuration and detailed statistics: +.Bd -literal -offset indent +# sysctl -a | grep dev.bxe +.Ed +.Pp +To dump information for a single instance (replace the '#' with the driver +instance / interface unit number): +.Bd -literal -offset indent +# sysctl -a | grep dev.bxe.# +.Ed +.Pp +To dump information for all the queues of a single instance: +.Bd -literal -offset indent +# sysctl -a | grep dev.bxe.#.queue +.Ed +.Pp +To dump information for a single queue of a single instance (replace the +additional '#' with the queue number): +.Bd -literal -offset indent +# sysctl -a | grep dev.bxe.#.queue.# +.Ed +.Pp +The +.Nm +driver has the ability to dump a ton of debug messages to the system +log. +The default level of logging can be set with the +.Va hw.bxe.debug +.Xr sysctl 8 . +Take care with this setting as it can result in too +many logs being dumped. +Since this parameter is the default one, it affects +every instance and will dramatically change the timing in the driver. +A better +alternative to aid in debugging is to dynamically change the debug level of a +specific instance with the +.Va dev.bxe.#.debug +.Xr sysctl 8 . +This allows +you to turn on/off logging of various debug groups on-the-fly. +.Pp +The different debug groups that can be toggled are: +.Bd -literal -offset indent +DBG_LOAD 0x00000001 /* load and unload */ +DBG_INTR 0x00000002 /* interrupt handling */ +DBG_SP 0x00000004 /* slowpath handling */ +DBG_STATS 0x00000008 /* stats updates */ +DBG_TX 0x00000010 /* packet transmit */ +DBG_RX 0x00000020 /* packet receive */ +DBG_PHY 0x00000040 /* phy/link handling */ +DBG_IOCTL 0x00000080 /* ioctl handling */ +DBG_MBUF 0x00000100 /* dumping mbuf info */ +DBG_REGS 0x00000200 /* register access */ +DBG_LRO 0x00000400 /* lro processing */ +DBG_ASSERT 0x80000000 /* debug assert */ +DBG_ALL 0xFFFFFFFF /* flying monkeys */ +.Ed +.Pp +For example, to debug an issue in the receive path on bxe0: +.Bd -literal -offset indent +# sysctl dev.bxe.0.debug=0x22 +.Ed +.Pp +When finished turn the logging back off: +.Bd -literal -offset indent +# sysctl dev.bxe.0.debug=0 +.Ed .Sh SEE ALSO +.Xr netstat 1 , .Xr altq 4 , .Xr arp 4 , .Xr netintro 4 , @@ -133,6 +335,7 @@ device driver first appeared in The .Nm driver was written by -.An Gary Zambrano Aq zambrano@broadcom.com +.An Eric Davis Aq edavis@broadcom.com , +.An David Christensen Aq davidch@broadcom.com , and -.An David Christensen Aq davidch@broadcom.com . +.An Gary Zambrano Aq zambrano@broadcom.com . Modified: stable/9/share/man/man4/vlan.4 ============================================================================== --- stable/9/share/man/man4/vlan.4 Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/share/man/man4/vlan.4 Sat Jan 4 04:48:58 2014 (r260252) @@ -127,6 +127,7 @@ in hardware: .Xr ale 4 , .Xr bce 4 , .Xr bge 4 , +.Xr bxe 4 , .Xr cxgb 4 , .Xr cxgbe 4 , .Xr em 4 , Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/amd64/conf/GENERIC Sat Jan 4 04:48:58 2014 (r260252) @@ -192,7 +192,7 @@ device ppi # Parallel port interface d device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. -device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet +device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family Modified: stable/9/sys/amd64/conf/NOTES ============================================================================== --- stable/9/sys/amd64/conf/NOTES Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/amd64/conf/NOTES Sat Jan 4 04:48:58 2014 (r260252) @@ -294,6 +294,8 @@ options DRM_DEBUG # Include debug print # Network interfaces: # +# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet +# adapters. # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices # (requires miibus) @@ -314,6 +316,7 @@ options DRM_DEBUG # Include debug print # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware module +device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards options ED_3C503 options ED_HPP Modified: stable/9/sys/conf/NOTES ============================================================================== --- stable/9/sys/conf/NOTES Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/conf/NOTES Sat Jan 4 04:48:58 2014 (r260252) @@ -1909,7 +1909,7 @@ device xmphy # XaQti XMAC II # BCM570x family of controllers, including the 3Com 3c996-T, # the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and # the embedded gigE NICs on Dell PowerEdge 2550 servers. -# bxe: Broadcom NetXtreme II (BCM57710/57711/57711E) PCIe 10b Ethernet +# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet # adapters. # bwi: Broadcom BCM430* and BCM431* family of wireless adapters. # bwn: Broadcom BCM43xx family of wireless adapters. @@ -2092,7 +2092,6 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # PCI Ethernet NICs. -device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet device cxgbe # Chelsio T4 10GbE PCIe adapter device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel Pro/1000 Gigabit Ethernet Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/conf/files Sat Jan 4 04:48:58 2014 (r260252) @@ -884,8 +884,6 @@ dev/bwi/if_bwi_pci.c optional bwi pci # XXX Work around clang warning, until maintainer approves fix. dev/bwn/if_bwn.c optional bwn siba_bwn \ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" -dev/bxe/if_bxe.c optional bxe -dev/bxe/bxe_link.c optional bxe dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus Modified: stable/9/sys/conf/files.amd64 ============================================================================== --- stable/9/sys/conf/files.amd64 Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/conf/files.amd64 Sat Jan 4 04:48:58 2014 (r260252) @@ -165,6 +165,14 @@ dev/atkbdc/atkbdc.c optional atkbdc dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +dev/bxe/bxe.c optional bxe pci +dev/bxe/bxe_stats.c optional bxe pci +dev/bxe/bxe_debug.c optional bxe pci +dev/bxe/ecore_sp.c optional bxe pci +dev/bxe/bxe_elink.c optional bxe pci +dev/bxe/57710_init_values.c optional bxe pci +dev/bxe/57711_init_values.c optional bxe pci +dev/bxe/57712_init_values.c optional bxe pci dev/coretemp/coretemp.c optional coretemp dev/cpuctl/cpuctl.c optional cpuctl dev/dpms/dpms.c optional dpms Modified: stable/9/sys/conf/files.i386 ============================================================================== --- stable/9/sys/conf/files.i386 Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/conf/files.i386 Sat Jan 4 04:48:58 2014 (r260252) @@ -152,6 +152,14 @@ dev/atkbdc/atkbdc.c optional atkbdc dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +dev/bxe/bxe.c optional bxe pci +dev/bxe/bxe_stats.c optional bxe pci +dev/bxe/bxe_debug.c optional bxe pci +dev/bxe/ecore_sp.c optional bxe pci +dev/bxe/bxe_elink.c optional bxe pci +dev/bxe/57710_init_values.c optional bxe pci +dev/bxe/57711_init_values.c optional bxe pci +dev/bxe/57712_init_values.c optional bxe pci dev/ce/ceddk.c optional ce dev/ce/if_ce.c optional ce dev/ce/tau32-ddk.c optional ce \ Modified: stable/9/sys/conf/options ============================================================================== --- stable/9/sys/conf/options Sat Jan 4 01:12:28 2014 (r260251) +++ stable/9/sys/conf/options Sat Jan 4 04:48:58 2014 (r260252) @@ -713,10 +713,6 @@ ED_SIC opt_ed.h BCE_DEBUG opt_bce.h BCE_NVRAM_WRITE_SUPPORT opt_bce.h -# bxe driver -BXE_DEBUG opt_bxe.h -BXE_NVRAM_WRITE_SUPPORT opt_bxe.h - SOCKBUF_DEBUG opt_global.h Copied: stable/9/sys/dev/bxe/57710_init_values.c (from r255736, head/sys/dev/bxe/57710_init_values.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/sys/dev/bxe/57710_init_values.c Sat Jan 4 04:48:58 2014 (r260252, copy of r255736, head/sys/dev/bxe/57710_init_values.c) @@ -0,0 +1,29161 @@ +/*- + * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. + * + * Eric Davis + * David Christensen + * Gary Zambrano + * + * 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. + * 3. Neither the name of Broadcom Corporation nor the name of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written consent. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + */ + +#include +__FBSDID("$FreeBSD$"); + + +/* +* This file contains an array of operations needed to initialize the chip: +* OP_WR - write a single register. +* OP_RD - read a single register. +* OP_SW - write an array to consecutive registers. +* OP_WB - write an array using DMAE. +* OP_ZR - clear consecutive registers. +* OP_WB_ZR - clear consecutive registers using DMAE. +* OP_ZP - unzip and write an array using DMAE. +* OP_WR_64 - write a 64-bit pattern to consecutive registers. +* OP_IF_MODE_OR - skip next ops if all modes do not match. +* OP_IF_MODE_AND - skip next ops if at least one mode does not match. +*/ +#include "bxe.h" + +#include "ecore_init.h" + +#ifdef __SunOS +#define const +#endif + +static const struct raw_op init_ops_e1[] = { +/* #define BRB1_COMMON_START 22 */ + {OP_WR, 0x600dc, 0x1}, + {OP_SW, 0x61000, 0x2000000}, + {OP_RD, 0x600d8, 0x0}, + {OP_SW, 0x60200, 0x30200}, + {OP_WR, 0x600dc, 0x0}, +/* #define BRB1_COMMON_END 23 */ +/* #define BRB1_PORT0_START 24 */ + {OP_WR, 0x60068, 0xb8}, + {OP_WR, 0x60078, 0x114}, + {OP_RD, 0x600b8, 0x0}, + {OP_RD, 0x600c8, 0x0}, +/* #define BRB1_PORT0_END 25 */ +/* #define BRB1_PORT1_START 26 */ + {OP_WR, 0x6006c, 0xb8}, + {OP_WR, 0x6007c, 0x114}, + {OP_RD, 0x600bc, 0x0}, + {OP_RD, 0x600cc, 0x0}, +/* #define BRB1_PORT1_END 27 */ +/* #define CCM_COMMON_START 44 */ + {OP_WR, 0xd0044, 0x32}, + {OP_SW, 0xd004c, 0x40203}, + {OP_ZR, 0xd005c, 0x4}, + {OP_SW, 0xd008c, 0x110207}, + {OP_WR, 0xd015c, 0x1}, + {OP_SW, 0xd0164, 0x20218}, + {OP_WR, 0xd0204, 0x1}, + {OP_SW, 0xd020c, 0x3021a}, + {OP_SW, 0xd0220, 0x2021d}, + {OP_ZR, 0xd0280, 0x12}, + {OP_SW, 0xd0300, 0x18021f}, + {OP_ZR, 0xd0360, 0xc}, + {OP_ZR, 0xd4000, 0xa00}, + {OP_SW, 0xd0004, 0xf0237}, +/* #define CCM_COMMON_END 45 */ +/* #define CCM_PORT0_START 46 */ + {OP_WR, 0xd0114, 0xd}, +/* #define CCM_PORT0_END 47 */ +/* #define CCM_PORT1_START 48 */ + {OP_WR, 0xd0118, 0x2d}, +/* #define CCM_PORT1_END 49 */ +/* #define CDU_COMMON_START 66 */ + {OP_SW, 0x101000, 0x30246}, + {OP_WR, 0x101010, 0x264}, + {OP_WB, 0x101100, 0x100249}, + {OP_WB_ZR, 0x101140, 0x8}, + {OP_WB, 0x101160, 0x100259}, + {OP_WB_ZR, 0x1011a0, 0x18}, + {OP_WB, 0x101800, 0x2000269}, + {OP_WR, 0x101010, 0x0}, +/* #define CDU_COMMON_END 67 */ +/* #define CFC_COMMON_START 88 */ + {OP_ZR, 0x104c00, 0x100}, + {OP_WR, 0x104028, 0x10}, + {OP_WR, 0x104044, 0x3fff}, + {OP_WR, 0x104058, 0x280000}, + {OP_WR, 0x104084, 0x84924a}, + {OP_WR, 0x104058, 0x0}, +/* #define CFC_COMMON_END 89 */ +/* #define CSDM_COMMON_START 110 */ + {OP_SW, 0xc2008, 0x30469}, + {OP_SW, 0xc201c, 0x4046c}, + {OP_SW, 0xc2038, 0x110470}, + {OP_ZR, 0xc207c, 0x4f}, + {OP_SW, 0xc21b8, 0x110481}, + {OP_ZR, 0xc21fc, 0xf}, + {OP_SW, 0xc2238, 0x40492}, + {OP_RD, 0xc2248, 0x0}, + {OP_RD, 0xc224c, 0x0}, + {OP_RD, 0xc2250, 0x0}, + {OP_RD, 0xc2254, 0x0}, + {OP_RD, 0xc2258, 0x0}, + {OP_RD, 0xc225c, 0x0}, + {OP_RD, 0xc2260, 0x0}, + {OP_RD, 0xc2264, 0x0}, + {OP_RD, 0xc2268, 0x0}, + {OP_RD, 0xc226c, 0x0}, + {OP_RD, 0xc2270, 0x0}, + {OP_RD, 0xc2274, 0x0}, + {OP_RD, 0xc2278, 0x0}, + {OP_RD, 0xc227c, 0x0}, + {OP_WR, 0xc24bc, 0x1}, + {OP_IF_MODE_AND, 1, 0x1}, /* asic */ + {OP_WR, 0xc2000, 0x3e8}, + {OP_IF_MODE_AND, 1, 0x2}, /* fpga */ + {OP_WR, 0xc2000, 0xa}, + {OP_IF_MODE_AND, 1, 0x4}, /* emul */ + {OP_WR, 0xc2000, 0x1}, +/* #define CSDM_COMMON_END 111 */ +/* #define CSEM_COMMON_START 132 */ + {OP_FW, 0x200400, 0xe00000}, + {OP_WR_64, 0x200780, 0x100496}, + {OP_ZR, 0x220000, 0x1600}, + {OP_ZR, 0x228000, 0x40}, + {OP_ZR, 0x223bd0, 0x8}, + {OP_ZR, 0x224800, 0x6}, + {OP_SW, 0x224818, 0x40498}, + {OP_ZR, 0x224828, 0xc}, + {OP_SW, 0x224858, 0x4049c}, + {OP_ZR, 0x224868, 0xc}, + {OP_SW, 0x224898, 0x404a0}, + {OP_ZR, 0x2248a8, 0xc}, + {OP_SW, 0x2248d8, 0x404a4}, + {OP_ZR, 0x2248e8, 0xc}, + {OP_SW, 0x224918, 0x404a8}, + {OP_ZR, 0x224928, 0xc}, + {OP_SW, 0x224958, 0x404ac}, + {OP_ZR, 0x224968, 0xc}, + {OP_SW, 0x224998, 0x404b0}, + {OP_ZR, 0x2249a8, 0xc}, + {OP_SW, 0x2249d8, 0x404b4}, + {OP_ZR, 0x2249e8, 0xc}, + {OP_SW, 0x224a18, 0x404b8}, + {OP_ZR, 0x224a28, 0xc}, + {OP_SW, 0x224a58, 0x404bc}, + {OP_ZR, 0x224a68, 0xc}, + {OP_SW, 0x224a98, 0x404c0}, + {OP_ZR, 0x224aa8, 0xc}, + {OP_SW, 0x224ad8, 0x404c4}, + {OP_ZR, 0x224ae8, 0xc}, + {OP_SW, 0x224b18, 0x404c8}, + {OP_ZR, 0x224b28, 0xc}, + {OP_SW, 0x224b58, 0x404cc}, + {OP_ZR, 0x224b68, 0xc}, + {OP_SW, 0x224b98, 0x404d0}, + {OP_ZR, 0x224ba8, 0xc}, + {OP_SW, 0x224bd8, 0x404d4}, + {OP_ZR, 0x224be8, 0xc}, + {OP_SW, 0x224c18, 0x404d8}, + {OP_ZR, 0x224c28, 0xc}, + {OP_SW, 0x224c58, 0x404dc}, + {OP_ZR, 0x224c68, 0xc}, + {OP_SW, 0x224c98, 0x404e0}, + {OP_ZR, 0x224ca8, 0xc}, + {OP_SW, 0x224cd8, 0x404e4}, + {OP_ZR, 0x224ce8, 0xc}, + {OP_SW, 0x224d18, 0x404e8}, + {OP_ZR, 0x224d28, 0xc}, + {OP_SW, 0x224d58, 0x404ec}, + {OP_ZR, 0x224d68, 0xc}, + {OP_SW, 0x224d98, 0x404f0}, + {OP_ZR, 0x224da8, 0xc}, + {OP_SW, 0x224dd8, 0x404f4}, + {OP_ZR, 0x224de8, 0xc}, + {OP_SW, 0x224e18, 0x404f8}, + {OP_ZR, 0x224e28, 0xc}, + {OP_SW, 0x224e58, 0x404fc}, + {OP_ZR, 0x224e68, 0xc}, + {OP_SW, 0x224e98, 0x40500}, + {OP_ZR, 0x224ea8, 0xc}, + {OP_SW, 0x224ed8, 0x40504}, + {OP_ZR, 0x224ee8, 0xc}, + {OP_SW, 0x224f18, 0x40508}, + {OP_ZR, 0x224f28, 0xc}, + {OP_SW, 0x224f58, 0x4050c}, + {OP_ZR, 0x224f68, 0xc}, + {OP_SW, 0x224f98, 0x40510}, + {OP_ZR, 0x224fa8, 0xc}, + {OP_SW, 0x224fd8, 0x40514}, + {OP_ZR, 0x224fe8, 0x6}, + {OP_SW, 0x225198, 0x40518}, + {OP_WR, 0x238000, 0x10}, + {OP_WR, 0x238040, 0x12}, + {OP_WR, 0x238080, 0x30}, + {OP_WR, 0x2380c0, 0xe}, + {OP_WR, 0x238380, 0x7a120}, + {OP_WR, 0x2383c0, 0x1f4}, + {OP_WR, 0x238bc0, 0x1}, + {OP_IF_MODE_AND, 2, 0x1}, /* asic */ + {OP_WR, 0x238300, 0x7a120}, + {OP_WR, 0x238340, 0x1f4}, + {OP_IF_MODE_AND, 2, 0x2}, /* fpga */ + {OP_WR, 0x238300, 0x1388}, + {OP_WR, 0x238340, 0x5}, + {OP_IF_MODE_AND, 2, 0x4}, /* emul */ + {OP_WR, 0x238300, 0x138}, + {OP_WR, 0x238340, 0x0}, + {OP_FW, 0x240000, 0x27300000}, + {OP_WR_64, 0x249cc0, 0x6ace051c}, + {OP_RD, 0x200000, 0x0}, + {OP_RD, 0x200004, 0x0}, + {OP_RD, 0x200008, 0x0}, + {OP_RD, 0x20000c, 0x0}, + {OP_RD, 0x200010, 0x0}, + {OP_RD, 0x200014, 0x0}, + {OP_SW, 0x200020, 0x1a051e}, + {OP_SW, 0x2000a4, 0x20538}, + {OP_WR, 0x200224, 0x0}, + {OP_WR, 0x200234, 0x0}, + {OP_WR, 0x20024c, 0x0}, + {OP_WR, 0x2002e4, 0xffff}, + {OP_WB_ZR, 0x202000, 0x800}, +/* #define CSEM_COMMON_END 133 */ +/* #define CSEM_PORT0_START 134 */ + {OP_ZR, 0x221400, 0x2}, + {OP_ZR, 0x221490, 0x30}, + {OP_ZR, 0x223900, 0x10}, + {OP_ZR, 0x225108, 0x2}, + {OP_ZR, 0x2251a8, 0x6}, +/* #define CSEM_PORT0_END 135 */ +/* #define CSEM_PORT1_START 136 */ + {OP_ZR, 0x221408, 0x2}, + {OP_ZR, 0x221550, 0x30}, + {OP_ZR, 0x223940, 0x10}, + {OP_ZR, 0x225110, 0x2}, + {OP_ZR, 0x2251c0, 0x6}, +/* #define CSEM_PORT1_END 137 */ +/* #define DMAE_COMMON_START 176 */ + {OP_ZR, 0x102400, 0xe0}, + {OP_SW, 0x10201c, 0x2053a}, + {OP_WR, 0x1020c0, 0x1}, + {OP_SW, 0x102004, 0x2053c}, +/* #define DMAE_COMMON_END 177 */ +/* #define DORQ_COMMON_START 198 */ + {OP_WR, 0x170008, 0x2}, + {OP_WR, 0x17002c, 0x3}, + {OP_SW, 0x170038, 0x2053e}, + {OP_SW, 0x170044, 0x60540}, + {OP_SW, 0x170060, 0x50546}, + {OP_SW, 0x170078, 0x2054b}, + {OP_WR, 0x170004, 0xf}, +/* #define DORQ_COMMON_END 199 */ +/* #define HC_COMMON_START 220 */ + {OP_ZR, 0x108068, 0x4}, +/* #define HC_COMMON_END 221 */ +/* #define HC_PORT0_START 222 */ + {OP_WR, 0x108000, 0x1080}, + {OP_ZR, 0x108040, 0x2}, + {OP_ZR, 0x108028, 0x2}, + {OP_WR, 0x108038, 0x10}, + {OP_SW, 0x108040, 0x2054d}, + {OP_WR, 0x108050, 0x0}, + {OP_WR, 0x108100, 0x0}, + {OP_ZR, 0x108120, 0x2}, + {OP_WR, 0x108008, 0x2b5}, + {OP_WR, 0x108010, 0x0}, + {OP_WR, 0x108108, 0x1ffff}, + {OP_ZR, 0x108200, 0x4a}, + {OP_ZR, 0x108140, 0x2}, + {OP_WR, 0x108000, 0x1a80}, + {OP_ZR, 0x109000, 0x24}, + {OP_ZR, 0x109120, 0x4a}, + {OP_ZR, 0x109370, 0x4a}, + {OP_ZR, 0x1095c0, 0x4a}, +/* #define HC_PORT0_END 223 */ +/* #define HC_PORT1_START 224 */ + {OP_WR, 0x108004, 0x1080}, + {OP_ZR, 0x108048, 0x2}, + {OP_ZR, 0x108030, 0x2}, + {OP_WR, 0x10803c, 0x10}, + {OP_SW, 0x108048, 0x2054f}, + {OP_WR, 0x108054, 0x0}, + {OP_WR, 0x108104, 0x0}, + {OP_ZR, 0x108128, 0x2}, + {OP_WR, 0x10800c, 0x2b5}, + {OP_WR, 0x108014, 0x0}, + {OP_WR, 0x10810c, 0x1ffff}, + {OP_ZR, 0x108400, 0x4a}, + {OP_ZR, 0x108148, 0x2}, + {OP_WR, 0x108004, 0x1a80}, + {OP_ZR, 0x109090, 0x24}, + {OP_ZR, 0x109248, 0x4a}, + {OP_ZR, 0x109498, 0x4a}, + {OP_ZR, 0x1096e8, 0x4a}, +/* #define HC_PORT1_END 225 */ +/* #define MISC_COMMON_START 264 */ + {OP_WR, 0xa468, 0xaffdc}, + {OP_WR, 0xa280, 0x1}, + {OP_SW, 0xa294, 0x40551}, + {OP_WR, 0xa4fc, 0xff000000}, +/* #define MISC_COMMON_END 265 */ +/* #define NIG_COMMON_START 286 */ + {OP_SW, 0x100b4, 0x20555}, + {OP_WR, 0x100dc, 0x1}, + {OP_SW, 0x10100, 0x20557}, +/* #define NIG_COMMON_END 287 */ +/* #define NIG_PORT0_START 288 */ + {OP_WR, 0x1007c, 0x300000}, + {OP_WR, 0x10084, 0x28}, + {OP_WR, 0x1008c, 0x0}, + {OP_WR, 0x10130, 0x4}, + {OP_ZR, 0x10138, 0x11}, + {OP_WR, 0x10328, 0x0}, + {OP_WR, 0x10554, 0x30}, + {OP_WR, 0x100c4, 0x1}, + {OP_WR, 0x100cc, 0x1}, + {OP_WR, 0x100f8, 0x1}, + {OP_WR, 0x100f0, 0x1}, +/* #define NIG_PORT0_END 289 */ +/* #define NIG_PORT1_START 290 */ + {OP_WR, 0x10080, 0x300000}, + {OP_WR, 0x10088, 0x28}, + {OP_WR, 0x10090, 0x0}, + {OP_WR, 0x10134, 0x4}, + {OP_ZR, 0x1017c, 0x11}, + {OP_WR, 0x1032c, 0x0}, + {OP_WR, 0x10564, 0x30}, + {OP_WR, 0x100c8, 0x1}, + {OP_WR, 0x100d0, 0x1}, + {OP_WR, 0x100fc, 0x1}, + {OP_WR, 0x100f4, 0x1}, +/* #define NIG_PORT1_END 291 */ +/* #define PBF_COMMON_START 308 */ + {OP_WR, 0x140000, 0x1}, + {OP_WR, 0x14000c, 0x1}, + {OP_SW, 0x140040, 0x20559}, + {OP_WR, 0x14000c, 0x0}, + {OP_WR, 0x140000, 0x0}, + {OP_WR, 0x14006c, 0x0}, +/* #define PBF_COMMON_END 309 */ +/* #define PBF_PORT0_START 310 */ + {OP_WR, 0x140004, 0x1}, + {OP_WR, 0x140030, 0x1}, + {OP_WR, 0x140004, 0x0}, + {OP_WR, 0x14005c, 0x0}, +/* #define PBF_PORT0_END 311 */ +/* #define PBF_PORT1_START 312 */ + {OP_WR, 0x140008, 0x1}, + {OP_WR, 0x140034, 0x1}, + {OP_WR, 0x140008, 0x0}, + {OP_WR, 0x140060, 0x0}, +/* #define PBF_PORT1_END 313 */ +/* #define PRS_COMMON_START 352 */ + {OP_SW, 0x40004, 0x12055b}, + {OP_SW, 0x40054, 0x3056d}, + {OP_WR, 0x40070, 0x4}, + {OP_SW, 0x40078, 0x40570}, + {OP_ZR, 0x40088, 0x5}, + {OP_SW, 0x4009c, 0x30574}, + {OP_ZR, 0x400a8, 0x4}, + {OP_SW, 0x400b8, 0x50577}, + {OP_ZR, 0x400cc, 0x4}, + {OP_SW, 0x400dc, 0x4057c}, + {OP_ZR, 0x400ec, 0x4}, + {OP_RD, 0x40124, 0x0}, + {OP_RD, 0x40128, 0x0}, + {OP_RD, 0x4012c, 0x0}, + {OP_RD, 0x40130, 0x0}, + {OP_WR, 0x40134, 0xf}, +/* #define PRS_COMMON_END 353 */ +/* #define PXP2_COMMON_START 374 */ + {OP_SW, 0x120490, 0x220580}, + {OP_WR, 0x120520, 0x2}, + {OP_WR, 0x120388, 0x64}, + {OP_WR, 0x120390, 0x8}, + {OP_SW, 0x12039c, 0x305a2}, + {OP_WR, 0x1203bc, 0x4}, + {OP_WR, 0x1203c4, 0x4}, + {OP_WR, 0x1203d0, 0x0}, + {OP_WR, 0x1203dc, 0x0}, + {OP_WR, 0x12036c, 0x1}, + {OP_WR, 0x120368, 0x3f}, + {OP_SW, 0x1201bc, 0x3c05a5}, + {OP_SW, 0x1202b0, 0x205e1}, + {OP_SW, 0x120324, 0x205e3}, + {OP_WR, 0x1201b0, 0x1}, +/* #define PXP2_COMMON_END 375 */ +/* #define PXP_COMMON_START 396 */ + {OP_WB, 0x103800, 0x505e5}, + {OP_WB, 0x103c00, 0x505ea}, + {OP_WB, 0x103c20, 0x505ef}, +/* #define PXP_COMMON_END 397 */ +/* #define QM_COMMON_START 418 */ + {OP_SW, 0x168030, 0x805f4}, + {OP_WR, 0x168054, 0x2}, + {OP_SW, 0x168060, 0x505fc}, + {OP_ZR, 0x168074, 0x7}, + {OP_SW, 0x168090, 0x20601}, + {OP_SW, 0x16809c, 0x50603}, + {OP_ZR, 0x1680b0, 0x7}, + {OP_SW, 0x1680cc, 0x80608}, + {OP_WR, 0x1680f0, 0x7}, + {OP_ZR, 0x1680f4, 0xc}, + {OP_SW, 0x168124, 0x40610}, + {OP_ZR, 0x168134, 0xc}, + {OP_SW, 0x168164, 0x3b0614}, + {OP_ZR, 0x168250, 0x4}, + {OP_SW, 0x168260, 0x2064f}, + {OP_ZR, 0x168268, 0x8}, + {OP_SW, 0x168288, 0x80651}, + {OP_ZR, 0x1682a8, 0xa}, + {OP_WR, 0x168804, 0x4}, + {OP_SW, 0x16880c, 0x100659}, + {OP_WR, 0x1680ec, 0xff}, +/* #define QM_COMMON_END 419 */ +/* #define SRC_COMMON_START 440 */ + {OP_SW, 0x40408, 0x140669}, +/* #define SRC_COMMON_END 441 */ +/* #define TCM_COMMON_START 462 */ + {OP_SW, 0x50044, 0x2067d}, + {OP_SW, 0x50050, 0x4067f}, + {OP_ZR, 0x50060, 0x4}, + {OP_SW, 0x50090, 0x130683}, + {OP_WR, 0x50114, 0x1}, + {OP_SW, 0x5011c, 0x20696}, + {OP_WR, 0x50204, 0x1}, + {OP_SW, 0x5020c, 0x20698}, + {OP_SW, 0x5021c, 0x3069a}, + {OP_ZR, 0x50240, 0xa}, + {OP_SW, 0x50280, 0x20069d}, + {OP_ZR, 0x54000, 0xd00}, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 17:22:54 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E11EA47; Sat, 4 Jan 2014 17:22:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0896F1167; Sat, 4 Jan 2014 17:22:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HMrCh014934; Sat, 4 Jan 2014 17:22:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HMrOU014933; Sat, 4 Jan 2014 17:22:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041722.s04HMrOU014933@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:22:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260263 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:22:54 -0000 Author: dim Date: Sat Jan 4 17:22:53 2014 New Revision: 260263 URL: http://svnweb.freebsd.org/changeset/base/260263 Log: MFC r260015: In libc++'s type_traits header, avoid warnings (activated by our use of -Wsystem-headers) about potential keyword compatibility problems, by adding a __libcpp prefix to the applicable identifiers. Upstream is still debating about this, but we need it now, to be able to import clang 3.4. Modified: stable/9/contrib/libc++/include/type_traits Directory Properties: stable/9/contrib/libc++/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/libc++/include/type_traits Directory Properties: stable/10/ (props changed) Modified: stable/9/contrib/libc++/include/type_traits ============================================================================== --- stable/9/contrib/libc++/include/type_traits Sat Jan 4 17:09:41 2014 (r260262) +++ stable/9/contrib/libc++/include/type_traits Sat Jan 4 17:22:53 2014 (r260263) @@ -280,53 +280,53 @@ template using remove_cv_t = // is_void -template struct __is_void : public false_type {}; -template <> struct __is_void : public true_type {}; +template struct __libcpp_is_void : public false_type {}; +template <> struct __libcpp_is_void : public true_type {}; template struct _LIBCPP_TYPE_VIS is_void - : public __is_void::type> {}; + : public __libcpp_is_void::type> {}; // __is_nullptr_t -template struct ____is_nullptr_t : public false_type {}; -template <> struct ____is_nullptr_t : public true_type {}; +template struct __libcpp___is_nullptr : public false_type {}; +template <> struct __libcpp___is_nullptr : public true_type {}; template struct _LIBCPP_TYPE_VIS __is_nullptr_t - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; // is_integral -template struct __is_integral : public false_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template struct __libcpp_is_integral : public false_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #endif // _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; template struct _LIBCPP_TYPE_VIS is_integral - : public __is_integral::type> {}; + : public __libcpp_is_integral::type> {}; // is_floating_point -template struct __is_floating_point : public false_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; +template struct __libcpp_is_floating_point : public false_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; template struct _LIBCPP_TYPE_VIS is_floating_point - : public __is_floating_point::type> {}; + : public __libcpp_is_floating_point::type> {}; // is_array @@ -339,11 +339,11 @@ template struct // is_pointer -template struct __is_pointer : public false_type {}; -template struct __is_pointer<_Tp*> : public true_type {}; +template struct __libcpp_is_pointer : public false_type {}; +template struct __libcpp_is_pointer<_Tp*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_pointer - : public __is_pointer::type> {}; + : public __libcpp_is_pointer::type> {}; // is_reference @@ -419,29 +419,29 @@ template ::value || is_reference<_Tp>::value || is_same<_Tp, nullptr_t>::value > -struct __is_function +struct __libcpp_is_function : public integral_constant(__is_function_imp::__source<_Tp>())) == 1> {}; -template struct __is_function<_Tp, true> : public false_type {}; +template struct __libcpp_is_function<_Tp, true> : public false_type {}; template struct _LIBCPP_TYPE_VIS is_function - : public __is_function<_Tp> {}; + : public __libcpp_is_function<_Tp> {}; // is_member_function_pointer -template struct __is_member_function_pointer : public false_type {}; -template struct __is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +template struct __libcpp_is_member_function_pointer : public false_type {}; +template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; template struct _LIBCPP_TYPE_VIS is_member_function_pointer - : public __is_member_function_pointer::type> {}; + : public __libcpp_is_member_function_pointer::type> {}; // is_member_pointer -template struct __is_member_pointer : public false_type {}; -template struct __is_member_pointer<_Tp _Up::*> : public true_type {}; +template struct __libcpp_is_member_pointer : public false_type {}; +template struct __libcpp_is_member_pointer<_Tp _Up::*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_member_pointer - : public __is_member_pointer::type> {}; + : public __libcpp_is_member_pointer::type> {}; // is_member_object_pointer @@ -640,11 +640,11 @@ template struct ___is_signed<_Tp, false> : public true_type {}; // floating point template ::value> -struct __is_signed : public ___is_signed<_Tp> {}; +struct __libcpp_is_signed : public ___is_signed<_Tp> {}; -template struct __is_signed<_Tp, false> : public false_type {}; +template struct __libcpp_is_signed<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_signed : public __is_signed<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_signed : public __libcpp_is_signed<_Tp> {}; // is_unsigned @@ -655,11 +655,11 @@ template struct ___is_unsigned<_Tp, false> : public false_type {}; // floating point template ::value> -struct __is_unsigned : public ___is_unsigned<_Tp> {}; +struct __libcpp_is_unsigned : public ___is_unsigned<_Tp> {}; -template struct __is_unsigned<_Tp, false> : public false_type {}; +template struct __libcpp_is_unsigned<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_unsigned : public __is_unsigned<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_unsigned : public __libcpp_is_unsigned<_Tp> {}; // rank From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 17:27:46 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AEFAECD5; Sat, 4 Jan 2014 17:27:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96CA21187; Sat, 4 Jan 2014 17:27:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HRksY015529; Sat, 4 Jan 2014 17:27:46 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HRhka015512; Sat, 4 Jan 2014 17:27:43 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041727.s04HRhka015512@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:27:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260264 - in stable: 10/lib/libiconv_modules/BIG5 10/lib/libiconv_modules/DECHanyu 10/lib/libiconv_modules/EUC 10/lib/libiconv_modules/EUCTW 10/lib/libiconv_modules/GBK2K 10/lib/libicon... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:27:46 -0000 Author: dim Date: Sat Jan 4 17:27:43 2014 New Revision: 260264 URL: http://svnweb.freebsd.org/changeset/base/260264 Log: MFC r260003: In libiconv_modules, surround unused static _citrus_XXX_pack_state() and _citrus_XXX_unpack_state() functions with #if 0, for now. Modified: stable/9/lib/libiconv_modules/BIG5/citrus_big5.c stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/9/lib/libiconv_modules/EUC/citrus_euc.c stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/9/lib/libiconv_modules/HZ/citrus_hz.c stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/9/lib/libiconv_modules/UES/citrus_ues.c stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c stable/9/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/9/lib/libiconv_modules/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/10/lib/libiconv_modules/EUC/citrus_euc.c stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/10/lib/libiconv_modules/HZ/citrus_hz.c stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/10/lib/libiconv_modules/UES/citrus_ues.c stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c stable/10/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/10/ (props changed) Modified: stable/9/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- stable/9/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:27:43 2014 (r260264) @@ -123,6 +123,7 @@ _citrus_BIG5_init_state(_BIG5EncodingInf memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei __unused, @@ -142,6 +143,7 @@ _citrus_BIG5_unpack_state(_BIG5EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline int _citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c) Modified: stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:27:43 2014 (r260264) @@ -78,6 +78,7 @@ _citrus_DECHanyu_init_state(_DECHanyuEnc psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei __unused, @@ -96,6 +97,7 @@ _citrus_DECHanyu_unpack_state(_DECHanyuE memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- stable/9/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:27:43 2014 (r260264) @@ -169,6 +169,7 @@ _citrus_EUC_init_state(_EUCEncodingInfo memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_EUC_pack_state(_EUCEncodingInfo *ei __unused, void *pspriv, @@ -186,6 +187,7 @@ _citrus_EUC_unpack_state(_EUCEncodingInf memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s, Modified: stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -136,6 +136,7 @@ _citrus_EUCTW_init_state(_EUCTWEncodingI memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei __unused, @@ -153,6 +154,7 @@ _citrus_EUCTW_unpack_state(_EUCTWEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_GBK2K_init_state(_GBK2KEncodingI memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei __unused, @@ -97,6 +98,7 @@ _citrus_GBK2K_unpack_state(_GBK2KEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline bool _mb_singlebyte(int c) Modified: stable/9/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- stable/9/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:27:43 2014 (r260264) @@ -153,6 +153,7 @@ _citrus_HZ_init_state(_HZEncodingInfo * psenc->inuse = INIT0(ei); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei __unused, @@ -170,6 +171,7 @@ _citrus_HZ_unpack_state(_HZEncodingInfo memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, Modified: stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:27:43 2014 (r260264) @@ -444,6 +444,7 @@ _citrus_ISO2022_init_state(_ISO2022Encod s->flags |= _ISO2022STATE_FLAG_INITIALIZED; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei __unused, @@ -461,6 +462,7 @@ _citrus_ISO2022_unpack_state(_ISO2022Enc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_JOHAB_init_state(_JOHABEncodingI psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei __unused, @@ -97,6 +98,7 @@ _citrus_JOHAB_unpack_state(_JOHABEncodin memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:27:43 2014 (r260264) @@ -130,6 +130,7 @@ _citrus_MSKanji_init_state(_MSKanjiEncod s->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei __unused, @@ -147,6 +148,7 @@ _citrus_MSKanji_unpack_state(_MSKanjiEnc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- stable/9/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:27:43 2014 (r260264) @@ -75,6 +75,7 @@ _citrus_UES_init_state(_UESEncodingInfo psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UES_pack_state(_UESEncodingInfo * __restrict ei __unused, @@ -92,6 +93,7 @@ _citrus_UES_unpack_state(_UESEncodingInf memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static __inline int to_int(int ch) Modified: stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:27:43 2014 (r260264) @@ -87,6 +87,7 @@ _citrus_UTF7_init_state(_UTF7EncodingInf memset((void *)s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UTF7_pack_state(_UTF7EncodingInfo * __restrict ei __unused, @@ -104,6 +105,7 @@ _citrus_UTF7_unpack_state(_UTF7EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" Modified: stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:27:43 2014 (r260264) @@ -156,6 +156,7 @@ _citrus_UTF8_init_state(_UTF8EncodingInf s->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UTF8_pack_state(_UTF8EncodingInfo *ei __unused, void *pspriv, @@ -173,6 +174,7 @@ _citrus_UTF8_unpack_state(_UTF8EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s, Modified: stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:27:43 2014 (r260264) @@ -230,6 +230,7 @@ _citrus_VIQR_init_state(_VIQREncodingInf psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_VIQR_pack_state(_VIQREncodingInfo * __restrict ei __unused, @@ -247,6 +248,7 @@ _citrus_VIQR_unpack_state(_VIQREncodingI memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, Modified: stable/9/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- stable/9/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -85,6 +85,7 @@ _citrus_ZW_init_state(_ZWEncodingInfo * psenc->charset = NONE; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_ZW_pack_state(_ZWEncodingInfo * __restrict ei __unused, @@ -102,6 +103,7 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 17:33:06 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68101E4; Sat, 4 Jan 2014 17:33:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 536151205; Sat, 4 Jan 2014 17:33:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HX6gD018817; Sat, 4 Jan 2014 17:33:06 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HX6jh018816; Sat, 4 Jan 2014 17:33:06 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041733.s04HX6jh018816@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:33:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260265 - in stable: 10/sys/dev/sk 7/sys/dev/sk 8/sys/dev/sk 9/sys/dev/sk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:33:06 -0000 Author: dim Date: Sat Jan 4 17:33:05 2014 New Revision: 260265 URL: http://svnweb.freebsd.org/changeset/base/260265 Log: MFC r260016: Remove superfluous old-style rcsid[] from if_sk.c. There is already an __FBSDID() at the top of the file. Modified: stable/9/sys/dev/sk/if_sk.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/sk/if_sk.c stable/7/sys/dev/sk/if_sk.c stable/8/sys/dev/sk/if_sk.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/sk/if_sk.c ============================================================================== --- stable/9/sys/dev/sk/if_sk.c Sat Jan 4 17:27:43 2014 (r260264) +++ stable/9/sys/dev/sk/if_sk.c Sat Jan 4 17:33:05 2014 (r260265) @@ -138,11 +138,6 @@ MODULE_DEPEND(sk, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - static const struct sk_type sk_devs[] = { { VENDORID_SK, From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 17:56:21 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38596F62; Sat, 4 Jan 2014 17:56:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 238C71371; Sat, 4 Jan 2014 17:56:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HuLYO026919; Sat, 4 Jan 2014 17:56:21 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HuKDe026911; Sat, 4 Jan 2014 17:56:20 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041756.s04HuKDe026911@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:56:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260269 - in stable/9/sys: conf modules/mlx4 modules/mlx4ib modules/mlxen modules/mthca X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:56:21 -0000 Author: dim Date: Sat Jan 4 17:56:19 2014 New Revision: 260269 URL: http://svnweb.freebsd.org/changeset/base/260269 Log: MFC r260102: Similar to r260020, only use -fms-extensions with gcc, for all other modules which require this flag to compile. Use a GCC_MS_EXTENSIONS variable, defined in kern.pre.mk, which can be used to easily supply the flag (or not), depending on the compiler type. Modified: stable/9/sys/conf/kern.pre.mk stable/9/sys/modules/mlx4/Makefile stable/9/sys/modules/mlx4ib/Makefile stable/9/sys/modules/mlxen/Makefile stable/9/sys/modules/mthca/Makefile Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/conf/kern.pre.mk ============================================================================== --- stable/9/sys/conf/kern.pre.mk Sat Jan 4 17:54:06 2014 (r260268) +++ stable/9/sys/conf/kern.pre.mk Sat Jan 4 17:56:19 2014 (r260269) @@ -106,6 +106,8 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCO .if ${COMPILER_TYPE} == "clang" CLANG_NO_IAS= -no-integrated-as +.else +GCC_MS_EXTENSIONS= -fms-extensions .endif .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 @@ -157,7 +159,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLA # Infiniband C flags. Correct include paths and omit errors that linux # does not honor. OFEDINCLUDES= -I$S/ofed/include/ -OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF} OFED_C= ${OFED_C_NOIMP} ${.IMPSRC} Modified: stable/9/sys/modules/mlx4/Makefile ============================================================================== --- stable/9/sys/modules/mlx4/Makefile Sat Jan 4 17:54:06 2014 (r260268) +++ stable/9/sys/modules/mlx4/Makefile Sat Jan 4 17:56:19 2014 (r260269) @@ -26,4 +26,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/9/sys/modules/mlx4ib/Makefile ============================================================================== --- stable/9/sys/modules/mlx4ib/Makefile Sat Jan 4 17:54:06 2014 (r260268) +++ stable/9/sys/modules/mlx4ib/Makefile Sat Jan 4 17:56:19 2014 (r260269) @@ -24,4 +24,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/9/sys/modules/mlxen/Makefile ============================================================================== --- stable/9/sys/modules/mlxen/Makefile Sat Jan 4 17:54:06 2014 (r260268) +++ stable/9/sys/modules/mlxen/Makefile Sat Jan 4 17:56:19 2014 (r260269) @@ -25,4 +25,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/9/sys/modules/mthca/Makefile ============================================================================== --- stable/9/sys/modules/mthca/Makefile Sat Jan 4 17:54:06 2014 (r260268) +++ stable/9/sys/modules/mthca/Makefile Sat Jan 4 17:56:19 2014 (r260269) @@ -28,4 +28,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 17:59:41 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3403E15A; Sat, 4 Jan 2014 17:59:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1EC841389; Sat, 4 Jan 2014 17:59:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HxeDO027306; Sat, 4 Jan 2014 17:59:40 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HxeYg027305; Sat, 4 Jan 2014 17:59:40 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041759.s04HxeYg027305@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260270 - in stable: 10/sys/modules/drm2/i915kms 9/sys/modules/drm2/i915kms X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:59:41 -0000 Author: dim Date: Sat Jan 4 17:59:40 2014 New Revision: 260270 URL: http://svnweb.freebsd.org/changeset/base/260270 Log: MFC r260019: For some files under sys/dev/drm2/i915, turn off warnings about unused functions and variables, since they are contributed code. Modified: stable/9/sys/modules/drm2/i915kms/Makefile Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/modules/drm2/i915kms/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/modules/drm2/i915kms/Makefile ============================================================================== --- stable/9/sys/modules/drm2/i915kms/Makefile Sat Jan 4 17:56:19 2014 (r260269) +++ stable/9/sys/modules/drm2/i915kms/Makefile Sat Jan 4 17:59:40 2014 (r260270) @@ -38,3 +38,8 @@ SRCS += device_if.h bus_if.h pci_if.h ii opt_compat.h .include + +CWARNFLAGS.i915_debug.c= -Wno-unused-function +CWARNFLAGS.intel_lvds.c= -Wno-unused +CWARNFLAGS.intel_tv.c= -Wno-unused +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 18:24:46 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 23092F0D; Sat, 4 Jan 2014 18:24:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E9F3D160F; Sat, 4 Jan 2014 18:24:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IOj1L039371; Sat, 4 Jan 2014 18:24:45 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IOj7t039367; Sat, 4 Jan 2014 18:24:45 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041824.s04IOj7t039367@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:24:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260273 - in stable: 10/sys/conf 10/sys/modules/wlan 9/sys/conf 9/sys/modules/wlan X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:24:46 -0000 Author: dim Date: Sat Jan 4 18:24:45 2014 New Revision: 260273 URL: http://svnweb.freebsd.org/changeset/base/260273 Log: MFC r260026: Disable warning about unused functions for ieee80211_crypto.c and ieee80211_mesh.c for now. Modified: stable/9/sys/conf/files stable/9/sys/modules/wlan/Makefile Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/conf/files stable/10/sys/modules/wlan/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Sat Jan 4 18:19:53 2014 (r260272) +++ stable/9/sys/conf/files Sat Jan 4 18:24:45 2014 (r260273) @@ -2749,7 +2749,8 @@ net80211/ieee80211_ageq.c optional wlan net80211/ieee80211_adhoc.c optional wlan net80211/ieee80211_ageq.c optional wlan net80211/ieee80211_amrr.c optional wlan | wlan_amrr -net80211/ieee80211_crypto.c optional wlan +net80211/ieee80211_crypto.c optional wlan \ + compile-with "${NORMAL_C} -Wno-unused-function" net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip @@ -2762,7 +2763,8 @@ net80211/ieee80211_ht.c optional wlan net80211/ieee80211_hwmp.c optional wlan ieee80211_support_mesh net80211/ieee80211_input.c optional wlan net80211/ieee80211_ioctl.c optional wlan -net80211/ieee80211_mesh.c optional wlan ieee80211_support_mesh +net80211/ieee80211_mesh.c optional wlan ieee80211_support_mesh \ + compile-with "${NORMAL_C} -Wno-unused-function" net80211/ieee80211_monitor.c optional wlan net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan Modified: stable/9/sys/modules/wlan/Makefile ============================================================================== --- stable/9/sys/modules/wlan/Makefile Sat Jan 4 18:19:53 2014 (r260272) +++ stable/9/sys/modules/wlan/Makefile Sat Jan 4 18:24:45 2014 (r260273) @@ -30,3 +30,7 @@ opt_ddb.h: .endif .include + +CWARNFLAGS.ieee80211_crypto.c= -Wno-unused-function +CWARNFLAGS.ieee80211_mesh.c= -Wno-unused-function +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 18:48:30 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28100B86; Sat, 4 Jan 2014 18:48:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 127CA1786; Sat, 4 Jan 2014 18:48:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04ImTaj047738; Sat, 4 Jan 2014 18:48:29 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04ImTVS047737; Sat, 4 Jan 2014 18:48:29 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041848.s04ImTVS047737@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:48:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260275 - in stable: 10/sys/dev/en 7/sys/dev/en 8/sys/dev/en 9/sys/dev/en X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:48:30 -0000 Author: dim Date: Sat Jan 4 18:48:29 2014 New Revision: 260275 URL: http://svnweb.freebsd.org/changeset/base/260275 Log: MFC r260038: In sys/dev/en/midway.c, #if 0 an unused static function. Modified: stable/9/sys/dev/en/midway.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/en/midway.c stable/7/sys/dev/en/midway.c stable/8/sys/dev/en/midway.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/en/midway.c ============================================================================== --- stable/9/sys/dev/en/midway.c Sat Jan 4 18:33:28 2014 (r260274) +++ stable/9/sys/dev/en/midway.c Sat Jan 4 18:48:29 2014 (r260275) @@ -343,6 +343,7 @@ en_k2sz(int k) } #define en_log2(X) en_k2sz(X) +#if 0 /* * en_b2sz: convert a DMA burst code to its byte size */ @@ -364,6 +365,7 @@ en_b2sz(int b) } return (0); } +#endif /* * en_sz2b: convert a burst size (bytes) to DMA burst code From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 18:53:32 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 398932CF; Sat, 4 Jan 2014 18:53:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24326182B; Sat, 4 Jan 2014 18:53:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IrW02051045; Sat, 4 Jan 2014 18:53:32 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IrVrX051044; Sat, 4 Jan 2014 18:53:31 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041853.s04IrVrX051044@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:53:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260276 - in stable: 10/sys/dev/mcd 7/sys/dev/mcd 8/sys/dev/mcd 9/sys/dev/mcd X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:53:32 -0000 Author: dim Date: Sat Jan 4 18:53:31 2014 New Revision: 260276 URL: http://svnweb.freebsd.org/changeset/base/260276 Log: MFC r260040: In sys/dev/mcd/mcd.c, mark the static const COPYRIGHT string as __used, so it ends up in the object file, and no warnings are emitted about it being actually unused. Modified: stable/9/sys/dev/mcd/mcd.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/mcd/mcd.c stable/7/sys/dev/mcd/mcd.c stable/8/sys/dev/mcd/mcd.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/mcd/mcd.c ============================================================================== --- stable/9/sys/dev/mcd/mcd.c Sat Jan 4 18:48:29 2014 (r260275) +++ stable/9/sys/dev/mcd/mcd.c Sat Jan 4 18:53:31 2014 (r260276) @@ -44,7 +44,7 @@ #include __FBSDID("$FreeBSD$"); -static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; +static const char __used COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include #include From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 18:58:19 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C1A58A2; Sat, 4 Jan 2014 18:58:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 46E841858; Sat, 4 Jan 2014 18:58:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IwJRU051739; Sat, 4 Jan 2014 18:58:19 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IwJkC051737; Sat, 4 Jan 2014 18:58:19 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041858.s04IwJkC051737@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:58:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260277 - in stable: 10/sys/dev/my 7/sys/dev/my 8/sys/dev/my 9/sys/dev/my X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:58:19 -0000 Author: dim Date: Sat Jan 4 18:58:18 2014 New Revision: 260277 URL: http://svnweb.freebsd.org/changeset/base/260277 Log: MFC r260042: Remove superfluous old-style rcsid[] from if_my.c. There is already an __FBSDID() at the top of the file. Modified: stable/9/sys/dev/my/if_my.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/my/if_my.c stable/7/sys/dev/my/if_my.c stable/8/sys/dev/my/if_my.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/my/if_my.c ============================================================================== --- stable/9/sys/dev/my/if_my.c Sat Jan 4 18:53:31 2014 (r260276) +++ stable/9/sys/dev/my/if_my.c Sat Jan 4 18:58:18 2014 (r260277) @@ -80,11 +80,6 @@ static int MY_USEIOSPACE = 1; #include -#ifndef lint -static const char rcsid[] = -"$Id: if_my.c,v 1.16 2003/04/15 06:37:25 mdodd Exp $"; -#endif - /* * Various supported device vendors/types and their names. */ From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 19:04:54 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1CD8D9E; Sat, 4 Jan 2014 19:04:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81E7A18D6; Sat, 4 Jan 2014 19:04:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04J4ssC055426; Sat, 4 Jan 2014 19:04:54 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04J4rmc055422; Sat, 4 Jan 2014 19:04:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041904.s04J4rmc055422@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 19:04:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260278 - in stable: 10/sys/netgraph/netflow 7/sys/netgraph/netflow 8/sys/netgraph/netflow 9/sys/netgraph/netflow X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:04:54 -0000 Author: dim Date: Sat Jan 4 19:04:53 2014 New Revision: 260278 URL: http://svnweb.freebsd.org/changeset/base/260278 Log: MFC r260048: In sys/netgraph/netflow, use __FBSDID() instead of old-style rcs_id[]. Modified: stable/9/sys/netgraph/netflow/netflow.c stable/9/sys/netgraph/netflow/netflow_v9.c stable/9/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/netgraph/netflow/netflow.c stable/10/sys/netgraph/netflow/netflow_v9.c stable/10/sys/netgraph/netflow/ng_netflow.c stable/7/sys/netgraph/netflow/netflow.c stable/7/sys/netgraph/netflow/ng_netflow.c stable/8/sys/netgraph/netflow/netflow.c stable/8/sys/netgraph/netflow/netflow_v9.c stable/8/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/netgraph/netflow/netflow.c ============================================================================== --- stable/9/sys/netgraph/netflow/netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/9/sys/netgraph/netflow/netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -28,8 +28,8 @@ * $SourceForge: netflow.c,v 1.41 2004/09/05 11:41:10 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" Modified: stable/9/sys/netgraph/netflow/netflow_v9.c ============================================================================== --- stable/9/sys/netgraph/netflow/netflow_v9.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/9/sys/netgraph/netflow/netflow_v9.c Sat Jan 4 19:04:53 2014 (r260278) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" Modified: stable/9/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- stable/9/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/9/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -28,8 +28,8 @@ * $SourceForge: ng_netflow.c,v 1.30 2004/09/05 11:37:43 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 19:13:26 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94F7940D; Sat, 4 Jan 2014 19:13:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 802CE1989; Sat, 4 Jan 2014 19:13:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04JDQFE059353; Sat, 4 Jan 2014 19:13:26 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04JDQp6059352; Sat, 4 Jan 2014 19:13:26 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041913.s04JDQp6059352@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 19:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260279 - in stable: 10/sys/dev/tpm 8/sys/dev/tpm 9/sys/dev/tpm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:13:26 -0000 Author: dim Date: Sat Jan 4 19:13:25 2014 New Revision: 260279 URL: http://svnweb.freebsd.org/changeset/base/260279 Log: MFC r260054: In sys/dev/tpm/tpm.c, #if 0 an unused static function. Modified: stable/9/sys/dev/tpm/tpm.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/tpm/tpm.c stable/8/sys/dev/tpm/tpm.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/tpm/tpm.c ============================================================================== --- stable/9/sys/dev/tpm/tpm.c Sat Jan 4 19:04:53 2014 (r260278) +++ stable/9/sys/dev/tpm/tpm.c Sat Jan 4 19:13:25 2014 (r260279) @@ -1138,6 +1138,7 @@ tpm_legacy_in(bus_space_tag_t iot, bus_s return bus_space_read_1(iot, ioh, 1); } +#if 0 /* Write single byte using legacy interface. */ static inline void tpm_legacy_out(bus_space_tag_t iot, bus_space_handle_t ioh, int reg, u_int8_t v) @@ -1145,6 +1146,7 @@ tpm_legacy_out(bus_space_tag_t iot, bus_ bus_space_write_1(iot, ioh, 0, reg); bus_space_write_1(iot, ioh, 1, v); } +#endif /* Probe for TPM using legacy interface. */ int From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 21:18:55 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43EB1E3F; Sat, 4 Jan 2014 21:18:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F7A811E2; Sat, 4 Jan 2014 21:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LItO5005626; Sat, 4 Jan 2014 21:18:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LIthJ005625; Sat, 4 Jan 2014 21:18:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042118.s04LIthJ005625@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:18:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260284 - in stable: 10/sys/dev/usb/wlan 8/sys/dev/usb/wlan 9/sys/dev/usb/wlan X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:18:55 -0000 Author: dim Date: Sat Jan 4 21:18:54 2014 New Revision: 260284 URL: http://svnweb.freebsd.org/changeset/base/260284 Log: MFC r260055: In sys/dev/usb/wlan/if_urtw.c, #if 0 a static const variable, which has been unused since r198194. Modified: stable/9/sys/dev/usb/wlan/if_urtw.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/usb/wlan/if_urtw.c stable/8/sys/dev/usb/wlan/if_urtw.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- stable/9/sys/dev/usb/wlan/if_urtw.c Sat Jan 4 21:18:22 2014 (r260283) +++ stable/9/sys/dev/usb/wlan/if_urtw.c Sat Jan 4 21:18:54 2014 (r260284) @@ -477,6 +477,7 @@ static struct urtw_pair urtw_ratetable[] { 96, 10 }, { 108, 11 } }; +#if 0 static const uint8_t urtw_8187b_reg_table[][3] = { { 0xf0, 0x32, 0 }, { 0xf1, 0x32, 0 }, { 0xf2, 0x00, 0 }, { 0xf3, 0x00, 0 }, { 0xf4, 0x32, 0 }, { 0xf5, 0x43, 0 }, @@ -510,6 +511,7 @@ static const uint8_t urtw_8187b_reg_tabl { 0x4c, 0x00, 2 }, { 0x9f, 0x00, 3 }, { 0x8c, 0x01, 0 }, { 0x8d, 0x10, 0 }, { 0x8e, 0x08, 0 }, { 0x8f, 0x00, 0 } }; +#endif static usb_callback_t urtw_bulk_rx_callback; static usb_callback_t urtw_bulk_tx_callback; From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 21:23:50 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34E77447; Sat, 4 Jan 2014 21:23:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2060F1255; Sat, 4 Jan 2014 21:23:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LNn2E008902; Sat, 4 Jan 2014 21:23:49 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LNnaH008901; Sat, 4 Jan 2014 21:23:49 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042123.s04LNnaH008901@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:23:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260286 - in stable: 10/sys/dev/vxge/vxgehal 9/sys/dev/vxge/vxgehal X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:23:50 -0000 Author: dim Date: Sat Jan 4 21:23:49 2014 New Revision: 260286 URL: http://svnweb.freebsd.org/changeset/base/260286 Log: MFC r260056: In sys/dev/vxge/vxgehal/vxgehal-ring.c, #if 0 an unused static function. Modified: stable/9/sys/dev/vxge/vxgehal/vxgehal-ring.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/vxge/vxgehal/vxgehal-ring.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/dev/vxge/vxgehal/vxgehal-ring.c ============================================================================== --- stable/9/sys/dev/vxge/vxgehal/vxgehal-ring.c Sat Jan 4 21:19:20 2014 (r260285) +++ stable/9/sys/dev/vxge/vxgehal/vxgehal-ring.c Sat Jan 4 21:23:49 2014 (r260286) @@ -62,6 +62,7 @@ __hal_ring_block_memblock_idx_set( VXGE_HAL_RING_MEMBLOCK_IDX_OFFSET))) = memblock_idx; } +#if 0 /* * __hal_ring_block_next_pointer - Returns the dma address of next block * @block: RxD block @@ -76,6 +77,7 @@ __hal_ring_block_next_pointer( return (dma_addr_t)*((u64 *) ((void *)((u8 *) block + VXGE_HAL_RING_NEXT_BLOCK_POINTER_OFFSET))); } +#endif /* * __hal_ring_block_next_pointer_set - Sets the next block pointer in RxD block From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 21:32:54 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A52FD9D3; Sat, 4 Jan 2014 21:32:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7677412F1; Sat, 4 Jan 2014 21:32:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LWsv0012787; Sat, 4 Jan 2014 21:32:54 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LWs3s012786; Sat, 4 Jan 2014 21:32:54 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042132.s04LWs3s012786@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:32:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260287 - in stable: 10/sys/dev/scc 7/sys/dev/scc 8/sys/dev/scc 9/sys/dev/scc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:32:54 -0000 Author: dim Date: Sat Jan 4 21:32:53 2014 New Revision: 260287 URL: http://svnweb.freebsd.org/changeset/base/260287 Log: MFC r260057: In sys/dev/scc, remove unused static function scc_setmreg(). While here, invoke scc_getmreg() in two more places where it can be used. Reviewed by: marcel Modified: stable/9/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/scc/scc_dev_z8530.c stable/7/sys/dev/scc/scc_dev_z8530.c stable/8/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/scc/scc_dev_z8530.c ============================================================================== --- stable/9/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:23:49 2014 (r260286) +++ stable/9/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:32:53 2014 (r260287) @@ -66,15 +66,6 @@ struct scc_class scc_z8530_class = { }; /* Multiplexed I/O. */ -static __inline void -scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) -{ - - scc_setreg(bas, ch + REG_CTRL, reg); - scc_barrier(bas); - scc_setreg(bas, ch + REG_CTRL, val); -} - static __inline uint8_t scc_getmreg(struct scc_bas *bas, int ch, int reg) { @@ -146,9 +137,7 @@ z8530_bfe_ipend(struct scc_softc *sc) if (ip & IP_TIB) ch[1]->ch_ipend |= SER_INT_TXIDLE; if (ip & IP_SIA) { - scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_A + REG_CTRL); + bes = scc_getmreg(bas, CHAN_A, CR_RSTXSI); if (bes & BES_BRK) ch[0]->ch_ipend |= SER_INT_BREAK; sig = ch[0]->ch_hwsig; @@ -164,9 +153,7 @@ z8530_bfe_ipend(struct scc_softc *sc) ch[0]->ch_ipend |= SER_INT_OVERRUN; } if (ip & IP_SIB) { - scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_B + REG_CTRL); + bes = scc_getmreg(bas, CHAN_B, CR_RSTXSI); if (bes & BES_BRK) ch[1]->ch_ipend |= SER_INT_BREAK; sig = ch[1]->ch_hwsig; From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 21:45:52 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A74F12A9; Sat, 4 Jan 2014 21:45:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 924C813AC; Sat, 4 Jan 2014 21:45:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LjqCd016906; Sat, 4 Jan 2014 21:45:52 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LjqbQ016905; Sat, 4 Jan 2014 21:45:52 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042145.s04LjqbQ016905@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:45:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260289 - in stable: 10/sys/amd64/amd64 7/sys/amd64/amd64 8/sys/amd64/amd64 9/sys/amd64/amd64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:45:52 -0000 Author: dim Date: Sat Jan 4 21:45:52 2014 New Revision: 260289 URL: http://svnweb.freebsd.org/changeset/base/260289 Log: MFC r260103: In sys/amd64/amd64/pmap.c, remove static function pmap_is_current(), which has been unused since r189415. Reviewed by: alc Modified: stable/9/sys/amd64/amd64/pmap.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/amd64/amd64/pmap.c stable/7/sys/amd64/amd64/pmap.c stable/8/sys/amd64/amd64/pmap.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/pmap.c ============================================================================== --- stable/9/sys/amd64/amd64/pmap.c Sat Jan 4 21:38:41 2014 (r260288) +++ stable/9/sys/amd64/amd64/pmap.c Sat Jan 4 21:45:52 2014 (r260289) @@ -1228,16 +1228,6 @@ pmap_invalidate_cache_pages(vm_page_t *p } /* - * Are we current address space or kernel? - */ -static __inline int -pmap_is_current(pmap_t pmap) -{ - return (pmap == kernel_pmap || - (pmap->pm_pml4[PML4PML4I] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); -} - -/* * Routine: pmap_extract * Function: * Extract the physical page address associated From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 22:00:09 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44AD2984; Sat, 4 Jan 2014 22:00:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24DA314C0; Sat, 4 Jan 2014 22:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04M08Ev021277; Sat, 4 Jan 2014 22:00:08 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04M07D8021268; Sat, 4 Jan 2014 22:00:07 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042200.s04M07D8021268@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 22:00:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260291 - in stable: 10/sys/boot/i386 10/sys/boot/i386/boot2 10/sys/boot/i386/gptboot 10/sys/boot/i386/gptzfsboot 10/sys/boot/i386/zfsboot 10/sys/boot/pc98/boot2 7/sys/boot/i386 7/sys/b... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 22:00:09 -0000 Author: dim Date: Sat Jan 4 22:00:07 2014 New Revision: 260291 URL: http://svnweb.freebsd.org/changeset/base/260291 Log: MFC r260095: For sys/boot/i386 and sys/boot/pc98, separate flags to be passed directly to the linker (LD_FLAGS) from flags passed indirectly, via the compiler driver (LDFLAGS). This is because several Makefiles under sys/boot/i386 and sys/boot/pc98 use ${LD} directly to link, and the normal LDFLAGS value should not be used in these cases. Modified: stable/9/sys/boot/i386/Makefile.inc stable/9/sys/boot/i386/boot2/Makefile stable/9/sys/boot/i386/gptboot/Makefile stable/9/sys/boot/i386/gptzfsboot/Makefile stable/9/sys/boot/i386/zfsboot/Makefile stable/9/sys/boot/pc98/boot2/Makefile Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/boot/i386/Makefile.inc stable/10/sys/boot/i386/boot2/Makefile stable/10/sys/boot/i386/gptboot/Makefile stable/10/sys/boot/i386/gptzfsboot/Makefile stable/10/sys/boot/i386/zfsboot/Makefile stable/10/sys/boot/pc98/boot2/Makefile stable/7/sys/boot/i386/Makefile.inc stable/7/sys/boot/i386/boot2/Makefile stable/7/sys/boot/i386/gptboot/Makefile stable/7/sys/boot/i386/gptzfsboot/Makefile stable/7/sys/boot/i386/zfsboot/Makefile stable/7/sys/boot/pc98/boot2/Makefile stable/8/sys/boot/i386/Makefile.inc stable/8/sys/boot/i386/boot2/Makefile stable/8/sys/boot/i386/gptboot/Makefile stable/8/sys/boot/i386/gptzfsboot/Makefile stable/8/sys/boot/i386/zfsboot/Makefile stable/8/sys/boot/pc98/boot2/Makefile Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/boot/i386/Makefile.inc ============================================================================== --- stable/9/sys/boot/i386/Makefile.inc Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/i386/Makefile.inc Sat Jan 4 22:00:07 2014 (r260291) @@ -13,7 +13,8 @@ LDFLAGS+= -nostdlib .if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 ACFLAGS+= -m32 -LDFLAGS+= -m elf_i386_fbsd +# LD_FLAGS is passed directly to ${LD}, not via ${CC}: +LD_FLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif Modified: stable/9/sys/boot/i386/boot2/Makefile ============================================================================== --- stable/9/sys/boot/i386/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/i386/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -44,7 +44,7 @@ CFLAGS.gcc+= -fno-guess-branch-probabili -fno-unit-at-a-time \ -mno-align-long-strings \ -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -60,7 +60,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -81,7 +81,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s ${CC} ${ACFLAGS} -c boot2.s Modified: stable/9/sys/boot/i386/gptboot/Makefile ============================================================================== --- stable/9/sys/boot/i386/gptboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/i386/gptboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -37,7 +37,7 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -54,7 +54,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \ cons.o util.o @@ -63,7 +63,7 @@ gptboot.bin: gptboot.out objcopy -S -O binary gptboot.out ${.TARGET} gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} gptboot.o: ${.CURDIR}/../../common/ufsread.c Modified: stable/9/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- stable/9/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -34,7 +34,7 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -51,7 +51,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \ drv.o gpt.o util.o @@ -60,7 +60,7 @@ gptzfsboot.bin: gptzfsboot.out objcopy -S -O binary gptzfsboot.out ${.TARGET} gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c Modified: stable/9/sys/boot/i386/zfsboot/Makefile ============================================================================== --- stable/9/sys/boot/i386/zfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/i386/zfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -31,7 +31,7 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -47,7 +47,7 @@ zfsboot1: zfsldr.out objcopy -S -O binary zfsldr.out ${.TARGET} zfsldr.out: zfsldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o CLEANFILES+= zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \ zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o @@ -73,7 +73,7 @@ zfsboot.bin: zfsboot.out objcopy -S -O binary zfsboot.out ${.TARGET} zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} SRCS= zfsboot.c Modified: stable/9/sys/boot/pc98/boot2/Makefile ============================================================================== --- stable/9/sys/boot/pc98/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/9/sys/boot/pc98/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -50,7 +50,7 @@ CFLAGS= -Os \ # Initialize the bi_bios_geom using the BIOS geometry #CFLAGS+= -DGET_BIOSGEOM -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -68,7 +68,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -89,7 +89,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 22:13:17 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F48F261; Sat, 4 Jan 2014 22:13:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3B1AE15DA; Sat, 4 Jan 2014 22:13:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04MDH9l028509; Sat, 4 Jan 2014 22:13:17 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04MDHwk028508; Sat, 4 Jan 2014 22:13:17 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042213.s04MDHwk028508@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 22:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260293 - in stable: 10/sys/conf 10/sys/modules/ibcore 9/sys/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 22:13:17 -0000 Author: dim Date: Sat Jan 4 22:13:16 2014 New Revision: 260293 URL: http://svnweb.freebsd.org/changeset/base/260293 Log: MFC r260104: For sys/ofed/drivers/infiniband/core/cm.c, disable warning about unused functions for now. Modified: stable/9/sys/conf/files Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/conf/files stable/10/sys/modules/ibcore/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Sat Jan 4 22:09:53 2014 (r260292) +++ stable/9/sys/conf/files Sat Jan 4 22:13:16 2014 (r260293) @@ -3078,7 +3078,7 @@ ofed/drivers/infiniband/core/mad.c opti compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" ofed/drivers/infiniband/core/cm.c optional ofed \ no-depend \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" + compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/ -Wno-unused-function" ofed/drivers/infiniband/core/cma.c optional ofed \ no-depend \ compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 4 23:12:02 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1F426D6; Sat, 4 Jan 2014 23:12:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 73836199D; Sat, 4 Jan 2014 23:12:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NC2Mq051316; Sat, 4 Jan 2014 23:12:02 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NC2Rp051315; Sat, 4 Jan 2014 23:12:02 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042312.s04NC2Rp051315@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 23:12:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260298 - in stable: 10/sys/dev/sound/pci 7/sys/dev/sound/pci 8/sys/dev/sound/pci 9/sys/dev/sound/pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:12:02 -0000 Author: dim Date: Sat Jan 4 23:12:01 2014 New Revision: 260298 URL: http://svnweb.freebsd.org/changeset/base/260298 Log: MFC r260112: In sys/dev/sound/pci/maestro.c, #if 0 two unused static functions. Modified: stable/9/sys/dev/sound/pci/maestro.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/sound/pci/maestro.c stable/7/sys/dev/sound/pci/maestro.c stable/8/sys/dev/sound/pci/maestro.c Directory Properties: stable/10/ (props changed) stable/7/sys/ (props changed) stable/8/sys/ (props changed) Modified: stable/9/sys/dev/sound/pci/maestro.c ============================================================================== --- stable/9/sys/dev/sound/pci/maestro.c Sat Jan 4 23:00:56 2014 (r260297) +++ stable/9/sys/dev/sound/pci/maestro.c Sat Jan 4 23:12:01 2014 (r260298) @@ -207,9 +207,11 @@ SYSCTL_UINT(_debug_maestro, OID_AUTO, po static void agg_sleep(struct agg_info*, const char *wmesg, int msec); +#if 0 static __inline u_int32_t agg_rd(struct agg_info*, int, int size); static __inline void agg_wr(struct agg_info*, int, u_int32_t data, int size); +#endif static int agg_rdcodec(struct agg_info*, int); static int agg_wrcodec(struct agg_info*, int, u_int32_t); @@ -286,6 +288,7 @@ agg_sleep(struct agg_info *sc, const cha /* I/O port */ +#if 0 static __inline u_int32_t agg_rd(struct agg_info *sc, int regno, int size) { @@ -300,12 +303,14 @@ agg_rd(struct agg_info *sc, int regno, i return ~(u_int32_t)0; } } +#endif #define AGG_RD(sc, regno, size) \ bus_space_read_##size( \ ((struct agg_info*)(sc))->st, \ ((struct agg_info*)(sc))->sh, (regno)) +#if 0 static __inline void agg_wr(struct agg_info *sc, int regno, u_int32_t data, int size) { @@ -321,6 +326,7 @@ agg_wr(struct agg_info *sc, int regno, u break; } } +#endif #define AGG_WR(sc, regno, data, size) \ bus_space_write_##size( \