From owner-svn-src-all@FreeBSD.ORG  Wed Aug  1 17:34:44 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 48935106566C;
	Wed,  1 Aug 2012 17:34:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 33D078FC1B;
	Wed,  1 Aug 2012 17:34:44 +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 q71HYifb080351;
	Wed, 1 Aug 2012 17:34:44 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q71HYh3C080349;
	Wed, 1 Aug 2012 17:34:43 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201208011734.q71HYh3C080349@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 1 Aug 2012 17:34:43 +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: r238975 - head/sys/x86/x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 17:34:44 -0000

Author: kib
Date: Wed Aug  1 17:34:43 2012
New Revision: 238975
URL: http://svn.freebsd.org/changeset/base/238975

Log:
  Do a trivial reformatting of the comment, to record the proper commit
  message for r238973:
  
  Rdtsc instruction is not synchronized, it seems on some Intel cores it
  can bypass even the locked instructions.  As a result, rdtsc executed
  on different cores may return unordered TSC values even when the rdtsc
  appearance in the instruction sequences is provably ordered.
  
  Similarly to what has been done in r238755 for TSC synchronization
  test, add explicit fences right before rdtsc in the timecounters 'get'
  functions.  Intel recommends to use LFENCE, while AMD refers to
  MFENCE. For VIA follow what Linux does and use LFENCE.  With this
  change, I see no reordered reads of TSC on Nehalem.
  
  Change the rmb() to inlined CPUID in the SMP TSC synchronization test.
  On i386, locked instruction is used for rmb(), and as noted earlier,
  it is not enough. Since i386 machine may not support SSE2, do simplest
  possible synchronization with CPUID.
  
  MFC after:	  1 week
  Discussed with:	  avg, bde, jkim

Modified:
  head/sys/x86/x86/tsc.c

Modified: head/sys/x86/x86/tsc.c
==============================================================================
--- head/sys/x86/x86/tsc.c	Wed Aug  1 17:31:31 2012	(r238974)
+++ head/sys/x86/x86/tsc.c	Wed Aug  1 17:34:43 2012	(r238975)
@@ -354,8 +354,7 @@ init_TSC(void)
  * timecounters use MFENCE for AMD CPUs, and LFENCE for others (Intel
  * and VIA) when SSE2 is present, and nothing on older machines which
  * also do not issue RDTSC prematurely.  There, testing for SSE2 and
- * vendor is too cumbersome, and we learn about TSC presence from
- * CPUID.
+ * vendor is too cumbersome, and we learn about TSC presence from CPUID.
  *
  * Do not use do_cpuid(), since we do not need CPUID results, which
  * have to be written into memory with do_cpuid().