From owner-svn-src-projects@freebsd.org Sun Jun 10 01:41:08 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4619B1008919 for ; Sun, 10 Jun 2018 01:41:08 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB8F1830A1; Sun, 10 Jun 2018 01:41:07 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCE8A25E70; Sun, 10 Jun 2018 01:41:07 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5A1f7o9061243; Sun, 10 Jun 2018 01:41:07 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5A1f7LS061230; Sun, 10 Jun 2018 01:41:07 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806100141.w5A1f7LS061230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 10 Jun 2018 01:41:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334908 - projects/pnfs-planb-server/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfs X-SVN-Commit-Revision: 334908 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 01:41:08 -0000 Author: rmacklem Date: Sun Jun 10 01:41:07 2018 New Revision: 334908 URL: https://svnweb.freebsd.org/changeset/base/334908 Log: Get rid of some stuff left over from the first pNFS server design. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Sun Jun 10 01:38:52 2018 (r334907) +++ projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Sun Jun 10 01:41:07 2018 (r334908) @@ -226,9 +226,8 @@ struct nfsstate { struct nfslockfile *ls_lfp; /* Back pointer */ struct nfsrvcache *ls_op; /* Op cache reference */ struct nfsclient *ls_clp; /* Back pointer */ - u_int32_t ls_ownerlen; /* Length of ls_owner */ + u_short ls_ownerlen; /* Length of ls_owner */ u_char ls_owner[1]; /* malloc'd the correct size */ - /* Must be uint32_t * aligned */ }; #define ls_lock ls_head.lock #define ls_open ls_head.open @@ -240,8 +239,6 @@ struct nfsstate { #define ls_delegtime ls_un.deleg.expiry #define ls_delegtimelimit ls_un.deleg.limit #define ls_compref ls_un.deleg.compref -#define ls_layout ls_owner -#define ls_layoutlen ls_ownerlen /* * Nfs lock structure. From owner-svn-src-projects@freebsd.org Sun Jun 10 22:11:52 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3007B100FBBE for ; Sun, 10 Jun 2018 22:11:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D32F17B39D; Sun, 10 Jun 2018 22:11:51 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B49812BC8; Sun, 10 Jun 2018 22:11:51 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5AMBpO0091915; Sun, 10 Jun 2018 22:11:51 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5AMBp9o091914; Sun, 10 Jun 2018 22:11:51 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806102211.w5AMBp9o091914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 10 Jun 2018 22:11:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334934 - in projects/pnfs-planb-server/sys/fs: nfs nfsclient X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys/fs: nfs nfsclient X-SVN-Commit-Revision: 334934 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 22:11:52 -0000 Author: rmacklem Date: Sun Jun 10 22:11:51 2018 New Revision: 334934 URL: https://svnweb.freebsd.org/changeset/base/334934 Log: Add code that sets the session defunct after a "soft" mount has returned an error without completing the RPC. Without this, if a DS server is down for a long time, RPCs will use up all the session slots and then processes will hang waiting for a slot. Once an RPC has returned error without completion, the state of the session slot is unknown, so setting it defunct seems to be the only option. Also, add EIO to ENXIO for the case where a DS replies NFSERR_IO to report I/O problems on the server. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c Sun Jun 10 21:36:29 2018 (r334933) +++ projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c Sun Jun 10 22:11:51 2018 (r334934) @@ -810,6 +810,56 @@ tryagain: error = EINTR; } else if (stat == RPC_CANTSEND || stat == RPC_CANTRECV || stat == RPC_SYSTEMERROR) { + if ((nd->nd_flag & ND_NFSV41) != 0 && nmp != NULL && + nd->nd_procnum != NFSPROC_NULL) { + /* + * The nfsess_defunct field is protected by + * the NFSLOCKMNT()/nm_mtx lock and not the + * nfsess_mtx lock to simplify its handling, + * for the MDS session. This lock is also + * sufficient for nfsess_sessionid, since it + * never changes in the structure. + */ + NFSLOCKCLSTATE(); + NFSLOCKMNT(nmp); + /* The session must be marked defunct. */ + if (dssep == NULL) { + /* + * This is either an MDS proxy operation or + * a client mount with "soft,retrans=N" options. + * Mark the MDS session defunct and initiate + * recovery, as required. + */ + NFSCL_DEBUG(1, "Failed soft proxy RPC\n"); + sep = NFSMNT_MDSSESSION(nmp); + if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, + NFSX_V4SESSIONID) == 0) { + /* Initiate recovery. */ + sep->nfsess_defunct = 1; + NFSCL_DEBUG(1, "Marked defunct\n"); + if (nmp->nm_clp != NULL) { + nmp->nm_clp->nfsc_flags |= + NFSCLFLAGS_RECOVER; + wakeup(nmp->nm_clp); + } + } + } else { + /* + * This is a client side DS RPC. Just mark + * the session defunct. A subsequent LayoutGet + * should get a new session. + */ + NFSCL_DEBUG(1, "Failed client DS RPC\n"); + if (bcmp(dssep->nfsess_sessionid, + nd->nd_sequence, NFSX_V4SESSIONID) == 0) { + /* Mark it defunct. */ + dssep->nfsess_defunct = 1; + NFSCL_DEBUG(1, "Marked defunct\n"); + } + } + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + } NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = ENXIO; } else { Modified: projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Sun Jun 10 21:36:29 2018 (r334933) +++ projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Sun Jun 10 22:11:51 2018 (r334934) @@ -6040,8 +6040,14 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * *dspp, fhp, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "commitds=%d\n", error); - /* ENXIO indicates a problem with the DS. */ - if (error == ENXIO) { + /* + * ENXIO indicates that the krpc cannot do + * an RPC on the DS. EIO is returned by the + * RPC as an indication of I/O problems on the + * server. + * Are there other fatal errors? + */ + if (error == ENXIO || error == EIO) { NFSCL_DEBUG(4, "DS layreterr for commit\n"); nfscl_dserr(NFSV4OP_COMMIT, dp, lyp); @@ -6065,8 +6071,14 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * off, xfer, fhp, 1, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "readds=%d\n", error); - if (error == ENXIO) { - /* ENXIO indicates a problem with the DS. */ + if (error == ENXIO || error == EIO) { + /* + * ENXIO indicates that the krpc cannot do + * an RPC on the DS. EIO is returned by the + * RPC as an indication of I/O problems on the + * server. + * Are there other fatal errors? + */ NFSCL_DEBUG(4, "DS layreterr for read\n"); nfscl_dserr(NFSV4OP_READ, dp, lyp); } @@ -6101,8 +6113,14 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * xfer, fhp, m, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "nfsio_writedsmir=%d\n", error); - if (error == ENXIO) { - /* ENXIO indicates a DS problem. */ + if (error == ENXIO || error == EIO) { + /* + * ENXIO indicates that the krpc cannot + * do an RPC on the DS. EIO is returned + * by the RPC as an indication of I/O + * problems on the server. + * Are there other fatal errors? + */ NFSCL_DEBUG(4, "DS layreterr for write\n"); nfscl_dserr(NFSV4OP_WRITE, dp, lyp); From owner-svn-src-projects@freebsd.org Mon Jun 11 01:06:28 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF85810073AB for ; Mon, 11 Jun 2018 01:06:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E43C826B3; Mon, 11 Jun 2018 01:06:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AB2A1483C; Mon, 11 Jun 2018 01:06:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5B16S2r079351; Mon, 11 Jun 2018 01:06:28 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5B16S1D079350; Mon, 11 Jun 2018 01:06:28 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806110106.w5B16S1D079350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 01:06:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334936 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 334936 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 01:06:29 -0000 Author: rmacklem Date: Mon Jun 11 01:06:27 2018 New Revision: 334936 URL: https://svnweb.freebsd.org/changeset/base/334936 Log: Add EPERM, since that is the error actually returned by the NFS VOP_SETACL() when the server doesn't support acls. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Sun Jun 10 22:26:15 2018 (r334935) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Mon Jun 11 01:06:27 2018 (r334936) @@ -8090,7 +8090,7 @@ tryagain2: * This case should be recognized as a trivial ACL * by UFS's VOP_SETACL() and succeed, but... */ - if (ret == ENOATTR || ret == EOPNOTSUPP) + if (ret == ENOATTR || ret == EOPNOTSUPP || ret == EPERM) ret = 0; } From owner-svn-src-projects@freebsd.org Mon Jun 11 01:13:13 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B5AA10083DC for ; Mon, 11 Jun 2018 01:13:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46BB182C14; Mon, 11 Jun 2018 01:13:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24714149E2; Mon, 11 Jun 2018 01:13:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5B1DCRA084179; Mon, 11 Jun 2018 01:13:12 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5B1DCnt084178; Mon, 11 Jun 2018 01:13:12 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806110113.w5B1DCnt084178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 01:13:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334937 - in projects/pnfs-planb-server/sys/fs: nfs nfsclient X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys/fs: nfs nfsclient X-SVN-Commit-Revision: 334937 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 01:13:13 -0000 Author: rmacklem Date: Mon Jun 11 01:13:12 2018 New Revision: 334937 URL: https://svnweb.freebsd.org/changeset/base/334937 Log: Use a macro to check if an error should disable a DS. This allows the set of errors to be changed easily, if needed. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsport.h projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsport.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfsport.h Mon Jun 11 01:06:27 2018 (r334936) +++ projects/pnfs-planb-server/sys/fs/nfs/nfsport.h Mon Jun 11 01:13:12 2018 (r334937) @@ -1045,6 +1045,15 @@ struct nfsreq { */ extern const char nfs_vnode_tag[]; +/* + * Check for the errors that indicate a DS should be disabled. + * ENXIO indicates that the krpc cannot do an RPC on the DS. + * EIO is returned by the RPC as an indication of I/O problems on the + * server. + * Are there other fatal errors? + */ +#define nfsds_failerr(e) ((e) == ENXIO || (e) == EIO) + #endif /* _KERNEL */ #endif /* _NFS_NFSPORT_H */ Modified: projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Mon Jun 11 01:06:27 2018 (r334936) +++ projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c Mon Jun 11 01:13:12 2018 (r334937) @@ -6040,14 +6040,7 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * *dspp, fhp, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "commitds=%d\n", error); - /* - * ENXIO indicates that the krpc cannot do - * an RPC on the DS. EIO is returned by the - * RPC as an indication of I/O problems on the - * server. - * Are there other fatal errors? - */ - if (error == ENXIO || error == EIO) { + if (nfsds_failerr(error)) { NFSCL_DEBUG(4, "DS layreterr for commit\n"); nfscl_dserr(NFSV4OP_COMMIT, dp, lyp); @@ -6071,14 +6064,7 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * off, xfer, fhp, 1, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "readds=%d\n", error); - if (error == ENXIO || error == EIO) { - /* - * ENXIO indicates that the krpc cannot do - * an RPC on the DS. EIO is returned by the - * RPC as an indication of I/O problems on the - * server. - * Are there other fatal errors? - */ + if (nfsds_failerr(error)) { NFSCL_DEBUG(4, "DS layreterr for read\n"); nfscl_dserr(NFSV4OP_READ, dp, lyp); } @@ -6113,14 +6099,7 @@ nfscl_dofflayoutio(vnode_t vp, struct uio *uiop, int * xfer, fhp, m, dp->nfsdi_vers, dp->nfsdi_minorvers, tcred, p); NFSCL_DEBUG(4, "nfsio_writedsmir=%d\n", error); - if (error == ENXIO || error == EIO) { - /* - * ENXIO indicates that the krpc cannot - * do an RPC on the DS. EIO is returned - * by the RPC as an indication of I/O - * problems on the server. - * Are there other fatal errors? - */ + if (nfsds_failerr(error)) { NFSCL_DEBUG(4, "DS layreterr for write\n"); nfscl_dserr(NFSV4OP_WRITE, dp, lyp); From owner-svn-src-projects@freebsd.org Mon Jun 11 01:22:02 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51C1E10097A2 for ; Mon, 11 Jun 2018 01:22:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F3A628331B; Mon, 11 Jun 2018 01:22:01 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D508714B53; Mon, 11 Jun 2018 01:22:01 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5B1M1nm088276; Mon, 11 Jun 2018 01:22:01 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5B1M1I5088275; Mon, 11 Jun 2018 01:22:01 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806110122.w5B1M1I5088275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 01:22:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334938 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 334938 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 01:22:02 -0000 Author: rmacklem Date: Mon Jun 11 01:22:01 2018 New Revision: 334938 URL: https://svnweb.freebsd.org/changeset/base/334938 Log: Use the macro that checks if an error should disable a DS in the pNFS server code. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Jun 11 01:13:12 2018 (r334937) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Jun 11 01:22:01 2018 (r334938) @@ -3930,7 +3930,7 @@ nfsrv_pnfscreate(struct vnode *vp, struct vattr *vap, if (ret != 0) { KASSERT(error == 0, ("nfsrv_dscreate err=%d", error)); - if (failpos == -1 && ret == ENXIO) + if (failpos == -1 && nfsds_failerr(ret)) failpos = i; else error = ret; @@ -3941,7 +3941,7 @@ nfsrv_pnfscreate(struct vnode *vp, struct vattr *vap, tpf->dsf_dir = dsdir[mirrorcnt - 1]; error = nfsrv_dscreate(dvp[mirrorcnt - 1], vap, &va, &fh, tpf, &dsattr, NULL, tcred, p, NULL); - if (failpos == -1 && mirrorcnt > 1 && error == ENXIO) { + if (failpos == -1 && mirrorcnt > 1 && nfsds_failerr(error)) { failpos = mirrorcnt - 1; error = 0; } @@ -3954,7 +3954,7 @@ nfsrv_pnfscreate(struct vnode *vp, struct vattr *vap, while (tdsc->inprog != 0 && tdsc->done == 0) tsleep(&tdsc->tsk, PVFS, "srvdcr", timo); if (tdsc->err != 0) { - if (failpos == -1 && tdsc->err == ENXIO) + if (failpos == -1 && nfsds_failerr(tdsc->err)) failpos = i; else if (error == 0) error = tdsc->err; @@ -4161,12 +4161,12 @@ nfsrv_pnfsremove(struct vnode **dvp, int mirrorcnt, ch } if (ret != 0) { ret = nfsrv_dsremove(dvp[i], fname, tcred, p); - if (failpos == -1 && ret == ENXIO) + if (failpos == -1 && nfsds_failerr(ret)) failpos = i; } } ret = nfsrv_dsremove(dvp[mirrorcnt - 1], fname, tcred, p); - if (failpos == -1 && mirrorcnt > 1 && ret == ENXIO) + if (failpos == -1 && mirrorcnt > 1 && nfsds_failerr(ret)) failpos = mirrorcnt - 1; timo = hz / 50; /* Wait for 20msec. */ if (timo < 1) @@ -4175,7 +4175,7 @@ nfsrv_pnfsremove(struct vnode **dvp, int mirrorcnt, ch for (tdsrm = dsrm, i = 0; i < mirrorcnt - 1; i++, tdsrm++) { while (tdsrm->inprog != 0 && tdsrm->done == 0) tsleep(&tdsrm->tsk, PVFS, "srvdsrm", timo); - if (failpos == -1 && tdsrm->err == ENXIO) + if (failpos == -1 && nfsds_failerr(tdsrm->err)) failpos = i; } @@ -4364,9 +4364,8 @@ tryagain: if (ioproc == NFSPROC_READDS) { error = nfsrv_readdsrpc(fh, off, cnt, cred, p, nmp[0], mpp, mpp2); - if (error == ENXIO && mirrorcnt > 1) { + if (nfsds_failerr(error) && mirrorcnt > 1) { /* - * ENXIO indicates a problem with the mirror. * Setting failpos will cause the mirror * to be disabled and then a retry of this * read is required. @@ -4387,9 +4386,8 @@ tryagain: else { error = nfsrv_getattrdsrpc(&fh[mirrorcnt - 1], cred, p, vp, nmp[mirrorcnt - 1], nap); - if (error == ENXIO && mirrorcnt > 1) { + if (nfsds_failerr(error) && mirrorcnt > 1) { /* - * ENXIO indicates a problem with the mirror. * Setting failpos will cause the mirror * to be disabled and then a retry of this * getattr is required. @@ -4951,7 +4949,7 @@ nfsrv_writedsrpc(fhandle_t *fhp, off_t off, int len, s if (ret != 0) { ret = nfsrv_writedsdorpc(*nmpp, fhp, off, len, NULL, tdrpc->m, cred, p); - if (ret == ENXIO && *failposp == -1) + if (nfsds_failerr(ret) && *failposp == -1) *failposp = i; else if (error == 0 && ret != 0) error = ret; @@ -4961,7 +4959,7 @@ nfsrv_writedsrpc(fhandle_t *fhp, off_t off, int len, s } m = m_copym(*mpp, offs, NFSM_RNDUP(len), M_WAITOK); ret = nfsrv_writedsdorpc(*nmpp, fhp, off, len, &na, m, cred, p); - if (ret == ENXIO && *failposp == -1 && mirrorcnt > 1) + if (nfsds_failerr(ret) && *failposp == -1 && mirrorcnt > 1) *failposp = mirrorcnt - 1; else if (error == 0 && ret != 0) error = ret; @@ -4976,7 +4974,7 @@ nfsrv_writedsrpc(fhandle_t *fhp, off_t off, int len, s /* Wait for RPCs on separate threads to complete. */ while (tdrpc->inprog != 0 && tdrpc->done == 0) tsleep(&tdrpc->tsk, PVFS, "srvwrds", timo); - if (tdrpc->err == ENXIO && *failposp == -1) + if (nfsds_failerr(tdrpc->err) && *failposp == -1) *failposp = i; else if (error == 0 && tdrpc->err != 0) error = tdrpc->err; @@ -5135,7 +5133,7 @@ nfsrv_setattrdsrpc(fhandle_t *fhp, struct ucred *cred, if (ret != 0) { ret = nfsrv_setattrdsdorpc(fhp, cred, p, vp, *nmpp, nap, &na); - if (ret == ENXIO && *failposp == -1) + if (nfsds_failerr(ret) && *failposp == -1) *failposp = i; else if (error == 0 && ret != 0) error = ret; @@ -5144,7 +5142,7 @@ nfsrv_setattrdsrpc(fhandle_t *fhp, struct ucred *cred, fhp++; } ret = nfsrv_setattrdsdorpc(fhp, cred, p, vp, *nmpp, nap, &na); - if (ret == ENXIO && *failposp == -1 && mirrorcnt > 1) + if (nfsds_failerr(ret) && *failposp == -1 && mirrorcnt > 1) *failposp = mirrorcnt - 1; else if (error == 0 && ret != 0) error = ret; @@ -5159,7 +5157,7 @@ nfsrv_setattrdsrpc(fhandle_t *fhp, struct ucred *cred, /* Wait for RPCs on separate threads to complete. */ while (tdrpc->inprog != 0 && tdrpc->done == 0) tsleep(&tdrpc->tsk, PVFS, "srvsads", timo); - if (tdrpc->err == ENXIO && *failposp == -1) + if (nfsds_failerr(tdrpc->err) && *failposp == -1) *failposp = i; else if (error == 0 && tdrpc->err != 0) error = tdrpc->err; @@ -5283,7 +5281,7 @@ nfsrv_setacldsrpc(fhandle_t *fhp, struct ucred *cred, if (ret != 0) { ret = nfsrv_setacldsdorpc(fhp, cred, p, vp, *nmpp, aclp); - if (ret == ENXIO && *failposp == -1) + if (nfsds_failerr(ret) && *failposp == -1) *failposp = i; else if (error == 0 && ret != 0) error = ret; @@ -5292,7 +5290,7 @@ nfsrv_setacldsrpc(fhandle_t *fhp, struct ucred *cred, fhp++; } ret = nfsrv_setacldsdorpc(fhp, cred, p, vp, *nmpp, aclp); - if (ret == ENXIO && *failposp == -1 && mirrorcnt > 1) + if (nfsds_failerr(ret) && *failposp == -1 && mirrorcnt > 1) *failposp = mirrorcnt - 1; else if (error == 0 && ret != 0) error = ret; @@ -5305,7 +5303,7 @@ nfsrv_setacldsrpc(fhandle_t *fhp, struct ucred *cred, /* Wait for RPCs on separate threads to complete. */ while (tdrpc->inprog != 0 && tdrpc->done == 0) tsleep(&tdrpc->tsk, PVFS, "srvacds", timo); - if (tdrpc->err == ENXIO && *failposp == -1) + if (nfsds_failerr(tdrpc->err) && *failposp == -1) *failposp = i; else if (error == 0 && tdrpc->err != 0) error = tdrpc->err; From owner-svn-src-projects@freebsd.org Mon Jun 11 19:03:56 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB7391008CD3 for ; Mon, 11 Jun 2018 19:03:56 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5625476EFC; Mon, 11 Jun 2018 19:03:56 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36E3F1F805; Mon, 11 Jun 2018 19:03:56 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5BJ3uVj031050; Mon, 11 Jun 2018 19:03:56 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5BJ3oxT031018; Mon, 11 Jun 2018 19:03:50 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806111903.w5BJ3oxT031018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 19:03:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334967 - in projects/pnfs-planb-server/sys: amd64/amd64 arm64/arm64 arm64/conf compat/linuxkpi/common/include/asm compat/linuxkpi/common/include/linux conf dev/atkbdc dev/bxe dev/drm2/... X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys: amd64/amd64 arm64/arm64 arm64/conf compat/linuxkpi/common/include/asm compat/linuxkpi/common/include/linux conf dev/atkbdc dev/bxe dev/drm2/i915 dev/hwpmc dev/mse de... X-SVN-Commit-Revision: 334967 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 19:03:57 -0000 Author: rmacklem Date: Mon Jun 11 19:03:49 2018 New Revision: 334967 URL: https://svnweb.freebsd.org/changeset/base/334967 Log: Merge in an up to date kernel from head/current. Modified: projects/pnfs-planb-server/sys/amd64/amd64/machdep.c projects/pnfs-planb-server/sys/amd64/amd64/mp_machdep.c projects/pnfs-planb-server/sys/arm64/arm64/cpu_errata.c projects/pnfs-planb-server/sys/arm64/arm64/exception.S projects/pnfs-planb-server/sys/arm64/arm64/trap.c projects/pnfs-planb-server/sys/arm64/arm64/vm_machdep.c projects/pnfs-planb-server/sys/arm64/conf/GENERIC projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/asm/uaccess.h projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kernel.h projects/pnfs-planb-server/sys/conf/files.arm64 projects/pnfs-planb-server/sys/conf/options.arm64 projects/pnfs-planb-server/sys/dev/atkbdc/psm.c projects/pnfs-planb-server/sys/dev/bxe/bxe.c projects/pnfs-planb-server/sys/dev/drm2/i915/intel_display.c projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_mod.c projects/pnfs-planb-server/sys/dev/mse/mse.c projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_ioctl.c projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_sport.c projects/pnfs-planb-server/sys/dev/syscons/sysmouse.c projects/pnfs-planb-server/sys/dev/usb/net/if_muge.c projects/pnfs-planb-server/sys/dev/usb/usbdevs projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c projects/pnfs-planb-server/sys/fs/nfsclient/nfsmount.h projects/pnfs-planb-server/sys/i386/i386/vm86bios.s projects/pnfs-planb-server/sys/kern/makesyscalls.sh projects/pnfs-planb-server/sys/kern/uipc_socket.c projects/pnfs-planb-server/sys/modules/Makefile projects/pnfs-planb-server/sys/netinet/tcp_hpts.c projects/pnfs-planb-server/sys/netinet/tcp_stacks/rack.c projects/pnfs-planb-server/sys/sys/mouse.h projects/pnfs-planb-server/sys/x86/x86/nexus.c Directory Properties: projects/pnfs-planb-server/sys/ (props changed) Modified: projects/pnfs-planb-server/sys/amd64/amd64/machdep.c ============================================================================== --- projects/pnfs-planb-server/sys/amd64/amd64/machdep.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/amd64/amd64/machdep.c Mon Jun 11 19:03:49 2018 (r334967) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" #include "opt_maxmem.h" #include "opt_mp_watchdog.h" +#include "opt_pci.h" #include "opt_platform.h" #include "opt_sched.h" @@ -184,7 +185,9 @@ struct init_ops init_ops = { .mp_bootaddress = mp_bootaddress, .start_all_aps = native_start_all_aps, #endif +#ifdef DEV_PCI .msi_init = msi_init, +#endif }; /* Modified: projects/pnfs-planb-server/sys/amd64/amd64/mp_machdep.c ============================================================================== --- projects/pnfs-planb-server/sys/amd64/amd64/mp_machdep.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/amd64/amd64/mp_machdep.c Mon Jun 11 19:03:49 2018 (r334967) @@ -122,7 +122,7 @@ mp_bootaddress(vm_paddr_t *physmap, unsigned int *phys */ if (physmap[i] >= GiB(4) || physmap[i + 1] - round_page(physmap[i]) < PAGE_SIZE * 3 || - physmap[i + 1] > Maxmem) + atop(physmap[i + 1]) > Maxmem) continue; allocated = true; Modified: projects/pnfs-planb-server/sys/arm64/arm64/cpu_errata.c ============================================================================== --- projects/pnfs-planb-server/sys/arm64/arm64/cpu_errata.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/arm64/arm64/cpu_errata.c Mon Jun 11 19:03:49 2018 (r334967) @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include -#ifdef DEV_PSCI #include -#endif typedef void (cpu_quirk_install)(void); struct cpu_quirks { @@ -81,9 +79,7 @@ static void install_psci_bp_hardening(void) { -#ifdef DEV_PSCI PCPU_SET(bp_harden, psci_get_version); -#endif } void Modified: projects/pnfs-planb-server/sys/arm64/arm64/exception.S ============================================================================== --- projects/pnfs-planb-server/sys/arm64/arm64/exception.S Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/arm64/arm64/exception.S Mon Jun 11 19:03:49 2018 (r334967) @@ -161,10 +161,6 @@ ENTRY(handle_el1h_irq) eret END(handle_el1h_irq) -ENTRY(handle_el1h_error) - brk 0xf13 -END(handle_el1h_error) - ENTRY(handle_el0_sync) save_registers 0 ldr x0, [x18, #PC_CURTHREAD] @@ -185,18 +181,23 @@ ENTRY(handle_el0_irq) eret END(handle_el0_irq) -ENTRY(handle_el0_error) +ENTRY(handle_serror) save_registers 0 mov x0, sp - bl do_el0_error - brk 0xf23 - 1: b 1b -END(handle_el0_error) +1: bl do_serror + b 1b +END(handle_serror) +ENTRY(handle_empty_exception) + save_registers 0 + mov x0, sp +1: bl unhandled_exception + b 1b +END(handle_unhandled_exception) + .macro vempty .align 7 - brk 0xfff - 1: b 1b + b handle_empty_exception .endm .macro vector name @@ -215,15 +216,15 @@ exception_vectors: vector el1h_sync /* Synchronous EL1h */ vector el1h_irq /* IRQ EL1h */ vempty /* FIQ EL1h */ - vector el1h_error /* Error EL1h */ + vector serror /* Error EL1h */ vector el0_sync /* Synchronous 64-bit EL0 */ vector el0_irq /* IRQ 64-bit EL0 */ vempty /* FIQ 64-bit EL0 */ - vector el0_error /* Error 64-bit EL0 */ + vector serror /* Error 64-bit EL0 */ vector el0_sync /* Synchronous 32-bit EL0 */ vector el0_irq /* IRQ 32-bit EL0 */ vempty /* FIQ 32-bit EL0 */ - vector el0_error /* Error 32-bit EL0 */ + vector serror /* Error 32-bit EL0 */ Modified: projects/pnfs-planb-server/sys/arm64/arm64/trap.c ============================================================================== --- projects/pnfs-planb-server/sys/arm64/arm64/trap.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/arm64/arm64/trap.c Mon Jun 11 19:03:49 2018 (r334967) @@ -76,6 +76,9 @@ extern register_t fsu_intr_fault; void do_el1h_sync(struct thread *, struct trapframe *); void do_el0_sync(struct thread *, struct trapframe *); void do_el0_error(struct trapframe *); +void do_serror(struct trapframe *); +void unhandled_exception(struct trapframe *); + static void print_registers(struct trapframe *frame); int (*dtrace_invop_jump_addr)(struct trapframe *); @@ -477,10 +480,33 @@ do_el0_sync(struct thread *td, struct trapframe *frame ("Kernel VFP state in use when entering userspace")); } +/* + * TODO: We will need to handle these later when we support ARMv8.2 RAS. + */ void -do_el0_error(struct trapframe *frame) +do_serror(struct trapframe *frame) { + uint64_t esr, far; - panic("ARM64TODO: do_el0_error"); + far = READ_SPECIALREG(far_el1); + esr = frame->tf_esr; + + print_registers(frame); + printf(" far: %16lx\n", far); + printf(" esr: %.8lx\n", esr); + panic("Unhandled System Error"); } +void +unhandled_exception(struct trapframe *frame) +{ + uint64_t esr, far; + + far = READ_SPECIALREG(far_el1); + esr = frame->tf_esr; + + print_registers(frame); + printf(" far: %16lx\n", far); + printf(" esr: %.8lx\n", esr); + panic("Unhandled exception"); +} Modified: projects/pnfs-planb-server/sys/arm64/arm64/vm_machdep.c ============================================================================== --- projects/pnfs-planb-server/sys/arm64/arm64/vm_machdep.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/arm64/arm64/vm_machdep.c Mon Jun 11 19:03:49 2018 (r334967) @@ -54,9 +54,7 @@ __FBSDID("$FreeBSD$"); #include #endif -#ifdef DEV_PSCI #include -#endif /* * Finish a fork operation, with process p2 nearly set up. @@ -119,9 +117,7 @@ void cpu_reset(void) { -#ifdef DEV_PSCI psci_reset(); -#endif printf("cpu_reset failed"); while(1) Modified: projects/pnfs-planb-server/sys/arm64/conf/GENERIC ============================================================================== --- projects/pnfs-planb-server/sys/arm64/conf/GENERIC Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/arm64/conf/GENERIC Mon Jun 11 19:03:49 2018 (r334967) @@ -239,7 +239,6 @@ device tun # Packet tunnel. device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module -device psci # Support for ARM PSCI options EFIRT # EFI Runtime Services # EXT_RESOURCES pseudo devices Modified: projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/asm/uaccess.h ============================================================================== --- projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/asm/uaccess.h Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/asm/uaccess.h Mon Jun 11 19:03:49 2018 (r334967) @@ -52,4 +52,17 @@ copy_from_user(void *to, const void *from, unsigned lo #define __copy_from_user(...) copy_from_user(__VA_ARGS__) #define __copy_in_user(...) copy_from_user(__VA_ARGS__) +#define user_access_begin() do { } while (0) +#define user_access_end() do { } while (0) + +#define unsafe_get_user(x, ptr, err) do { \ + if (unlikely(__get_user(x, ptr))) \ + goto err; \ +} while (0) + +#define unsafe_put_user(x, ptr, err) do { \ + if (unlikely(__put_user(x, ptr))) \ + goto err; \ +} while (0) + #endif /* _ASM_UACCESS_H_ */ Modified: projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jun 11 19:03:49 2018 (r334967) @@ -50,7 +50,9 @@ #include #include #include + #include +#include #include @@ -370,6 +372,46 @@ kstrtou32(const char *cp, unsigned int base, u32 *res) if (temp != (u32)temp) return (-ERANGE); return (0); +} + +static inline int +kstrtobool(const char *s, bool *res) +{ + int len; + + if (s == NULL || (len = strlen(s)) == 0 || res == NULL) + return (-EINVAL); + + /* skip newline character, if any */ + if (s[len - 1] == '\n') + len--; + + if (len == 1 && strchr("yY1", s[0]) != NULL) + *res = true; + else if (len == 1 && strchr("nN0", s[0]) != NULL) + *res = false; + else if (strncasecmp("on", s, len) == 0) + *res = true; + else if (strncasecmp("off", s, len) == 0) + *res = false; + else + return (-EINVAL); + + return (0); +} + +static inline int +kstrtobool_from_user(const char __user *s, size_t count, bool *res) +{ + char buf[8] = {}; + + if (count > (sizeof(buf) - 1)) + count = (sizeof(buf) - 1); + + if (copy_from_user(buf, s, count)) + return (-EFAULT); + + return (kstrtobool(buf, res)); } #define min(x, y) ((x) < (y) ? (x) : (y)) Modified: projects/pnfs-planb-server/sys/conf/files.arm64 ============================================================================== --- projects/pnfs-planb-server/sys/conf/files.arm64 Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/conf/files.arm64 Mon Jun 11 19:03:49 2018 (r334967) @@ -206,8 +206,8 @@ dev/ofw/ofwpci.c optional fdt pci dev/pci/pci_host_generic.c optional pci dev/pci/pci_host_generic_acpi.c optional pci acpi dev/pci/pci_host_generic_fdt.c optional pci fdt -dev/psci/psci.c optional psci -dev/psci/psci_arm64.S optional psci +dev/psci/psci.c standard +dev/psci/psci_arm64.S standard dev/uart/uart_cpu_arm64.c optional uart dev/uart/uart_dev_pl011.c optional uart pl011 dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt soc_hisi_hi6220 Modified: projects/pnfs-planb-server/sys/conf/options.arm64 ============================================================================== --- projects/pnfs-planb-server/sys/conf/options.arm64 Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/conf/options.arm64 Mon Jun 11 19:03:49 2018 (r334967) @@ -13,9 +13,6 @@ COMPAT_FREEBSD32 opt_global.h # EFI Runtime services support EFIRT opt_efirt.h -# Devices -DEV_PSCI opt_platform.h - # SoC Support SOC_ALLWINNER_A64 opt_soc.h SOC_ALLWINNER_H5 opt_soc.h Modified: projects/pnfs-planb-server/sys/dev/atkbdc/psm.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/atkbdc/psm.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/atkbdc/psm.c Mon Jun 11 19:03:49 2018 (r334967) @@ -2560,9 +2560,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, i struct psm_softc *sc = dev->si_drv1; mousemode_t mode; mousestatus_t status; -#if (defined(MOUSE_GETVARS)) - mousevar_t *var; -#endif mousedata_t *data; int stat[3]; int command_byte; @@ -2758,21 +2755,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, i splx(s); *(mousestatus_t *)addr = status; break; - -#if (defined(MOUSE_GETVARS)) - case MOUSE_GETVARS: - var = (mousevar_t *)addr; - bzero(var, sizeof(*var)); - s = spltty(); - var->var[0] = MOUSE_VARS_PS2_SIG; - var->var[1] = sc->config; - var->var[2] = sc->flags; - splx(s); - break; - - case MOUSE_SETVARS: - return (ENODEV); -#endif /* MOUSE_GETVARS */ case MOUSE_READSTATE: case MOUSE_READDATA: Modified: projects/pnfs-planb-server/sys/dev/bxe/bxe.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/bxe/bxe.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/bxe/bxe.c Mon Jun 11 19:03:49 2018 (r334967) @@ -12849,12 +12849,12 @@ bxe_allocate_bars(struct bxe_softc *sc) sc->bar[i].handle = rman_get_bushandle(sc->bar[i].resource); sc->bar[i].kva = (vm_offset_t)rman_get_virtual(sc->bar[i].resource); - BLOGI(sc, "PCI BAR%d [%02x] memory allocated: %p-%p (%jd) -> %p\n", + BLOGI(sc, "PCI BAR%d [%02x] memory allocated: %#jx-%#jx (%jd) -> %#jx\n", i, PCIR_BAR(i), - (void *)rman_get_start(sc->bar[i].resource), - (void *)rman_get_end(sc->bar[i].resource), + rman_get_start(sc->bar[i].resource), + rman_get_end(sc->bar[i].resource), rman_get_size(sc->bar[i].resource), - (void *)sc->bar[i].kva); + (uintmax_t)sc->bar[i].kva); } return (0); Modified: projects/pnfs-planb-server/sys/dev/drm2/i915/intel_display.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/drm2/i915/intel_display.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/drm2/i915/intel_display.c Mon Jun 11 19:03:49 2018 (r334967) @@ -8872,7 +8872,15 @@ static int intel_dmi_reverse_brightness(const struct d static const struct intel_dmi_quirk intel_dmi_quirks[] = { { - .dmi_id_list = &(const struct dmi_system_id[]) { + .dmi_id_list = +#if !defined(__clang__) && !__GNUC_PREREQ__(4, 3) + /* gcc 4.2 needs an additional cast, to avoid a bogus + * "initialization from incompatible pointer type" warning. + * see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36432 + */ + (const struct dmi_system_id (*)[]) +#endif + &(const struct dmi_system_id[]) { { .callback = intel_dmi_reverse_brightness, .ident = "NCR Corporation", Modified: projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_mod.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_mod.c Mon Jun 11 19:03:49 2018 (r334967) @@ -4748,9 +4748,9 @@ pmc_process_interrupt(int ring, struct pmc *pm, struct td = curthread; if ((pm->pm_flags & PMC_F_USERCALLCHAIN) && - (td->td_proc->p_flag & P_KPROC) == 0 && - !TRAPF_USERMODE(tf)) { - atomic_add_int(&curthread->td_pmcpend, 1); + (td->td_proc->p_flag & P_KPROC) == 0 && + !TRAPF_USERMODE(tf)) { + atomic_add_int(&td->td_pmcpend, 1); return (pmc_add_sample(PMC_UR, pm, tf)); } return (pmc_add_sample(ring, pm, tf)); Modified: projects/pnfs-planb-server/sys/dev/mse/mse.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/mse/mse.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/mse/mse.c Mon Jun 11 19:03:49 2018 (r334967) @@ -434,12 +434,6 @@ mseioctl(struct cdev *dev, u_long cmd, caddr_t addr, i case MOUSE_READDATA: return (ENODEV); -#if (defined(MOUSE_GETVARS)) - case MOUSE_GETVARS: - case MOUSE_SETVARS: - return (ENODEV); -#endif - default: return (ENOTTY); } Modified: projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_ioctl.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_ioctl.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_ioctl.c Mon Jun 11 19:03:49 2018 (r334967) @@ -140,7 +140,7 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbo wrobj->host_buffer_descriptor[0].u.data.buffer_address_high = ocs_addr32_hi(dma->phys); /* copy the data into the DMA buffer */ - copyin((void *)mcmd->in_addr, dma->virt, mcmd->in_bytes); + copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); } break; case SLI4_OPC_COMMON_DELETE_OBJECT: @@ -169,8 +169,8 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbo break; default: device_printf(ocs->dev, "%s: in=%p (%lld) out=%p (%lld)\n", __func__, - (void *)mcmd->in_addr, (unsigned long long)mcmd->in_bytes, - (void *)mcmd->out_addr, (unsigned long long)mcmd->out_bytes); + (void *)(uintptr_t)mcmd->in_addr, (unsigned long long)mcmd->in_bytes, + (void *)(uintptr_t)mcmd->out_addr, (unsigned long long)mcmd->out_bytes); device_printf(ocs->dev, "%s: unknown (opc=%#x)\n", __func__, req->opcode); hexdump(mcmd, mcmd->size, NULL, 0); @@ -184,7 +184,7 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbo return ENXIO; } - copyin((void *)mcmd->in_addr, dma->virt, mcmd->in_bytes); + copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); sli_config->payload.mem.address_low = ocs_addr32_lo(dma->phys); sli_config->payload.mem.address_high = ocs_addr32_hi(dma->phys); @@ -250,7 +250,7 @@ ocs_process_mbx_ioctl(ocs_t *ocs, ocs_ioctl_elxu_mbox_ if( SLI4_MBOX_COMMAND_SLI_CONFIG == ((sli4_mbox_command_header_t *)mcmd->payload)->command && mcmd->out_bytes && dma.virt) { - copyout(dma.virt, (void *)mcmd->out_addr, mcmd->out_bytes); + copyout(dma.virt, (void *)(uintptr_t)mcmd->out_addr, mcmd->out_bytes); } no_support: Modified: projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_sport.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_sport.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/ocs_fc/ocs_sport.c Mon Jun 11 19:03:49 2018 (r334967) @@ -781,7 +781,7 @@ __ocs_sport_attached(ocs_sm_ctx_t *ctx, ocs_sm_event_t case OCS_EVT_ENTER: { ocs_node_t *node; - ocs_log_debug(ocs, "[%s] SPORT attached WWPN %016llx WWNN %016llx \n", (unsigned long long)sport->display_name, + ocs_log_debug(ocs, "[%s] SPORT attached WWPN %016llx WWNN %016llx \n", sport->display_name, sport->wwpn, sport->wwnn); ocs_sport_lock(sport); ocs_list_foreach(&sport->node_list, node) { @@ -805,7 +805,7 @@ __ocs_sport_attached(ocs_sm_ctx_t *ctx, ocs_sm_event_t } case OCS_EVT_EXIT: - ocs_log_debug(ocs, "[%s] SPORT deattached WWPN %016llx WWNN %016llx \n", (unsigned long long)sport->display_name, + ocs_log_debug(ocs, "[%s] SPORT deattached WWPN %016llx WWNN %016llx \n", sport->display_name, sport->wwpn, sport->wwnn); if (sport->enable_ini) { ocs_scsi_ini_del_sport(sport); Modified: projects/pnfs-planb-server/sys/dev/syscons/sysmouse.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/syscons/sysmouse.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/syscons/sysmouse.c Mon Jun 11 19:03:49 2018 (r334967) @@ -202,12 +202,6 @@ smdev_ioctl(struct tty *tp, u_long cmd, caddr_t data, mouse_status.dz = 0; return 0; -#ifdef notyet - case MOUSE_GETVARS: /* get internal mouse variables */ - case MOUSE_SETVARS: /* set internal mouse variables */ - return ENODEV; -#endif - case MOUSE_READSTATE: /* read status from the device */ case MOUSE_READDATA: /* read data from the device */ return ENODEV; Modified: projects/pnfs-planb-server/sys/dev/usb/net/if_muge.c ============================================================================== --- projects/pnfs-planb-server/sys/dev/usb/net/if_muge.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/usb/net/if_muge.c Mon Jun 11 19:03:49 2018 (r334967) @@ -40,6 +40,9 @@ __FBSDID("$FreeBSD$"); * USB 3.1 to 10/100/1000 Mbps Ethernet * LAN7800 http://www.microchip.com/wwwproducts/en/LAN7800 * + * USB 2.0 to 10/100/1000 Mbps Ethernet + * LAN7850 http://www.microchip.com/wwwproducts/en/LAN7850 + * * USB 2 to 10/100/1000 Mbps Ethernet with built-in USB hub * LAN7515 (no datasheet available, but probes and functions as LAN7800) * @@ -386,11 +389,14 @@ lan78xx_eeprom_read_raw(struct muge_softc *sc, uint16_ if (!locked) MUGE_LOCK(sc); - err = lan78xx_read_reg(sc, ETH_HW_CFG, &val); - saved = val; + if (sc->chipid == ETH_ID_REV_CHIP_ID_7800_) { + /* EEDO/EECLK muxed with LED0/LED1 on LAN7800. */ + err = lan78xx_read_reg(sc, ETH_HW_CFG, &val); + saved = val; - val &= ~(ETH_HW_CFG_LEDO_EN_ | ETH_HW_CFG_LED1_EN_); - err = lan78xx_write_reg(sc, ETH_HW_CFG, val); + val &= ~(ETH_HW_CFG_LEDO_EN_ | ETH_HW_CFG_LED1_EN_); + err = lan78xx_write_reg(sc, ETH_HW_CFG, val); + } err = lan78xx_wait_for_bits(sc, ETH_E2P_CMD, ETH_E2P_CMD_BUSY_); if (err != 0) { @@ -432,7 +438,10 @@ lan78xx_eeprom_read_raw(struct muge_softc *sc, uint16_ done: if (!locked) MUGE_UNLOCK(sc); - lan78xx_write_reg(sc, ETH_HW_CFG, saved); + if (sc->chipid == ETH_ID_REV_CHIP_ID_7800_) { + /* Restore saved LED configuration. */ + lan78xx_write_reg(sc, ETH_HW_CFG, saved); + } return (err); } @@ -982,7 +991,11 @@ lan78xx_chip_init(struct muge_softc *sc) } sc->chipid = (buf & ETH_ID_REV_CHIP_ID_MASK_) >> 16; sc->chiprev = buf & ETH_ID_REV_CHIP_REV_MASK_; - if (sc->chipid != ETH_ID_REV_CHIP_ID_7800_) { + switch (sc->chipid) { + case ETH_ID_REV_CHIP_ID_7800_: + case ETH_ID_REV_CHIP_ID_7850_: + break; + default: muge_warn_printf(sc, "Chip ID 0x%04x not yet supported\n", sc->chipid); goto init_failed; @@ -1078,9 +1091,12 @@ lan78xx_chip_init(struct muge_softc *sc) goto init_failed; } - /* Enable automatic duplex detection and automatic speed detection. */ err = lan78xx_read_reg(sc, ETH_MAC_CR, &buf); - buf |= ETH_MAC_CR_AUTO_DUPLEX_ | ETH_MAC_CR_AUTO_SPEED_; + if (sc->chipid == ETH_ID_REV_CHIP_ID_7800_ && + !lan78xx_eeprom_present(sc)) { + /* Set automatic duplex and speed on LAN7800 without EEPROM. */ + buf |= ETH_MAC_CR_AUTO_DUPLEX_ | ETH_MAC_CR_AUTO_SPEED_; + } err = lan78xx_write_reg(sc, ETH_MAC_CR, buf); /* Modified: projects/pnfs-planb-server/sys/dev/usb/usbdevs ============================================================================== --- projects/pnfs-planb-server/sys/dev/usb/usbdevs Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/dev/usb/usbdevs Mon Jun 11 19:03:49 2018 (r334967) @@ -717,6 +717,7 @@ vendor ELV 0x18ef ELV vendor LINKSYS3 0x1915 Linksys vendor MEINBERG 0x1938 Meinberg Funkuhren vendor BECEEM 0x198f Beceem Communications +vendor ZTE 0x19d2 ZTE vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated vendor QUALCOMM3 0x19f5 Qualcomm, Inc. vendor QUANTA2 0x1a32 Quanta Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c Mon Jun 11 19:03:49 2018 (r334967) @@ -925,9 +925,9 @@ tryagain: if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) || (clp != NULL && i == NFSV4OP_CBSEQUENCE && j != 0)) NFSCL_DEBUG(1, "failed seq=%d\n", j); - if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) || - (clp != NULL && i == NFSV4OP_CBSEQUENCE && j == 0) - ) { + if (((nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) || + (clp != NULL && i == NFSV4OP_CBSEQUENCE && + j == 0)) && sep != NULL) { if (i == NFSV4OP_SEQUENCE) NFSM_DISSECT(tl, uint32_t *, NFSX_V4SESSIONID + @@ -969,7 +969,8 @@ tryagain: } if (nd->nd_repstat != 0) { if (nd->nd_repstat == NFSERR_BADSESSION && - nmp != NULL && dssep == NULL) { + nmp != NULL && dssep == NULL && + (nd->nd_flag & ND_NFSV41) != 0) { /* * If this is a client side MDS RPC, mark * the MDS session defunct and initiate Modified: projects/pnfs-planb-server/sys/fs/nfsclient/nfsmount.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsclient/nfsmount.h Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/fs/nfsclient/nfsmount.h Mon Jun 11 19:03:49 2018 (r334967) @@ -129,8 +129,10 @@ nfsmnt_mdssession(struct nfsmount *nmp) { struct nfsclsession *tsep; + tsep = NULL; mtx_lock(&nmp->nm_mtx); - tsep = NFSMNT_MDSSESSION(nmp); + if (TAILQ_FIRST(&nmp->nm_sess) != NULL) + tsep = NFSMNT_MDSSESSION(nmp); mtx_unlock(&nmp->nm_mtx); return (tsep); } Modified: projects/pnfs-planb-server/sys/i386/i386/vm86bios.s ============================================================================== --- projects/pnfs-planb-server/sys/i386/i386/vm86bios.s Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/i386/i386/vm86bios.s Mon Jun 11 19:03:49 2018 (r334967) @@ -67,7 +67,8 @@ ENTRY(vm86_bioscall) pushl %edx movl TD_PCB(%ecx),%ecx pushl PCB_SAVEFPU(%ecx) - call npxsave + movl $npxsave,%eax + call *%eax addl $4,%esp popl %edx /* recover our pcb */ 1: Modified: projects/pnfs-planb-server/sys/kern/makesyscalls.sh ============================================================================== --- projects/pnfs-planb-server/sys/kern/makesyscalls.sh Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/kern/makesyscalls.sh Mon Jun 11 19:03:49 2018 (r334967) @@ -47,7 +47,7 @@ systracetmp="systrace.$$" systraceret="systraceret.$$" if [ -r capabilities.conf ]; then - capenabled=`cat capabilities.conf | grep -v "^#" | grep -v "^$"` + capenabled=`egrep -v '^#|^$' capabilities.conf` capenabled=`echo $capenabled | sed 's/ /,/g'` else capenabled="" Modified: projects/pnfs-planb-server/sys/kern/uipc_socket.c ============================================================================== --- projects/pnfs-planb-server/sys/kern/uipc_socket.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/kern/uipc_socket.c Mon Jun 11 19:03:49 2018 (r334967) @@ -2162,7 +2162,6 @@ release: /* * Optimized version of soreceive() for stream (TCP) sockets. - * XXXAO: (MSG_WAITALL | MSG_PEEK) isn't properly handled. */ int soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio, @@ -2177,12 +2176,12 @@ soreceive_stream(struct socket *so, struct sockaddr ** return (EINVAL); if (psa != NULL) *psa = NULL; - if (controlp != NULL) - return (EINVAL); if (flagsp != NULL) flags = *flagsp &~ MSG_EOR; else flags = 0; + if (controlp != NULL) + *controlp = NULL; if (flags & MSG_OOB) return (soreceive_rcvoob(so, uio, flags)); if (mp0 != NULL) Modified: projects/pnfs-planb-server/sys/modules/Makefile ============================================================================== --- projects/pnfs-planb-server/sys/modules/Makefile Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/modules/Makefile Mon Jun 11 19:03:49 2018 (r334967) @@ -627,7 +627,9 @@ _aac= aac _aacraid= aacraid _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) +.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} > 40201 _aesni= aesni +.endif .endif _amd_ecc_inject=amd_ecc_inject _amdsbwd= amdsbwd Modified: projects/pnfs-planb-server/sys/netinet/tcp_hpts.c ============================================================================== --- projects/pnfs-planb-server/sys/netinet/tcp_hpts.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/netinet/tcp_hpts.c Mon Jun 11 19:03:49 2018 (r334967) @@ -1960,3 +1960,4 @@ tcp_init_hptsi(void *st) } SYSINIT(tcphptsi, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, tcp_init_hptsi, NULL); +MODULE_VERSION(tcphpts, 1); Modified: projects/pnfs-planb-server/sys/netinet/tcp_stacks/rack.c ============================================================================== --- projects/pnfs-planb-server/sys/netinet/tcp_stacks/rack.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/netinet/tcp_stacks/rack.c Mon Jun 11 19:03:49 2018 (r334967) @@ -127,10 +127,6 @@ uma_zone_t rack_pcb_zone; struct sysctl_ctx_list rack_sysctl_ctx; struct sysctl_oid *rack_sysctl_root; -#ifndef TCPHPTS -fatal error missing option TCPHSTS in the build; -#endif - #define CUM_ACKED 1 #define SACKED 2 @@ -9162,3 +9158,4 @@ static moduledata_t tcp_rack = { MODULE_VERSION(MODNAME, 1); DECLARE_MODULE(MODNAME, tcp_rack, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); +MODULE_DEPEND(MODNAME, tcphpts, 1, 1, 1); Modified: projects/pnfs-planb-server/sys/sys/mouse.h ============================================================================== --- projects/pnfs-planb-server/sys/sys/mouse.h Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/sys/mouse.h Mon Jun 11 19:03:49 2018 (r334967) @@ -38,8 +38,6 @@ #define MOUSE_SETMODE _IOW('M', 3, mousemode_t) #define MOUSE_GETLEVEL _IOR('M', 4, int) #define MOUSE_SETLEVEL _IOW('M', 5, int) -#define MOUSE_GETVARS _IOR('M', 6, mousevar_t) -#define MOUSE_SETVARS _IOW('M', 7, mousevar_t) #define MOUSE_READSTATE _IOWR('M', 8, mousedata_t) #define MOUSE_READDATA _IOWR('M', 9, mousedata_t) @@ -227,19 +225,6 @@ typedef struct mousedata { int len; /* # of data in the buffer */ int buf[16]; /* data buffer */ } mousedata_t; - -#if (defined(MOUSE_GETVARS)) - -typedef struct mousevar { - int var[16]; -} mousevar_t; - -/* magic numbers in var[0] */ -#define MOUSE_VARS_PS2_SIG 0x00325350 /* 'PS2' */ -#define MOUSE_VARS_BUS_SIG 0x00535542 /* 'BUS' */ -#define MOUSE_VARS_INPORT_SIG 0x00504e49 /* 'INP' */ - -#endif /* MOUSE_GETVARS */ /* Synaptics Touchpad */ #define MOUSE_SYNAPTICS_PACKETSIZE 6 /* '3' works better */ Modified: projects/pnfs-planb-server/sys/x86/x86/nexus.c ============================================================================== --- projects/pnfs-planb-server/sys/x86/x86/nexus.c Mon Jun 11 19:00:07 2018 (r334966) +++ projects/pnfs-planb-server/sys/x86/x86/nexus.c Mon Jun 11 19:03:49 2018 (r334967) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include "opt_apic.h" #endif #include "opt_isa.h" +#include "opt_pci.h" #include #include @@ -131,7 +132,7 @@ static int nexus_get_resource(device_t, device_t, int, static void nexus_delete_resource(device_t, device_t, int, int); static int nexus_get_cpus(device_t, device_t, enum cpu_sets, size_t, cpuset_t *); -#ifdef DEV_APIC +#if defined(DEV_APIC) && defined(DEV_PCI) static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int *irq); @@ -172,7 +173,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_get_cpus, nexus_get_cpus), /* pcib interface */ -#ifdef DEV_APIC +#if defined(DEV_APIC) && defined(DEV_PCI) DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), @@ -701,7 +702,7 @@ nexus_add_irq(u_long irq) panic("%s: failed", __func__); } -#ifdef DEV_APIC +#if defined(DEV_APIC) && defined(DEV_PCI) static int nexus_alloc_msix(device_t pcib, device_t dev, int *irq) { @@ -736,7 +737,7 @@ nexus_map_msi(device_t pcib, device_t dev, int irq, ui return (msi_map(irq, addr, data)); } -#endif +#endif /* DEV_APIC && DEV_PCI */ /* Placeholder for system RAM. */ static void From owner-svn-src-projects@freebsd.org Mon Jun 11 19:51:49 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 594251010CAD for ; Mon, 11 Jun 2018 19:51:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B42E7A323; Mon, 11 Jun 2018 19:51:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E24FA1FEEE; Mon, 11 Jun 2018 19:51:48 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5BJpmF9053907; Mon, 11 Jun 2018 19:51:48 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5BJpmAt053906; Mon, 11 Jun 2018 19:51:48 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806111951.w5BJpmAt053906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 19:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334976 - projects/pnfs-planb-server/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfs X-SVN-Commit-Revision: 334976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 19:51:49 -0000 Author: rmacklem Date: Mon Jun 11 19:51:48 2018 New Revision: 334976 URL: https://svnweb.freebsd.org/changeset/base/334976 Log: Delete a comment line that is no longer valid. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Mon Jun 11 19:48:15 2018 (r334975) +++ projects/pnfs-planb-server/sys/fs/nfs/nfsrvstate.h Mon Jun 11 19:51:48 2018 (r334976) @@ -192,7 +192,6 @@ struct nfsdsession { * - open file structures chained off an open_owner structure * - lock_owner structures chained off an open file structure * - delegated file structures chained off of nfsclient and nfslockfile - * - pNFS layouts chained off of nfsclient and nfslockfile * - the ls_list field is used for the chain it is in * - the ls_head structure is used to chain off the sibling structure * (it is a union between an nfsstate and nfslock structure head) From owner-svn-src-projects@freebsd.org Mon Jun 11 20:26:12 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E633810162B1 for ; Mon, 11 Jun 2018 20:26:11 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 950517C1AF; Mon, 11 Jun 2018 20:26:11 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F0D3204EC; Mon, 11 Jun 2018 20:26:11 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5BKQBJd072343; Mon, 11 Jun 2018 20:26:11 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5BKQBsb072342; Mon, 11 Jun 2018 20:26:11 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806112026.w5BKQBsb072342@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 11 Jun 2018 20:26:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334978 - projects/pnfs-planb-server/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfs X-SVN-Commit-Revision: 334978 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 20:26:12 -0000 Author: rmacklem Date: Mon Jun 11 20:26:10 2018 New Revision: 334978 URL: https://svnweb.freebsd.org/changeset/base/334978 Log: Delete the definition for nfsrvd_notsuppvp(), since it no longer exists. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_var.h Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfs_var.h Mon Jun 11 20:19:20 2018 (r334977) +++ projects/pnfs-planb-server/sys/fs/nfs/nfs_var.h Mon Jun 11 20:26:10 2018 (r334978) @@ -280,8 +280,6 @@ int nfsrvd_teststateid(struct nfsrv_descript *, int, vnode_t, NFSPROC_T *, struct nfsexstuff *); int nfsrvd_notsupp(struct nfsrv_descript *, int, vnode_t, NFSPROC_T *, struct nfsexstuff *); -int nfsrvd_notsuppvp(struct nfsrv_descript *, int, - vnode_t, NFSPROC_T *, struct nfsexstuff *); /* nfs_nfsdsocket.c */ void nfsrvd_rephead(struct nfsrv_descript *); From owner-svn-src-projects@freebsd.org Tue Jun 12 01:24:48 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF88C101E8A3 for ; Tue, 12 Jun 2018 01:24:48 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B61228AC41; Tue, 12 Jun 2018 01:24:48 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98499236DC; Tue, 12 Jun 2018 01:24:48 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5C1Om6f026561; Tue, 12 Jun 2018 01:24:48 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5C1OmRl026560; Tue, 12 Jun 2018 01:24:48 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806120124.w5C1OmRl026560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 12 Jun 2018 01:24:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334984 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 334984 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jun 2018 01:24:49 -0000 Author: rmacklem Date: Tue Jun 12 01:24:48 2018 New Revision: 334984 URL: https://svnweb.freebsd.org/changeset/base/334984 Log: malloc a structure to save about 200bytes on the stack. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Mon Jun 11 23:32:06 2018 (r334983) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Tue Jun 12 01:24:48 2018 (r334984) @@ -4237,13 +4237,14 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, n { mbuf_t m; u_int32_t *tl; - struct nfsrv_descript nfsd, *nd = &nfsd; + struct nfsrv_descript *nd; struct ucred *cred; int error = 0; u_int32_t callback; struct nfsdsession *sep = NULL; uint64_t tval; + nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK | M_ZERO); cred = newnfs_getcred(); NFSLOCKSTATE(); /* mostly for lc_cbref++ */ if (clp->lc_flags & LCL_NEEDSCONFIRM) { @@ -4448,6 +4449,7 @@ errout: } NFSUNLOCKSTATE(); + free(nd, M_TEMP); NFSEXITCODE(error); return (error); } From owner-svn-src-projects@freebsd.org Wed Jun 13 23:48:50 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BB9C10029C5 for ; Wed, 13 Jun 2018 23:48:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DDEB683121; Wed, 13 Jun 2018 23:48:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBC242065E; Wed, 13 Jun 2018 23:48:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DNmnUe053311; Wed, 13 Jun 2018 23:48:49 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DNmnq4053310; Wed, 13 Jun 2018 23:48:49 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806132348.w5DNmnq4053310@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 13 Jun 2018 23:48:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335095 - projects/pnfs-planb-server/usr.sbin/nfsd X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.sbin/nfsd X-SVN-Commit-Revision: 335095 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 23:48:50 -0000 Author: rmacklem Date: Wed Jun 13 23:48:49 2018 New Revision: 335095 URL: https://svnweb.freebsd.org/changeset/base/335095 Log: Although they both seem to work, ai_addrlen seems like the better length to check than ai_addr->sa_len. Modified: projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c Modified: projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c ============================================================================== --- projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c Wed Jun 13 23:30:54 2018 (r335094) +++ projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c Wed Jun 13 23:48:49 2018 (r335095) @@ -1250,7 +1250,7 @@ parse_dsserver(const char *optionarg, struct nfsd_nfsd err(1, "getaddrinfo pnfs: %s %s", cp, gai_strerror(ecode)); if (ai_tcp->ai_addr->sa_family != AF_INET || - ai_tcp->ai_addr->sa_len < sizeof(sin)) + ai_tcp->ai_addrlen < sizeof(sin)) err(1, "getaddrinfo() returned non-INET address"); /* Mips cares about sockaddr_in alignment, so copy the addr. */ memcpy(&sin, ai_tcp->ai_addr, sizeof(sin)); From owner-svn-src-projects@freebsd.org Wed Jun 13 23:56:23 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 711D5100351F for ; Wed, 13 Jun 2018 23:56:23 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E7B6836C9; Wed, 13 Jun 2018 23:56:23 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F321220803; Wed, 13 Jun 2018 23:56:22 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DNuMS3058403; Wed, 13 Jun 2018 23:56:22 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DNuM6J058402; Wed, 13 Jun 2018 23:56:22 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806132356.w5DNuM6J058402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 13 Jun 2018 23:56:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335096 - projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Commit-Revision: 335096 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 23:56:23 -0000 Author: rmacklem Date: Wed Jun 13 23:56:22 2018 New Revision: 335096 URL: https://svnweb.freebsd.org/changeset/base/335096 Log: Fix a few things in preparation for a merge to head. Get rid of SPDX-License-Identifier for now. Use a second ssize_t variable to avoid a "signed vs unsigned" warning for powerpc. Copy ai_addr to a struct sockaddr_in instead of casting the pointer, since mips warns that the alignment requirements are different. Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Wed Jun 13 23:48:49 2018 (r335095) +++ projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Wed Jun 13 23:56:22 2018 (r335096) @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without @@ -67,13 +65,13 @@ int main(int argc, char *argv[]) { struct addrinfo *res, *ad, *newres; - struct sockaddr_in *sin, *adsin; - struct sockaddr_in6 *sin6, *adsin6; + struct sockaddr_in *sin, adsin; + struct sockaddr_in6 *sin6, adsin6; char hostn[2 * NI_MAXHOST + 2], *cp; struct pnfsdsfile dsfile[NFSDEV_MAXMIRRORS]; int ch, dosetxattr, i, mirrorcnt, quiet, zerods, zerofh; in_port_t tport; - ssize_t xattrsize; + ssize_t xattrsize, xattrsize2; zerods = 0; zerofh = 0; @@ -81,6 +79,7 @@ main(int argc, char *argv[]) dosetxattr = 0; res = NULL; newres = NULL; + cp = NULL; while ((ch = getopt_long(argc, argv, "c:qr:s:z", longopts, NULL)) != -1) { switch (ch) { @@ -145,7 +144,8 @@ main(int argc, char *argv[]) xattrsize = extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, "pnfsd.dsfile", dsfile, sizeof(dsfile)); mirrorcnt = xattrsize / sizeof(struct pnfsdsfile); - if (mirrorcnt < 1 || xattrsize != mirrorcnt * sizeof(struct pnfsdsfile)) + xattrsize2 = mirrorcnt * sizeof(struct pnfsdsfile); + if (mirrorcnt < 1 || xattrsize != xattrsize2) err(1, "Can't get extattr pnfsd.dsfile for %s", *argv); if (quiet == 0) @@ -166,16 +166,22 @@ main(int argc, char *argv[]) sin6 = &dsfile[i].dsf_sin6; ad = res; while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) + if (ad->ai_addr->sa_family == AF_INET && + sin->sin_family == AF_INET && + ad->ai_addrlen >= sizeof(adsin)) { + memcpy(&adsin, ad->ai_addr, + sizeof(adsin)); + if (sin->sin_addr.s_addr == + adsin.sin_addr.s_addr) break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) + } + if (ad->ai_addr->sa_family == AF_INET6 && + sin6->sin6_family == AF_INET6 && + ad->ai_addrlen >= sizeof(adsin6)) { + memcpy(&adsin6, ad->ai_addr, + sizeof(adsin6)); + if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6.sin6_addr)) break; } ad = ad->ai_next; @@ -198,16 +204,22 @@ main(int argc, char *argv[]) sin6 = &dsfile[i].dsf_sin6; ad = res; while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) + if (ad->ai_addr->sa_family == AF_INET && + sin->sin_family == AF_INET && + ad->ai_addrlen >= sizeof(adsin)) { + memcpy(&adsin, ad->ai_addr, + sizeof(adsin)); + if (sin->sin_addr.s_addr == + adsin.sin_addr.s_addr) break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) + } + if (ad->ai_addr->sa_family == AF_INET6 && + sin6->sin6_family == AF_INET6 && + ad->ai_addrlen >= sizeof(adsin6)) { + memcpy(&adsin6, ad->ai_addr, + sizeof(adsin6)); + if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6.sin6_addr)) break; } ad = ad->ai_next; @@ -234,16 +246,22 @@ main(int argc, char *argv[]) sin6 = &dsfile[i].dsf_sin6; ad = res; while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) + if (ad->ai_addr->sa_family == AF_INET && + sin->sin_family == AF_INET && + ad->ai_addrlen >= sizeof(adsin)) { + memcpy(&adsin, ad->ai_addr, + sizeof(adsin)); + if (sin->sin_addr.s_addr == + adsin.sin_addr.s_addr) break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) + } + if (ad->ai_addr->sa_family == AF_INET6 && + sin6->sin6_family == AF_INET6 && + ad->ai_addrlen >= sizeof(adsin6)) { + memcpy(&adsin6, ad->ai_addr, + sizeof(adsin6)); + if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6.sin6_addr)) break; } ad = ad->ai_next; From owner-svn-src-projects@freebsd.org Wed Jun 13 23:58:37 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69E261003A67 for ; Wed, 13 Jun 2018 23:58:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D00C8383F; Wed, 13 Jun 2018 23:58:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2FE220806; Wed, 13 Jun 2018 23:58:36 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DNwasQ058537; Wed, 13 Jun 2018 23:58:36 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DNwapT058536; Wed, 13 Jun 2018 23:58:36 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806132358.w5DNwapT058536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 13 Jun 2018 23:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335097 - projects/pnfs-planb-server/usr.bin/pnfsdskill X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdskill X-SVN-Commit-Revision: 335097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 23:58:37 -0000 Author: rmacklem Date: Wed Jun 13 23:58:36 2018 New Revision: 335097 URL: https://svnweb.freebsd.org/changeset/base/335097 Log: Get rid of SPDX-License-Identifier for now. Modified: projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Wed Jun 13 23:56:22 2018 (r335096) +++ projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Wed Jun 13 23:58:36 2018 (r335097) @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without From owner-svn-src-projects@freebsd.org Thu Jun 14 00:03:46 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04BD910044DC for ; Thu, 14 Jun 2018 00:03:45 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 71A7283FF9; Thu, 14 Jun 2018 00:03:45 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52C362099C; Thu, 14 Jun 2018 00:03:45 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5E03jEd063666; Thu, 14 Jun 2018 00:03:45 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5E03jPG063665; Thu, 14 Jun 2018 00:03:45 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806140003.w5E03jPG063665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 14 Jun 2018 00:03:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335098 - projects/pnfs-planb-server/usr.bin/pnfsdscopymr X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdscopymr X-SVN-Commit-Revision: 335098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 00:03:46 -0000 Author: rmacklem Date: Thu Jun 14 00:03:44 2018 New Revision: 335098 URL: https://svnweb.freebsd.org/changeset/base/335098 Log: Fix some things in preparation for a merge into head. Get rid of SPDX-License-Identifier for now. Use a second ssize_t variable to avoid a "signed vs unsigned" warning for powerpc. Copy ai_addr into a struct sockaddr_in, since mips warns that the alignment requirements for "struct sockaddr" is different than "struct sockaddr_in". Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Wed Jun 13 23:58:36 2018 (r335097) +++ projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Thu Jun 14 00:03:44 2018 (r335098) @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without @@ -74,9 +72,9 @@ main(int argc, char *argv[]) struct stat sb; struct statfs sf; struct addrinfo hints, *res, *nres; - struct sockaddr_in *sin; - struct sockaddr_in6 *sin6; - ssize_t xattrsize; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + ssize_t xattrsize, xattrsize2; size_t mirlen; int ch, fnd, fndzero, i, migrateit, mirrorcnt, mirrorit, ret; int mirrorlevel; @@ -134,7 +132,8 @@ main(int argc, char *argv[]) xattrsize = extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, "pnfsd.dsfile", dsfile, sizeof(dsfile)); mirrorcnt = xattrsize / sizeof(struct pnfsdsfile); - if (mirrorcnt < 1 || xattrsize != mirrorcnt * sizeof(struct pnfsdsfile)) + xattrsize2 = mirrorcnt * sizeof(struct pnfsdsfile); + if (mirrorcnt < 1 || xattrsize != xattrsize2) errx(1, "Can't get extattr pnfsd.dsfile for %s", *argv); /* See if there is a 0.0.0.0 entry. */ @@ -195,16 +194,19 @@ main(int argc, char *argv[]) * DS, just exit(0), since copying isn't * required. */ - if (nres->ai_family == AF_INET) { - sin = (struct sockaddr_in *) - nres->ai_addr; - if (sin->sin_addr.s_addr == + if (nres->ai_family == AF_INET && + nres->ai_addrlen >= sizeof(sin)) { + memcpy(&sin, nres->ai_addr, + sizeof(sin)); + if (sin.sin_addr.s_addr == dsfile[i].dsf_sin.sin_addr.s_addr) exit(0); - } else if (nres->ai_family == AF_INET6) { - sin6 = (struct sockaddr_in6 *) - nres->ai_addr; - if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + } else if (nres->ai_family == + AF_INET6 && nres->ai_addrlen >= + sizeof(sin6)) { + memcpy(&sin6, nres->ai_addr, + sizeof(sin)); + if (IN6_ARE_ADDR_EQUAL(&sin6.sin6_addr, &dsfile[i].dsf_sin6.sin6_addr)) exit(0); } @@ -253,18 +255,21 @@ main(int argc, char *argv[]) /* * Note if the entry is found. */ - if (nres->ai_family == AF_INET) { - sin = (struct sockaddr_in *) - nres->ai_addr; - if (sin->sin_addr.s_addr == + if (nres->ai_family == AF_INET && + nres->ai_addrlen >= sizeof(sin)) { + memcpy(&sin, nres->ai_addr, + sizeof(sin)); + if (sin.sin_addr.s_addr == dsfile[i].dsf_sin.sin_addr.s_addr) { fnd = 1; break; } - } else if (nres->ai_family == AF_INET6) { - sin6 = (struct sockaddr_in6 *) - nres->ai_addr; - if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + } else if (nres->ai_family == + AF_INET6 && nres->ai_addrlen >= + sizeof(sin6)) { + memcpy(&sin6, nres->ai_addr, + sizeof(sin)); + if (IN6_ARE_ADDR_EQUAL(&sin6.sin6_addr, &dsfile[i].dsf_sin6.sin6_addr)) { fnd = 1; break; From owner-svn-src-projects@freebsd.org Thu Jun 14 00:20:56 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33112100623B for ; Thu, 14 Jun 2018 00:20:56 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D583C84E83; Thu, 14 Jun 2018 00:20:55 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6B9520B56; Thu, 14 Jun 2018 00:20:55 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5E0KtDi069570; Thu, 14 Jun 2018 00:20:55 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5E0KtWS069569; Thu, 14 Jun 2018 00:20:55 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806140020.w5E0KtWS069569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 14 Jun 2018 00:20:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335100 - projects/pnfs-planb-server/usr.bin/pnfsdscopymr X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdscopymr X-SVN-Commit-Revision: 335100 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 00:20:56 -0000 Author: rmacklem Date: Thu Jun 14 00:20:55 2018 New Revision: 335100 URL: https://svnweb.freebsd.org/changeset/base/335100 Log: Fix a typo in the recent commit related to IPv6. Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Thu Jun 14 00:10:16 2018 (r335099) +++ projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Thu Jun 14 00:20:55 2018 (r335100) @@ -205,7 +205,7 @@ main(int argc, char *argv[]) AF_INET6 && nres->ai_addrlen >= sizeof(sin6)) { memcpy(&sin6, nres->ai_addr, - sizeof(sin)); + sizeof(sin6)); if (IN6_ARE_ADDR_EQUAL(&sin6.sin6_addr, &dsfile[i].dsf_sin6.sin6_addr)) exit(0); @@ -268,7 +268,7 @@ main(int argc, char *argv[]) AF_INET6 && nres->ai_addrlen >= sizeof(sin6)) { memcpy(&sin6, nres->ai_addr, - sizeof(sin)); + sizeof(sin6)); if (IN6_ARE_ADDR_EQUAL(&sin6.sin6_addr, &dsfile[i].dsf_sin6.sin6_addr)) { fnd = 1; From owner-svn-src-projects@freebsd.org Fri Jun 15 00:50:02 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD9FA10217B1 for ; Fri, 15 Jun 2018 00:50:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 746D26E356; Fri, 15 Jun 2018 00:50:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52B44104AF; Fri, 15 Jun 2018 00:50:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5F0o2Bo026613; Fri, 15 Jun 2018 00:50:02 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5F0o29Q026612; Fri, 15 Jun 2018 00:50:02 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806150050.w5F0o29Q026612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 15 Jun 2018 00:50:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335184 - projects/pnfs-planb-server/usr.bin/pnfsdskill X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdskill X-SVN-Commit-Revision: 335184 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 00:50:02 -0000 Author: rmacklem Date: Fri Jun 15 00:50:01 2018 New Revision: 335184 URL: https://svnweb.freebsd.org/changeset/base/335184 Log: Revert r335097, since the SPDX tag is correct. Modified: projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Fri Jun 15 00:36:41 2018 (r335183) +++ projects/pnfs-planb-server/usr.bin/pnfsdskill/pnfsdskill.c Fri Jun 15 00:50:01 2018 (r335184) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without From owner-svn-src-projects@freebsd.org Fri Jun 15 00:54:04 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35A841021F00 for ; Fri, 15 Jun 2018 00:54:04 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF6C66E7C4; Fri, 15 Jun 2018 00:54:03 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C19CE1063D; Fri, 15 Jun 2018 00:54:03 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5F0s3r2031401; Fri, 15 Jun 2018 00:54:03 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5F0s33o031400; Fri, 15 Jun 2018 00:54:03 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806150054.w5F0s33o031400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 15 Jun 2018 00:54:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335185 - in projects/pnfs-planb-server/usr.bin: pnfsdscopymr pnfsdsfile X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/usr.bin: pnfsdscopymr pnfsdsfile X-SVN-Commit-Revision: 335185 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 00:54:04 -0000 Author: rmacklem Date: Fri Jun 15 00:54:03 2018 New Revision: 335185 URL: https://svnweb.freebsd.org/changeset/base/335185 Log: Put the SPDX tags back on these files, since they are correct. Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Fri Jun 15 00:50:01 2018 (r335184) +++ projects/pnfs-planb-server/usr.bin/pnfsdscopymr/pnfsdscopymr.c Fri Jun 15 00:54:03 2018 (r335185) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Fri Jun 15 00:50:01 2018 (r335184) +++ projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Fri Jun 15 00:54:03 2018 (r335185) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Rick Macklem * * Redistribution and use in source and binary forms, with or without