Merge branch 'rickard/default-unbound/OTP-9726'

* rickard/default-unbound/OTP-9726:
  Use unbound schedulers as default

3 files changed, 23 insertions, 53 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index d0a0ceaeba..53f46d2a2e 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -41,25 +41,11 @@
       to scroll back to text which has scrolled off the screen.
       The <c><![CDATA[erl]]></c> program must be used, however, in pipelines or if
       you want to redirect standard input or output.</p>
-      <note><p>As of ERTS version 5.8 (OTP-R14A) the runtime system will by
-               default bind schedulers to logical processors using the
-	       <c>default_bind</c> bind type if the amount of schedulers are
-	       at least equal to the amount of logical processors configured,
-	       binding of schedulers is supported, and a CPU topology is
-	       available at startup.
-	    </p><p>
-	       If the Erlang runtime system is the only operating system
-	       process that binds threads to logical processors, this
-	       improves the performance of the runtime system. However,
-	       if other operating system processes (as for example
-	       another Erlang runtime system) also bind threads to
-	       logical processors, there might be a performance penalty
-	       instead. If this is the case you, are are advised to
-	       unbind the schedulers using the
-	       <seealso marker="#+sbt">+sbtu</seealso> command line argument,
-	       or by invoking
-	       <seealso marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type,
-	       unbound)</seealso>.</p>
+      <note><p>As of ERTS version 5.9 (OTP-R15B) the runtime system will by
+               default <em>not</em> bind schedulers to logical processors.
+	       For more information see documentation of the
+	       <seealso marker="#+sbt">+sbt</seealso> system flag.
+	    </p>
       </note>
   </description>
   <funcs>
@@ -725,22 +711,18 @@
 	       that the <c>+sct</c> flag may have to be passed before the
 	       <c>+sbt</c> flag on the command line (in case no CPU topology
 	       has been automatically detected).</p>
-            <p>The runtime system will by default bind schedulers to logical
-	       processors using the <c>default_bind</c> bind type if the amount
-	       of schedulers are at least equal to the amount of logical
-	       processors configured, binding of schedulers is supported,
-	       and a CPU topology is available at startup.
+            <p>The runtime system will by default <em>not</em> bind schedulers
+	       to logical processors.
 	    </p>
-	    <p><em>NOTE:</em> If the Erlang runtime system is the only operating
-	       system process that binds threads to logical processors, this
-	       improves the performance of the runtime system. However, if other
-	       operating system processes (as for example another Erlang runtime
-	       system) also bind threads to logical processors, there might be a
-	       performance penalty instead. If this is the case you, are advised
-	       to unbind the schedulers using the <c>+sbtu</c> command line
-	       argument, or by invoking
-	       <seealso marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type,
-	       unbound)</seealso>.</p>
+	    <p><em>NOTE:</em> If the Erlang runtime system is the only operating system
+	       process that binds threads to logical processors, this
+	       improves the performance of the runtime system. However,
+	       if other operating system processes (as for example
+	       another Erlang runtime system) also bind threads to
+	       logical processors, there might be a performance penalty
+	       instead. In some cases this performance penalty might be
+	       severe. If this is the case, you are advised to not
+	       bind the schedulers.</p>
 	    <p>For more information, see
 	    <seealso marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type, SchedulerBindType)</seealso>.
 	    </p>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 2ea144eb3f..d685728862 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5200,21 +5200,17 @@ true</pre>
 	       For more information on how to define the CPU topology, see 
 	       <seealso marker="#system_flag_cpu_topology">erlang:system_flag(cpu_topology, CpuTopology)</seealso>.
 	    </p>
-            <p>The runtime system will by default bind schedulers to logical
-	       processors using the <c>default_bind</c> bind type if the amount
-	       of schedulers are at least equal to the amount of logical
-	       processors configured, binding of schedulers is supported,
-	       and a CPU topology is available at startup.
+            <p>The runtime system will by default <em>not</em> bind schedulers
+	       to logical processors.
 	    </p>
 	    <p><em>NOTE:</em> If the Erlang runtime system is the only
 	       operating system process that binds threads to logical processors,
 	       this improves the performance of the runtime system. However,
 	       if other operating system processes (as for example another Erlang
 	       runtime system) also bind threads to logical processors, there
-	       might be a performance penalty instead. If this is the case you,
-	       are are advised to unbind the schedulers using the
-	       <seealso marker="erl#+sbt">+sbtu</seealso> command line argument,
-	       or <c>erlang:system_flag(scheduler_bind_type, unbound)</c>.</p>
+	       might be a performance penalty instead. In some cases this
+	       performance penalty might be severe. If this is the case, you
+	       are advised to not bind the schedulers.</p>
 	    <p>Schedulers can be bound in different ways. The <c>How</c>
 	       argument determines how schedulers are bound. <c>How</c> can
 	       currently be one of:</p>
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
index 03c0ef904a..cc930ba1e3 100644
--- a/erts/emulator/beam/erl_cpu_topology.c
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -1729,16 +1729,8 @@ erts_init_cpu_topology(void)
 	scheduler2cpu_map[ix].bound_id = -1;
     }
 
-    if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED) {
-	int ncpus = erts_get_cpu_configured(cpuinfo);
-	if (ncpus < 1 || erts_no_schedulers < ncpus)
-	    cpu_bind_order = ERTS_CPU_BIND_NONE;
-	else
-	    cpu_bind_order = ((system_cpudata || user_cpudata)
-			      && (erts_bind_to_cpu(cpuinfo, -1) != -ENOTSUP)
-			      ? ERTS_CPU_BIND_DEFAULT_BIND
-			      : ERTS_CPU_BIND_NONE);
-    }
+    if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED)
+	cpu_bind_order = ERTS_CPU_BIND_NONE;
 
     reader_groups_map = add_cpu_groups(reader_groups,
 				       reader_groups_callback,