From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [kvm-unit-test PATCH] kvmclock: serialize RDTSC Date: Fri, 14 Jun 2013 18:30:04 -0300 Message-ID: <20130614213004.GA2250@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: kvm-devel Return-path: Received: from mx1.redhat.com ([209.132.183.28]:9830 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752166Ab3FOAqL (ORCPT ); Fri, 14 Jun 2013 20:46:11 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5F0kAfb002840 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 Jun 2013 20:46:10 -0400 Received: from amt.cnet (vpn1-6-66.gru2.redhat.com [10.97.6.66]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5F0kAEQ029235 for ; Fri, 14 Jun 2013 20:46:10 -0400 Received: from amt.cnet (localhost [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E2AB41048A5 for ; Fri, 14 Jun 2013 18:30:10 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.6/8.14.6/Submit) id r5ELUAsD002261 for kvm@vger.kernel.org; Fri, 14 Jun 2013 18:30:10 -0300 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: Serialize RDTSC so its executed inside kvmclock_read section. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=922285 Signed-off-by: Marcelo Tosatti diff --git a/x86/kvmclock.c b/x86/kvmclock.c index 0624da3..5b831c5 100644 --- a/x86/kvmclock.c +++ b/x86/kvmclock.c @@ -177,10 +177,10 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) do { version = pvclock_get_time_values(&shadow, src); - barrier(); + mb(); offset = pvclock_get_nsec_offset(&shadow); ret = shadow.system_timestamp + offset; - barrier(); + mb(); } while (version != src->version); if ((valid_flags & PVCLOCK_RAW_CYCLE_BIT) ||