From owner-svn-src-head@FreeBSD.ORG Sat Jul 30 20:42:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD283106564A; Sat, 30 Jul 2011 20:42:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A39358FC08; Sat, 30 Jul 2011 20:42:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6UKgEJa014782; Sat, 30 Jul 2011 20:42:14 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6UKgEIV014778; Sat, 30 Jul 2011 20:42:14 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201107302042.p6UKgEIV014778@svn.freebsd.org> From: Andriy Gapon Date: Sat, 30 Jul 2011 20:42:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224528 - in head: release/doc/en_US.ISO8859-1/hardware share/man/man4 tools/tools/sysdoc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2011 20:42:14 -0000 Author: avg Date: Sat Jul 30 20:42:14 2011 New Revision: 224528 URL: http://svn.freebsd.org/changeset/base/224528 Log: update smp related documentation after recent changes Remove references to machdep.hlt_logical_cpus and machdep.hlt_cpus sysctls and tunables. Document machdep.hyperthreading_allowed and hint.lapic.X.disabled tunables. Prompted by: ru Proofreading: bf Reviewed by: jhb Approved by: re (kib) Modified: head/release/doc/en_US.ISO8859-1/hardware/article.sgml head/share/man/man4/smp.4 head/tools/tools/sysdoc/tunables.mdoc Modified: head/release/doc/en_US.ISO8859-1/hardware/article.sgml ============================================================================== --- head/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Jul 30 20:29:39 2011 (r224527) +++ head/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Jul 30 20:42:14 2011 (r224528) @@ -196,10 +196,8 @@ Because this naive scheduling can result in suboptimal performance, under certain circumstances it may be useful to disable the logical processors with the the - machdep.hlt_logical_cpus sysctl variable. - It is also possible to halt any CPU in the idle loop with the - machdep.hlt_cpus sysctl variable. The - &man.smp.4; manual page has more details. + machdep.hyperthreading_allowed tunable. + The &man.smp.4; manual page has more details. &os; will take advantage of Physical Address Extensions (PAE) support on CPUs that support this feature. A kernel Modified: head/share/man/man4/smp.4 ============================================================================== --- head/share/man/man4/smp.4 Sat Jul 30 20:29:39 2011 (r224527) +++ head/share/man/man4/smp.4 Sat Jul 30 20:42:14 2011 (r224528) @@ -63,10 +63,10 @@ the read-only sysctl variable .Pp .Fx allows specific CPUs on a multi-processor system to be disabled. -The sysctl variable -.Va machdep.hlt_cpus -is an integer bitmask denoting CPUs to halt, counting from 0. -Setting a bit to 1 will result in the corresponding CPU being +This can be done using the +.Va hint.lapic.X.disabled +tunable, where X is the APIC ID of a CPU. +Setting this tunable to 1 will result in the corresponding CPU being disabled. .Pp The @@ -122,12 +122,12 @@ tasks on CPUs that are closely grouped t supports hyperthreading on Intel CPU's on the i386 and AMD64 platforms. Since using logical CPUs can cause performance penalties under certain loads, the logical CPUs can be disabled by setting the -.Va machdep.hlt_logical_cpus -sysctl to one. -Note that this operation is different from the mechanism used by the +.Va machdep.hyperthreading_allowed +tunable to zero. .Xr cpuset 1 . .Sh SEE ALSO .Xr mptable 1 , +.Xr loader 8 , .Xr sysctl 8 , .Xr condvar 9 , .Xr msleep 9 , Modified: head/tools/tools/sysdoc/tunables.mdoc ============================================================================== --- head/tools/tools/sysdoc/tunables.mdoc Sat Jul 30 20:29:39 2011 (r224527) +++ head/tools/tools/sysdoc/tunables.mdoc Sat Jul 30 20:42:14 2011 (r224528) @@ -1233,24 +1233,12 @@ machdep.disable_mtrrs machdep.guessed_bootdev --- -machdep.hlt_cpus +machdep.hyperthreading_allowed bool -This option will permit the halting -of CPUs. -For instance, to halt CPU 0, -machdep.htl_cpus=1 can be used. -It is possible to halt two CPUs by providing -a comma separated list (i.e: cpu1,cpu2). - ---- -machdep.hlt_logical_cpus -bool - -This keeps the logical CPUs halted in the idle loop. -By default the logical CPUs are halted at startup. -It is also possible to halt any cpu in the idle loop now -using machdep.hlt_cpus. +Setting this tunable to zero disables +the use of additional logical processors +provided by Intel HTT technology. --- machdep.panic_on_nmi