From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvlYa-0007KJ-88 for qemu-devel@nongnu.org; Tue, 02 Dec 2014 06:23:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvlYT-00015w-RX for qemu-devel@nongnu.org; Tue, 02 Dec 2014 06:23:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvlYT-00015W-KU for qemu-devel@nongnu.org; Tue, 02 Dec 2014 06:23:41 -0500 From: Stefan Hajnoczi Date: Tue, 2 Dec 2014 11:23:19 +0000 Message-Id: <1417519399-3166-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1417519399-3166-1-git-send-email-stefanha@redhat.com> References: <1417519399-3166-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [RFC v2 6/6] memory: make cpu_physical_memory_sync_dirty_bitmap() fully atomic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Peter Maydell The fast path of cpu_physical_memory_sync_dirty_bitmap() directly manipulates the dirty bitmap. Use atomic_xchg() to make the test-and-clear atomic. Signed-off-by: Stefan Hajnoczi --- include/exec/ram_addr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index cdcbe9a..3d2a4c1 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -195,13 +195,13 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, unsigned long *src = ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION]; for (k = page; k < page + nr; k++) { - if (src[k]) { + unsigned long bits = atomic_xchg(&src[k], 0); + if (bits) { unsigned long new_dirty; new_dirty = ~dest[k]; - dest[k] |= src[k]; - new_dirty &= src[k]; + dest[k] |= bits; + new_dirty &= bits; num_dirty += ctpopl(new_dirty); - src[k] = 0; } } } else { -- 2.1.0