From patchwork Mon Feb 15 19:00:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8317991 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82A08C02AA for ; Mon, 15 Feb 2016 19:00:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 915402017E for ; Mon, 15 Feb 2016 19:00:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9681D2035B for ; Mon, 15 Feb 2016 19:00:44 +0000 (UTC) Received: from localhost ([::1]:35337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVOO4-0005DK-4b for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Feb 2016 14:00:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVONt-00059l-Au for qemu-devel@nongnu.org; Mon, 15 Feb 2016 14:00:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVONo-00070P-5K for qemu-devel@nongnu.org; Mon, 15 Feb 2016 14:00:33 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:35678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVONn-00070D-UP for qemu-devel@nongnu.org; Mon, 15 Feb 2016 14:00:28 -0500 Received: by mail-wm0-x22e.google.com with SMTP id c200so127203711wme.0 for ; Mon, 15 Feb 2016 11:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=b3iupx4UjxXsXSYVxZT/Z7zRg0H+d8SWE4h1QUCO10E=; b=D0CxgY+1TEhH9IDhSumzWV0hvXQP/ge3kYkpgcbKdj4d42DX0G+aPDCcg6wT0FR4+Y roMMbcywaq7ewiMs0s3BTg6HA+WD970EfCQAcYmZ1qY9KCIEA7hEji6+L7tifD9qdDZx 6fxNic5mGFpGjjRcBXbtTsgAmznE0f1n/+69RaYkdomwXgF240xyPLMnX/L5gqGk2CUs D4SUGj3/0LxPf1AlEmadPD/FGZxsbq1hQmwaX6gRTxlOZn01a9z72U+X8/YXT/utnArM DoMTPocbxA4zz25KXPELo9lxK4+VO7W1o2pzZNZNt6C7ZqpVqLeTBLOGE0zEf4bGsj0d FRqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=b3iupx4UjxXsXSYVxZT/Z7zRg0H+d8SWE4h1QUCO10E=; b=ba5guAQuSXWNGm6IgYY/YOZGitKV/VJP2qyTpleYoJxjkFpqq7sXi5KhSFwTKiqJiw rUKj601S1CcsTDRBD5YSkxAtmEN0rvFjKF+phiC08Qt5xurFe1uEXECLH408ZuMHG7VL pOCy3BrecpM/LZ3HlqCo8507SZDg0Cs4EjxfFmMiShumx0wzQhnHsaQS9zGpiLZ52RLO rKYd1YJebJ53etZUs8cVS1jg9uj2vGki/38pJIFN0KCDGqu+Bzl+VNX7+NQ1p/tLzttN jcOoK1qMrP0nQ4Rv/MAk5Uqxv2snoADmdZ9mI1DBCnqKc1HlkLMj4uQMNcWXUx4nhQUY oH8A== X-Gm-Message-State: AG10YOS2UUtNk0doc2/4Pq/pBUMdug/29nSdnHdAFT9/FEoS+AFGqql4sl4JhqfuRVj5uw== X-Received: by 10.194.250.35 with SMTP id yz3mr19861779wjc.173.1455562827216; Mon, 15 Feb 2016 11:00:27 -0800 (PST) Received: from donizetti.lan (94-39-170-121.adsl-ull.clienti.tiscali.it. [94.39.170.121]) by smtp.gmail.com with ESMTPSA id b203sm16910560wmh.8.2016.02.15.11.00.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2016 11:00:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 Feb 2016 20:00:23 +0100 Message-Id: <1455562823-31250-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22e Cc: Dave Gilbert , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] migration: fix incorrect memory_global_dirty_log_start outside BQL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This can cause various segmentation faults or aborts in qemu-iotests test 091. Fixes: 5b82b703b69acc67b78b98a5efc897a3912719eb Cc: Dave Gilbert Cc: Stefan Hajnoczi Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- migration/ram.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 96c749f..704f6a9 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1920,6 +1920,9 @@ static int ram_save_setup(QEMUFile *f, void *opaque) acct_clear(); } + /* For memory_global_dirty_log_start below. */ + qemu_mutex_lock_iothread(); + qemu_mutex_lock_ramlist(); rcu_read_lock(); bytes_transferred = 0; @@ -1944,6 +1947,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) memory_global_dirty_log_start(); migration_bitmap_sync(); qemu_mutex_unlock_ramlist(); + qemu_mutex_unlock_iothread(); qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE);