From owner-svn-src-projects@freebsd.org Sun Aug 16 18:10:16 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBE873C2474 for ; Sun, 16 Aug 2020 18:10:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BV4w84bF8z4cgV; Sun, 16 Aug 2020 18:10:16 +0000 (UTC) (envelope-from dim@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 7D8B9140A4; Sun, 16 Aug 2020 18:10:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07GIAGs1065789; Sun, 16 Aug 2020 18:10:16 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07GIAGFG065787; Sun, 16 Aug 2020 18:10:16 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202008161810.07GIAGFG065787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 16 Aug 2020 18:10:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364275 - projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC X-SVN-Commit-Revision: 364275 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.33 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, 16 Aug 2020 18:10:16 -0000 Author: dim Date: Sun Aug 16 18:10:15 2020 New Revision: 364275 URL: https://svnweb.freebsd.org/changeset/base/364275 Log: Tentatively apply https://reviews.llvm.org/D85659, which fixes an assertion failure when building world for powerpc. This has been reported upstream as . Modified: projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.h Modified: projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp ============================================================================== --- projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp Sun Aug 16 17:56:30 2020 (r364274) +++ projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp Sun Aug 16 18:10:15 2020 (r364275) @@ -2653,22 +2653,31 @@ const unsigned *PPCInstrInfo::getLoadOpcodesForSpillAr return LoadSpillOpcodesArray[getSpillTarget()]; } -void PPCInstrInfo::fixupIsDeadOrKill(MachineInstr &StartMI, MachineInstr &EndMI, +void PPCInstrInfo::fixupIsDeadOrKill(MachineInstr *StartMI, MachineInstr *EndMI, unsigned RegNo) const { // Conservatively clear kill flag for the register if the instructions are in // different basic blocks and in SSA form, because the kill flag may no longer // be right. There is no need to bother with dead flags since defs with no // uses will be handled by DCE. - MachineRegisterInfo &MRI = StartMI.getParent()->getParent()->getRegInfo(); - if (MRI.isSSA() && (StartMI.getParent() != EndMI.getParent())) { + MachineRegisterInfo &MRI = StartMI->getParent()->getParent()->getRegInfo(); + if (MRI.isSSA() && (StartMI->getParent() != EndMI->getParent())) { MRI.clearKillFlags(RegNo); return; } // Instructions between [StartMI, EndMI] should be in same basic block. - assert((StartMI.getParent() == EndMI.getParent()) && + assert((StartMI->getParent() == EndMI->getParent()) && "Instructions are not in same basic block"); + // If before RA, StartMI may be def through copy, we need to adjust it to the + // real def. See function getForwardingDefMI. + if (MRI.isSSA() && StartMI->findRegisterUseOperandIdx(RegNo) < 0 && + StartMI->findRegisterDefOperandIdx(RegNo) < 0) { + assert(Register::isVirtualRegister(RegNo) && "Must be a virtual register"); + // Get real def and ignore copies. + StartMI = MRI.getVRegDef(RegNo); + } + bool IsKillSet = false; auto clearOperandKillInfo = [=] (MachineInstr &MI, unsigned Index) { @@ -2681,21 +2690,21 @@ void PPCInstrInfo::fixupIsDeadOrKill(MachineInstr &Sta // Set killed flag for EndMI. // No need to do anything if EndMI defines RegNo. int UseIndex = - EndMI.findRegisterUseOperandIdx(RegNo, false, &getRegisterInfo()); + EndMI->findRegisterUseOperandIdx(RegNo, false, &getRegisterInfo()); if (UseIndex != -1) { - EndMI.getOperand(UseIndex).setIsKill(true); + EndMI->getOperand(UseIndex).setIsKill(true); IsKillSet = true; // Clear killed flag for other EndMI operands related to RegNo. In some // upexpected cases, killed may be set multiple times for same register // operand in same MI. - for (int i = 0, e = EndMI.getNumOperands(); i != e; ++i) + for (int i = 0, e = EndMI->getNumOperands(); i != e; ++i) if (i != UseIndex) - clearOperandKillInfo(EndMI, i); + clearOperandKillInfo(*EndMI, i); } // Walking the inst in reverse order (EndMI -> StartMI]. - MachineBasicBlock::reverse_iterator It = EndMI; - MachineBasicBlock::reverse_iterator E = EndMI.getParent()->rend(); + MachineBasicBlock::reverse_iterator It = *EndMI; + MachineBasicBlock::reverse_iterator E = EndMI->getParent()->rend(); // EndMI has been handled above, skip it here. It++; MachineOperand *MO = nullptr; @@ -2721,13 +2730,13 @@ void PPCInstrInfo::fixupIsDeadOrKill(MachineInstr &Sta } else if ((MO = It->findRegisterDefOperand(RegNo, false, true, &getRegisterInfo()))) { // No use found, set dead for its def. - assert(&*It == &StartMI && "No new def between StartMI and EndMI."); + assert(&*It == StartMI && "No new def between StartMI and EndMI."); MO->setIsDead(true); break; } } - if ((&*It) == &StartMI) + if ((&*It) == StartMI) break; } // Ensure RegMo liveness is killed after EndMI. @@ -3858,7 +3867,7 @@ bool PPCInstrInfo::simplifyToLI(MachineInstr &MI, Mach // ForwardingOperandReg = LI imm1 // y = op2 imm2, ForwardingOperandReg(killed) if (IsForwardingOperandKilled) - fixupIsDeadOrKill(DefMI, MI, ForwardingOperandReg); + fixupIsDeadOrKill(&DefMI, &MI, ForwardingOperandReg); LLVM_DEBUG(dbgs() << "With:\n"); LLVM_DEBUG(MI.dump()); @@ -3950,9 +3959,9 @@ bool PPCInstrInfo::transformToNewImmFormFedByAdd( // Update kill flag if (RegMO->isKill() || IsKilledFor(RegMO->getReg())) - fixupIsDeadOrKill(DefMI, MI, RegMO->getReg()); + fixupIsDeadOrKill(&DefMI, &MI, RegMO->getReg()); if (ForwardKilledOperandReg != ~0U) - fixupIsDeadOrKill(DefMI, MI, ForwardKilledOperandReg); + fixupIsDeadOrKill(&DefMI, &MI, ForwardKilledOperandReg); } LLVM_DEBUG(dbgs() << "With:\n"); @@ -4063,12 +4072,12 @@ bool PPCInstrInfo::transformToImmFormFedByAdd( // x = ADD reg(killed), imm // y = XOP 0, x if (IsFwdFeederRegKilled || RegMO->isKill()) - fixupIsDeadOrKill(DefMI, MI, RegMO->getReg()); + fixupIsDeadOrKill(&DefMI, &MI, RegMO->getReg()); // Pattern 3: // ForwardKilledOperandReg = ADD reg, imm // y = XOP 0, ForwardKilledOperandReg(killed) if (ForwardKilledOperandReg != ~0U) - fixupIsDeadOrKill(DefMI, MI, ForwardKilledOperandReg); + fixupIsDeadOrKill(&DefMI, &MI, ForwardKilledOperandReg); LLVM_DEBUG(dbgs() << "With:\n"); LLVM_DEBUG(MI.dump()); @@ -4224,7 +4233,7 @@ bool PPCInstrInfo::transformToImmFormFedByLI(MachineIn // ForwardKilledOperandReg = LI imm // y = XOP reg, ForwardKilledOperandReg(killed) if (ForwardKilledOperandReg != ~0U) - fixupIsDeadOrKill(DefMI, MI, ForwardKilledOperandReg); + fixupIsDeadOrKill(&DefMI, &MI, ForwardKilledOperandReg); return true; } Modified: projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.h ============================================================================== --- projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.h Sun Aug 16 17:56:30 2020 (r364274) +++ projects/clang1100-import/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.h Sun Aug 16 18:10:15 2020 (r364275) @@ -577,7 +577,7 @@ class PPCInstrInfo : public PPCGenInstrInfo { (public) /// we conservatively clear kill flag for all uses of \p RegNo for pre-RA /// and for post-RA, we give an assertion as without reaching definition /// analysis post-RA, \p StartMI and \p EndMI are hard to keep right. - void fixupIsDeadOrKill(MachineInstr &StartMI, MachineInstr &EndMI, + void fixupIsDeadOrKill(MachineInstr *StartMI, MachineInstr *EndMI, unsigned RegNo) const; void replaceInstrWithLI(MachineInstr &MI, const LoadImmediateInfo &LII) const; void replaceInstrOperandWithImm(MachineInstr &MI, unsigned OpNo, From owner-svn-src-projects@freebsd.org Sun Aug 16 18:23:53 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5EDF93C2ED4 for ; Sun, 16 Aug 2020 18:23:53 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BV5Cs1p3Kz4f4p; Sun, 16 Aug 2020 18:23:53 +0000 (UTC) (envelope-from dim@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 212301459C; Sun, 16 Aug 2020 18:23:53 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07GINr6j078008; Sun, 16 Aug 2020 18:23:53 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07GINqOu078006; Sun, 16 Aug 2020 18:23:52 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202008161823.07GINqOu078006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 16 Aug 2020 18:23:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364278 - projects/clang1100-import X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang1100-import X-SVN-Commit-Revision: 364278 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.33 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, 16 Aug 2020 18:23:53 -0000 Author: dim Date: Sun Aug 16 18:23:52 2020 New Revision: 364278 URL: https://svnweb.freebsd.org/changeset/base/364278 Log: Set tentative merge date. Modified: projects/clang1100-import/ObsoleteFiles.inc projects/clang1100-import/UPDATING Modified: projects/clang1100-import/ObsoleteFiles.inc ============================================================================== --- projects/clang1100-import/ObsoleteFiles.inc Sun Aug 16 18:21:21 2020 (r364277) +++ projects/clang1100-import/ObsoleteFiles.inc Sun Aug 16 18:23:52 2020 (r364278) @@ -36,7 +36,7 @@ # xargs -n1 | sort | uniq -d; # done -# 2020mmdd: new clang import which bumps version from 10.0.1 to 11.0.0. +# 20200816: new clang import which bumps version from 10.0.1 to 11.0.0. OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/complex OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/new Modified: projects/clang1100-import/UPDATING ============================================================================== --- projects/clang1100-import/UPDATING Sun Aug 16 18:21:21 2020 (r364277) +++ projects/clang1100-import/UPDATING Sun Aug 16 18:23:52 2020 (r364278) @@ -26,7 +26,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -2020mmdd: +20200816: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 11.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already From owner-svn-src-projects@freebsd.org Sun Aug 16 18:24:57 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 313023C2F58 for ; Sun, 16 Aug 2020 18:24:57 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BV5F50sx8z4drq; Sun, 16 Aug 2020 18:24:57 +0000 (UTC) (envelope-from dim@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 DBACE141E1; Sun, 16 Aug 2020 18:24:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07GIOu2O078157; Sun, 16 Aug 2020 18:24:56 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07GIOmaM078113; Sun, 16 Aug 2020 18:24:48 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202008161824.07GIOmaM078113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 16 Aug 2020 18:24:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364279 - in projects/clang1100-import: lib/libcasper/services lib/libcasper/services/cap_dns lib/libcasper/services/cap_net share/mk sys/compat/linuxkpi/common/include/linux sys/fs/aut... X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang1100-import: lib/libcasper/services lib/libcasper/services/cap_dns lib/libcasper/services/cap_net share/mk sys/compat/linuxkpi/common/include/linux sys/fs/autofs sys/fs/ext2fs sys/fs/... X-SVN-Commit-Revision: 364279 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.33 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, 16 Aug 2020 18:24:57 -0000 Author: dim Date: Sun Aug 16 18:24:48 2020 New Revision: 364279 URL: https://svnweb.freebsd.org/changeset/base/364279 Log: Merge ^/head r364264 through r364278. Added: projects/clang1100-import/lib/libcasper/services/cap_net/ - copied from r364278, head/lib/libcasper/services/cap_net/ Modified: projects/clang1100-import/lib/libcasper/services/Makefile projects/clang1100-import/lib/libcasper/services/cap_dns/Makefile projects/clang1100-import/lib/libcasper/services/cap_dns/cap_dns.3 projects/clang1100-import/share/mk/src.libnames.mk projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/fs.h projects/clang1100-import/sys/fs/autofs/autofs_vnops.c projects/clang1100-import/sys/fs/ext2fs/ext2_vfsops.c projects/clang1100-import/sys/fs/fdescfs/fdesc_vfsops.c projects/clang1100-import/sys/fs/fdescfs/fdesc_vnops.c projects/clang1100-import/sys/fs/fuse/fuse_vfsops.c projects/clang1100-import/sys/fs/msdosfs/msdosfs_vfsops.c projects/clang1100-import/sys/fs/nfsclient/nfs_clvfsops.c projects/clang1100-import/sys/fs/nullfs/null_vfsops.c projects/clang1100-import/sys/fs/pseudofs/pseudofs_vncache.c projects/clang1100-import/sys/fs/smbfs/smbfs_node.c projects/clang1100-import/sys/fs/smbfs/smbfs_vfsops.c projects/clang1100-import/sys/fs/tmpfs/tmpfs_subr.c projects/clang1100-import/sys/fs/tmpfs/tmpfs_vfsops.c projects/clang1100-import/sys/kern/uipc_mqueue.c projects/clang1100-import/sys/kern/vfs_cache.c projects/clang1100-import/sys/kern/vfs_default.c projects/clang1100-import/sys/kern/vfs_lookup.c projects/clang1100-import/sys/kern/vfs_subr.c projects/clang1100-import/sys/modules/nvd/Makefile projects/clang1100-import/sys/modules/usb/cp2112/Makefile projects/clang1100-import/sys/netinet/sctp_input.c projects/clang1100-import/sys/netinet/sctp_output.c projects/clang1100-import/sys/netinet/sctp_pcb.c projects/clang1100-import/sys/netinet/sctp_structs.h projects/clang1100-import/sys/netinet/sctputil.c projects/clang1100-import/sys/netinet/sctputil.h projects/clang1100-import/sys/sys/namei.h projects/clang1100-import/sys/sys/param.h projects/clang1100-import/sys/sys/vnode.h projects/clang1100-import/sys/ufs/ffs/ffs_alloc.c projects/clang1100-import/sys/ufs/ffs/ffs_softdep.c projects/clang1100-import/sys/ufs/ffs/ffs_vfsops.c projects/clang1100-import/sys/ufs/ufs/ufs_quota.c projects/clang1100-import/sys/vm/vm_fault.c projects/clang1100-import/sys/vm/vm_mmap.c projects/clang1100-import/sys/vm/vm_pageout.c Directory Properties: projects/clang1100-import/ (props changed) Modified: projects/clang1100-import/lib/libcasper/services/Makefile ============================================================================== --- projects/clang1100-import/lib/libcasper/services/Makefile Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/lib/libcasper/services/Makefile Sun Aug 16 18:24:48 2020 (r364279) @@ -5,6 +5,7 @@ SUBDIR= cap_dns SUBDIR+= cap_fileargs SUBDIR+= cap_grp +SUBDIR+= cap_net SUBDIR+= cap_pwd SUBDIR+= cap_sysctl SUBDIR+= cap_syslog Modified: projects/clang1100-import/lib/libcasper/services/cap_dns/Makefile ============================================================================== --- projects/clang1100-import/lib/libcasper/services/cap_dns/Makefile Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/lib/libcasper/services/cap_dns/Makefile Sun Aug 16 18:24:48 2020 (r364279) @@ -27,11 +27,6 @@ SUBDIR.${MK_TESTS}+= tests MAN+= cap_dns.3 MLINKS+=cap_dns.3 libcap_dns.3 -MLINKS+=cap_dns.3 cap_gethostbyname.3 -MLINKS+=cap_dns.3 cap_gethostbyname2.3 -MLINKS+=cap_dns.3 cap_gethostbyaddr.3 -MLINKS+=cap_dns.3 cap_getaddrinfo.3 -MLINKS+=cap_dns.3 cap_getnameinfo.3 MLINKS+=cap_dns.3 cap_dns_type_limit.3 MLINKS+=cap_dns.3 cap_dns_family_limit.3 Modified: projects/clang1100-import/lib/libcasper/services/cap_dns/cap_dns.3 ============================================================================== --- projects/clang1100-import/lib/libcasper/services/cap_dns/cap_dns.3 Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/lib/libcasper/services/cap_dns/cap_dns.3 Sun Aug 16 18:24:48 2020 (r364279) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd August 15, 2020 .Dt CAP_DNS 3 .Os .Sh NAME @@ -58,6 +58,9 @@ .Fn cap_dns_family_limit "const cap_channel_t *chan" "const int *families" "size_t nfamilies" .Sh DESCRIPTION .Bf -symbolic +This service is obsolete and +.Xr cap_net 3 +should be used instead. The .Fn cap_getaddrinfo , and Modified: projects/clang1100-import/share/mk/src.libnames.mk ============================================================================== --- projects/clang1100-import/share/mk/src.libnames.mk Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/share/mk/src.libnames.mk Sun Aug 16 18:24:48 2020 (r364279) @@ -89,6 +89,7 @@ _LIBRARIES= \ cap_dns \ cap_fileargs \ cap_grp \ + cap_net \ cap_pwd \ cap_sysctl \ cap_syslog \ @@ -637,6 +638,7 @@ LIBBSNMPDIR= ${OBJTOP}/lib/libbsnmp/libbsnmp LIBCASPERDIR= ${OBJTOP}/lib/libcasper/libcasper LIBCAP_DNSDIR= ${OBJTOP}/lib/libcasper/services/cap_dns LIBCAP_GRPDIR= ${OBJTOP}/lib/libcasper/services/cap_grp +LIBCAP_NETDIR= ${OBJTOP}/lib/libcasper/services/cap_net LIBCAP_PWDDIR= ${OBJTOP}/lib/libcasper/services/cap_pwd LIBCAP_SYSCTLDIR= ${OBJTOP}/lib/libcasper/services/cap_sysctl LIBCAP_SYSLOGDIR= ${OBJTOP}/lib/libcasper/services/cap_syslog Modified: projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/fs.h ============================================================================== --- projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/fs.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/fs.h Sun Aug 16 18:24:48 2020 (r364279) @@ -260,7 +260,7 @@ igrab(struct inode *inode) { int error; - error = vget(inode, 0, curthread); + error = vget(inode, 0); if (error) return (NULL); Modified: projects/clang1100-import/sys/fs/autofs/autofs_vnops.c ============================================================================== --- projects/clang1100-import/sys/fs/autofs/autofs_vnops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/autofs/autofs_vnops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -656,7 +656,7 @@ autofs_node_vn(struct autofs_node *anp, struct mount * vp = anp->an_vnode; if (vp != NULL) { - error = vget(vp, flags | LK_RETRY, curthread); + error = vget(vp, flags | LK_RETRY); if (error != 0) { AUTOFS_WARN("vget failed with error %d", error); sx_xunlock(&anp->an_vnode_lock); Modified: projects/clang1100-import/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/ext2fs/ext2_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/ext2fs/ext2_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -799,7 +799,7 @@ loop: /* * Step 4: invalidate all cached file data. */ - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; } @@ -1158,7 +1158,7 @@ loop: VI_UNLOCK(vp); continue; } - error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, td); + error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK); if (error) { if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); Modified: projects/clang1100-import/sys/fs/fdescfs/fdesc_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/fdescfs/fdesc_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/fdescfs/fdesc_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -163,7 +163,7 @@ fdesc_root(struct mount *mp, int flags, struct vnode * * Return locked reference to root. */ vp = VFSTOFDESC(mp)->f_root; - vget(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + vget(vp, LK_EXCLUSIVE | LK_RETRY); *vpp = vp; return (0); } Modified: projects/clang1100-import/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- projects/clang1100-import/sys/fs/fdescfs/fdesc_vnops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/fdescfs/fdesc_vnops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -182,7 +182,7 @@ loop: vp = fd->fd_vnode; VI_LOCK(vp); mtx_unlock(&fdesc_hashmtx); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) goto loop; *vpp = vp; return (0); @@ -232,7 +232,7 @@ loop: vp2 = fd2->fd_vnode; VI_LOCK(vp2); mtx_unlock(&fdesc_hashmtx); - error = vget(vp2, LK_EXCLUSIVE | LK_INTERLOCK, td); + error = vget(vp2, LK_EXCLUSIVE | LK_INTERLOCK); /* Someone beat us, dec use count and wait for reclaim */ vgone(vp); vput(vp); Modified: projects/clang1100-import/sys/fs/fuse/fuse_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/fuse/fuse_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/fuse/fuse_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -610,7 +610,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct int err = 0; if (data->vroot != NULL) { - err = vget(data->vroot, lkflags, curthread); + err = vget(data->vroot, lkflags); if (err == 0) *vpp = data->vroot; } else { Modified: projects/clang1100-import/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/msdosfs/msdosfs_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/msdosfs/msdosfs_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -921,7 +921,7 @@ loop: VI_UNLOCK(vp); continue; } - error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, td); + error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK); if (error) { if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, nvp); Modified: projects/clang1100-import/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/nfsclient/nfs_clvfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/nfsclient/nfs_clvfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -1828,7 +1828,7 @@ loop: VI_UNLOCK(vp); continue; } - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; } Modified: projects/clang1100-import/sys/fs/nullfs/null_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/nullfs/null_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/nullfs/null_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -281,7 +281,7 @@ nullfs_root(mp, flags, vpp) NULLFSDEBUG("nullfs_root(mp = %p, vp = %p)\n", mp, mntdata->nullm_lowerrootvp); - error = vget(mntdata->nullm_lowerrootvp, flags, curthread); + error = vget(mntdata->nullm_lowerrootvp, flags); if (error == 0) { error = null_nodeget(mp, mntdata->nullm_lowerrootvp, &vp); if (error == 0) { Modified: projects/clang1100-import/sys/fs/pseudofs/pseudofs_vncache.c ============================================================================== --- projects/clang1100-import/sys/fs/pseudofs/pseudofs_vncache.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/pseudofs/pseudofs_vncache.c Sun Aug 16 18:24:48 2020 (r364279) @@ -136,7 +136,7 @@ retry: vp = pvd->pvd_vnode; VI_LOCK(vp); mtx_unlock(&pfs_vncache_mutex); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, curthread) == 0) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK) == 0) { ++pfs_vncache_hits; *vpp = vp; /* @@ -218,7 +218,7 @@ retry2: vp = pvd2->pvd_vnode; VI_LOCK(vp); mtx_unlock(&pfs_vncache_mutex); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, curthread) == 0) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK) == 0) { ++pfs_vncache_hits; vgone(*vpp); vput(*vpp); Modified: projects/clang1100-import/sys/fs/smbfs/smbfs_node.c ============================================================================== --- projects/clang1100-import/sys/fs/smbfs/smbfs_node.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/smbfs/smbfs_node.c Sun Aug 16 18:24:48 2020 (r364279) @@ -124,7 +124,7 @@ smbfs_node_alloc(struct mount *mp, struct vnode *dvp, if (dvp == NULL) return EINVAL; vp = VTOSMB(VTOSMB(dvp)->n_parent)->n_vnode; - error = vget(vp, LK_EXCLUSIVE, td); + error = vget(vp, LK_EXCLUSIVE); if (error == 0) *vpp = vp; return error; Modified: projects/clang1100-import/sys/fs/smbfs/smbfs_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/smbfs/smbfs_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/smbfs/smbfs_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -329,7 +329,7 @@ smbfs_root(struct mount *mp, int flags, struct vnode * if (smp->sm_root) { *vpp = SMBTOV(smp->sm_root); - return vget(*vpp, LK_EXCLUSIVE | LK_RETRY, td); + return vget(*vpp, LK_EXCLUSIVE | LK_RETRY); } scred = smbfs_malloc_scred(); smb_makescred(scred, td, cred); Modified: projects/clang1100-import/sys/fs/tmpfs/tmpfs_subr.c ============================================================================== --- projects/clang1100-import/sys/fs/tmpfs/tmpfs_subr.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/tmpfs/tmpfs_subr.c Sun Aug 16 18:24:48 2020 (r364279) @@ -588,6 +588,7 @@ tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *no struct vnode **vpp) { struct vnode *vp; + enum vgetstate vs; struct tmpfs_mount *tm; vm_object_t object; int error; @@ -600,18 +601,15 @@ loop: TMPFS_NODE_ASSERT_LOCKED(node); if ((vp = node->tn_vnode) != NULL) { MPASS((node->tn_vpstate & TMPFS_VNODE_DOOMED) == 0); - VI_LOCK(vp); if ((node->tn_type == VDIR && node->tn_dir.tn_parent == NULL) || (VN_IS_DOOMED(vp) && (lkflag & LK_NOWAIT) != 0)) { - VI_UNLOCK(vp); TMPFS_NODE_UNLOCK(node); error = ENOENT; vp = NULL; goto out; } if (VN_IS_DOOMED(vp)) { - VI_UNLOCK(vp); node->tn_vpstate |= TMPFS_VNODE_WRECLAIM; while ((node->tn_vpstate & TMPFS_VNODE_WRECLAIM) != 0) { msleep(&node->tn_vnode, TMPFS_NODE_MTX(node), @@ -619,8 +617,9 @@ loop: } goto loop; } + vs = vget_prep(vp); TMPFS_NODE_UNLOCK(node); - error = vget(vp, lkflag | LK_INTERLOCK, curthread); + error = vget_finish(vp, lkflag, vs); if (error == ENOENT) { TMPFS_NODE_LOCK(node); goto loop; Modified: projects/clang1100-import/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- projects/clang1100-import/sys/fs/tmpfs/tmpfs_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/fs/tmpfs/tmpfs_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -130,8 +130,7 @@ tmpfs_update_mtime(struct mount *mp, bool lazy) * metadata changes now. */ if (!lazy || obj->generation != obj->cleangeneration) { - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, - curthread) != 0) + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK) != 0) continue; tmpfs_check_mtime(vp); if (!lazy) Modified: projects/clang1100-import/sys/kern/uipc_mqueue.c ============================================================================== --- projects/clang1100-import/sys/kern/uipc_mqueue.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/kern/uipc_mqueue.c Sun Aug 16 18:24:48 2020 (r364279) @@ -754,7 +754,7 @@ mqfs_allocv(struct mount *mp, struct vnode **vpp, stru found: *vpp = vd->mv_vnode; sx_xunlock(&mqfs->mi_lock); - error = vget(*vpp, LK_RETRY | LK_EXCLUSIVE, curthread); + error = vget(*vpp, LK_RETRY | LK_EXCLUSIVE); vdrop(*vpp); return (error); } Modified: projects/clang1100-import/sys/kern/vfs_cache.c ============================================================================== --- projects/clang1100-import/sys/kern/vfs_cache.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/kern/vfs_cache.c Sun Aug 16 18:24:48 2020 (r364279) @@ -2427,11 +2427,11 @@ sys___getcwd(struct thread *td, struct __getcwd_args * if (buflen > MAXPATHLEN) buflen = MAXPATHLEN; - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = uma_zalloc(namei_zone, M_WAITOK); error = vn_getcwd(td, buf, &retbuf, &buflen); if (error == 0) error = copyout(retbuf, uap->buf, buflen); - free(buf, M_TEMP); + uma_zfree(namei_zone, buf); return (error); } @@ -2982,8 +2982,6 @@ DB_SHOW_COMMAND(vpath, db_show_vpath) } #endif - -extern uma_zone_t namei_zone; static bool __read_frequently cache_fast_lookup = true; SYSCTL_BOOL(_vfs, OID_AUTO, cache_fast_lookup, CTLFLAG_RW, Modified: projects/clang1100-import/sys/kern/vfs_default.c ============================================================================== --- projects/clang1100-import/sys/kern/vfs_default.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/kern/vfs_default.c Sun Aug 16 18:24:48 2020 (r364279) @@ -1348,7 +1348,7 @@ loop: VI_UNLOCK(vp); continue; } - if ((error = vget(vp, lockreq, td)) != 0) { + if ((error = vget(vp, lockreq)) != 0) { if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; Modified: projects/clang1100-import/sys/kern/vfs_lookup.c ============================================================================== --- projects/clang1100-import/sys/kern/vfs_lookup.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/kern/vfs_lookup.c Sun Aug 16 18:24:48 2020 (r364279) @@ -504,8 +504,7 @@ namei(struct nameidata *ndp) * Get a buffer for the name to be translated, and copy the * name into the buffer. */ - if ((cnp->cn_flags & HASBUF) == 0) - cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK); + cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK); if (ndp->ni_segflg == UIO_SYSSPACE) error = copystr(ndp->ni_dirp, cnp->cn_pnbuf, MAXPATHLEN, &ndp->ni_pathlen); Modified: projects/clang1100-import/sys/kern/vfs_subr.c ============================================================================== --- projects/clang1100-import/sys/kern/vfs_subr.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/kern/vfs_subr.c Sun Aug 16 18:24:48 2020 (r364279) @@ -2856,12 +2856,10 @@ vget_abort(struct vnode *vp, enum vgetstate vs) } int -vget(struct vnode *vp, int flags, struct thread *td) +vget(struct vnode *vp, int flags) { enum vgetstate vs; - MPASS(td == curthread); - vs = vget_prep(vp); return (vget_finish(vp, flags, vs)); } @@ -4684,7 +4682,7 @@ vfs_periodic_msync_inactive(struct mount *mp, int flag VI_UNLOCK(vp); continue; } - if (vget(vp, lkflags, td) == 0) { + if (vget(vp, lkflags) == 0) { obj = vp->v_object; if (obj != NULL && (vp->v_vflag & VV_NOSYNC) == 0) { VM_OBJECT_WLOCK(obj); Modified: projects/clang1100-import/sys/modules/nvd/Makefile ============================================================================== --- projects/clang1100-import/sys/modules/nvd/Makefile Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/modules/nvd/Makefile Sun Aug 16 18:24:48 2020 (r364279) @@ -3,6 +3,6 @@ .PATH: ${SRCTOP}/sys/dev/nvd KMOD= nvd -SRCS= nvd.c opt_geom.h device_if.h bus_if.h +SRCS= nvd.c opt_geom.h device_if.h bus_if.h pci_if.h .include Modified: projects/clang1100-import/sys/modules/usb/cp2112/Makefile ============================================================================== --- projects/clang1100-import/sys/modules/usb/cp2112/Makefile Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/modules/usb/cp2112/Makefile Sun Aug 16 18:24:48 2020 (r364279) @@ -31,7 +31,7 @@ S= ${SRCTOP}/sys KMOD= cp2112 SRCS= cp2112.c -SRCS+= opt_bus.h opt_usb.h +SRCS+= opt_bus.h opt_platform.h opt_usb.h SRCS+= device_if.h bus_if.h gpio_if.h iicbus_if.h usb_if.h usbdevs.h .include Modified: projects/clang1100-import/sys/netinet/sctp_input.c ============================================================================== --- projects/clang1100-import/sys/netinet/sctp_input.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctp_input.c Sun Aug 16 18:24:48 2020 (r364279) @@ -829,7 +829,6 @@ sctp_handle_abort(struct sctp_abort_chunk *abort, #ifdef SCTP_ASOCLOG_OF_TSNS sctp_print_out_track_log(stcb); #endif - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); (void)sctp_free_assoc(stcb->sctp_ep, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_8); SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_abort: finished\n"); @@ -1866,7 +1865,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphle /* send up all the data */ SCTP_TCB_SEND_LOCK(stcb); - sctp_report_all_outbound(stcb, 0, 1, SCTP_SO_LOCKED); + sctp_report_all_outbound(stcb, 0, SCTP_SO_LOCKED); for (i = 0; i < stcb->asoc.streamoutcnt; i++) { stcb->asoc.strmout[i].chunks_on_queues = 0; #if defined(SCTP_DETAILED_STR_STATS) Modified: projects/clang1100-import/sys/netinet/sctp_output.c ============================================================================== --- projects/clang1100-import/sys/netinet/sctp_output.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctp_output.c Sun Aug 16 18:24:48 2020 (r364279) @@ -13148,12 +13148,21 @@ skip_preblock: if (sinfo_flags & SCTP_UNORDERED) { SCTP_STAT_INCR(sctps_sends_with_unord); } + sp->processing = 1; TAILQ_INSERT_TAIL(&strm->outqueue, sp, next); stcb->asoc.ss_functions.sctp_ss_add_to_stream(stcb, asoc, strm, sp, 1); SCTP_TCB_SEND_UNLOCK(stcb); } else { SCTP_TCB_SEND_LOCK(stcb); sp = TAILQ_LAST(&strm->outqueue, sctp_streamhead); + if (sp->processing) { + SCTP_TCB_SEND_UNLOCK(stcb); + SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); + error = EINVAL; + goto out; + } else { + sp->processing = 1; + } SCTP_TCB_SEND_UNLOCK(stcb); if (sp == NULL) { /* ???? Huh ??? last msg is gone */ @@ -13195,13 +13204,14 @@ skip_preblock: } /* Update the mbuf and count */ SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { /* * we need to get out. Peer probably * aborted. */ sctp_m_freem(mm); - if (stcb->asoc.state & SCTP_PCB_FLAGS_WAS_ABORTED) { + if (stcb->asoc.state & SCTP_STATE_WAS_ABORTED) { SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET); error = ECONNRESET; } @@ -13405,7 +13415,8 @@ skip_preblock: } } SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13421,6 +13432,7 @@ skip_preblock: strm->last_msg_incomplete = 0; asoc->stream_locked = 0; } + sp->processing = 0; } else { SCTP_PRINTF("Huh no sp TSNH?\n"); strm->last_msg_incomplete = 0; Modified: projects/clang1100-import/sys/netinet/sctp_pcb.c ============================================================================== --- projects/clang1100-import/sys/netinet/sctp_pcb.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctp_pcb.c Sun Aug 16 18:24:48 2020 (r364279) @@ -4733,6 +4733,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* there is no asoc, really TSNH :-0 */ return (1); } + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.alternate) { sctp_free_remote_addr(stcb->asoc.alternate); stcb->asoc.alternate = NULL; @@ -4767,6 +4768,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* nope, reader or writer in the way */ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); /* no asoc destroyed */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); #ifdef SCTP_LOG_CLOSING sctp_log_closing(inp, stcb, 8); @@ -4835,6 +4837,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE); sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) @@ -4868,10 +4871,12 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc if (from_inpcbfree == SCTP_NORMAL_PROC) { atomic_add_int(&stcb->asoc.refcnt, 1); + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_INP_INFO_WLOCK(); SCTP_INP_WLOCK(inp); SCTP_TCB_LOCK(stcb); + SCTP_TCB_SEND_LOCK(stcb); } /* Double check the GONE flag */ if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || @@ -4919,6 +4924,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_INP_INFO_WUNLOCK(); SCTP_INP_WUNLOCK(inp); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); return (0); } @@ -4950,7 +4956,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc * in case. */ /* anything on the wheel needs to be removed */ - SCTP_TCB_SEND_LOCK(stcb); for (i = 0; i < asoc->streamoutcnt; i++) { struct sctp_stream_out *outs; @@ -4981,7 +4986,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED); } } - SCTP_TCB_SEND_UNLOCK(stcb); /* sa_ignore FREED_MEMORY */ TAILQ_FOREACH_SAFE(strrst, &asoc->resetHead, next_resp, nstrrst) { TAILQ_REMOVE(&asoc->resetHead, strrst, next_resp); @@ -5183,6 +5187,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* Insert new items here :> */ /* Get rid of LOCK */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_TCB_LOCK_DESTROY(stcb); SCTP_TCB_SEND_LOCK_DESTROY(stcb); Modified: projects/clang1100-import/sys/netinet/sctp_structs.h ============================================================================== --- projects/clang1100-import/sys/netinet/sctp_structs.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctp_structs.h Sun Aug 16 18:24:48 2020 (r364279) @@ -534,6 +534,7 @@ struct sctp_stream_queue_pending { uint8_t sender_all_done; uint8_t put_last_out; uint8_t discard_rest; + uint8_t processing; }; /* Modified: projects/clang1100-import/sys/netinet/sctputil.c ============================================================================== --- projects/clang1100-import/sys/netinet/sctputil.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctputil.c Sun Aug 16 18:24:48 2020 (r364279) @@ -4239,7 +4239,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb } void -sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked) +sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int so_locked) { struct sctp_association *asoc; struct sctp_stream_out *outs; @@ -4261,9 +4261,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 return; } /* now through all the gunk freeing chunks */ - if (holds_lock == 0) { - SCTP_TCB_SEND_LOCK(stcb); - } /* sent queue SHOULD be empty */ TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) { TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next); @@ -4340,10 +4337,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 /* sa_ignore FREED_MEMORY */ } } - - if (holds_lock == 0) { - SCTP_TCB_SEND_UNLOCK(stcb); - } } void @@ -4363,8 +4356,11 @@ sctp_abort_notification(struct sctp_tcb *stcb, uint8_t (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { return; } + SCTP_TCB_SEND_LOCK(stcb); + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Tell them we lost the asoc */ - sctp_report_all_outbound(stcb, error, 0, so_locked); + sctp_report_all_outbound(stcb, error, so_locked); + SCTP_TCB_SEND_UNLOCK(stcb); if (from_peer) { sctp_ulp_notify(SCTP_NOTIFY_ASSOC_REM_ABORTED, stcb, error, abort, so_locked); } else { @@ -4393,7 +4389,6 @@ sctp_abort_association(struct sctp_inpcb *inp, struct if (stcb != NULL) { /* We have a TCB to abort, send notification too */ sctp_abort_notification(stcb, 0, 0, NULL, SCTP_SO_NOT_LOCKED); - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Ok, now lets free it */ SCTP_STAT_INCR_COUNTER32(sctps_aborted); if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || @@ -4482,8 +4477,6 @@ sctp_abort_an_association(struct sctp_inpcb *inp, stru } } return; - } else { - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); } /* notify the peer */ sctp_send_abort_tcb(stcb, op_err, so_locked); Modified: projects/clang1100-import/sys/netinet/sctputil.h ============================================================================== --- projects/clang1100-import/sys/netinet/sctputil.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/netinet/sctputil.h Sun Aug 16 18:24:48 2020 (r364279) @@ -164,7 +164,7 @@ void sctp_stop_timers_for_shutdown(struct sctp_tcb *); /* Stop all timers for association and remote addresses. */ void sctp_stop_association_timers(struct sctp_tcb *, bool); -void sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int); +void sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int); int sctp_expand_mapping_array(struct sctp_association *, uint32_t); Modified: projects/clang1100-import/sys/sys/namei.h ============================================================================== --- projects/clang1100-import/sys/sys/namei.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/sys/namei.h Sun Aug 16 18:24:48 2020 (r364279) @@ -149,21 +149,21 @@ int cache_fplookup(struct nameidata *ndp, enum cache_f * buffer and for vrele'ing ni_startdir. */ #define RDONLY 0x00000200 /* lookup with read-only semantics */ -#define HASBUF 0x00000400 /* has allocated pathname buffer */ -#define SAVENAME 0x00000800 /* save pathname buffer */ -#define SAVESTART 0x00001000 /* save starting directory */ -#define ISWHITEOUT 0x00002000 /* found whiteout */ -#define DOWHITEOUT 0x00004000 /* do whiteouts */ -#define WILLBEDIR 0x00008000 /* new files will be dirs; allow trailing / */ -#define ISOPEN 0x00010000 /* caller is opening; return a real vnode. */ -#define NOCROSSMOUNT 0x00020000 /* do not cross mount points */ -#define NOMACCHECK 0x00040000 /* do not perform MAC checks */ -#define AUDITVNODE1 0x00080000 /* audit the looked up vnode information */ -#define AUDITVNODE2 0x00100000 /* audit the looked up vnode information */ -#define NOCAPCHECK 0x00200000 /* do not perform capability checks */ +#define SAVENAME 0x00000400 /* save pathname buffer */ +#define SAVESTART 0x00000800 /* save starting directory */ +#define ISWHITEOUT 0x00001000 /* found whiteout */ +#define DOWHITEOUT 0x00002000 /* do whiteouts */ +#define WILLBEDIR 0x00004000 /* new files will be dirs; allow trailing / */ +#define ISOPEN 0x00008000 /* caller is opening; return a real vnode. */ +#define NOCROSSMOUNT 0x00010000 /* do not cross mount points */ +#define NOMACCHECK 0x00020000 /* do not perform MAC checks */ +#define AUDITVNODE1 0x00040000 /* audit the looked up vnode information */ +#define AUDITVNODE2 0x00080000 /* audit the looked up vnode information */ +#define NOCAPCHECK 0x00100000 /* do not perform capability checks */ /* UNUSED 0x00400000 */ +/* UNUSED 0x00200000 */ /* UNUSED 0x00800000 */ -/* UNUSED 0x01000000 */ +#define HASBUF 0x01000000 /* has allocated pathname buffer */ #define NOEXECCHECK 0x02000000 /* do not perform exec check on dir */ #define MAKEENTRY 0x04000000 /* entry is to be added to name cache */ #define ISSYMLINK 0x08000000 /* symlink needs interpretation */ @@ -176,7 +176,8 @@ int cache_fplookup(struct nameidata *ndp, enum cache_f * Flags which must not be passed in by callers. */ #define NAMEI_INTERNAL_FLAGS \ - (NOEXECCHECK | MAKEENTRY | ISSYMLINK | ISLASTCN | ISDOTDOT | TRAILINGSLASH) + (HASBUF | NOEXECCHECK | MAKEENTRY | ISSYMLINK | ISLASTCN | ISDOTDOT | \ + TRAILINGSLASH) /* * Namei results flags Modified: projects/clang1100-import/sys/sys/param.h ============================================================================== --- projects/clang1100-import/sys/sys/param.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/sys/param.h Sun Aug 16 18:24:48 2020 (r364279) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300108 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300109 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: projects/clang1100-import/sys/sys/vnode.h ============================================================================== --- projects/clang1100-import/sys/sys/vnode.h Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/sys/vnode.h Sun Aug 16 18:24:48 2020 (r364279) @@ -680,7 +680,7 @@ void vlazy(struct vnode *); void vdrop(struct vnode *); void vdropl(struct vnode *); int vflush(struct mount *mp, int rootrefs, int flags, struct thread *td); -int vget(struct vnode *vp, int flags, struct thread *td); +int vget(struct vnode *vp, int flags); enum vgetstate vget_prep_smr(struct vnode *vp); enum vgetstate vget_prep(struct vnode *vp); int vget_finish(struct vnode *vp, int flags, enum vgetstate vs); Modified: projects/clang1100-import/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- projects/clang1100-import/sys/ufs/ffs/ffs_alloc.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/ufs/ffs/ffs_alloc.c Sun Aug 16 18:24:48 2020 (r364279) @@ -3463,7 +3463,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) */ pwd = pwd_hold(td); dvp = pwd->pwd_cdir; - if ((error = vget(dvp, LK_EXCLUSIVE, td)) != 0) { + if ((error = vget(dvp, LK_EXCLUSIVE)) != 0) { vput(fdvp); pwd_drop(pwd); break; Modified: projects/clang1100-import/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- projects/clang1100-import/sys/ufs/ffs/ffs_softdep.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/ufs/ffs/ffs_softdep.c Sun Aug 16 18:24:48 2020 (r364279) @@ -13624,8 +13624,7 @@ softdep_request_cleanup_flush(mp, ump) VI_UNLOCK(lvp); continue; } - if (vget(lvp, LK_EXCLUSIVE | LK_INTERLOCK | LK_NOWAIT, - td) != 0) { + if (vget(lvp, LK_EXCLUSIVE | LK_INTERLOCK | LK_NOWAIT) != 0) { failed_vnode = 1; continue; } Modified: projects/clang1100-import/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- projects/clang1100-import/sys/ufs/ffs/ffs_vfsops.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/ufs/ffs/ffs_vfsops.c Sun Aug 16 18:24:48 2020 (r364279) @@ -974,7 +974,7 @@ loop: /* * Step 4: invalidate all cached file data. */ - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; } @@ -1758,8 +1758,7 @@ ffs_sync_lazy(mp) VI_UNLOCK(vp); continue; } - if ((error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, - td)) != 0) + if ((error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK)) != 0) continue; #ifdef QUOTA qsyncvp(vp); @@ -1856,7 +1855,7 @@ loop: VI_UNLOCK(vp); continue; } - if ((error = vget(vp, lockreq, td)) != 0) { + if ((error = vget(vp, lockreq)) != 0) { if (error == ENOENT || error == ENOLCK) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; Modified: projects/clang1100-import/sys/ufs/ufs/ufs_quota.c ============================================================================== --- projects/clang1100-import/sys/ufs/ufs/ufs_quota.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/ufs/ufs/ufs_quota.c Sun Aug 16 18:24:48 2020 (r364279) @@ -613,7 +613,7 @@ quotaon(struct thread *td, struct mount *mp, int type, */ again: MNT_VNODE_FOREACH_ALL(vp, mp, mvp) { - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto again; } @@ -680,7 +680,7 @@ again: VI_UNLOCK(vp); continue; } - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto again; } @@ -1064,7 +1064,6 @@ int qsync(struct mount *mp) { struct ufsmount *ump = VFSTOUFS(mp); - struct thread *td = curthread; /* XXX */ struct vnode *vp, *mvp; struct dquot *dq; int i, error; @@ -1088,7 +1087,7 @@ again: VI_UNLOCK(vp); continue; } - error = vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td); + error = vget(vp, LK_EXCLUSIVE | LK_INTERLOCK); if (error) { if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); Modified: projects/clang1100-import/sys/vm/vm_fault.c ============================================================================== --- projects/clang1100-import/sys/vm/vm_fault.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/vm/vm_fault.c Sun Aug 16 18:24:48 2020 (r364279) @@ -673,7 +673,7 @@ vm_fault_lock_vnode(struct faultstate *fs, bool objloc * paging-in-progress count incremented. Otherwise, we could * deadlock. */ - error = vget(vp, locked | LK_CANRECURSE | LK_NOWAIT, curthread); + error = vget(vp, locked | LK_CANRECURSE | LK_NOWAIT); if (error == 0) { fs->vp = vp; return (KERN_SUCCESS); @@ -684,7 +684,7 @@ vm_fault_lock_vnode(struct faultstate *fs, bool objloc unlock_and_deallocate(fs); else fault_deallocate(fs); - error = vget(vp, locked | LK_RETRY | LK_CANRECURSE, curthread); + error = vget(vp, locked | LK_RETRY | LK_CANRECURSE); vdrop(vp); fs->vp = vp; KASSERT(error == 0, ("vm_fault: vget failed %d", error)); Modified: projects/clang1100-import/sys/vm/vm_mmap.c ============================================================================== --- projects/clang1100-import/sys/vm/vm_mmap.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/vm/vm_mmap.c Sun Aug 16 18:24:48 2020 (r364279) @@ -1284,7 +1284,7 @@ vm_mmap_vnode(struct thread *td, vm_size_t objsize, cred = td->td_ucred; writex = (*maxprotp & VM_PROT_WRITE) != 0 && (*flagsp & MAP_SHARED) != 0; - if ((error = vget(vp, LK_SHARED, td)) != 0) + if ((error = vget(vp, LK_SHARED)) != 0) return (error); AUDIT_ARG_VNODE1(vp); foff = *foffp; @@ -1305,7 +1305,7 @@ vm_mmap_vnode(struct thread *td, vm_size_t objsize, * Bypass filesystems obey the mpsafety of the * underlying fs. Tmpfs never bypasses. */ - error = vget(vp, LK_SHARED, td); + error = vget(vp, LK_SHARED); if (error != 0) return (error); } Modified: projects/clang1100-import/sys/vm/vm_pageout.c ============================================================================== --- projects/clang1100-import/sys/vm/vm_pageout.c Sun Aug 16 18:23:52 2020 (r364278) +++ projects/clang1100-import/sys/vm/vm_pageout.c Sun Aug 16 18:24:48 2020 (r364279) @@ -643,7 +643,7 @@ vm_pageout_clean(vm_page_t m, int *numpagedout) VM_OBJECT_WUNLOCK(object); lockmode = MNT_SHARED_WRITES(vp->v_mount) ? LK_SHARED : LK_EXCLUSIVE; - if (vget(vp, lockmode | LK_TIMELOCK, curthread)) { + if (vget(vp, lockmode | LK_TIMELOCK)) { vp = NULL; error = EDEADLK; goto unlock_mp; From owner-svn-src-projects@freebsd.org Tue Aug 18 02:42:54 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C3DF3AB09B for ; Tue, 18 Aug 2020 02:42:54 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BVwFB14Kwz4ZkD; Tue, 18 Aug 2020 02:42:54 +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 07798A6F3; Tue, 18 Aug 2020 02:42:54 +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 07I2gsF2073531; Tue, 18 Aug 2020 02:42:54 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07I2gqun073524; Tue, 18 Aug 2020 02:42:52 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008180242.07I2gqun073524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 18 Aug 2020 02:42:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364333 - in projects/nfs-over-tls/sys: amd64/include arm/allwinner arm/allwinner/clkng arm/arm arm/broadcom/bcm2835 arm/ti arm/ti/am335x arm/ti/clk arm/ti/cpsw arm/ti/omap4 arm/ti/usb ... X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys: amd64/include arm/allwinner arm/allwinner/clkng arm/arm arm/broadcom/bcm2835 arm/ti arm/ti/am335x arm/ti/clk arm/ti/cpsw arm/ti/omap4 arm/ti/usb arm64/arm64 arm64/conf ar... X-SVN-Commit-Revision: 364333 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.33 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, 18 Aug 2020 02:42:54 -0000 Author: rmacklem Date: Tue Aug 18 02:42:51 2020 New Revision: 364333 URL: https://svnweb.freebsd.org/changeset/base/364333 Log: Merge in an up to date kernel from head. Added: projects/nfs-over-tls/sys/amd64/include/iommu.h - copied unchanged from r364330, head/sys/amd64/include/iommu.h projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2838_xhci.c - copied unchanged from r364330, head/sys/arm/broadcom/bcm2835/bcm2838_xhci.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c - copied unchanged from r364330, head/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c projects/nfs-over-tls/sys/arm/ti/am335x/am3359_cppi41.c - copied unchanged from r364330, head/sys/arm/ti/am335x/am3359_cppi41.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_usb_phy.c - copied unchanged from r364330, head/sys/arm/ti/am335x/am335x_usb_phy.c projects/nfs-over-tls/sys/arm/ti/clk/ - copied from r364330, head/sys/arm/ti/clk/ projects/nfs-over-tls/sys/arm/ti/ti_omap4_cm.c - copied unchanged from r364330, head/sys/arm/ti/ti_omap4_cm.c projects/nfs-over-tls/sys/arm/ti/ti_omap4_cm.h - copied unchanged from r364330, head/sys/arm/ti/ti_omap4_cm.h projects/nfs-over-tls/sys/arm/ti/ti_prm.c - copied unchanged from r364330, head/sys/arm/ti/ti_prm.c projects/nfs-over-tls/sys/arm/ti/ti_prm.h - copied unchanged from r364330, head/sys/arm/ti/ti_prm.h projects/nfs-over-tls/sys/arm/ti/ti_scm_syscon.c - copied unchanged from r364330, head/sys/arm/ti/ti_scm_syscon.c projects/nfs-over-tls/sys/arm/ti/ti_sysc.h - copied unchanged from r364330, head/sys/arm/ti/ti_sysc.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/sizes.h - copied unchanged from r364330, head/sys/compat/linuxkpi/common/include/linux/sizes.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/wait_bit.h - copied unchanged from r364330, head/sys/compat/linuxkpi/common/include/linux/wait_bit.h projects/nfs-over-tls/sys/contrib/pcg-c/ - copied from r364330, head/sys/contrib/pcg-c/ projects/nfs-over-tls/sys/dev/acpica/acpi_apei.c - copied unchanged from r364330, head/sys/dev/acpica/acpi_apei.c projects/nfs-over-tls/sys/dev/smc/if_smc_acpi.c - copied unchanged from r364330, head/sys/dev/smc/if_smc_acpi.c projects/nfs-over-tls/sys/dev/usb/misc/cp2112.c - copied unchanged from r364330, head/sys/dev/usb/misc/cp2112.c projects/nfs-over-tls/sys/gnu/dts/arm/am5729-beagleboneai.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/am5729-beagleboneai.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-facebook-yosemitev2.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/aspeed-bmc-facebook-yosemitev2.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-nicole.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/aspeed-bmc-opp-nicole.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d2_icp.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/at91-sama5d2_icp.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm2835-rpi-common.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/bcm2835-rpi-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra7-ipu-dsp-common.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/dra7-ipu-dsp-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra74-ipu-dsp-common.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/dra74-ipu-dsp-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/exynos4210-i9100.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/exynos4210-i9100.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx6dl-colibri-v1_1-eval-v3.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/imx6dl-colibri-v1_1-eval-v3.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-colibri-v1_1-uhs.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/imx6qdl-colibri-v1_1-uhs.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/integratorap-im-pd1.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/integratorap-im-pd1.dts projects/nfs-over-tls/sys/gnu/dts/arm/kirkwood-l-50.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/kirkwood-l-50.dts projects/nfs-over-tls/sys/gnu/dts/arm/r8a7742-iwg21d-q7.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/r8a7742-iwg21d-q7.dts projects/nfs-over-tls/sys/gnu/dts/arm/r8a7742-iwg21m.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/r8a7742-iwg21m.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7742.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/r8a7742.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rtd1195-horseradish.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/rtd1195-horseradish.dts projects/nfs-over-tls/sys/gnu/dts/arm/rtd1195-mele-x1000.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/rtd1195-mele-x1000.dts projects/nfs-over-tls/sys/gnu/dts/arm/rtd1195.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/rtd1195.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157a-dhcor-avenger96.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp157a-dhcor-avenger96.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157a-iot-box.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp157a-iot-box.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157a-stinger96.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp157a-stinger96.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157a-stinger96.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp157a-stinger96.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-lxa-mc1.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp157c-lxa-mc1.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dhcom-pdk2.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-dhcom-pdk2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dhcom-som.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-dhcom-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dhcor-avenger96.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-dhcor-avenger96.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dhcor-io1v8.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-dhcor-io1v8.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dhcor-som.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-dhcor-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-osd32.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm/stm32mp15xx-osd32.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime-emmc.dts - copied unchanged from r364330, head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime-emmc.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-cpu-opp.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/allwinner/sun50i-h6-cpu-opp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-gtking-pro.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-g12b-gtking-pro.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-gtking.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-g12b-gtking.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-w400.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-g12b-w400.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-sml5442tw.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-sml5442tw.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-sm1-odroid-c4.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/amlogic/meson-sm1-odroid-c4.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mm-beacon-baseboard.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/freescale/imx8mm-beacon-baseboard.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mm-beacon-kit.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/freescale/imx8mm-beacon-kit.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mm-beacon-som.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/freescale/imx8mm-beacon-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt6358.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt6358.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana-rev7.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana-rev7.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt8173-elm-hana.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173-elm.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt8173-elm.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm660-xiaomi-lavender.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/qcom/sdm660-xiaomi-lavender.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm660.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/qcom/sdm660.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1295-xnano-x5.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1295-xnano-x5.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1395-bpi-m4.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1395-bpi-m4.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1395-lionskin.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1395-lionskin.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1395.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1395.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd139x.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd139x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1619-mjolnir.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1619-mjolnir.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1619.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd1619.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd16xx.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/realtek/rtd16xx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/aistarvision-mipi-adapter-2.1.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/renesas/aistarvision-mipi-adapter-2.1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a774c0-ek874-mipi-2.1.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/renesas/r8a774c0-ek874-mipi-2.1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3326-odroid-go2.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/rockchip/rk3326-odroid-go2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3326.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/rockchip/rk3326.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld20-akebi96.dts - copied unchanged from r364330, head/sys/gnu/dts/arm64/socionext/uniphier-ld20-akebi96.dts projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-am654-industrial-thermal.dtsi - copied unchanged from r364330, head/sys/gnu/dts/arm64/ti/k3-am654-industrial-thermal.dtsi projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/agilex-clock.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/agilex-clock.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/bt1-ccu.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/bt1-ccu.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/intel,lgm-clk.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/intel,lgm-clk.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2-audio.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2-audio.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/mt6765-clk.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/mt6765-clk.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8939.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8939.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/r8a7742-cpg-mssr.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/r8a7742-cpg-mssr.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/x1830-cgu.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/clock/x1830-cgu.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/interconnect/imx8mm.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/interconnect/imx8mm.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/interconnect/imx8mn.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/interconnect/imx8mn.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/interconnect/imx8mq.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/interconnect/imx8mq.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/mailbox/qcom-ipcc.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/mailbox/qcom-ipcc.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/pinctrl/pads-imx8dxl.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/pinctrl/pads-imx8dxl.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/power/marvell,mmp2.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/power/marvell,mmp2.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/power/meson-gxbb-power.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/power/meson-gxbb-power.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/power/meson8-power.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/power/meson8-power.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/power/r8a7742-sysc.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/power/r8a7742-sysc.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/bt1-ccu.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/reset/bt1-ccu.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/imx8mp-reset.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/reset/imx8mp-reset.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8939.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8939.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/realtek,rtd1195.h - copied unchanged from r364330, head/sys/gnu/dts/include/dt-bindings/reset/realtek,rtd1195.h projects/nfs-over-tls/sys/i386/include/iommu.h - copied unchanged from r364330, head/sys/i386/include/iommu.h projects/nfs-over-tls/sys/kern/subr_prng.c - copied unchanged from r364330, head/sys/kern/subr_prng.c projects/nfs-over-tls/sys/modules/usb/cp2112/ - copied from r364330, head/sys/modules/usb/cp2112/ projects/nfs-over-tls/sys/sys/prng.h - copied unchanged from r364330, head/sys/sys/prng.h projects/nfs-over-tls/sys/x86/include/iommu.h - copied unchanged from r364330, head/sys/x86/include/iommu.h Deleted: projects/nfs-over-tls/sys/arm/ti/am335x/am335x_prcm.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_usbss.c projects/nfs-over-tls/sys/arm/ti/ti_hwmods.c projects/nfs-over-tls/sys/arm/ti/ti_hwmods.h projects/nfs-over-tls/sys/compat/netbsd/ projects/nfs-over-tls/sys/dev/cy/ projects/nfs-over-tls/sys/dev/rc/ projects/nfs-over-tls/sys/dev/rp/ projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-dhcom-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/apq8016-sbc-pmic-pins.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/apq8016-sbc-soc-pins.dtsi projects/nfs-over-tls/sys/modules/rc/ projects/nfs-over-tls/sys/modules/rp/ Modified: projects/nfs-over-tls/sys/arm/allwinner/aw_cir.c projects/nfs-over-tls/sys/arm/allwinner/clkng/aw_clk_nm.c projects/nfs-over-tls/sys/arm/allwinner/clkng/ccu_sun8i_r.c projects/nfs-over-tls/sys/arm/arm/trap-v6.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_firmware.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_firmware.h projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/nfs-over-tls/sys/arm/broadcom/bcm2835/files.bcm283x projects/nfs-over-tls/sys/arm/ti/am335x/am335x_dmtimer.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_dmtpps.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_dmtreg.h projects/nfs-over-tls/sys/arm/ti/am335x/am335x_gpio.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_lcd.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_musb.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_pwmss.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_rtc.c projects/nfs-over-tls/sys/arm/ti/am335x/am335x_scm.c projects/nfs-over-tls/sys/arm/ti/am335x/files.am335x projects/nfs-over-tls/sys/arm/ti/cpsw/if_cpsw.c projects/nfs-over-tls/sys/arm/ti/files.ti projects/nfs-over-tls/sys/arm/ti/omap4/files.omap4 projects/nfs-over-tls/sys/arm/ti/ti_adc.c projects/nfs-over-tls/sys/arm/ti/ti_edma3.c projects/nfs-over-tls/sys/arm/ti/ti_gpio.c projects/nfs-over-tls/sys/arm/ti/ti_i2c.c projects/nfs-over-tls/sys/arm/ti/ti_mbox.c projects/nfs-over-tls/sys/arm/ti/ti_pinmux.c projects/nfs-over-tls/sys/arm/ti/ti_prcm.c projects/nfs-over-tls/sys/arm/ti/ti_prcm.h projects/nfs-over-tls/sys/arm/ti/ti_pruss.c projects/nfs-over-tls/sys/arm/ti/ti_scm.c projects/nfs-over-tls/sys/arm/ti/ti_sdhci.c projects/nfs-over-tls/sys/arm/ti/ti_sdma.c projects/nfs-over-tls/sys/arm/ti/ti_spi.c projects/nfs-over-tls/sys/arm/ti/ti_sysc.c projects/nfs-over-tls/sys/arm/ti/ti_wdt.c projects/nfs-over-tls/sys/arm/ti/usb/omap_ehci.c projects/nfs-over-tls/sys/arm/ti/usb/omap_host.c projects/nfs-over-tls/sys/arm/ti/usb/omap_tll.c projects/nfs-over-tls/sys/arm64/arm64/identcpu.c projects/nfs-over-tls/sys/arm64/arm64/machdep.c projects/nfs-over-tls/sys/arm64/conf/GENERIC projects/nfs-over-tls/sys/arm64/include/acpica_machdep.h projects/nfs-over-tls/sys/arm64/include/armreg.h projects/nfs-over-tls/sys/arm64/include/profile.h projects/nfs-over-tls/sys/arm64/rockchip/clk/rk3328_cru.c projects/nfs-over-tls/sys/arm64/rockchip/clk/rk_clk_composite.c projects/nfs-over-tls/sys/arm64/rockchip/clk/rk_clk_composite.h projects/nfs-over-tls/sys/arm64/rockchip/if_dwc_rk.c projects/nfs-over-tls/sys/cam/ctl/ctl.c projects/nfs-over-tls/sys/cam/ctl/ctl_cmd_table.c projects/nfs-over-tls/sys/cam/ctl/ctl_private.h projects/nfs-over-tls/sys/cam/mmc/mmc_all.h projects/nfs-over-tls/sys/cam/mmc/mmc_da.c projects/nfs-over-tls/sys/cam/mmc/mmc_xpt.c projects/nfs-over-tls/sys/cam/nvme/nvme_da.c projects/nfs-over-tls/sys/cam/nvme/nvme_xpt.c projects/nfs-over-tls/sys/cam/scsi/scsi_all.h projects/nfs-over-tls/sys/cam/scsi/scsi_enc_ses.c projects/nfs-over-tls/sys/cam/scsi/scsi_ses.h projects/nfs-over-tls/sys/cddl/compat/opensolaris/sys/assfail.h projects/nfs-over-tls/sys/cddl/compat/opensolaris/sys/stat.h projects/nfs-over-tls/sys/cddl/compat/opensolaris/sys/time.h projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/nfs-over-tls/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h projects/nfs-over-tls/sys/compat/freebsd32/freebsd32_misc.c projects/nfs-over-tls/sys/compat/linprocfs/linprocfs.c projects/nfs-over-tls/sys/compat/linux/linux_fork.c projects/nfs-over-tls/sys/compat/linux/linux_futex.c projects/nfs-over-tls/sys/compat/linux/linux_mmap.c projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/bitops.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/dma-mapping.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/fs.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/jiffies.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/kref.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/mutex.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/radix-tree.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/sched.h projects/nfs-over-tls/sys/compat/linuxkpi/common/include/linux/wait.h projects/nfs-over-tls/sys/compat/linuxkpi/common/src/linux_compat.c projects/nfs-over-tls/sys/compat/linuxkpi/common/src/linux_radix.c projects/nfs-over-tls/sys/compat/linuxkpi/common/src/linux_rcu.c projects/nfs-over-tls/sys/conf/files projects/nfs-over-tls/sys/conf/files.arm64 projects/nfs-over-tls/sys/conf/kern.pre.mk projects/nfs-over-tls/sys/dev/acpica/acpi.c projects/nfs-over-tls/sys/dev/ahci/ahci_pci.c projects/nfs-over-tls/sys/dev/asmc/asmc.c projects/nfs-over-tls/sys/dev/asmc/asmcvar.h projects/nfs-over-tls/sys/dev/cxgbe/t4_main.c projects/nfs-over-tls/sys/dev/dwc/if_dwc.c projects/nfs-over-tls/sys/dev/dwc/if_dwc.h projects/nfs-over-tls/sys/dev/dwc/if_dwc_if.m projects/nfs-over-tls/sys/dev/dwc/if_dwcvar.h projects/nfs-over-tls/sys/dev/e1000/if_em.c projects/nfs-over-tls/sys/dev/fdt/simplebus.c projects/nfs-over-tls/sys/dev/fdt/simplebus.h projects/nfs-over-tls/sys/dev/gpio/gpiokeys.c projects/nfs-over-tls/sys/dev/hwpmc/hwpmc_arm64.c projects/nfs-over-tls/sys/dev/hwpmc/hwpmc_mod.c projects/nfs-over-tls/sys/dev/hwpmc/pmc_events.h projects/nfs-over-tls/sys/dev/hyperv/vmbus/vmbus.c projects/nfs-over-tls/sys/dev/ice/ice_common.h projects/nfs-over-tls/sys/dev/ioat/ioat.c projects/nfs-over-tls/sys/dev/iommu/busdma_iommu.c projects/nfs-over-tls/sys/dev/iommu/iommu.h projects/nfs-over-tls/sys/dev/iommu/iommu_gas.c projects/nfs-over-tls/sys/dev/ixl/i40e_prototype.h projects/nfs-over-tls/sys/dev/mmc/host/dwmmc.c projects/nfs-over-tls/sys/dev/mpr/mpr.c projects/nfs-over-tls/sys/dev/mpr/mpr_sas.c projects/nfs-over-tls/sys/dev/mpr/mpr_user.c projects/nfs-over-tls/sys/dev/mps/mps.c projects/nfs-over-tls/sys/dev/mps/mps_sas.c projects/nfs-over-tls/sys/dev/mps/mps_user.c projects/nfs-over-tls/sys/dev/neta/if_mvneta.c projects/nfs-over-tls/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/nfs-over-tls/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/nfs-over-tls/sys/dev/nvd/nvd.c projects/nfs-over-tls/sys/dev/nvme/nvme_qpair.c projects/nfs-over-tls/sys/dev/nvme/nvme_sim.c projects/nfs-over-tls/sys/dev/pci/pci.c projects/nfs-over-tls/sys/dev/pci/pcivar.h projects/nfs-over-tls/sys/dev/rtwn/usb/rtwn_usb_attach.h projects/nfs-over-tls/sys/dev/safexcel/safexcel.c projects/nfs-over-tls/sys/dev/smc/if_smc.c projects/nfs-over-tls/sys/dev/smc/if_smc_fdt.c projects/nfs-over-tls/sys/dev/smc/if_smcvar.h projects/nfs-over-tls/sys/dev/uart/uart_dev_ti8250.c projects/nfs-over-tls/sys/dev/usb/controller/xhci.h projects/nfs-over-tls/sys/dev/usb/controller/xhci_pci.c projects/nfs-over-tls/sys/dev/usb/usbdevs projects/nfs-over-tls/sys/dev/virtio/pci/virtio_pci.c projects/nfs-over-tls/sys/dev/vt/vt_core.c projects/nfs-over-tls/sys/fs/autofs/autofs_vnops.c projects/nfs-over-tls/sys/fs/cd9660/cd9660_vnops.c projects/nfs-over-tls/sys/fs/devfs/devfs.h projects/nfs-over-tls/sys/fs/devfs/devfs_devs.c projects/nfs-over-tls/sys/fs/devfs/devfs_int.h projects/nfs-over-tls/sys/fs/devfs/devfs_vnops.c projects/nfs-over-tls/sys/fs/ext2fs/ext2_inode_cnv.c projects/nfs-over-tls/sys/fs/ext2fs/ext2_vfsops.c projects/nfs-over-tls/sys/fs/ext2fs/ext2_vnops.c projects/nfs-over-tls/sys/fs/fdescfs/fdesc_vfsops.c projects/nfs-over-tls/sys/fs/fdescfs/fdesc_vnops.c projects/nfs-over-tls/sys/fs/fuse/fuse_internal.c projects/nfs-over-tls/sys/fs/fuse/fuse_vfsops.c projects/nfs-over-tls/sys/fs/msdosfs/msdosfs_vfsops.c projects/nfs-over-tls/sys/fs/msdosfs/msdosfs_vnops.c projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c projects/nfs-over-tls/sys/fs/nfs/nfs_var.h projects/nfs-over-tls/sys/fs/nfs/nfscl.h projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c projects/nfs-over-tls/sys/fs/nfsclient/nfs_clvfsops.c projects/nfs-over-tls/sys/fs/nfsclient/nfs_clvnops.c projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c projects/nfs-over-tls/sys/fs/nullfs/null_subr.c projects/nfs-over-tls/sys/fs/nullfs/null_vfsops.c projects/nfs-over-tls/sys/fs/nullfs/null_vnops.c projects/nfs-over-tls/sys/fs/pseudofs/pseudofs_vncache.c projects/nfs-over-tls/sys/fs/pseudofs/pseudofs_vnops.c projects/nfs-over-tls/sys/fs/smbfs/smbfs_node.c projects/nfs-over-tls/sys/fs/smbfs/smbfs_vfsops.c projects/nfs-over-tls/sys/fs/smbfs/smbfs_vnops.c projects/nfs-over-tls/sys/fs/tmpfs/tmpfs_subr.c projects/nfs-over-tls/sys/fs/tmpfs/tmpfs_vfsops.c projects/nfs-over-tls/sys/fs/tmpfs/tmpfs_vnops.c projects/nfs-over-tls/sys/fs/tmpfs/tmpfs_vnops.h projects/nfs-over-tls/sys/fs/udf/udf_vnops.c projects/nfs-over-tls/sys/geom/eli/g_eli_integrity.c projects/nfs-over-tls/sys/geom/eli/g_eli_privacy.c projects/nfs-over-tls/sys/geom/part/g_part.c projects/nfs-over-tls/sys/geom/part/g_part.h projects/nfs-over-tls/sys/geom/part/g_part_gpt.c projects/nfs-over-tls/sys/gnu/dts/arm/am335x-baltos.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am335x-boneblack-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am335x-boneblack-wireless.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-boneblue.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-bonegreen-wireless.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-evmsk.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-guardian.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-lxm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-moxa-uc-2100-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-pepper.dts projects/nfs-over-tls/sys/gnu/dts/arm/am335x-phycore-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am335x-pocketbeagle.dts projects/nfs-over-tls/sys/gnu/dts/arm/am33xx-l4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am33xx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am3517-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am3517.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am4372.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am437x-cm-t43.dts projects/nfs-over-tls/sys/gnu/dts/arm/am437x-gp-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am437x-l4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am437x-sk-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am43x-epos-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/am571x-idk.dts projects/nfs-over-tls/sys/gnu/dts/arm/am572x-idk-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/am57xx-idk-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/armada-370-xp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/armada-375.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/armada-38x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/armada-39x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-ast2600-evb.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-facebook-tiogapass.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-ibm-rainier.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-mihawk.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-romulus.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-tacoma.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-witherspoon.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-bmc-opp-zaius.dts projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-g4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-g5.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/aspeed-g6.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91-dvk_su60_somc.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91-kizbox3-hs.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-kizbox3_common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91-sam9x60ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d27_som1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d27_som1_ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d27_wlsom1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d27_wlsom1_ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-sama5d2_xplained.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91-wb50n.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91rm9200.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9g45.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9m10g45ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9n12.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9n12ek.dts projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9rl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/at91sam9x5.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm-nsp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm2711-rpi-4-b.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm2835-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm2835.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm2836.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm2837.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/bcm47094-luxul-xwc-2000.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958522er.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958525er.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958525xmc.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958622hr.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958623hr.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958625hr.dts projects/nfs-over-tls/sys/gnu/dts/arm/bcm958625k.dts projects/nfs-over-tls/sys/gnu/dts/arm/berlin2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/berlin2cd.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/berlin2q.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dm814x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dm816x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dove.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra7-evm-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra7-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/dra7-l4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra7.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra71-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/dra72-evm-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra72-evm-revc.dts projects/nfs-over-tls/sys/gnu/dts/arm/dra72-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/dra72x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra74x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/dra76-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/e60k02.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/exynos3250-monk.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos3250-rinato.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos4210-origen.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos4210-trats.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos4210-universal_c210.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos4412-galaxy-s3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/exynos4412-midas.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/exynos4412-odroid-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/exynos4412-origen.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos5250-arndale.dts projects/nfs-over-tls/sys/gnu/dts/arm/exynos5420-arndale-octa.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx50.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx51.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx53-cx9020.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx53.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6q-dhcom-pdk2.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-colibri.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-gw551x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-gw552x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-gw560x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-gw5904.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-gw5910.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-icore.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl-sr-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6qdl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6sl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6sx-sabreauto.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx6sx-sdb.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6sx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6ul-kontron-n6x1x-s.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6ul-kontron-n6x1x-som-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx6ul.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx7-tqma7.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-colibri.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-nitrogen7.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-pinfunc.h projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-sdb.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-tqma7.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-zii-rmu2.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx7d-zii-rpu2.dts projects/nfs-over-tls/sys/gnu/dts/arm/imx7d.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/imx7s.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/integratorap.dts projects/nfs-over-tls/sys/gnu/dts/arm/keystone-k2e.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/keystone-k2g-evm.dts projects/nfs-over-tls/sys/gnu/dts/arm/keystone-k2g.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/keystone-k2hk.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/keystone-k2l.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/kirkwood-netgear_readynas_nv+_v2.dts projects/nfs-over-tls/sys/gnu/dts/arm/kirkwood.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/logicpd-torpedo-baseboard.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/ls1021a-twr.dts projects/nfs-over-tls/sys/gnu/dts/arm/meson.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/meson8b-odroidc1.dts projects/nfs-over-tls/sys/gnu/dts/arm/meson8b.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/meson8m2-mxiii-plus.dts projects/nfs-over-tls/sys/gnu/dts/arm/meson8m2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/mmp2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/mmp3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/motorola-cpcap-mapphone.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/mt2701-evb.dts projects/nfs-over-tls/sys/gnu/dts/arm/mt2701.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/mt7623.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/mt7623n-rfb-emmc.dts projects/nfs-over-tls/sys/gnu/dts/arm/omap2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap2420.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap2430.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap3-beagle.dts projects/nfs-over-tls/sys/gnu/dts/arm/omap3-devkit8000.dts projects/nfs-over-tls/sys/gnu/dts/arm/omap3-gta04.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap3-n900.dts projects/nfs-over-tls/sys/gnu/dts/arm/omap3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap4-duovero-parlor.dts projects/nfs-over-tls/sys/gnu/dts/arm/omap4-l4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap5-l4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/omap5.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/pxa168.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/pxa3xx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/pxa910.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/qcom-ipq4019.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/qcom-ipq8064.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/qcom-msm8974-samsung-klte.dts projects/nfs-over-tls/sys/gnu/dts/arm/qcom-msm8974.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7740.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7743.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7744.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7745.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7790.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7791.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7793.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/r8a7794.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rk3036-kylin.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3066a-mk808.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3188-radxarock.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3229-xms6.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk322x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-firefly-reload.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-firefly.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-miqi.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-phycore-som.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-rock2-square.dts projects/nfs-over-tls/sys/gnu/dts/arm/rk3288-tinker.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/rk3288.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/s5pv210-aries.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/s5pv210-fascinate4g.dts projects/nfs-over-tls/sys/gnu/dts/arm/s5pv210-galaxys.dts projects/nfs-over-tls/sys/gnu/dts/arm/s5pv210-pinctrl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/s5pv210.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_can.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_emac.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_gmac.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_lcd.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_mci2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_tcb1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3_uart.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3xmb.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d3xmb_cmp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sama5d4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sh73a0.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/socfpga.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/socfpga_arria10.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/ste-ux500-samsung-golden.dts projects/nfs-over-tls/sys/gnu/dts/arm/ste-ux500-samsung-skomer.dts projects/nfs-over-tls/sys/gnu/dts/arm/stih407-family.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stih418.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32f429.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32h743.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15-pinctrl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp151.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157a-avenger96.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-dhcom-pdk2.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-dk2.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-ed1.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp157c-ev1.dts projects/nfs-over-tls/sys/gnu/dts/arm/stm32mp15xx-dkx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun4i-a10.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun5i.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun7i-a20.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun8i-a83t.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sun8i-h2-plus-bananapi-m2-zero.dts projects/nfs-over-tls/sys/gnu/dts/arm/sun8i-h3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/sunxi-h3-h5.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/tegra114-dalmore.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra124-venice2.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-colibri-eval-v3.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-colibri-iris.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-harmony.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-medcom-wide.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-paz00.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-seaboard.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra20-ventana.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra30-apalis-eval.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra30-apalis-v1.1-eval.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra30-beaver.dts projects/nfs-over-tls/sys/gnu/dts/arm/tegra30-cardhu.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/tegra30-colibri-eval-v3.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-ld4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-ld6b-ref.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pro4-ace.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pro4-ref.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pro4-sanji.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pro4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pro5.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pxs2-gentil.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pxs2-vodka.dts projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-pxs2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/uniphier-sld8.dtsi projects/nfs-over-tls/sys/gnu/dts/arm/vexpress-v2m-rs1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-a64-olinuxino.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-a64.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-beelink-gs1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-3.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-lite2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-pine-h64.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6-tanix-tx6.dts projects/nfs-over-tls/sys/gnu/dts/arm64/allwinner/sun50i-h6.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/altera/socfpga_stratix10.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/altera/socfpga_stratix10_socdk.dts projects/nfs-over-tls/sys/gnu/dts/arm64/altera/socfpga_stratix10_socdk_nand.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-axg.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-khadas-vim3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-s922x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b-ugoos-am6.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-g12b.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gx-libretech-pc.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gx-p23x-q20x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-kii-pro.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-nanopi-k2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-nexbox-a95x.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-odroidc2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-vega-s95.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-wetek-play2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb-wetek.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxbb.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x-libretech-ac.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x-p241.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-phicomm-n1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905w-p281.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905w-tx3-mini.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-khadas-vim.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-libretech-cc.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-p212.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxm-khadas-vim2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxm-nexbox-a1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxm-rbox-pro.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxm-vega-s96.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-gxm.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-khadas-vim3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-sm1-sei610.dts projects/nfs-over-tls/sys/gnu/dts/arm64/amlogic/meson-sm1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/foundation-v8-gicv2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/foundation-v8-gicv3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/foundation-v8.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/fvp-base-revc.dts projects/nfs-over-tls/sys/gnu/dts/arm64/arm/juno-base.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/juno-motherboard.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/rtsm_ve-aemv8a.dts projects/nfs-over-tls/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard-rs2.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/arm/vexpress-v2m-rs1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1012a-frdm.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1012a-frwy.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1012a-qds.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1012a-rdb.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1012a.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28-var2.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1028a-kontron-sl28.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1028a.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1043a-rdb.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-ls1043a.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/fsl-lx2160a.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mm-evk.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mm.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mn-ddr4-evk.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mn.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mq-librem5-devkit.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8mq.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8qxp-mek.dts projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/imx8qxp.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/freescale/qoriq-fman3-0.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/hisilicon/hi3660.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/hisilicon/hi6220-coresight.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/hisilicon/hikey960-pinctrl.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/intel/socfpga_agilex.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/intel/socfpga_agilex_socdk.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-3720-db.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-3720-espressobin.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-3720-turris-mox.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-3720-uDPU.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-37xx.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-8040-clearfog-gt-8k.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-8040-mcbin-singleshot.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dts projects/nfs-over-tls/sys/gnu/dts/arm64/marvell/armada-ap80x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt2712-evb.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt2712e.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt6797-x20-dev.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt6797.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt7622-bananapi-bpi-r64.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt7622-rfb1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt7622.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8173.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8183-evb.dts projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8183.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/mt8516.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/mediatek/pumpkin-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra132-norrin.dts projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra186-p3310.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra194-p2888.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra194.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra210-p2180.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra210-p2597.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra210-p3450-0000.dts projects/nfs-over-tls/sys/gnu/dts/arm64/nvidia/tegra210.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/apq8016-sbc.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/apq8096-db820c.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/ipq8074-hk01.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/ipq8074.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916-longcheer-l8150.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916-pins.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916-samsung-a2015-common.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916-samsung-a3u-eur.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916-samsung-a5u-eur.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8916.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8996.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/msm8998.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/pm8150.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/pm8150b.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/pm8150l.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/pmi8994.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/qcs404-evb.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/qcs404.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sc7180-idp.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sc7180.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm845-cheza.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm845-db845c.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm845-mtp.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm845.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sdm850-lenovo-yoga-c630.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sm8250-mtp.dts projects/nfs-over-tls/sys/gnu/dts/arm64/qcom/sm8250.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1293-ds418j.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1293.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1295-mele-v9.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1295-probox2-ava.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1295-zidoo-x9s.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1295.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1296-ds418.dts projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd1296.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/realtek/rtd129x.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a774a1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a774b1.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a774c0.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77950.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77951.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77960.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77961.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77965.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77970.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77980.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77990.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/renesas/r8a77995.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/px30.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3308-roc-cc.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3328-a1.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3328-roc-cc.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3328-rock64.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3328.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3368-geekbox.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3368-orion-r68-meta.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3368-r88.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-ficus.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-firefly.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-hugsun-x99.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-nanopi4.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-orangepi.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-pinebook-pro.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-rock960.dts projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399-rockpro64.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/rockchip/rk3399.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld11-global.dts projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld11-ref.dts projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld11.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld20-global.dts projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld20-ref.dts projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-ld20.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-pxs3-ref.dts projects/nfs-over-tls/sys/gnu/dts/arm64/socionext/uniphier-pxs3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/sprd/sc9863a.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/sprd/sharkl3.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-am65-main.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-am65-mcu.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-am65-wakeup.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-j721e-common-proc-board.dts projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-j721e-main.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/ti/k3-j721e-mcu-wakeup.dtsi projects/nfs-over-tls/sys/gnu/dts/arm64/xilinx/zynqmp.dtsi projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/at91.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/imx7ulp-clock.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/imx8mp-clock.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/meson8b-clkc.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8998.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sc7180.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/sprd,sc9863a-clk.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/tegra124-car-common.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/tegra20-car.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/tegra210-car.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/clock/x1000-cgu.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/firmware/imx/rsrc.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/phy/phy.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/pinctrl/rockchip.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/power/qcom-rpmpd.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/imx8mq-reset.h projects/nfs-over-tls/sys/gnu/dts/include/dt-bindings/reset/realtek,rtd1295.h projects/nfs-over-tls/sys/kern/kern_conf.c projects/nfs-over-tls/sys/kern/kern_dump.c projects/nfs-over-tls/sys/kern/kern_environment.c projects/nfs-over-tls/sys/kern/kern_malloc.c projects/nfs-over-tls/sys/kern/kern_mbuf.c projects/nfs-over-tls/sys/kern/kern_mutex.c projects/nfs-over-tls/sys/kern/kern_priv.c projects/nfs-over-tls/sys/kern/kern_proc.c projects/nfs-over-tls/sys/kern/kern_prot.c projects/nfs-over-tls/sys/kern/kern_rmlock.c projects/nfs-over-tls/sys/kern/kern_thread.c projects/nfs-over-tls/sys/kern/makesyscalls.sh projects/nfs-over-tls/sys/kern/subr_acl_nfs4.c projects/nfs-over-tls/sys/kern/subr_acl_posix1e.c projects/nfs-over-tls/sys/kern/subr_bus.c projects/nfs-over-tls/sys/kern/subr_epoch.c projects/nfs-over-tls/sys/kern/subr_smp.c projects/nfs-over-tls/sys/kern/subr_witness.c projects/nfs-over-tls/sys/kern/sys_pipe.c projects/nfs-over-tls/sys/kern/tty.c projects/nfs-over-tls/sys/kern/uipc_mbuf.c projects/nfs-over-tls/sys/kern/uipc_mqueue.c projects/nfs-over-tls/sys/kern/uipc_sem.c projects/nfs-over-tls/sys/kern/uipc_shm.c projects/nfs-over-tls/sys/kern/uipc_socket.c projects/nfs-over-tls/sys/kern/uipc_usrreq.c projects/nfs-over-tls/sys/kern/vfs_bio.c projects/nfs-over-tls/sys/kern/vfs_cache.c projects/nfs-over-tls/sys/kern/vfs_default.c projects/nfs-over-tls/sys/kern/vfs_hash.c projects/nfs-over-tls/sys/kern/vfs_lookup.c projects/nfs-over-tls/sys/kern/vfs_subr.c projects/nfs-over-tls/sys/kern/vfs_syscalls.c projects/nfs-over-tls/sys/kern/vfs_vnops.c projects/nfs-over-tls/sys/kern/vnode_if.src projects/nfs-over-tls/sys/libkern/random.c projects/nfs-over-tls/sys/mips/conf/std.MALTA projects/nfs-over-tls/sys/mips/mips/trap.c projects/nfs-over-tls/sys/modules/Makefile projects/nfs-over-tls/sys/modules/cpsw/Makefile projects/nfs-over-tls/sys/modules/esp/Makefile projects/nfs-over-tls/sys/modules/linux/Makefile projects/nfs-over-tls/sys/modules/linux64/Makefile projects/nfs-over-tls/sys/modules/nvd/Makefile projects/nfs-over-tls/sys/modules/uart/Makefile projects/nfs-over-tls/sys/modules/usb/Makefile projects/nfs-over-tls/sys/net/if.c projects/nfs-over-tls/sys/net/if_lagg.c projects/nfs-over-tls/sys/net/if_media.h projects/nfs-over-tls/sys/net/if_vxlan.c projects/nfs-over-tls/sys/net/iflib.c projects/nfs-over-tls/sys/net/iflib.h projects/nfs-over-tls/sys/net/route.c projects/nfs-over-tls/sys/net/route.h projects/nfs-over-tls/sys/net/route/route_ctl.c projects/nfs-over-tls/sys/net/route/route_ctl.h projects/nfs-over-tls/sys/net/route/route_var.h projects/nfs-over-tls/sys/net/route/shared.h projects/nfs-over-tls/sys/net/rtsock.c projects/nfs-over-tls/sys/net80211/_ieee80211.h projects/nfs-over-tls/sys/net80211/ieee80211.c projects/nfs-over-tls/sys/net80211/ieee80211_ht.c projects/nfs-over-tls/sys/net80211/ieee80211_ioctl.c projects/nfs-over-tls/sys/net80211/ieee80211_ioctl.h projects/nfs-over-tls/sys/net80211/ieee80211_proto.h projects/nfs-over-tls/sys/net80211/ieee80211_var.h projects/nfs-over-tls/sys/net80211/ieee80211_vht.c projects/nfs-over-tls/sys/netgraph/ng_iface.c projects/nfs-over-tls/sys/netgraph/ng_iface.h projects/nfs-over-tls/sys/netinet/cc/cc_cubic.c projects/nfs-over-tls/sys/netinet/in.c projects/nfs-over-tls/sys/netinet/in_mcast.c projects/nfs-over-tls/sys/netinet/in_proto.c projects/nfs-over-tls/sys/netinet/in_rmx.c projects/nfs-over-tls/sys/netinet/in_var.h projects/nfs-over-tls/sys/netinet/sctp_input.c projects/nfs-over-tls/sys/netinet/sctp_output.c projects/nfs-over-tls/sys/netinet/sctp_pcb.c projects/nfs-over-tls/sys/netinet/sctp_structs.h projects/nfs-over-tls/sys/netinet/sctputil.c projects/nfs-over-tls/sys/netinet/sctputil.h projects/nfs-over-tls/sys/netinet/tcp_input.c projects/nfs-over-tls/sys/netinet/tcp_sack.c projects/nfs-over-tls/sys/netinet/tcp_subr.c projects/nfs-over-tls/sys/netinet/tcp_syncache.c projects/nfs-over-tls/sys/netinet/tcp_syncache.h projects/nfs-over-tls/sys/netinet/tcp_var.h projects/nfs-over-tls/sys/netinet/udp_usrreq.c projects/nfs-over-tls/sys/netinet6/in6.c projects/nfs-over-tls/sys/netinet6/in6_ifattach.c projects/nfs-over-tls/sys/netinet6/in6_mcast.c projects/nfs-over-tls/sys/netinet6/in6_proto.c projects/nfs-over-tls/sys/netinet6/in6_rmx.c projects/nfs-over-tls/sys/netinet6/in6_var.h projects/nfs-over-tls/sys/netinet6/ip6_output.c projects/nfs-over-tls/sys/netinet6/scope6.c projects/nfs-over-tls/sys/netinet6/scope6_var.h projects/nfs-over-tls/sys/netinet6/udp6_usrreq.c projects/nfs-over-tls/sys/netpfil/ipfw/ip_fw2.c projects/nfs-over-tls/sys/netpfil/ipfw/nat64/nat64_translate.c projects/nfs-over-tls/sys/powerpc/aim/mmu_radix.c projects/nfs-over-tls/sys/powerpc/powerpc/trap.c projects/nfs-over-tls/sys/riscv/conf/GENERIC projects/nfs-over-tls/sys/riscv/include/ieeefp.h projects/nfs-over-tls/sys/riscv/include/pcpu.h projects/nfs-over-tls/sys/riscv/include/pcpu_aux.h projects/nfs-over-tls/sys/riscv/include/profile.h projects/nfs-over-tls/sys/riscv/include/stack.h projects/nfs-over-tls/sys/riscv/riscv/db_trace.c projects/nfs-over-tls/sys/riscv/riscv/intr_machdep.c projects/nfs-over-tls/sys/riscv/riscv/locore.S projects/nfs-over-tls/sys/riscv/riscv/machdep.c projects/nfs-over-tls/sys/riscv/riscv/stack_machdep.c projects/nfs-over-tls/sys/riscv/riscv/trap.c projects/nfs-over-tls/sys/riscv/riscv/unwind.c projects/nfs-over-tls/sys/security/audit/audit_arg.c projects/nfs-over-tls/sys/security/mac/mac_framework.c projects/nfs-over-tls/sys/security/mac/mac_framework.h projects/nfs-over-tls/sys/security/mac/mac_vfs.c projects/nfs-over-tls/sys/sys/ata.h projects/nfs-over-tls/sys/sys/caprights.h projects/nfs-over-tls/sys/sys/capsicum.h projects/nfs-over-tls/sys/sys/disk/gpt.h projects/nfs-over-tls/sys/sys/domain.h projects/nfs-over-tls/sys/sys/file.h projects/nfs-over-tls/sys/sys/malloc.h projects/nfs-over-tls/sys/sys/mbuf.h projects/nfs-over-tls/sys/sys/mount.h projects/nfs-over-tls/sys/sys/mutex.h projects/nfs-over-tls/sys/sys/namei.h projects/nfs-over-tls/sys/sys/param.h projects/nfs-over-tls/sys/sys/pipe.h projects/nfs-over-tls/sys/sys/pmc.h projects/nfs-over-tls/sys/sys/protosw.h projects/nfs-over-tls/sys/sys/smp.h projects/nfs-over-tls/sys/sys/sysctl.h projects/nfs-over-tls/sys/sys/un.h projects/nfs-over-tls/sys/sys/vnode.h projects/nfs-over-tls/sys/tools/makesyscalls.lua projects/nfs-over-tls/sys/tools/vnode_if.awk projects/nfs-over-tls/sys/ufs/ffs/ffs_alloc.c projects/nfs-over-tls/sys/ufs/ffs/ffs_softdep.c projects/nfs-over-tls/sys/ufs/ffs/ffs_vfsops.c projects/nfs-over-tls/sys/ufs/ffs/ffs_vnops.c projects/nfs-over-tls/sys/ufs/ufs/ufs_quota.c projects/nfs-over-tls/sys/ufs/ufs/ufs_vnops.c projects/nfs-over-tls/sys/vm/uma.h projects/nfs-over-tls/sys/vm/uma_core.c projects/nfs-over-tls/sys/vm/vm_extern.h projects/nfs-over-tls/sys/vm/vm_fault.c projects/nfs-over-tls/sys/vm/vm_init.c projects/nfs-over-tls/sys/vm/vm_kern.c projects/nfs-over-tls/sys/vm/vm_kern.h projects/nfs-over-tls/sys/vm/vm_map.c projects/nfs-over-tls/sys/vm/vm_map.h projects/nfs-over-tls/sys/vm/vm_meter.c projects/nfs-over-tls/sys/vm/vm_mmap.c projects/nfs-over-tls/sys/vm/vm_object.c projects/nfs-over-tls/sys/vm/vm_page.c projects/nfs-over-tls/sys/vm/vm_page.h projects/nfs-over-tls/sys/vm/vm_pageout.c projects/nfs-over-tls/sys/vm/vm_pagequeue.h projects/nfs-over-tls/sys/vm/vnode_pager.c projects/nfs-over-tls/sys/x86/include/acpica_machdep.h projects/nfs-over-tls/sys/x86/include/bus_dma.h projects/nfs-over-tls/sys/x86/iommu/intel_ctx.c projects/nfs-over-tls/sys/x86/iommu/intel_dmar.h projects/nfs-over-tls/sys/x86/iommu/intel_drv.c projects/nfs-over-tls/sys/x86/iommu/intel_idpgtbl.c projects/nfs-over-tls/sys/x86/iommu/intel_intrmap.c projects/nfs-over-tls/sys/x86/iommu/intel_qi.c projects/nfs-over-tls/sys/x86/iommu/intel_quirks.c projects/nfs-over-tls/sys/x86/iommu/intel_utils.c projects/nfs-over-tls/sys/x86/x86/busdma_bounce.c projects/nfs-over-tls/sys/x86/x86/busdma_machdep.c projects/nfs-over-tls/sys/x86/x86/cpu_machdep.c Directory Properties: projects/nfs-over-tls/sys/ (props changed) projects/nfs-over-tls/sys/cddl/contrib/opensolaris/ (props changed) projects/nfs-over-tls/sys/gnu/dts/arm/ (props changed) projects/nfs-over-tls/sys/gnu/dts/arm64/ (props changed) projects/nfs-over-tls/sys/gnu/dts/include/ (props changed) projects/nfs-over-tls/sys/gnu/dts/riscv/ (props changed) Copied: projects/nfs-over-tls/sys/amd64/include/iommu.h (from r364330, head/sys/amd64/include/iommu.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/nfs-over-tls/sys/amd64/include/iommu.h Tue Aug 18 02:42:51 2020 (r364333, copy of r364330, head/sys/amd64/include/iommu.h) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: projects/nfs-over-tls/sys/arm/allwinner/aw_cir.c ============================================================================== --- projects/nfs-over-tls/sys/arm/allwinner/aw_cir.c Tue Aug 18 02:02:36 2020 (r364332) +++ projects/nfs-over-tls/sys/arm/allwinner/aw_cir.c Tue Aug 18 02:42:51 2020 (r364333) @@ -126,16 +126,21 @@ __FBSDID("$FreeBSD$"); #define AW_IR_DMAX 53 /* Active Thresholds */ -#define AW_IR_ACTIVE_T ((0 & 0xff) << 16) -#define AW_IR_ACTIVE_T_C ((1 & 0xff) << 23) +#define AW_IR_ACTIVE_T_VAL AW_IR_L1_MIN +#define AW_IR_ACTIVE_T (((AW_IR_ACTIVE_T_VAL - 1) & 0xff) << 16) +#define AW_IR_ACTIVE_T_C_VAL 0 +#define AW_IR_ACTIVE_T_C ((AW_IR_ACTIVE_T_C_VAL & 0xff) << 23) /* Code masks */ #define CODE_MASK 0x00ff00ff #define INV_CODE_MASK 0xff00ff00 #define VALID_CODE_MASK 0x00ff0000 -#define A10_IR 1 -#define A13_IR 2 +enum { + A10_IR = 1, + A13_IR, + A31_IR, +}; #define AW_IR_RAW_BUF_SIZE 128 @@ -158,6 +163,7 @@ static struct resource_spec aw_ir_spec[] = { static struct ofw_compat_data compat_data[] = { { "allwinner,sun4i-a10-ir", A10_IR }, { "allwinner,sun5i-a13-ir", A13_IR }, + { "allwinner,sun6i-a31-ir", A31_IR }, { NULL, 0 } }; @@ -196,24 +202,24 @@ aw_ir_read_data(struct aw_ir_softc *sc) static unsigned long aw_ir_decode_packets(struct aw_ir_softc *sc) { - unsigned long len, code; - unsigned char val, last; + unsigned int len, code; unsigned int active_delay; + unsigned char val, last; int i, bitcount; if (bootverbose) device_printf(sc->dev, "sc->dcnt = %d\n", sc->dcnt); /* Find Lead 1 (bit separator) */ - active_delay = (AW_IR_ACTIVE_T + 1) * (AW_IR_ACTIVE_T_C != 0 ? 128 : 1); - len = 0; - len += (active_delay >> 1); + active_delay = AW_IR_ACTIVE_T_VAL * + (AW_IR_ACTIVE_T_C_VAL != 0 ? 128 : 1); + len = active_delay; if (bootverbose) - device_printf(sc->dev, "Initial len: %ld\n", len); + device_printf(sc->dev, "Initial len: %d\n", len); for (i = 0; i < sc->dcnt; i++) { val = sc->buf[i]; if (val & VAL_MASK) - len += val & PERIOD_MASK; + len += (val & PERIOD_MASK) + 1; else { if (len > AW_IR_L1_MIN) break; @@ -221,7 +227,7 @@ aw_ir_decode_packets(struct aw_ir_softc *sc) } } if (bootverbose) - device_printf(sc->dev, "len = %ld\n", len); + device_printf(sc->dev, "len = %d\n", len); if ((val & VAL_MASK) || (len <= AW_IR_L1_MIN)) { if (bootverbose) device_printf(sc->dev, "Bit separator error\n"); @@ -237,7 +243,7 @@ aw_ir_decode_packets(struct aw_ir_softc *sc) break; len = 0; } else - len += val & PERIOD_MASK; + len += (val & PERIOD_MASK) + 1; } if ((!(val & VAL_MASK)) || (len <= AW_IR_L0_MIN)) { if (bootverbose) @@ -254,23 +260,25 @@ aw_ir_decode_packets(struct aw_ir_softc *sc) val = sc->buf[i]; if (last) { if (val & VAL_MASK) - len += val & PERIOD_MASK; + len += (val & PERIOD_MASK) + 1; else { if (len > AW_IR_PMAX) { if (bootverbose) device_printf(sc->dev, - "Pulse error\n"); + "Pulse error, len=%d\n", + len); goto error_code; } last = 0; - len = val & PERIOD_MASK; + len = (val & PERIOD_MASK) + 1; } } else { if (val & VAL_MASK) { if (len > AW_IR_DMAX) { if (bootverbose) device_printf(sc->dev, - "Distant error\n"); + "Distance error, len=%d\n", + len); goto error_code; } else { if (len > AW_IR_DMID) { @@ -282,9 +290,9 @@ aw_ir_decode_packets(struct aw_ir_softc *sc) break; /* Finish decoding */ } last = 1; - len = val & PERIOD_MASK; + len = (val & PERIOD_MASK) + 1; } else - len += val & PERIOD_MASK; + len += (val & PERIOD_MASK) + 1; } } return (code); @@ -364,7 +372,7 @@ aw_ir_intr(void *arg) device_printf(sc->dev, "IR code status: %d\n", stat); } - sc->dcnt = 0; + aw_ir_buf_reset(sc); } if (val & AW_IR_RXINT_ROI_EN) { /* RX FIFO overflow */ @@ -414,6 +422,7 @@ aw_ir_attach(device_t dev) sc->fifo_size = 16; break; case A13_IR: + case A31_IR: sc->fifo_size = 64; break; } @@ -464,7 +473,8 @@ aw_ir_attach(device_t dev) &sc->intrhand)) { bus_release_resources(dev, aw_ir_spec, sc->res); device_printf(dev, "cannot setup interrupt handler\n"); - return (ENXIO); + err = ENXIO; + goto error; } /* Enable CIR Mode */ Modified: projects/nfs-over-tls/sys/arm/allwinner/clkng/aw_clk_nm.c ============================================================================== --- projects/nfs-over-tls/sys/arm/allwinner/clkng/aw_clk_nm.c Tue Aug 18 02:02:36 2020 (r364332) +++ projects/nfs-over-tls/sys/arm/allwinner/clkng/aw_clk_nm.c Tue Aug 18 02:42:51 2020 (r364333) @@ -151,7 +151,7 @@ aw_clk_nm_find_best(struct aw_clk_nm_sc *sc, uint64_t min_n = aw_clk_factor_get_min(&sc->n); for (m = min_m; m <= max_m; ) { - for (n = min_m; n <= max_n; ) { + for (n = min_n; n <= max_n; ) { cur = fparent / n / m; if (abs(*fout - cur) < abs(*fout - best)) { best = cur; @@ -196,7 +196,7 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fpare clknode_get_freq(p_clk, &fparent); cur = aw_clk_nm_find_best(sc, fparent, fout, &n, &m); - if ((*fout - cur) < (*fout - best)) { + if (abs((*fout - cur)) < abs((*fout - best))) { best = cur; best_parent = p_idx; best_n = n; Modified: projects/nfs-over-tls/sys/arm/allwinner/clkng/ccu_sun8i_r.c ============================================================================== --- projects/nfs-over-tls/sys/arm/allwinner/clkng/ccu_sun8i_r.c Tue Aug 18 02:02:36 2020 (r364332) +++ projects/nfs-over-tls/sys/arm/allwinner/clkng/ccu_sun8i_r.c Tue Aug 18 02:42:51 2020 (r364333) @@ -119,10 +119,10 @@ NM_CLK(r_ccu_ir_clk, "ir", r_ccu_ir_parents, /* names, parents */ 0x54, /* offset */ 0, 4, 0, 0, /* N factor */ - 16, 2, 0, 0, /* M flags */ + 16, 2, 0, 0, /* M factor */ 24, 2, /* mux */ 31, /* gate */ - AW_CLK_HAS_MUX | AW_CLK_REPARENT); /* flags */ + AW_CLK_HAS_MUX | AW_CLK_REPARENT | AW_CLK_HAS_GATE);/* flags */ static const char *a83t_ir_parents[] = {"osc16M", "osc24M"}; static struct aw_clk_nm_def a83t_ir_clk = { Modified: projects/nfs-over-tls/sys/arm/arm/trap-v6.c ============================================================================== --- projects/nfs-over-tls/sys/arm/arm/trap-v6.c Tue Aug 18 02:02:36 2020 (r364332) +++ projects/nfs-over-tls/sys/arm/arm/trap-v6.c Tue Aug 18 02:42:51 2020 (r364333) @@ -169,7 +169,8 @@ static const struct abort aborts[] = { }; static __inline void -call_trapsignal(struct thread *td, int sig, int code, vm_offset_t addr) +call_trapsignal(struct thread *td, int sig, int code, vm_offset_t addr, + int trapno) { ksiginfo_t ksi; @@ -185,6 +186,7 @@ call_trapsignal(struct thread *td, int sig, int code, ksi.ksi_signo = sig; ksi.ksi_code = code; ksi.ksi_addr = (void *)addr; + ksi.ksi_trapno = trapno; trapsignal(td, &ksi); } @@ -252,7 +254,7 @@ abort_debug(struct trapframe *tf, u_int fsr, u_int pre struct thread *td; td = curthread; - call_trapsignal(td, SIGTRAP, TRAP_BRKPT, far); + call_trapsignal(td, SIGTRAP, TRAP_BRKPT, far, FAULT_DEBUG); userret(td, tf); } else { #ifdef KDB @@ -523,7 +525,7 @@ nogo: ksig.addr = far; do_trapsignal: - call_trapsignal(td, ksig.sig, ksig.code, ksig.addr); + call_trapsignal(td, ksig.sig, ksig.code, ksig.addr, idx); out: if (usermode) userret(td, tf); Modified: projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c ============================================================================== --- projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Tue Aug 18 02:02:36 2020 (r364332) +++ projects/nfs-over-tls/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Tue Aug 18 02:42:51 2020 (r364333) @@ -47,12 +47,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include #include #include "cpufreq_if.h" -#include "mbox_if.h" #ifdef DEBUG #define DPRINTF(fmt, ...) do { \ @@ -101,6 +99,7 @@ static struct sysctl_ctx_list bcm2835_sysctl_ctx; struct bcm2835_cpufreq_softc { device_t dev; + device_t firmware; int arm_max_freq; int arm_min_freq; int core_max_freq; @@ -161,7 +160,7 @@ static int bcm2835_cpufreq_get_clock_rate(struct bcm2835_cpufreq_softc *sc, uint32_t clock_id) { - struct msg_get_clock_rate msg; + union msg_get_clock_rate_body msg; int rate; int err; @@ -181,16 +180,11 @@ bcm2835_cpufreq_get_clock_rate(struct bcm2835_cpufreq_ /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_CLOCK_RATE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.clock_id = clock_id; - msg.end_tag = 0; + msg.req.clock_id = clock_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_CLOCK_RATE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get clock rate (id=%u)\n", clock_id); @@ -198,7 +192,7 @@ bcm2835_cpufreq_get_clock_rate(struct bcm2835_cpufreq_ } /* result (Hz) */ - rate = (int)msg.body.resp.rate_hz; + rate = (int)msg.resp.rate_hz; DPRINTF("clock = %d(Hz)\n", rate); return (rate); } @@ -207,7 +201,7 @@ static int bcm2835_cpufreq_get_max_clock_rate(struct bcm2835_cpufreq_softc *sc, uint32_t clock_id) { - struct msg_get_max_clock_rate msg; + union msg_get_clock_rate_body msg; int rate; int err; @@ -227,16 +221,11 @@ bcm2835_cpufreq_get_max_clock_rate(struct bcm2835_cpuf /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_MAX_CLOCK_RATE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.clock_id = clock_id; - msg.end_tag = 0; + msg.req.clock_id = clock_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_MAX_CLOCK_RATE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get max clock rate (id=%u)\n", clock_id); @@ -244,7 +233,7 @@ bcm2835_cpufreq_get_max_clock_rate(struct bcm2835_cpuf } /* result (Hz) */ - rate = (int)msg.body.resp.rate_hz; + rate = (int)msg.resp.rate_hz; DPRINTF("clock = %d(Hz)\n", rate); return (rate); } @@ -253,7 +242,7 @@ static int bcm2835_cpufreq_get_min_clock_rate(struct bcm2835_cpufreq_softc *sc, uint32_t clock_id) { - struct msg_get_min_clock_rate msg; + union msg_get_clock_rate_body msg; int rate; int err; @@ -273,16 +262,11 @@ bcm2835_cpufreq_get_min_clock_rate(struct bcm2835_cpuf /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_MIN_CLOCK_RATE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.clock_id = clock_id; - msg.end_tag = 0; + msg.req.clock_id = clock_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_MIN_CLOCK_RATE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get min clock rate (id=%u)\n", clock_id); @@ -290,7 +274,7 @@ bcm2835_cpufreq_get_min_clock_rate(struct bcm2835_cpuf } /* result (Hz) */ - rate = (int)msg.body.resp.rate_hz; + rate = (int)msg.resp.rate_hz; DPRINTF("clock = %d(Hz)\n", rate); return (rate); } @@ -299,7 +283,7 @@ static int bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_softc *sc, uint32_t clock_id, uint32_t rate_hz) { - struct msg_set_clock_rate msg; + union msg_set_clock_rate_body msg; int rate; int err; @@ -320,17 +304,12 @@ bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_ /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_SET_CLOCK_RATE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.clock_id = clock_id; - msg.body.req.rate_hz = rate_hz; - msg.end_tag = 0; + msg.req.clock_id = clock_id; + msg.req.rate_hz = rate_hz; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_SET_CLOCK_RATE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't set clock rate (id=%u)\n", clock_id); @@ -338,7 +317,7 @@ bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_ } /* workaround for core clock */ - if (clock_id == BCM2835_MBOX_CLOCK_ID_CORE) { + if (clock_id == BCM2835_FIRMWARE_CLOCK_ID_CORE) { /* for safety (may change voltage without changing clock) */ DELAY(TRANSITION_LATENCY); @@ -349,17 +328,12 @@ bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_ /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_SET_CLOCK_RATE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.clock_id = clock_id; - msg.body.req.rate_hz = rate_hz; - msg.end_tag = 0; + msg.req.clock_id = clock_id; + msg.req.rate_hz = rate_hz; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_SET_CLOCK_RATE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't set clock rate (id=%u)\n", clock_id); @@ -368,7 +342,7 @@ bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_ } /* result (Hz) */ - rate = (int)msg.body.resp.rate_hz; + rate = (int)msg.resp.rate_hz; DPRINTF("clock = %d(Hz)\n", rate); return (rate); } @@ -376,7 +350,7 @@ bcm2835_cpufreq_set_clock_rate(struct bcm2835_cpufreq_ static int bcm2835_cpufreq_get_turbo(struct bcm2835_cpufreq_softc *sc) { - struct msg_get_turbo msg; + union msg_get_turbo_body msg; int level; int err; @@ -396,23 +370,18 @@ bcm2835_cpufreq_get_turbo(struct bcm2835_cpufreq_softc /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_TURBO; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.id = 0; - msg.end_tag = 0; + msg.req.id = 0; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_TURBO, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get turbo\n"); return (MSG_ERROR); } /* result 0=non-turbo, 1=turbo */ - level = (int)msg.body.resp.level; + level = (int)msg.resp.level; DPRINTF("level = %d\n", level); return (level); } @@ -420,7 +389,7 @@ bcm2835_cpufreq_get_turbo(struct bcm2835_cpufreq_softc static int bcm2835_cpufreq_set_turbo(struct bcm2835_cpufreq_softc *sc, uint32_t level) { - struct msg_set_turbo msg; + union msg_set_turbo_body msg; int value; int err; @@ -440,29 +409,25 @@ bcm2835_cpufreq_set_turbo(struct bcm2835_cpufreq_softc */ /* replace unknown value to OFF */ - if (level != BCM2835_MBOX_TURBO_ON && level != BCM2835_MBOX_TURBO_OFF) - level = BCM2835_MBOX_TURBO_OFF; + if (level != BCM2835_FIRMWARE_TURBO_ON && + level != BCM2835_FIRMWARE_TURBO_OFF) + level = BCM2835_FIRMWARE_TURBO_OFF; /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_SET_TURBO; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.id = 0; - msg.body.req.level = level; - msg.end_tag = 0; + msg.req.id = 0; + msg.req.level = level; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_SET_TURBO, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't set turbo\n"); return (MSG_ERROR); } /* result 0=non-turbo, 1=turbo */ - value = (int)msg.body.resp.level; + value = (int)msg.resp.level; DPRINTF("level = %d\n", value); return (value); } @@ -471,7 +436,7 @@ static int bcm2835_cpufreq_get_voltage(struct bcm2835_cpufreq_softc *sc, uint32_t voltage_id) { - struct msg_get_voltage msg; + union msg_get_voltage_body msg; int value; int err; @@ -491,23 +456,18 @@ bcm2835_cpufreq_get_voltage(struct bcm2835_cpufreq_sof /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_VOLTAGE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.voltage_id = voltage_id; - msg.end_tag = 0; + msg.req.voltage_id = voltage_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_VOLTAGE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get voltage\n"); return (MSG_ERROR); } /* result (offset from 1.2V) */ - value = (int)msg.body.resp.value; + value = (int)msg.resp.value; DPRINTF("value = %d\n", value); return (value); } @@ -516,7 +476,7 @@ static int bcm2835_cpufreq_get_max_voltage(struct bcm2835_cpufreq_softc *sc, uint32_t voltage_id) { - struct msg_get_max_voltage msg; + union msg_get_voltage_body msg; int value; int err; @@ -536,23 +496,18 @@ bcm2835_cpufreq_get_max_voltage(struct bcm2835_cpufreq /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_MAX_VOLTAGE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.voltage_id = voltage_id; - msg.end_tag = 0; + msg.req.voltage_id = voltage_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_MAX_VOLTAGE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get max voltage\n"); return (MSG_ERROR); } /* result (offset from 1.2V) */ - value = (int)msg.body.resp.value; + value = (int)msg.resp.value; DPRINTF("value = %d\n", value); return (value); } @@ -560,7 +515,7 @@ static int bcm2835_cpufreq_get_min_voltage(struct bcm2835_cpufreq_softc *sc, uint32_t voltage_id) { - struct msg_get_min_voltage msg; + union msg_get_voltage_body msg; int value; int err; @@ -580,23 +535,18 @@ bcm2835_cpufreq_get_min_voltage(struct bcm2835_cpufreq /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_MIN_VOLTAGE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.voltage_id = voltage_id; - msg.end_tag = 0; + msg.req.voltage_id = voltage_id; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_MIN_VOLTAGE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get min voltage\n"); return (MSG_ERROR); } /* result (offset from 1.2V) */ - value = (int)msg.body.resp.value; + value = (int)msg.resp.value; DPRINTF("value = %d\n", value); return (value); } @@ -605,7 +555,7 @@ static int bcm2835_cpufreq_set_voltage(struct bcm2835_cpufreq_softc *sc, uint32_t voltage_id, int32_t value) { - struct msg_set_voltage msg; + union msg_set_voltage_body msg; int err; /* @@ -636,24 +586,19 @@ bcm2835_cpufreq_set_voltage(struct bcm2835_cpufreq_sof /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_SET_VOLTAGE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.voltage_id = voltage_id; - msg.body.req.value = (uint32_t)value; - msg.end_tag = 0; + msg.req.voltage_id = voltage_id; + msg.req.value = (uint32_t)value; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_SET_VOLTAGE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't set voltage\n"); return (MSG_ERROR); } /* result (offset from 1.2V) */ - value = (int)msg.body.resp.value; + value = (int)msg.resp.value; DPRINTF("value = %d\n", value); return (value); } @@ -661,7 +606,7 @@ bcm2835_cpufreq_set_voltage(struct bcm2835_cpufreq_sof static int bcm2835_cpufreq_get_temperature(struct bcm2835_cpufreq_softc *sc) { - struct msg_get_temperature msg; + union msg_get_temperature_body msg; int value; int err; @@ -681,23 +626,18 @@ bcm2835_cpufreq_get_temperature(struct bcm2835_cpufreq /* setup single tag buffer */ memset(&msg, 0, sizeof(msg)); - msg.hdr.buf_size = sizeof(msg); - msg.hdr.code = BCM2835_MBOX_CODE_REQ; - msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_TEMPERATURE; - msg.tag_hdr.val_buf_size = sizeof(msg.body); - msg.tag_hdr.val_len = sizeof(msg.body.req); - msg.body.req.temperature_id = 0; - msg.end_tag = 0; + msg.req.temperature_id = 0; /* call mailbox property */ - err = bcm2835_mbox_property(&msg, sizeof(msg)); + err = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_GET_TEMPERATURE, &msg, sizeof(msg)); if (err) { device_printf(sc->dev, "can't get temperature\n"); return (MSG_ERROR); } /* result (temperature of degree C) */ - value = (int)msg.body.resp.value; + value = (int)msg.resp.value; DPRINTF("value = %d\n", value); return (value); } @@ -713,7 +653,7 @@ sysctl_bcm2835_cpufreq_arm_freq(SYSCTL_HANDLER_ARGS) /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_ARM); + val = bcm2835_cpufreq_get_clock_rate(sc, BCM2835_FIRMWARE_CLOCK_ID_ARM); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -724,7 +664,7 @@ sysctl_bcm2835_cpufreq_arm_freq(SYSCTL_HANDLER_ARGS) /* write request */ VC_LOCK(sc); - err = bcm2835_cpufreq_set_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_ARM, + err = bcm2835_cpufreq_set_clock_rate(sc, BCM2835_FIRMWARE_CLOCK_ID_ARM, val); VC_UNLOCK(sc); if (err == MSG_ERROR) { @@ -745,7 +685,8 @@ sysctl_bcm2835_cpufreq_core_freq(SYSCTL_HANDLER_ARGS) /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_CORE); + val = bcm2835_cpufreq_get_clock_rate(sc, + BCM2835_FIRMWARE_CLOCK_ID_CORE); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -756,7 +697,7 @@ sysctl_bcm2835_cpufreq_core_freq(SYSCTL_HANDLER_ARGS) /* write request */ VC_LOCK(sc); - err = bcm2835_cpufreq_set_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_CORE, + err = bcm2835_cpufreq_set_clock_rate(sc, BCM2835_FIRMWARE_CLOCK_ID_CORE, val); if (err == MSG_ERROR) { VC_UNLOCK(sc); @@ -778,7 +719,8 @@ sysctl_bcm2835_cpufreq_sdram_freq(SYSCTL_HANDLER_ARGS) /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_SDRAM); + val = bcm2835_cpufreq_get_clock_rate(sc, + BCM2835_FIRMWARE_CLOCK_ID_SDRAM); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -789,8 +731,8 @@ sysctl_bcm2835_cpufreq_sdram_freq(SYSCTL_HANDLER_ARGS) /* write request */ VC_LOCK(sc); - err = bcm2835_cpufreq_set_clock_rate(sc, BCM2835_MBOX_CLOCK_ID_SDRAM, - val); + err = bcm2835_cpufreq_set_clock_rate(sc, + BCM2835_FIRMWARE_CLOCK_ID_SDRAM, val); VC_UNLOCK(sc); if (err == MSG_ERROR) { device_printf(sc->dev, "set clock sdram_freq error\n"); @@ -821,9 +763,9 @@ sysctl_bcm2835_cpufreq_turbo(SYSCTL_HANDLER_ARGS) /* write request */ if (val > 0) - sc->turbo_mode = BCM2835_MBOX_TURBO_ON; + sc->turbo_mode = BCM2835_FIRMWARE_TURBO_ON; else - sc->turbo_mode = BCM2835_MBOX_TURBO_OFF; + sc->turbo_mode = BCM2835_FIRMWARE_TURBO_OFF; VC_LOCK(sc); err = bcm2835_cpufreq_set_turbo(sc, sc->turbo_mode); @@ -846,7 +788,7 @@ sysctl_bcm2835_cpufreq_voltage_core(SYSCTL_HANDLER_ARG /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_CORE); + val = bcm2835_cpufreq_get_voltage(sc, BCM2835_FIRMWARE_VOLTAGE_ID_CORE); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -861,7 +803,7 @@ sysctl_bcm2835_cpufreq_voltage_core(SYSCTL_HANDLER_ARG sc->voltage_core = val; VC_LOCK(sc); - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_CORE, + err = bcm2835_cpufreq_set_voltage(sc, BCM2835_FIRMWARE_VOLTAGE_ID_CORE, sc->voltage_core); VC_UNLOCK(sc); if (err == MSG_ERROR) { @@ -882,7 +824,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_c(SYSCTL_HANDLER_ /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_C); + val = bcm2835_cpufreq_get_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -897,7 +840,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_c(SYSCTL_HANDLER_ sc->voltage_sdram_c = val; VC_LOCK(sc); - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_C, + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C, sc->voltage_sdram_c); VC_UNLOCK(sc); if (err == MSG_ERROR) { @@ -918,7 +862,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_i(SYSCTL_HANDLER_ /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_I); + val = bcm2835_cpufreq_get_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -933,8 +878,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_i(SYSCTL_HANDLER_ sc->voltage_sdram_i = val; VC_LOCK(sc); - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_I, - sc->voltage_sdram_i); + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I, sc->voltage_sdram_i); VC_UNLOCK(sc); if (err == MSG_ERROR) { device_printf(sc->dev, "set voltage sdram_i error\n"); @@ -954,7 +899,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_p(SYSCTL_HANDLER_ /* get realtime value */ VC_LOCK(sc); - val = bcm2835_cpufreq_get_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_P); + val = bcm2835_cpufreq_get_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P); VC_UNLOCK(sc); if (val == MSG_ERROR) return (EIO); @@ -969,8 +915,8 @@ sysctl_bcm2835_cpufreq_voltage_sdram_p(SYSCTL_HANDLER_ sc->voltage_sdram_p = val; VC_LOCK(sc); - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_P, - sc->voltage_sdram_p); + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P, sc->voltage_sdram_p); VC_UNLOCK(sc); if (err == MSG_ERROR) { device_printf(sc->dev, "set voltage sdram_p error\n"); @@ -1002,22 +948,22 @@ sysctl_bcm2835_cpufreq_voltage_sdram(SYSCTL_HANDLER_AR sc->voltage_sdram = val; VC_LOCK(sc); - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_C, - val); + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C, val); if (err == MSG_ERROR) { VC_UNLOCK(sc); device_printf(sc->dev, "set voltage sdram_c error\n"); return (EIO); } - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_I, - val); + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I, val); if (err == MSG_ERROR) { VC_UNLOCK(sc); device_printf(sc->dev, "set voltage sdram_i error\n"); return (EIO); } - err = bcm2835_cpufreq_set_voltage(sc, BCM2835_MBOX_VOLTAGE_ID_SDRAM_P, - val); + err = bcm2835_cpufreq_set_voltage(sc, + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P, val); if (err == MSG_ERROR) { VC_UNLOCK(sc); device_printf(sc->dev, "set voltage sdram_p error\n"); @@ -1097,42 +1043,42 @@ bcm2835_cpufreq_init(void *arg) /* current clock */ arm_freq = bcm2835_cpufreq_get_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_ARM); + BCM2835_FIRMWARE_CLOCK_ID_ARM); core_freq = bcm2835_cpufreq_get_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_CORE); + BCM2835_FIRMWARE_CLOCK_ID_CORE); sdram_freq = bcm2835_cpufreq_get_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_SDRAM); + BCM2835_FIRMWARE_CLOCK_ID_SDRAM); /* max/min clock */ arm_max_freq = bcm2835_cpufreq_get_max_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_ARM); + BCM2835_FIRMWARE_CLOCK_ID_ARM); arm_min_freq = bcm2835_cpufreq_get_min_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_ARM); + BCM2835_FIRMWARE_CLOCK_ID_ARM); core_max_freq = bcm2835_cpufreq_get_max_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_CORE); + BCM2835_FIRMWARE_CLOCK_ID_CORE); core_min_freq = bcm2835_cpufreq_get_min_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_CORE); + BCM2835_FIRMWARE_CLOCK_ID_CORE); sdram_max_freq = bcm2835_cpufreq_get_max_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_SDRAM); + BCM2835_FIRMWARE_CLOCK_ID_SDRAM); sdram_min_freq = bcm2835_cpufreq_get_min_clock_rate(sc, - BCM2835_MBOX_CLOCK_ID_SDRAM); + BCM2835_FIRMWARE_CLOCK_ID_SDRAM); /* turbo mode */ turbo = bcm2835_cpufreq_get_turbo(sc); if (turbo > 0) - sc->turbo_mode = BCM2835_MBOX_TURBO_ON; + sc->turbo_mode = BCM2835_FIRMWARE_TURBO_ON; else - sc->turbo_mode = BCM2835_MBOX_TURBO_OFF; + sc->turbo_mode = BCM2835_FIRMWARE_TURBO_OFF; /* voltage */ voltage_core = bcm2835_cpufreq_get_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_CORE); + BCM2835_FIRMWARE_VOLTAGE_ID_CORE); voltage_sdram_c = bcm2835_cpufreq_get_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_C); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C); voltage_sdram_i = bcm2835_cpufreq_get_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_I); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I); voltage_sdram_p = bcm2835_cpufreq_get_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_P); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P); /* current values (offset from 1.2V) */ sc->voltage_core = voltage_core; @@ -1143,21 +1089,21 @@ bcm2835_cpufreq_init(void *arg) /* max/min voltage */ max_voltage_core = bcm2835_cpufreq_get_max_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_CORE); + BCM2835_FIRMWARE_VOLTAGE_ID_CORE); min_voltage_core = bcm2835_cpufreq_get_min_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_CORE); + BCM2835_FIRMWARE_VOLTAGE_ID_CORE); max_voltage_sdram_c = bcm2835_cpufreq_get_max_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_C); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C); max_voltage_sdram_i = bcm2835_cpufreq_get_max_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_I); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I); max_voltage_sdram_p = bcm2835_cpufreq_get_max_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_P); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P); min_voltage_sdram_c = bcm2835_cpufreq_get_min_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_C); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_C); min_voltage_sdram_i = bcm2835_cpufreq_get_min_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_I); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_I); min_voltage_sdram_p = bcm2835_cpufreq_get_min_voltage(sc, - BCM2835_MBOX_VOLTAGE_ID_SDRAM_P); + BCM2835_FIRMWARE_VOLTAGE_ID_SDRAM_P); /* temperature */ temperature = bcm2835_cpufreq_get_temperature(sc); @@ -1168,7 +1114,7 @@ bcm2835_cpufreq_init(void *arg) device_printf(sc->dev, "current ARM %dMHz, Core %dMHz, SDRAM %dMHz, Turbo %s\n", HZ2MHZ(arm_freq), HZ2MHZ(core_freq), HZ2MHZ(sdram_freq), - (sc->turbo_mode == BCM2835_MBOX_TURBO_ON) ? "ON" : "OFF"); + (sc->turbo_mode == BCM2835_FIRMWARE_TURBO_ON) ? "ON":"OFF"); device_printf(sc->dev, "max/min ARM %d/%dMHz, Core %d/%dMHz, SDRAM %d/%dMHz\n", @@ -1202,7 +1148,7 @@ bcm2835_cpufreq_init(void *arg) device_printf(sc->dev, "ARM %dMHz, Core %dMHz, SDRAM %dMHz, Turbo %s\n", HZ2MHZ(arm_freq), HZ2MHZ(core_freq), HZ2MHZ(sdram_freq), - (sc->turbo_mode == BCM2835_MBOX_TURBO_ON) ? "ON" : "OFF"); + (sc->turbo_mode == BCM2835_FIRMWARE_TURBO_ON) ? "ON":"OFF"); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Aug 22 01:02:53 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 584823CE791 for ; Sat, 22 Aug 2020 01:02:53 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYKqx1fT8z3ckq; Sat, 22 Aug 2020 01:02:53 +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 1CF9CE43C; Sat, 22 Aug 2020 01:02:53 +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 07M12qqL000235; Sat, 22 Aug 2020 01:02:52 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07M12qVa000234; Sat, 22 Aug 2020 01:02:52 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008220102.07M12qVa000234@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 22 Aug 2020 01:02:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364472 - projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Commit-Revision: 364472 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.33 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: Sat, 22 Aug 2020 01:02:53 -0000 Author: rmacklem Date: Sat Aug 22 01:02:52 2020 New Revision: 364472 URL: https://svnweb.freebsd.org/changeset/base/364472 Log: See if $FreeBSD$ field gets filled in now. Modified: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x Modified: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x ============================================================================== --- projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x Sat Aug 22 00:42:33 2020 (r364471) +++ projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x Sat Aug 22 01:02:52 2020 (r364472) @@ -27,7 +27,7 @@ /* Modified from gssd.x for the client side of RPC-over-TLS. */ -/* $FreeBSD:$ */ +/* $FreeBSD$ */ struct rpctlscd_connect_res { uint32_t reterr; From owner-svn-src-projects@freebsd.org Sat Aug 22 01:09:02 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E5EE3CE3DE for ; Sat, 22 Aug 2020 01:09: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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYKz16hsSz3dJJ; Sat, 22 Aug 2020 01:09: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 B1A46E161; Sat, 22 Aug 2020 01:09: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 07M191dO000813; Sat, 22 Aug 2020 01:09:01 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07M191xZ000812; Sat, 22 Aug 2020 01:09:01 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008220109.07M191xZ000812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 22 Aug 2020 01:09:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364473 - projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Commit-Revision: 364473 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.33 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: Sat, 22 Aug 2020 01:09:02 -0000 Author: rmacklem Date: Sat Aug 22 01:09:01 2020 New Revision: 364473 URL: https://svnweb.freebsd.org/changeset/base/364473 Log: Try removing and re-adding rpctlscd.x to see if $FreeBSD$ field gets filled in. Deleted: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x From owner-svn-src-projects@freebsd.org Sat Aug 22 01:11:00 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC7853CE5F7 for ; Sat, 22 Aug 2020 01:11:00 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYL1J4bMGz3d8J; Sat, 22 Aug 2020 01:11:00 +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 68ED6E6BD; Sat, 22 Aug 2020 01:11:00 +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 07M1B0mF002662; Sat, 22 Aug 2020 01:11:00 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07M1B06i002661; Sat, 22 Aug 2020 01:11:00 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008220111.07M1B06i002661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 22 Aug 2020 01:11:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364474 - projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/rpc/rpcsec_tls X-SVN-Commit-Revision: 364474 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.33 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: Sat, 22 Aug 2020 01:11:00 -0000 Author: rmacklem Date: Sat Aug 22 01:10:59 2020 New Revision: 364474 URL: https://svnweb.freebsd.org/changeset/base/364474 Log: Add rpctlscd.x back in to see if $FreeBSD$ gets filled in. Added: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x (contents, props changed) Added: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctlscd.x Sat Aug 22 01:10:59 2020 (r364474) @@ -0,0 +1,72 @@ +/*- + * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ + * Authors: Doug Rabson + * Developed with Red Inc: Alfred Perlstein + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* Modified from gssd.x for the client side of RPC-over-TLS. */ + +/* $FreeBSD$ */ + +struct rpctlscd_connect_res { + uint32_t reterr; + uint64_t sec; + uint64_t usec; + uint64_t ssl; +}; + +struct rpctlscd_handlerecord_arg { + uint64_t sec; + uint64_t usec; + uint64_t ssl; +}; + +struct rpctlscd_handlerecord_res { + uint32_t reterr; +}; + +struct rpctlscd_disconnect_arg { + uint64_t sec; + uint64_t usec; + uint64_t ssl; +}; + +struct rpctlscd_disconnect_res { + uint32_t reterr; +}; + +program RPCTLSCD { + version RPCTLSCDVERS { + void RPCTLSCD_NULL(void) = 0; + + rpctlscd_connect_res + RPCTLSCD_CONNECT(void) = 1; + + rpctlscd_handlerecord_res + RPCTLSCD_HANDLERECORD(rpctlscd_handlerecord_arg) = 2; + + rpctlscd_disconnect_res + RPCTLSCD_DISCONNECT(rpctlscd_disconnect_arg) = 3; + } = 1; +} = 0x40677374; From owner-svn-src-projects@freebsd.org Sat Aug 22 22:56:51 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D28C3C7ADE for ; Sat, 22 Aug 2020 22:56:51 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYv033sKrz3g5y; Sat, 22 Aug 2020 22:56: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 4F7051D765; Sat, 22 Aug 2020 22:56: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 07MMupku007830; Sat, 22 Aug 2020 22:56:51 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07MMuoZZ007827; Sat, 22 Aug 2020 22:56:50 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008222256.07MMuoZZ007827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 22 Aug 2020 22:56:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364496 - in projects/nfs-over-tls: sys/fs/nfs sys/fs/nfsserver sys/sys usr.sbin/mountd X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls: sys/fs/nfs sys/fs/nfsserver sys/sys usr.sbin/mountd X-SVN-Commit-Revision: 364496 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.33 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: Sat, 22 Aug 2020 22:56:51 -0000 Author: rmacklem Date: Sat Aug 22 22:56:50 2020 New Revision: 364496 URL: https://svnweb.freebsd.org/changeset/base/364496 Log: Update mount.h to use high order bits of the 64bit mnt_flags and merge recent changes to mountd.c. Modified: projects/nfs-over-tls/sys/fs/nfs/nfsdport.h projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c projects/nfs-over-tls/sys/sys/mount.h projects/nfs-over-tls/usr.sbin/mountd/mountd.c Modified: projects/nfs-over-tls/sys/fs/nfs/nfsdport.h ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfsdport.h Sat Aug 22 21:32:11 2020 (r364495) +++ projects/nfs-over-tls/sys/fs/nfs/nfsdport.h Sat Aug 22 22:56:50 2020 (r364496) @@ -81,9 +81,9 @@ struct nfsexstuff { #define NFSVNO_EXPORTANON(e) ((e)->nes_exflag & MNT_EXPORTANON) #define NFSVNO_EXSTRICTACCESS(e) ((e)->nes_exflag & MNT_EXSTRICTACCESS) #define NFSVNO_EXV4ONLY(e) ((e)->nes_exflag & MNT_EXV4ONLY) -#define NFSVNO_EXTLS(e) ((e)->nes_exflag & MNTEX_TLS) -#define NFSVNO_EXTLSCERT(e) ((e)->nes_exflag & MNTEX_TLSCERT) -#define NFSVNO_EXTLSCERTUSER(e) ((e)->nes_exflag & MNTEX_TLSCERTUSER) +#define NFSVNO_EXTLS(e) ((e)->nes_exflag & MNT_EXTLS) +#define NFSVNO_EXTLSCERT(e) ((e)->nes_exflag & MNT_EXTLSCERT) +#define NFSVNO_EXTLSCERTUSER(e) ((e)->nes_exflag & MNT_EXTLSCERTUSER) #define NFSVNO_SETEXRDONLY(e) ((e)->nes_exflag = (MNT_EXPORTED|MNT_EXRDONLY)) Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Sat Aug 22 21:32:11 2020 (r364495) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Sat Aug 22 22:56:50 2020 (r364496) @@ -3561,11 +3561,11 @@ nfsvno_v4rootexport(struct nfsrv_descript *nd) } /* And set ND_EXxx flags for TLS. */ - if ((exflags & MNTEX_TLS) != 0) { + if ((exflags & MNT_EXTLS) != 0) { nd->nd_flag |= ND_EXTLS; - if ((exflags & MNTEX_TLSCERT) != 0) + if ((exflags & MNT_EXTLSCERT) != 0) nd->nd_flag |= ND_EXTLSCERT; - if ((exflags & MNTEX_TLSCERTUSER) != 0) + if ((exflags & MNT_EXTLSCERTUSER) != 0) nd->nd_flag |= ND_EXTLSCERTUSER; } Modified: projects/nfs-over-tls/sys/sys/mount.h ============================================================================== --- projects/nfs-over-tls/sys/sys/mount.h Sat Aug 22 21:32:11 2020 (r364495) +++ projects/nfs-over-tls/sys/sys/mount.h Sat Aug 22 22:56:50 2020 (r364496) @@ -294,6 +294,45 @@ void __mnt_vnode_markerfree_lazy(struct vnode #endif /* _KERNEL */ +#if defined(_WANT_MNTOPTNAMES) || defined(_KERNEL) +struct mntoptnames { + uint64_t o_opt; + const char *o_name; +}; +#define MNTOPT_NAMES \ + { MNT_ASYNC, "asynchronous" }, \ + { MNT_EXPORTED, "NFS exported" }, \ + { MNT_LOCAL, "local" }, \ + { MNT_NOATIME, "noatime" }, \ + { MNT_NOEXEC, "noexec" }, \ + { MNT_NOSUID, "nosuid" }, \ + { MNT_NOSYMFOLLOW, "nosymfollow" }, \ + { MNT_QUOTA, "with quotas" }, \ + { MNT_RDONLY, "read-only" }, \ + { MNT_SYNCHRONOUS, "synchronous" }, \ + { MNT_UNION, "union" }, \ + { MNT_NOCLUSTERR, "noclusterr" }, \ + { MNT_NOCLUSTERW, "noclusterw" }, \ + { MNT_SUIDDIR, "suiddir" }, \ + { MNT_SOFTDEP, "soft-updates" }, \ + { MNT_SUJ, "journaled soft-updates" }, \ + { MNT_MULTILABEL, "multilabel" }, \ + { MNT_ACLS, "acls" }, \ + { MNT_NFS4ACLS, "nfsv4acls" }, \ + { MNT_GJOURNAL, "gjournal" }, \ + { MNT_AUTOMOUNTED, "automounted" }, \ + { MNT_VERIFIED, "verified" }, \ + { MNT_UNTRUSTED, "untrusted" }, \ + { MNT_NOCOVER, "nocover" }, \ + { MNT_EMPTYDIR, "emptydir" }, \ + { MNT_UPDATE, "update" }, \ + { MNT_DELEXPORT, "delexport" }, \ + { MNT_RELOAD, "reload" }, \ + { MNT_FORCE, "force" }, \ + { MNT_SNAPSHOT, "snapshot" }, \ + { 0, NULL } +#endif + /* * User specifiable flags, stored in mnt_flag. */ @@ -326,6 +365,9 @@ void __mnt_vnode_markerfree_lazy(struct vnode #define MNT_EXPORTANON 0x0000000000000400ULL /* anon uid mapping for all */ #define MNT_EXKERB 0x0000000000000800ULL /* exported with Kerberos */ #define MNT_EXPUBLIC 0x0000000020000000ULL /* public export (WebNFS) */ +#define MNT_EXTLS 0x0000004000000000ULL /* require TLS */ +#define MNT_EXTLSCERT 0x0000008000000000ULL /* require TLS with client cert */ +#define MNT_EXTLSCERTUSER 0x0000010000000000ULL /* require TLS with user cert */ /* * Flags set by internal operations, @@ -364,23 +406,6 @@ void __mnt_vnode_markerfree_lazy(struct vnode MNT_NOCLUSTERR | MNT_NOCLUSTERW | MNT_SUIDDIR | \ MNT_ACLS | MNT_USER | MNT_NFS4ACLS | \ MNT_AUTOMOUNTED | MNT_UNTRUSTED) - -/* - * Export flags that are only set/used in the ex_flags field and - * not in mnt_flag. Since some are defined as MNT_EXxxx above, - * these ones are just redefined here. - * MNT_EXPORTED must remain and be set/cleared in mnt_flag. - * The others defined as MNT_xxx should probably remain for - * compatibility with old versions of mountd, etc. - */ -#define MNTEX_TLS 0x0000000000000001ULL /* TLS RPC required */ -#define MNTEX_TLSCERT 0x0000000000000002ULL /* verified cert req */ -#define MNTEX_TLSCERTUSER 0x0000000000000004ULL /* user cert req */ -#define MNTEX_EXPORTED MNT_EXPORTED /* filesystem exported */ -#define MNTEX_RDONLY MNT_EXRDONLY /* exported read only */ -#define MNTEX_EXPORTANON MNT_EXPORTANON /* anon uid mapping for all */ -#define MNTEX_KERB MNT_EXKERB /* exported with Kerberos */ -#define MNTEX_PUBLIC MNT_EXPUBLIC /* public export (WebNFS) */ /* * External filesystem command modifier flags. Modified: projects/nfs-over-tls/usr.sbin/mountd/mountd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/mountd/mountd.c Sat Aug 22 21:32:11 2020 (r364495) +++ projects/nfs-over-tls/usr.sbin/mountd/mountd.c Sat Aug 22 22:56:50 2020 (r364496) @@ -48,6 +48,7 @@ static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5 __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -112,6 +113,15 @@ struct dirlist { #define DP_DEFSET 0x1 #define DP_HOSTSET 0x2 +/* + * maproot/mapall credentials. + */ +struct expcred { + uid_t cr_uid; + int cr_ngroups; + gid_t cr_groups[NGROUPS_MAX + 1]; +}; + struct exportlist { struct dirlist *ex_dirl; struct dirlist *ex_defdir; @@ -120,8 +130,8 @@ struct exportlist { fsid_t ex_fs; char *ex_fsdir; char *ex_indexfile; - struct xucred ex_defanon; - int ex_defexflags; + struct expcred ex_defanon; + uint64_t ex_defexflags; int ex_numsecflavors; int ex_secflavors[MAXSECFLAVORS]; int ex_defnumsecflavors; @@ -152,8 +162,8 @@ struct grouplist { int gr_type; union grouptypes gr_ptr; struct grouplist *gr_next; - struct xucred gr_anon; - int gr_exflags; + struct expcred gr_anon; + uint64_t gr_exflags; int gr_flag; int gr_numsecflavors; int gr_secflavors[MAXSECFLAVORS]; @@ -184,11 +194,17 @@ struct fhreturn { #define GETPORT_MAXTRY 20 /* Max tries to get a port # */ +/* + * How long to delay a reload of exports when there are RPC request(s) + * to process, in usec. Must be less than 1second. + */ +#define RELOADDELAY 250000 + /* Global defs */ static char *add_expdir(struct dirlist **, char *, int); static void add_dlist(struct dirlist **, struct dirlist *, struct grouplist *, int, struct exportlist *, - struct xucred *, int); + struct expcred *, uint64_t); static void add_mlist(char *, char *); static int check_dirpath(char *); static int check_options(struct dirlist *); @@ -202,10 +218,10 @@ static void clearout_service(void); static void del_mlist(char *hostp, char *dirp); static struct dirlist *dirp_search(struct dirlist *, char *); static int do_export_mount(struct exportlist *, struct statfs *); -static int do_mount(struct exportlist *, struct grouplist *, int, - struct xucred *, char *, int, struct statfs *, int, int *); +static int do_mount(struct exportlist *, struct grouplist *, uint64_t, + struct expcred *, char *, int, struct statfs *, int, int *); static int do_opt(char **, char **, struct exportlist *, - struct grouplist *, int *, int *, struct xucred *); + struct grouplist *, int *, uint64_t *, struct expcred *); static struct exportlist *ex_search(fsid_t *, struct exportlisthead *); static struct exportlist *get_exp(void); static void free_dir(struct dirlist *); @@ -220,7 +236,7 @@ static void free_exports(struct exportlisthead *); static void read_exportfile(int); static int compare_nmount_exportlist(struct iovec *, int, char *); static int compare_export(struct exportlist *, struct exportlist *); -static int compare_cred(struct xucred *, struct xucred *); +static int compare_cred(struct expcred *, struct expcred *); static int compare_secflavor(int *, int *, int); static void delete_export(struct iovec *, int, struct statfs *, char *); static int get_host(char *, struct grouplist *, struct grouplist *); @@ -231,13 +247,13 @@ static int get_net(char *, struct netmsk *, int); static void getexp_err(struct exportlist *, struct grouplist *, const char *); static struct grouplist *get_grp(void); static void hang_dirp(struct dirlist *, struct grouplist *, - struct exportlist *, int, struct xucred *, int); + struct exportlist *, int, struct expcred *, uint64_t); static void huphandler(int sig); static int makemask(struct sockaddr_storage *ssp, int bitlen); static void mntsrv(struct svc_req *, SVCXPRT *); static void nextfield(char **, char **); static void out_of_mem(void); -static void parsecred(char *, struct xucred *); +static void parsecred(char *, struct expcred *); static int parsesec(char *, struct exportlist *); static int put_exlist(struct dirlist *, XDR *, struct dirlist *, int *, int); @@ -253,6 +269,7 @@ static int xdr_explist_common(XDR *, caddr_t, int); static int xdr_fhs(XDR *, caddr_t); static int xdr_mlist(XDR *, caddr_t); static void terminate(int); +static void cp_cred(struct expcred *, struct expcred *); #define EXPHASH(f) (fnv_32_buf((f), sizeof(fsid_t), 0) % exphashsize) static struct exportlisthead *exphead = NULL; @@ -262,13 +279,6 @@ static SLIST_HEAD(, mountlist) mlhead = SLIST_HEAD_INI static char *exnames_default[2] = { _PATH_EXPORTS, NULL }; static char **exnames; static char **hosts = NULL; -static struct xucred def_anon = { - XUCRED_VERSION, - (uid_t)65534, - 1, - { (gid_t)65533 }, - { NULL } -}; static int force_v2 = 0; static int resvport_only = 1; static int nhosts = 0; @@ -410,6 +420,10 @@ main(int argc, char **argv) int maxrec = RPC_MAXDATASIZE; int attempt_cnt, port_len, port_pos, ret; char **port_list; + uint64_t curtime, nexttime; + struct timeval tv; + struct timespec tp; + sigset_t sighup_mask; /* Check that another mountd isn't already running. */ pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &otherpid); @@ -665,19 +679,49 @@ main(int argc, char **argv) } /* Expand svc_run() here so that we can call get_exportlist(). */ + curtime = nexttime = 0; + sigemptyset(&sighup_mask); + sigaddset(&sighup_mask, SIGHUP); for (;;) { - if (got_sighup) { - get_exportlist(1); + clock_gettime(CLOCK_MONOTONIC, &tp); + curtime = tp.tv_sec; + curtime = curtime * 1000000 + tp.tv_nsec / 1000; + sigprocmask(SIG_BLOCK, &sighup_mask, NULL); + if (got_sighup && curtime >= nexttime) { got_sighup = 0; - } + sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL); + get_exportlist(1); + clock_gettime(CLOCK_MONOTONIC, &tp); + nexttime = tp.tv_sec; + nexttime = nexttime * 1000000 + tp.tv_nsec / 1000 + + RELOADDELAY; + } else + sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL); + + /* + * If a reload is pending, poll for received request(s), + * otherwise set a RELOADDELAY timeout, since a SIGHUP + * could be processed between the got_sighup test and + * the select() system call. + */ + tv.tv_sec = 0; + if (got_sighup) + tv.tv_usec = 0; + else + tv.tv_usec = RELOADDELAY; readfds = svc_fdset; - switch (select(svc_maxfd + 1, &readfds, NULL, NULL, NULL)) { + switch (select(svc_maxfd + 1, &readfds, NULL, NULL, &tv)) { case -1: - if (errno == EINTR) - continue; + if (errno == EINTR) { + /* Allow a reload now. */ + nexttime = 0; + continue; + } syslog(LOG_ERR, "mountd died: select: %m"); exit(1); case 0: + /* Allow a reload now. */ + nexttime = 0; continue; default: svc_getreqset(&readfds); @@ -1047,7 +1091,8 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp) struct sockaddr *saddr; u_short sport; char rpcpath[MNTPATHLEN + 1], dirpath[MAXPATHLEN]; - int bad = 0, defset, hostset; + int defset, hostset; + long bad = 0; sigset_t sighup_mask; int numsecflavors, *secflavorsp; @@ -1463,9 +1508,10 @@ get_exportlist_one(int passno) struct grouplist *grp, *tgrp, *savgrp; struct dirlist *dirhead; struct statfs fsb; - struct xucred anon; + struct expcred anon; char *cp, *endcp, *dirp, *hst, *usr, *dom, savedc; - int len, has_host, exflags, got_nondir, dirplen, netgrp; + int len, has_host, got_nondir, dirplen, netgrp; + uint64_t exflags; v4root_phase = 0; dirhead = (struct dirlist *)NULL; @@ -1481,8 +1527,10 @@ get_exportlist_one(int passno) * Set defaults. */ has_host = FALSE; - anon = def_anon; - exflags = MNTEX_EXPORTED; + anon.cr_uid = UID_NOBODY; + anon.cr_ngroups = 1; + anon.cr_groups[0] = GID_NOGROUP; + exflags = MNT_EXPORTED; got_nondir = 0; opt_flags = 0; ep = (struct exportlist *)NULL; @@ -1568,10 +1616,8 @@ get_exportlist_one(int passno) ep = get_exp(); } else { if (ep) { - if (ep->ex_fs.val[0] != - fsb.f_fsid.val[0] || - ep->ex_fs.val[1] != - fsb.f_fsid.val[1]) { + if (fsidcmp(&ep->ex_fs, &fsb.f_fsid) + != 0) { getexp_err(ep, tgrp, "fsid mismatch"); goto nextline; @@ -1700,7 +1746,7 @@ get_exportlist_one(int passno) grp = tgrp; do { grp->gr_exflags = exflags; - grp->gr_anon = anon; + cp_cred(&grp->gr_anon, &anon); if (v4root_phase == 2 && passno == 0) LOGDEBUG("do_mount v4root"); if (passno == 0 && do_mount(ep, grp, exflags, &anon, @@ -1840,7 +1886,7 @@ get_exportlist(int passno) */ bzero(&eargs, sizeof (eargs)); eargs.export.ex_flags = MNT_DELEXPORT; - if (nfssvc(NFSSVC_V4ROOTEXPORT, (caddr_t)&eargs) < 0 && + if (nfssvc(NFSSVC_V4ROOTEXPORT | NFSSVC_NEWSTRUCT, (caddr_t)&eargs) < 0 && errno != ENOENT) syslog(LOG_ERR, "Can't delete exports for V4:"); @@ -1868,7 +1914,7 @@ get_exportlist(int passno) LOGDEBUG("doing passno=0"); /* * Clear flag that notes if a public fh has been exported. - * It is set by do_mount() if MNTEX_PUBLIC is set for the entry. + * It is set by do_mount() if MNT_EXPUBLIC is set for the entry. */ has_publicfh = 0; @@ -2088,8 +2134,7 @@ compare_nmount_exportlist(struct iovec *iov, int iovle if ((oep->ex_flag & EX_DONE) == 0) { LOGDEBUG("not done delete=%s", oep->ex_fsdir); if (statfs(oep->ex_fsdir, &ofs) >= 0 && - oep->ex_fs.val[0] == ofs.f_fsid.val[0] && - oep->ex_fs.val[1] == ofs.f_fsid.val[1]) { + fsidcmp(&oep->ex_fs, &ofs.f_fsid) == 0) { LOGDEBUG("do delete"); /* * Clear has_publicfh if if was set @@ -2220,10 +2265,10 @@ compare_export(struct exportlist *ep, struct exportlis } while (0) /* - * Compare to struct xucred's. Return 0 if the same and 1 otherwise. + * Compare two struct expcred's. Return 0 if the same and 1 otherwise. */ static int -compare_cred(struct xucred *cr0, struct xucred *cr1) +compare_cred(struct expcred *cr0, struct expcred *cr1) { if (cr0->cr_uid != cr1->cr_uid || cr0->cr_ngroups != cr1->cr_ngroups) @@ -2353,8 +2398,7 @@ ex_search(fsid_t *fsid, struct exportlisthead *exhp) i = EXPHASH(fsid); SLIST_FOREACH(ep, &exhp[i], entries) { - if (ep->ex_fs.val[0] == fsid->val[0] && - ep->ex_fs.val[1] == fsid->val[1]) + if (fsidcmp(&ep->ex_fs, fsid) == 0) return (ep); } @@ -2389,7 +2433,7 @@ add_expdir(struct dirlist **dpp, char *cp, int len) */ static void hang_dirp(struct dirlist *dp, struct grouplist *grp, struct exportlist *ep, - int flags, struct xucred *anoncrp, int exflags) + int flags, struct expcred *anoncrp, uint64_t exflags) { struct hostlist *hp; struct dirlist *dp2; @@ -2407,7 +2451,7 @@ hang_dirp(struct dirlist *dp, struct grouplist *grp, s if (ep->ex_numsecflavors > 0) memcpy(ep->ex_defsecflavors, ep->ex_secflavors, sizeof(ep->ex_secflavors)); - ep->ex_defanon = *anoncrp; + cp_cred(&ep->ex_defanon, anoncrp); ep->ex_defexflags = exflags; } else while (grp) { hp = get_ht(); @@ -2441,7 +2485,8 @@ hang_dirp(struct dirlist *dp, struct grouplist *grp, s */ static void add_dlist(struct dirlist **dpp, struct dirlist *newdp, struct grouplist *grp, - int flags, struct exportlist *ep, struct xucred *anoncrp, int exflags) + int flags, struct exportlist *ep, struct expcred *anoncrp, + uint64_t exflags) { struct dirlist *dp; struct hostlist *hp; @@ -2490,7 +2535,7 @@ add_dlist(struct dirlist **dpp, struct dirlist *newdp, if (ep->ex_numsecflavors > 0) memcpy(ep->ex_defsecflavors, ep->ex_secflavors, sizeof(ep->ex_secflavors)); - ep->ex_defanon = *anoncrp; + cp_cred(&ep->ex_defanon, anoncrp); ep->ex_defexflags = exflags; } } @@ -2662,7 +2707,7 @@ parsesec(char *seclist, struct exportlist *ep) */ static int do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp, - int *has_hostp, int *exflagsp, struct xucred *cr) + int *has_hostp, uint64_t *exflagsp, struct expcred *cr) { char *cpoptarg, *cpoptend; char *cp, *endcp, *cpopt, savedc, savedc2; @@ -2697,14 +2742,14 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e } } if (!strcmp(cpopt, "ro") || !strcmp(cpopt, "o")) { - *exflagsp |= MNTEX_RDONLY; + *exflagsp |= MNT_EXRDONLY; } else if (cpoptarg && (!strcmp(cpopt, "maproot") || !(allflag = strcmp(cpopt, "mapall")) || !strcmp(cpopt, "root") || !strcmp(cpopt, "r"))) { usedarg++; parsecred(cpoptarg, cr); if (allflag == 0) { - *exflagsp |= MNTEX_EXPORTANON; + *exflagsp |= MNT_EXPORTANON; opt_flags |= OP_MAPALL; } else opt_flags |= OP_MAPROOT; @@ -2737,9 +2782,9 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e } else if (!strcmp(cpopt, "alldirs")) { opt_flags |= OP_ALLDIRS; } else if (!strcmp(cpopt, "public")) { - *exflagsp |= MNTEX_PUBLIC; + *exflagsp |= MNT_EXPUBLIC; } else if (!strcmp(cpopt, "webnfs")) { - *exflagsp |= (MNTEX_PUBLIC|MNTEX_RDONLY|MNTEX_EXPORTANON); + *exflagsp |= (MNT_EXPUBLIC|MNT_EXRDONLY|MNT_EXPORTANON); opt_flags |= OP_MAPALL; } else if (cpoptarg && !strcmp(cpopt, "index")) { ep->ex_indexfile = strdup(cpoptarg); @@ -2751,11 +2796,12 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e opt_flags |= OP_SEC; usedarg++; } else if (!strcmp(cpopt, "tls")) { - *exflagsp |= MNTEX_TLS; + *exflagsp |= MNT_EXTLS; } else if (!strcmp(cpopt, "tlscert")) { - *exflagsp |= (MNTEX_TLS | MNTEX_TLSCERT); + *exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT); } else if (!strcmp(cpopt, "tlscertuser")) { - *exflagsp |= (MNTEX_TLS | MNTEX_TLSCERT | MNTEX_TLSCERTUSER); + *exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT | + MNT_EXTLSCERTUSER); } else { syslog(LOG_ERR, "bad opt %s", cpopt); return (1); @@ -2930,7 +2976,7 @@ do_export_mount(struct exportlist *ep, struct statfs * defgrp.gr_type = GT_DEFAULT; defgrp.gr_next = NULL; /* We have an entry for all other hosts/nets. */ - LOGDEBUG("ex_defexflags=0x%x", ep->ex_defexflags); + LOGDEBUG("ex_defexflags=0x%jx", (uintmax_t)ep->ex_defexflags); ret = do_mount(ep, &defgrp, ep->ex_defexflags, &ep->ex_defanon, ep->ex_fsdir, dirlen, fsp, ep->ex_defnumsecflavors, ep->ex_defsecflavors); @@ -2941,8 +2987,8 @@ do_export_mount(struct exportlist *ep, struct statfs * /* Do a mount for each group. */ grp = ep->ex_grphead; while (grp != NULL) { - LOGDEBUG("do mount gr_type=0x%x gr_exflags=0x%x", - grp->gr_type, grp->gr_exflags); + LOGDEBUG("do mount gr_type=0x%x gr_exflags=0x%jx", + grp->gr_type, (uintmax_t)grp->gr_exflags); ret = do_mount(ep, grp, grp->gr_exflags, &grp->gr_anon, ep->ex_fsdir, dirlen, fsp, grp->gr_numsecflavors, grp->gr_secflavors); @@ -2958,8 +3004,8 @@ do_export_mount(struct exportlist *ep, struct statfs * * the kernel. */ static int -do_mount(struct exportlist *ep, struct grouplist *grp, int exflags, - struct xucred *anoncrp, char *dirp, int dirplen, struct statfs *fsb, +do_mount(struct exportlist *ep, struct grouplist *grp, uint64_t exflags, + struct expcred *anoncrp, char *dirp, int dirplen, struct statfs *fsb, int numsecflavors, int *secflavors) { struct statfs fsb1; @@ -2985,8 +3031,14 @@ do_mount(struct exportlist *ep, struct grouplist *grp, bzero(eap, sizeof (struct export_args)); bzero(errmsg, sizeof(errmsg)); eap->ex_flags = exflags; - eap->ex_anon = *anoncrp; - LOGDEBUG("do_mount exflags=0x%x", exflags); + eap->ex_uid = anoncrp->cr_uid; + eap->ex_ngroups = anoncrp->cr_ngroups; + if (eap->ex_ngroups > 0) { + eap->ex_groups = malloc(eap->ex_ngroups * sizeof(gid_t)); + memcpy(eap->ex_groups, anoncrp->cr_groups, eap->ex_ngroups * + sizeof(gid_t)); + } + LOGDEBUG("do_mount exflags=0x%jx", (uintmax_t)exflags); eap->ex_indexfile = ep->ex_indexfile; if (grp->gr_type == GT_HOST) ai = grp->gr_ptr.gt_addrinfo; @@ -3056,9 +3108,11 @@ do_mount(struct exportlist *ep, struct grouplist *grp, */ if (v4root_phase == 2) { nfsea.fspec = v4root_dirpath; - if (nfssvc(NFSSVC_V4ROOTEXPORT, (caddr_t)&nfsea) < 0) { + if (nfssvc(NFSSVC_V4ROOTEXPORT | NFSSVC_NEWSTRUCT, + (caddr_t)&nfsea) < 0) { syslog(LOG_ERR, "Exporting V4: failed"); - return (2); + ret = 2; + goto error_exit; } } else { /* @@ -3109,9 +3163,9 @@ do_mount(struct exportlist *ep, struct grouplist *grp, goto error_exit; } /* back up over the last component */ - while (*cp == '/' && cp > dirp) + while (cp > dirp && *cp == '/') cp--; - while (*(cp - 1) != '/' && cp > dirp) + while (cp > dirp && *(cp - 1) != '/') cp--; if (cp == dirp) { if (debug) @@ -3128,8 +3182,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, * filesystem. */ if (statfs(dirp, &fsb1) != 0 || - bcmp(&fsb1.f_fsid, &fsb->f_fsid, - sizeof (fsb1.f_fsid)) != 0) { + fsidcmp(&fsb1.f_fsid, &fsb->f_fsid) != 0) { *cp = savedc; syslog(LOG_ERR, "can't export %s %s", dirp, @@ -3145,7 +3198,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, * If this is the public directory, get the file handle * and load it into the kernel via the nfssvc() syscall. */ - if ((exflags & MNTEX_PUBLIC) != 0) { + if ((exflags & MNT_EXPUBLIC) != 0) { fhandle_t fh; char *public_name; @@ -3174,6 +3227,7 @@ skip: if (cp) *cp = savedc; error_exit: + free(eap->ex_groups); /* free strings allocated by strdup() in getmntopts.c */ if (iov != NULL) { free(iov[0].iov_base); /* fstype */ @@ -3400,22 +3454,19 @@ get_line(void) * Parse a description of a credential. */ static void -parsecred(char *namelist, struct xucred *cr) +parsecred(char *namelist, struct expcred *cr) { char *name; int cnt; char *names; struct passwd *pw; struct group *gr; - gid_t groups[XU_NGROUPS + 1]; - int ngroups; - cr->cr_version = XUCRED_VERSION; /* * Set up the unprivileged user. */ - cr->cr_uid = 65534; - cr->cr_groups[0] = 65533; + cr->cr_uid = UID_NOBODY; + cr->cr_groups[0] = GID_NOGROUP; cr->cr_ngroups = 1; /* * Get the user's password table entry. @@ -3436,19 +3487,24 @@ parsecred(char *namelist, struct xucred *cr) return; } cr->cr_uid = pw->pw_uid; - ngroups = XU_NGROUPS + 1; - if (getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups)) { + cr->cr_ngroups = NGROUPS_MAX + 1; + if (getgrouplist(pw->pw_name, pw->pw_gid, cr->cr_groups, + &cr->cr_ngroups)) { syslog(LOG_ERR, "too many groups"); - ngroups = XU_NGROUPS + 1; + cr->cr_ngroups = NGROUPS_MAX + 1; } /* * Compress out duplicate. */ - cr->cr_ngroups = ngroups - 1; - cr->cr_groups[0] = groups[0]; - for (cnt = 2; cnt < ngroups; cnt++) - cr->cr_groups[cnt - 1] = groups[cnt]; + if (cr->cr_ngroups > 1 && cr->cr_groups[0] == + cr->cr_groups[1]) { + for (cnt = 2; cnt < cr->cr_ngroups; cnt++) + cr->cr_groups[cnt - 1] = cr->cr_groups[cnt]; + cr->cr_ngroups--; + } + if (cr->cr_ngroups > NGROUPS_MAX) + cr->cr_ngroups = NGROUPS_MAX; return; } /* @@ -3464,7 +3520,7 @@ parsecred(char *namelist, struct xucred *cr) return; } cr->cr_ngroups = 0; - while (names != NULL && *names != '\0' && cr->cr_ngroups < XU_NGROUPS) { + while (names != NULL && *names != '\0' && cr->cr_ngroups < NGROUPS_MAX) { name = strsep_quote(&names, ":"); if (isdigit(*name) || *name == '-') { cr->cr_groups[cr->cr_ngroups++] = atoi(name); @@ -3476,7 +3532,7 @@ parsecred(char *namelist, struct xucred *cr) cr->cr_groups[cr->cr_ngroups++] = gr->gr_gid; } } - if (names != NULL && *names != '\0' && cr->cr_ngroups == XU_NGROUPS) + if (names != NULL && *names != '\0' && cr->cr_ngroups == NGROUPS_MAX) syslog(LOG_ERR, "too many groups"); } @@ -3796,4 +3852,14 @@ terminate(int sig __unused) rpcb_unset(MOUNTPROG, MOUNTVERS, NULL); rpcb_unset(MOUNTPROG, MOUNTVERS3, NULL); exit (0); +} + +static void +cp_cred(struct expcred *outcr, struct expcred *incr) +{ + + outcr->cr_uid = incr->cr_uid; + outcr->cr_ngroups = incr->cr_ngroups; + memcpy(outcr->cr_groups, incr->cr_groups, incr->cr_ngroups * + sizeof(gid_t)); }