Re: svn commit: r323123 - in head/usr.bin/tail: . tests

2017-09-01 Thread Ngie Cooper 

> On Sep 1, 2017, at 15:37, Conrad Meyer  wrote:
> 
> Author: cem
> Date: Fri Sep  1 22:37:49 2017
> New Revision: 323123
> URL: https://svnweb.freebsd.org/changeset/base/323123
> 
> Log:
>  tail(1): Do not print bogus errno string
> 
>  In the case where write(2) does not return -1, it does not initialize errno.
>  This can happen when a broken pipe causes a short write.
> 
>  I attempted to adapt the submitted test case to ATF but could not figure out
>  how to make the test run in the ATF environment.  So the aborted test is
>  left disabled, in case someone would like to run it manually or fix it.
> 
>  PR:221976
>  Submitted by: (earlier version)
>  Sponsored by:Dell EMC Isilon
> 
> Modified:
>  head/usr.bin/tail/extern.h
>  head/usr.bin/tail/tests/tail_test.sh
> 
> Modified: head/usr.bin/tail/extern.h
> ==
> --- head/usr.bin/tail/extern.hFri Sep  1 22:04:45 2017(r323122)
> +++ head/usr.bin/tail/extern.hFri Sep  1 22:37:49 2017(r323123)
> @@ -32,9 +32,15 @@
>  */
> 
> #defineWR(p, size) do { \
> -if (write(STDOUT_FILENO, p, size) != (ssize_t)size) \
> -oerr(); \
> -} while(0)
> +ssize_t res; \
> +res = write(STDOUT_FILENO, p, size); \
> +if (res != (ssize_t)size) { \
> +if (res == -1) \
> +oerr(); \
> +else \
> +errx(1, "stdout"); \
> +} \
> +} while (0)
> 
> #define TAILMAPLEN (4<<20)
> 
> 
> Modified: head/usr.bin/tail/tests/tail_test.sh
> ==
> --- head/usr.bin/tail/tests/tail_test.shFri Sep  1 22:04:45 2017
> (r323122)
> +++ head/usr.bin/tail/tests/tail_test.shFri Sep  1 22:37:49 2017
> (r323123)
> @@ -215,7 +215,20 @@ longfile_rn2500_body()
>atf_check cmp expectfile outpipe
> }
> 
> +atf_test_case broken_pipe
> +broken_pipe_head()
> +{
> +atf_set "descr" "Do not print bogus errno based output on short writes"
> +}
> +broken_pipe_body()
> +{
> +atf_expect_fail "Can't seem to get testcase to work in test environment. 
>  Reproduces easily in interactive shell."
> 
> +seq -f '%128g' 1 1000 > ints
> +atf_check -s exit:1 -o ignore -e "inline:tail: stdout" tail -n 856 ints 
> | awk '{ exit }'

Use need to use -x to run the command through the shell, e.g.

atf_check ... -x 'tail 856 ints| awk "{exit}"'

What the original pattern does is pipes atf_check to awk--which probably isn't 
what you want.

Seems like it could be written to not use a temporary file too.. I'll have to 
think about this.

-Ngie
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323123 - in head/usr.bin/tail: . tests

2017-09-01 Thread Conrad Meyer 
Author: cem
Date: Fri Sep  1 22:37:49 2017
New Revision: 323123
URL: https://svnweb.freebsd.org/changeset/base/323123

Log:
  tail(1): Do not print bogus errno string
  
  In the case where write(2) does not return -1, it does not initialize errno.
  This can happen when a broken pipe causes a short write.
  
  I attempted to adapt the submitted test case to ATF but could not figure out
  how to make the test run in the ATF environment.  So the aborted test is
  left disabled, in case someone would like to run it manually or fix it.
  
  PR:   221976
  Submitted by:  (earlier version)
  Sponsored by: Dell EMC Isilon

Modified:
  head/usr.bin/tail/extern.h
  head/usr.bin/tail/tests/tail_test.sh

Modified: head/usr.bin/tail/extern.h
==
--- head/usr.bin/tail/extern.h  Fri Sep  1 22:04:45 2017(r323122)
+++ head/usr.bin/tail/extern.h  Fri Sep  1 22:37:49 2017(r323123)
@@ -32,9 +32,15 @@
  */
 
 #defineWR(p, size) do { \
-   if (write(STDOUT_FILENO, p, size) != (ssize_t)size) \
-   oerr(); \
-   } while(0)
+   ssize_t res; \
+   res = write(STDOUT_FILENO, p, size); \
+   if (res != (ssize_t)size) { \
+   if (res == -1) \
+   oerr(); \
+   else \
+   errx(1, "stdout"); \
+   } \
+} while (0)
 
 #define TAILMAPLEN (4<<20)
 

Modified: head/usr.bin/tail/tests/tail_test.sh
==
--- head/usr.bin/tail/tests/tail_test.shFri Sep  1 22:04:45 2017
(r323122)
+++ head/usr.bin/tail/tests/tail_test.shFri Sep  1 22:37:49 2017
(r323123)
@@ -215,7 +215,20 @@ longfile_rn2500_body()
atf_check cmp expectfile outpipe
 }
 
+atf_test_case broken_pipe
+broken_pipe_head()
+{
+   atf_set "descr" "Do not print bogus errno based output on short writes"
+}
+broken_pipe_body()
+{
+   atf_expect_fail "Can't seem to get testcase to work in test 
environment.  Reproduces easily in interactive shell."
 
+   seq -f '%128g' 1 1000 > ints
+   atf_check -s exit:1 -o ignore -e "inline:tail: stdout" tail -n 856 ints 
| awk '{ exit }'
+}
+
+
 atf_init_test_cases()
 {
atf_add_test_case empty_r
@@ -230,4 +243,5 @@ atf_init_test_cases()
atf_add_test_case longfile_rc135782
atf_add_test_case longfile_rc145782_longlines
atf_add_test_case longfile_rn2500
+   #atf_add_test_case broken_pipe
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323122 - head/usr.sbin/autofs

2017-09-01 Thread Benjamin Kaduk 
Author: bjk (doc committer)
Date: Fri Sep  1 22:04:45 2017
New Revision: 323122
URL: https://svnweb.freebsd.org/changeset/base/323122

Log:
  Fix mdoc typo in auto_master.5
  
  There needs to be a space after the no-space macro in order for it
  to be interpreted.
  
  PR:   221986
  Submitted by: Paul Townsend 

Modified:
  head/usr.sbin/autofs/auto_master.5

Modified: head/usr.sbin/autofs/auto_master.5
==
--- head/usr.sbin/autofs/auto_master.5  Fri Sep  1 21:48:36 2017
(r323121)
+++ head/usr.sbin/autofs/auto_master.5  Fri Sep  1 22:04:45 2017
(r323122)
@@ -253,7 +253,7 @@ Query the remote NFS server and map exported shares.
 This map is traditionally mounted on
 .Pa /net .
 Access to files on a remote NFS server is provided through the
-.Pf /net/ Ar nfs-server-ip Ns / Ns Ar share-name Ns/
+.Pf /net/ Ar nfs-server-ip Ns / Ns Ar share-name Ns /
 directory without any additional configuration.
 Directories for individual NFS servers are not present until the first access,
 when they are automatically created.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Nathan Whitehorn 



On 09/01/17 09:54, Ian Lepore wrote:

On Fri, 2017-09-01 at 09:06 -0700, Conrad Meyer wrote:

Wait, why?  The PR doesn't explain it any better than this commit
message.

On Fri, Sep 1, 2017 at 8:54 AM, Josh Paetzel 
wrote:

Author: jpaetzel
Date: Fri Sep  1 15:54:53 2017
New Revision: 323087
URL: https://svnweb.freebsd.org/changeset/base/323087

Log:
   Take options IPSEC out of GENERIC

   PR:   220170
   Submitted by: delphij
   Reviewed by:  ae, glebius
   MFC after:2 weeks
   Differential Revision:D11806

The differential revision (which should be cited using the complete url
in the commit) seems to indicate that it's because it can be kldloaded.

This change misses the armv6 platform, where the option appears in
std.armv6, which gets included in GENERIC (and all other armv6
configs).

This change seems to warrant an entry in UPDATING, because it's going
to catch a lot of people by surprise.  Even people with custom kernels,
if they follow the advice of the handbook and "include GENERIC" then
override things.

-- Ian



I realize this is immediately moot because the commit has been reverted, 
but please remember about powerpc/conf/GENERIC64 for future such 
changes. This is the "GENERIC" kernel for the powerpc64 architecture, 
which does not have its own arch directory.

-Nathan
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323114 - head/sys/conf

2017-09-01 Thread Alexander Motin 
Author: mav
Date: Fri Sep  1 19:15:53 2017
New Revision: 323114
URL: https://svnweb.freebsd.org/changeset/base/323114

Log:
  Sync NTB options between amd64 and i386.
  
  Somehow they happen to become different.
  
  MFC after:13 days

Modified:
  head/sys/conf/files.i386

Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Fri Sep  1 19:11:47 2017(r323113)
+++ head/sys/conf/files.i386Fri Sep  1 19:15:53 2017(r323114)
@@ -272,10 +272,10 @@ dev/nctgpio/nctgpio.c optional nctgpio
 dev/nfe/if_nfe.c   optional nfe pci
 dev/ntb/if_ntb/if_ntb.coptional if_ntb
 dev/ntb/ntb_transport.coptional ntb_transport | if_ntb
-dev/ntb/ntb.c  optional ntb | ntb_transport | if_ntb | 
ntb_hw_intel | ntb_hw_plx
-dev/ntb/ntb_if.m   optional ntb | ntb_transport | if_ntb | 
ntb_hw_intel | ntb_hw_plx
-dev/ntb/ntb_hw/ntb_hw_intel.c  optional ntb_hw_intel
-dev/ntb/ntb_hw/ntb_hw_plx.coptional ntb_hw_plx
+dev/ntb/ntb.c  optional ntb | ntb_transport | if_ntb | 
ntb_hw_intel | ntb_hw_plx | ntb_hw
+dev/ntb/ntb_if.m   optional ntb | ntb_transport | if_ntb | 
ntb_hw_intel | ntb_hw_plx | ntb_hw
+dev/ntb/ntb_hw/ntb_hw_intel.c  optional ntb_hw_intel | ntb_hw
+dev/ntb/ntb_hw/ntb_hw_plx.coptional ntb_hw_plx | ntb_hw
 dev/nvd/nvd.c  optional nvd nvme
 dev/nvme/nvme.coptional nvme
 dev/nvme/nvme_ctrlr.c  optional nvme
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323112 - in head: contrib/llvm/include/llvm/CodeGen contrib/llvm/lib/Analysis contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/tools/clang/include/clang/AST contrib/llvm/tools/clang/...

2017-09-01 Thread Dimitry Andric 
Author: dim
Date: Fri Sep  1 18:53:36 2017
New Revision: 323112
URL: https://svnweb.freebsd.org/changeset/base/323112

Log:
  Upgrade our copies of clang, llvm, lldb and compiler-rt to r312293 from
  the upstream release_50 branch.  This corresponds to 5.0.0 rc4.
  
  As of this version, the cad/stepcode port should now compile in a more
  reasonable time on i386 (see bug 221836 for more information).
  
  PR:   221836
  MFC after:2 months
  X-MFC-with:   r321369

Modified:
  head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h
  head/contrib/llvm/lib/Analysis/PostDominators.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h
  head/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def
  head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h
  head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h
  head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp
  head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp
  head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h
  head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  head/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp
  head/lib/clang/include/clang/Basic/Version.inc
  head/lib/clang/include/lld/Config/Version.inc
  head/lib/clang/include/llvm/Support/VCSRevision.h
Directory Properties:
  head/contrib/compiler-rt/   (props changed)
  head/contrib/libc++/   (props changed)
  head/contrib/llvm/   (props changed)
  head/contrib/llvm/tools/clang/   (props changed)
  head/contrib/llvm/tools/lld/   (props changed)
  head/contrib/llvm/tools/lldb/   (props changed)

Modified: head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h
==
--- head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h  Fri Sep  1 
18:02:53 2017(r323111)
+++ head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h  Fri Sep  1 
18:53:36 2017(r323112)
@@ -801,7 +801,8 @@ class SDNode : public FoldingSetNode, public ilist_nod
   /// if DAG changes.
   static bool hasPredecessorHelper(const SDNode *N,
SmallPtrSetImpl ,
-   SmallVectorImpl ) {
+   SmallVectorImpl ,
+   unsigned int MaxSteps = 0) {
 if (Visited.count(N))
   return true;
 while (!Worklist.empty()) {
@@ -816,6 +817,8 @@ class SDNode : public FoldingSetNode, public ilist_nod
   }
   if (Found)
 return true;
+  if (MaxSteps != 0 && Visited.size() >= MaxSteps)
+return false;
 }
 return false;
   }

Modified: head/contrib/llvm/lib/Analysis/PostDominators.cpp
==
--- head/contrib/llvm/lib/Analysis/PostDominators.cpp   Fri Sep  1 18:02:53 
2017(r323111)
+++ head/contrib/llvm/lib/Analysis/PostDominators.cpp   Fri Sep  1 18:53:36 
2017(r323112)
@@ -23,8 +23,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "postdomtree"
 
-template class llvm::DominatorTreeBase; // PostDomTreeBase
-
 
//===--===//
 //  PostDominatorTree Implementation
 
//===--===//

Modified: head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
==
--- head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp  Fri Sep  1 
18:02:53 2017(r323111)
+++ head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp  Fri Sep  1 
18:53:36 2017(r323112)
@@ -1118,22 +1118,30 @@ SDValue DAGCombiner::PromoteIntBinOp(SDValue Op) {
 SDValue RV =
 DAG.getNode(ISD::TRUNCATE, DL, VT, DAG.getNode(Opc, DL, PVT, NN0, 
NN1));
 
-// New replace instances of N0 and N1
-if (Replace0 && N0 && N0.getOpcode() != ISD::DELETED_NODE && NN0 &&
-NN0.getOpcode() != ISD::DELETED_NODE) {
+// We are always replacing N0/N1's use in N and only need
+// additional replacements if there are additional uses.
+Replace0 &= !N0->hasOneUse();
+Replace1 &= (N0 != N1) && !N1->hasOneUse();
+
+// Combine Op here so it is presreved past replacements.
+CombineTo(Op.getNode(), RV);
+
+// If operands have a use ordering, make sur we deal with
+// predecessor first.
+if

svn commit: r323108 - head/sys/geom/part

2017-09-01 Thread Warner Losh 
Author: imp
Date: Fri Sep  1 17:55:25 2017
New Revision: 323108
URL: https://svnweb.freebsd.org/changeset/base/323108

Log:
  Add efimedia attribute for all GPT partitions.
  
  Sposnored by: Netflix
  Differential Revision: https://reviews.freebsd.org/D12206

Modified:
  head/sys/geom/part/g_part_gpt.c

Modified: head/sys/geom/part/g_part_gpt.c
==
--- head/sys/geom/part/g_part_gpt.c Fri Sep  1 17:43:08 2017
(r323107)
+++ head/sys/geom/part/g_part_gpt.c Fri Sep  1 17:55:25 2017
(r323108)
@@ -731,6 +731,12 @@ g_part_gpt_dumpconf(struct g_part_table *table, struct
sbuf_printf(sb, "%s", indent);
sbuf_printf_uuid(sb, >ent.ent_uuid);
sbuf_printf(sb, "\n");
+   sbuf_printf(sb, "%s", indent);
+   sbuf_printf(sb, "HD(%d,GPT,", entry->base.gpe_index);
+   sbuf_printf_uuid(sb, >ent.ent_uuid);
+   sbuf_printf(sb, ",%#jx,%#jx)", (intmax_t)entry->base.gpe_start,
+   (intmax_t)entry->base.gpe_end);
+   sbuf_printf(sb, "\n");
} else {
/* confxml: scheme information */
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Rodney W. Grimes 
[ Charset UTF-8 unsupported, converting... ]
> Author: jpaetzel
> Date: Fri Sep  1 15:54:53 2017
> New Revision: 323087
> URL: https://svnweb.freebsd.org/changeset/base/323087
> 
> Log:
>   Take options IPSEC out of GENERIC
>   
>   PR: 220170
>   Submitted by:   delphij
>   Reviewed by:ae, glebius
>   MFC after:  2 weeks
>   Differential Revision:  D11806
> 
> Modified:
>   head/sys/amd64/conf/GENERIC
>   head/sys/arm64/conf/GENERIC
>   head/sys/i386/conf/GENERIC
>   head/sys/powerpc/conf/GENERIC
>   head/sys/riscv/conf/GENERIC
>   head/sys/sparc64/conf/GENERIC
> 
> Modified: head/sys/amd64/conf/GENERIC
> ==
> --- head/sys/amd64/conf/GENERIC   Fri Sep  1 11:51:07 2017
> (r323086)
> +++ head/sys/amd64/conf/GENERIC   Fri Sep  1 15:54:53 2017
> (r323087)
> @@ -28,7 +28,6 @@ options SCHED_ULE   # ULE scheduler
>  options  PREEMPTION  # Enable kernel thread preemption
>  options  INET# InterNETworking
>  options  INET6   # IPv6 communications protocols
> -options  IPSEC   # IP (v4/v6) security
>  options  IPSEC_SUPPORT   # Allow kldload of ipsec and tcpmd5
>  options  TCP_OFFLOAD # TCP offload
>  options  TCP_HHOOK   # hhook(9) framework for TCP
> 
> Modified: head/sys/arm64/conf/GENERIC
> ==
> --- head/sys/arm64/conf/GENERIC   Fri Sep  1 11:51:07 2017
> (r323086)
> +++ head/sys/arm64/conf/GENERIC   Fri Sep  1 15:54:53 2017
> (r323087)
> @@ -29,7 +29,6 @@ options PREEMPTION  # Enable kernel thread 
> preemption
>  options  INET# InterNETworking
>  options  INET6   # IPv6 communications protocols
>  options  IPSEC   # IP (v4/v6) security
> -options  IPSEC_SUPPORT   # Allow kldload of ipsec and 
> tcpmd5

Was this a miss fire???

>  options  TCP_HHOOK   # hhook(9) framework for TCP
>  options  TCP_OFFLOAD # TCP offload
>  options  SCTP# Stream Control Transmission Protocol
> 
> Modified: head/sys/i386/conf/GENERIC
> ==
> --- head/sys/i386/conf/GENERICFri Sep  1 11:51:07 2017
> (r323086)
> +++ head/sys/i386/conf/GENERICFri Sep  1 15:54:53 2017
> (r323087)
> @@ -30,7 +30,6 @@ options SCHED_ULE   # ULE scheduler
>  options  PREEMPTION  # Enable kernel thread preemption
>  options  INET# InterNETworking
>  options  INET6   # IPv6 communications protocols
> -options  IPSEC   # IP (v4/v6) security
>  options  IPSEC_SUPPORT   # Allow kldload of ipsec and 
> tcpmd5
>  options  TCP_HHOOK   # hhook(9) framework for TCP
>  options  TCP_OFFLOAD # TCP offload
> 
> Modified: head/sys/powerpc/conf/GENERIC
> ==
> --- head/sys/powerpc/conf/GENERIC Fri Sep  1 11:51:07 2017
> (r323086)
> +++ head/sys/powerpc/conf/GENERIC Fri Sep  1 15:54:53 2017
> (r323087)
> @@ -37,7 +37,6 @@ options SCHED_ULE   #ULE scheduler
>  options  PREEMPTION  #Enable kernel thread preemption
>  options  INET#InterNETworking
>  options  INET6   #IPv6 communications protocols
> -options  IPSEC   # IP (v4/v6) security
>  options  IPSEC_SUPPORT   # Allow kldload of ipsec and 
> tcpmd5
>  options  TCP_HHOOK   # hhook(9) framework for TCP
>  options  SCTP#Stream Control Transmission Protocol
> 
> Modified: head/sys/riscv/conf/GENERIC
> ==
> --- head/sys/riscv/conf/GENERIC   Fri Sep  1 11:51:07 2017
> (r323086)
> +++ head/sys/riscv/conf/GENERIC   Fri Sep  1 15:54:53 2017
> (r323087)
> @@ -33,7 +33,6 @@ options PREEMPTION  # Enable kernel thread 
> preemption
>  options  INET# InterNETworking
>  options  INET6   # IPv6 communications protocols
>  options  TCP_HHOOK   # hhook(9) framework for TCP
> -options  IPSEC   # IP (v4/v6) security
>  options  IPSEC_SUPPORT   # Allow kldload of ipsec and 
> tcpmd5
>  options  TCP_OFFLOAD # TCP offload
>  options  SCTP# Stream Control Transmission Protocol
> 
> Modified: head/sys/sparc64/conf/GENERIC
>

svn commit: r323103 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Josh Paetzel 
Author: jpaetzel
Date: Fri Sep  1 17:03:48 2017
New Revision: 323103
URL: https://svnweb.freebsd.org/changeset/base/323103

Log:
  Revert r323087
  
  This needs more thinking out and consensus, and the commit message
  was wrong AND there was a typo in the commit.
  
  pointyhat:jpaetzel

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/arm64/conf/GENERIC
  head/sys/i386/conf/GENERIC
  head/sys/powerpc/conf/GENERIC
  head/sys/riscv/conf/GENERIC
  head/sys/sparc64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri Sep  1 16:56:37 2017(r323102)
+++ head/sys/amd64/conf/GENERIC Fri Sep  1 17:03:48 2017(r323103)
@@ -28,6 +28,7 @@ options   SCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
+optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and tcpmd5
 optionsTCP_OFFLOAD # TCP offload
 optionsTCP_HHOOK   # hhook(9) framework for TCP

Modified: head/sys/arm64/conf/GENERIC
==
--- head/sys/arm64/conf/GENERIC Fri Sep  1 16:56:37 2017(r323102)
+++ head/sys/arm64/conf/GENERIC Fri Sep  1 17:03:48 2017(r323103)
@@ -29,6 +29,7 @@ options   PREEMPTION  # Enable kernel thread 
preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsIPSEC   # IP (v4/v6) security
+optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsTCP_OFFLOAD # TCP offload
 optionsSCTP# Stream Control Transmission Protocol

Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC  Fri Sep  1 16:56:37 2017(r323102)
+++ head/sys/i386/conf/GENERIC  Fri Sep  1 17:03:48 2017(r323103)
@@ -30,6 +30,7 @@ options   SCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
+optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsTCP_OFFLOAD # TCP offload

Modified: head/sys/powerpc/conf/GENERIC
==
--- head/sys/powerpc/conf/GENERIC   Fri Sep  1 16:56:37 2017
(r323102)
+++ head/sys/powerpc/conf/GENERIC   Fri Sep  1 17:03:48 2017
(r323103)
@@ -37,6 +37,7 @@ options   SCHED_ULE   #ULE scheduler
 optionsPREEMPTION  #Enable kernel thread preemption
 optionsINET#InterNETworking
 optionsINET6   #IPv6 communications protocols
+optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsSCTP#Stream Control Transmission Protocol

Modified: head/sys/riscv/conf/GENERIC
==
--- head/sys/riscv/conf/GENERIC Fri Sep  1 16:56:37 2017(r323102)
+++ head/sys/riscv/conf/GENERIC Fri Sep  1 17:03:48 2017(r323103)
@@ -33,6 +33,7 @@ options   PREEMPTION  # Enable kernel thread 
preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsTCP_HHOOK   # hhook(9) framework for TCP
+optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_OFFLOAD # TCP offload
 optionsSCTP# Stream Control Transmission Protocol

Modified: head/sys/sparc64/conf/GENERIC
==
--- head/sys/sparc64/conf/GENERIC   Fri Sep  1 16:56:37 2017
(r323102)
+++ head/sys/sparc64/conf/GENERIC   Fri Sep  1 17:03:48 2017
(r323103)
@@ -30,6 +30,7 @@ options   SCHED_ULE   # ULE scheduler
 options

svn commit: r323102 - head/libexec/rtld-elf

2017-09-01 Thread Konstantin Belousov 
Author: kib
Date: Fri Sep  1 16:56:37 2017
New Revision: 323102
URL: https://svnweb.freebsd.org/changeset/base/323102

Log:
  Add serial comma.
  
  Submitted by: wblock
  MFC after:3 days

Modified:
  head/libexec/rtld-elf/rtld.1

Modified: head/libexec/rtld-elf/rtld.1
==
--- head/libexec/rtld-elf/rtld.1Fri Sep  1 16:50:59 2017
(r323101)
+++ head/libexec/rtld-elf/rtld.1Fri Sep  1 16:56:37 2017
(r323102)
@@ -351,7 +351,7 @@ execution environments.
 The verification only uses Unix
 .Dv DACs ,
 ignores
-.Dv ACLs
+.Dv ACLs ,
 and is naturally prone to race conditions.
 Environments which rely on such restrictions are weak
 and breakable on their own.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Ian Lepore 
On Fri, 2017-09-01 at 09:06 -0700, Conrad Meyer wrote:
> Wait, why?  The PR doesn't explain it any better than this commit
> message.
> 
> On Fri, Sep 1, 2017 at 8:54 AM, Josh Paetzel 
> wrote:
> > 
> > Author: jpaetzel
> > Date: Fri Sep  1 15:54:53 2017
> > New Revision: 323087
> > URL: https://svnweb.freebsd.org/changeset/base/323087
> > 
> > Log:
> >   Take options IPSEC out of GENERIC
> > 
> >   PR:   220170
> >   Submitted by: delphij
> >   Reviewed by:  ae, glebius
> >   MFC after:2 weeks
> >   Differential Revision:D11806

The differential revision (which should be cited using the complete url
in the commit) seems to indicate that it's because it can be kldloaded.

This change misses the armv6 platform, where the option appears in
std.armv6, which gets included in GENERIC (and all other armv6
configs).

This change seems to warrant an entry in UPDATING, because it's going
to catch a lot of people by surprise.  Even people with custom kernels,
if they follow the advice of the handbook and "include GENERIC" then
override things.

-- Ian
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323100 - head/lib/libstand

2017-09-01 Thread Toomas Soome 
Author: tsoome
Date: Fri Sep  1 16:40:12 2017
New Revision: 323100
URL: https://svnweb.freebsd.org/changeset/base/323100

Log:
  libstand: nfs_readlink() should return proper return code
  
  The nfs_readlink() is returning constant 0 instead of variable.
  
  Reviewed by:  avg
  Differential Revision:https://reviews.freebsd.org/D12201

Modified:
  head/lib/libstand/nfs.c

Modified: head/lib/libstand/nfs.c
==
--- head/lib/libstand/nfs.c Fri Sep  1 16:29:39 2017(r323099)
+++ head/lib/libstand/nfs.c Fri Sep  1 16:40:12 2017(r323100)
@@ -382,7 +382,7 @@ nfs_readlink(struct nfs_iodesc *d, char *buf)
buf[repl->len] = 0;
 done:
free(pkt);
-   return (0);
+   return (rc);
 }
 #endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Sergey Kandaurov 
1 сент. 2017 г. 18:55 пользователь "Josh Paetzel" 
написал:

Author: jpaetzel
Date: Fri Sep  1 15:54:53 2017
New Revision: 323087
URL: https://svnweb.freebsd.org/changeset/base/323087

Log:
  Take options IPSEC out of GENERIC

  PR:   220170
  Submitted by: delphij
  Reviewed by:  ae, glebius
  MFC after:2 weeks
  Differential Revision:D11806

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/arm64/conf/GENERIC
  head/sys/i386/conf/GENERIC
  head/sys/powerpc/conf/GENERIC
  head/sys/riscv/conf/GENERIC
  head/sys/sparc64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC

==
--- head/sys/amd64/conf/GENERIC Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/amd64/conf/GENERIC Fri Sep  1 15:54:53 2017(r323087)
@@ -28,7 +28,6 @@ options   SCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
-optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and tcpmd5
 optionsTCP_OFFLOAD # TCP offload
 optionsTCP_HHOOK   # hhook(9) framework for TCP

Modified: head/sys/arm64/conf/GENERIC

==
--- head/sys/arm64/conf/GENERIC Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/arm64/conf/GENERIC Fri Sep  1 15:54:53 2017(r323087)
@@ -29,7 +29,6 @@ options   PREEMPTION  # Enable kernel
thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsIPSEC   # IP (v4/v6) security
-optionsIPSEC_SUPPORT


Looks like the wrong line is removed.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Conrad Meyer 
Wait, why?  The PR doesn't explain it any better than this commit message.

On Fri, Sep 1, 2017 at 8:54 AM, Josh Paetzel  wrote:
> Author: jpaetzel
> Date: Fri Sep  1 15:54:53 2017
> New Revision: 323087
> URL: https://svnweb.freebsd.org/changeset/base/323087
>
> Log:
>   Take options IPSEC out of GENERIC
>
>   PR:   220170
>   Submitted by: delphij
>   Reviewed by:  ae, glebius
>   MFC after:2 weeks
>   Differential Revision:D11806
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

2017-09-01 Thread Josh Paetzel 
Author: jpaetzel
Date: Fri Sep  1 15:54:53 2017
New Revision: 323087
URL: https://svnweb.freebsd.org/changeset/base/323087

Log:
  Take options IPSEC out of GENERIC
  
  PR:   220170
  Submitted by: delphij
  Reviewed by:  ae, glebius
  MFC after:2 weeks
  Differential Revision:D11806

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/arm64/conf/GENERIC
  head/sys/i386/conf/GENERIC
  head/sys/powerpc/conf/GENERIC
  head/sys/riscv/conf/GENERIC
  head/sys/sparc64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/amd64/conf/GENERIC Fri Sep  1 15:54:53 2017(r323087)
@@ -28,7 +28,6 @@ options   SCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
-optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and tcpmd5
 optionsTCP_OFFLOAD # TCP offload
 optionsTCP_HHOOK   # hhook(9) framework for TCP

Modified: head/sys/arm64/conf/GENERIC
==
--- head/sys/arm64/conf/GENERIC Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/arm64/conf/GENERIC Fri Sep  1 15:54:53 2017(r323087)
@@ -29,7 +29,6 @@ options   PREEMPTION  # Enable kernel thread 
preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsIPSEC   # IP (v4/v6) security
-optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsTCP_OFFLOAD # TCP offload
 optionsSCTP# Stream Control Transmission Protocol

Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC  Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/i386/conf/GENERIC  Fri Sep  1 15:54:53 2017(r323087)
@@ -30,7 +30,6 @@ options   SCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
-optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsTCP_OFFLOAD # TCP offload

Modified: head/sys/powerpc/conf/GENERIC
==
--- head/sys/powerpc/conf/GENERIC   Fri Sep  1 11:51:07 2017
(r323086)
+++ head/sys/powerpc/conf/GENERIC   Fri Sep  1 15:54:53 2017
(r323087)
@@ -37,7 +37,6 @@ options   SCHED_ULE   #ULE scheduler
 optionsPREEMPTION  #Enable kernel thread preemption
 optionsINET#InterNETworking
 optionsINET6   #IPv6 communications protocols
-optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_HHOOK   # hhook(9) framework for TCP
 optionsSCTP#Stream Control Transmission Protocol

Modified: head/sys/riscv/conf/GENERIC
==
--- head/sys/riscv/conf/GENERIC Fri Sep  1 11:51:07 2017(r323086)
+++ head/sys/riscv/conf/GENERIC Fri Sep  1 15:54:53 2017(r323087)
@@ -33,7 +33,6 @@ options   PREEMPTION  # Enable kernel thread 
preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsTCP_HHOOK   # hhook(9) framework for TCP
-optionsIPSEC   # IP (v4/v6) security
 optionsIPSEC_SUPPORT   # Allow kldload of ipsec and 
tcpmd5
 optionsTCP_OFFLOAD # TCP offload
 optionsSCTP# Stream Control Transmission Protocol

Modified: head/sys/sparc64/conf/GENERIC
==
--- head/sys/sparc64/conf/GENERIC   Fri Sep  1 11:51:07 2017
(r323086)
+++ head/sys/sparc64/conf/GENERIC   Fri Sep  1 15:54:53 2017
(r323087)
@@ -30,7 +30,6 @@ options   SCHED_ULE   # ULE scheduler
 options

svn commit: r323086 - head/sys/netipsec

2017-09-01 Thread Andrey V. Elsukov 
Author: ae
Date: Fri Sep  1 11:51:07 2017
New Revision: 323086
URL: https://svnweb.freebsd.org/changeset/base/323086

Log:
  Fix possible double releasing for SA reference.
  
  This is missing part of r318734. When crypto subsystem returns error
  the xform code handles an error independently.
  
  PR:   221849
  MFC after:5 days

Modified:
  head/sys/netipsec/udpencap.c

Modified: head/sys/netipsec/udpencap.c
==
--- head/sys/netipsec/udpencap.cFri Sep  1 11:14:30 2017
(r323085)
+++ head/sys/netipsec/udpencap.cFri Sep  1 11:51:07 2017
(r323086)
@@ -120,7 +120,7 @@ udp_ipsec_input(struct mbuf *m, int off, int af)
struct udphdr *udp;
struct ip *ip;
uint32_t spi;
-   int error, hlen;
+   int hlen;
 
/*
 * Just return if packet doesn't have enough data.
@@ -205,10 +205,7 @@ udp_ipsec_input(struct mbuf *m, int off, int af)
 * will do this anyway, so don't touch them here.
 */
ESPSTAT_INC(esps_input);
-   error = (*sav->tdb_xform->xf_input)(m, sav, hlen, off);
-   if (error != 0)
-   key_freesav();
-
+   (*sav->tdb_xform->xf_input)(m, sav, hlen, off);
return (EINPROGRESS);   /* Consumed by IPsec. */
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r323084 - head/sys/dev/ntb/ntb_hw

2017-09-01 Thread Alexander Motin 
Author: mav
Date: Fri Sep  1 09:48:19 2017
New Revision: 323084
URL: https://svnweb.freebsd.org/changeset/base/323084

Log:
  Link Interface has no Link Error registers.
  
  MFC after:13 days

Modified:
  head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c

Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
==
--- head/sys/dev/ntb/ntb_hw/ntb_hw_plx.cFri Sep  1 07:10:01 2017
(r323083)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_plx.cFri Sep  1 09:48:19 2017
(r323084)
@@ -231,6 +231,9 @@ ntb_plx_isr(void *arg)
 
ntb_db_event((device_t)arg, 0);
 
+   if (sc->link)   /* Link Interface has no Link Error registers. */
+   return;
+
val = NTX_READ(sc, 0xfe0);
if (val == 0)
return;
@@ -275,8 +278,11 @@ ntb_plx_setup_intr(device_t dev)
device_printf(dev, "bus_setup_intr failed: %d\n", error);
return (error);
}
-   NTX_WRITE(sc, 0xfe0, 0xf);  /* Clear link interrupts. */
-   NTX_WRITE(sc, 0xfe4, 0x0);  /* Unmask link interrupts. */
+
+   if (!sc->link) { /* Link Interface has no Link Error registers. */
+   NTX_WRITE(sc, 0xfe0, 0xf);  /* Clear link interrupts. */
+   NTX_WRITE(sc, 0xfe4, 0x0);  /* Unmask link interrupts. */
+   }
return (0);
 }
 
@@ -285,7 +291,9 @@ ntb_plx_teardown_intr(device_t dev)
 {
struct ntb_plx_softc *sc = device_get_softc(dev);
 
-   NTX_WRITE(sc, 0xfe4, 0xf);  /* Mask link interrupts. */
+   if (!sc->link)  /* Link Interface has no Link Error registers. */
+   NTX_WRITE(sc, 0xfe4, 0xf);  /* Mask link interrupts. */
+
if (sc->int_res) {
bus_teardown_intr(dev, sc->int_res, sc->int_tag);
bus_release_resource(dev, SYS_RES_IRQ, sc->int_rid,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"