From patchwork Mon Feb 22 16:57:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 45974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 191EBB7CD5 for ; Tue, 23 Feb 2010 04:03:18 +1100 (EST) Received: from localhost ([127.0.0.1]:39062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Njbg9-0007ku-TY for incoming@patchwork.ozlabs.org; Mon, 22 Feb 2010 12:02:41 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Njbbu-0005uU-4w for qemu-devel@nongnu.org; Mon, 22 Feb 2010 11:58:18 -0500 Received: from [199.232.76.173] (port=50832 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Njbbt-0005ts-BZ for qemu-devel@nongnu.org; Mon, 22 Feb 2010 11:58:17 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Njbbq-0004NG-8r for qemu-devel@nongnu.org; Mon, 22 Feb 2010 11:58:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1026) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Njbbp-0004N8-Sn for qemu-devel@nongnu.org; Mon, 22 Feb 2010 11:58:14 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1MGwCbD021085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Feb 2010 11:58:13 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1MGwC5K004829; Mon, 22 Feb 2010 11:58:12 -0500 Received: from amt.cnet (vpn-11-163.rdu.redhat.com [10.11.11.163]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o1MGwAM3021923; Mon, 22 Feb 2010 11:58:11 -0500 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id C223D68A230; Mon, 22 Feb 2010 13:57:56 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o1MGvsps024912; Mon, 22 Feb 2010 13:57:54 -0300 Date: Mon, 22 Feb 2010 13:57:54 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org Message-ID: <20100222165754.GA24872@amt.cnet> References: <20100222135906.347393434@amt.cnet> <20100222140210.130087300@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100222140210.130087300@amt.cnet> User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: avi@redhat.com, "Michael S. Tsirkin" Subject: [Qemu-devel] Re: [patch uq/master 2/2] kvm-all.c: define smp_wmb and use it for coalesced mmio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Acked-by: "Michael S. Tsirkin" Signed-off-by: Marcelo Tosatti Index: qemu/kvm-all.c =================================================================== --- qemu.orig/kvm-all.c +++ qemu/kvm-all.c @@ -21,6 +21,7 @@ #include #include "qemu-common.h" +#include "qemu-barrier.h" #include "sysemu.h" #include "hw/hw.h" #include "gdbstub.h" @@ -730,7 +731,7 @@ void kvm_flush_coalesced_mmio_buffer(voi ent = &ring->coalesced_mmio[ring->first]; cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); - /* FIXME smp_wmb() */ + smp_wmb(); ring->first = (ring->first + 1) % KVM_COALESCED_MMIO_MAX; } } Index: qemu/qemu-barrier.h =================================================================== --- /dev/null +++ qemu/qemu-barrier.h @@ -0,0 +1,7 @@ +#ifndef __QEMU_BARRIER_H +#define __QEMU_BARRIER_H 1 + +/* FIXME: arch dependant, x86 version */ +#define smp_wmb() asm volatile("" ::: "memory") + +#endif