From patchwork Tue Oct 31 11:26:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 117588 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3782537qgn; Tue, 31 Oct 2017 04:31:27 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QXXuy1mzx1mrNfPmHHF5mH6hD5geI1T0ApYrKKLpop0OFz3TV5UsU2qOU3zPUyB+2Kilyc X-Received: by 10.37.98.135 with SMTP id w129mr877224ybb.177.1509449487907; Tue, 31 Oct 2017 04:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509449487; cv=none; d=google.com; s=arc-20160816; b=mPX0lUfHqVUp0C2ifnCijIZ1ycQG9cyB59e8spVO1oZljlamOpVaYIgFDG2DdN4wWe Z1Fu36tdJdpMZaiIyM3k+HGP4m9M8qp1Q6rD6VCZ5AvRm3VBLTcg501w8pGi6IK8eFMA W2knU2rI8+EtkD2JJjyuii/M5Z5RMPrdXJSqyJvVVBafx5Lmyzulg8UC8onKgSrs/RqM QzzkEhkMTXS20Ro7vzMycw/CgeNPV+/qBBMZEBUtrC4X4Z4XGAkKA+QRKexmrzvzr9cB AQ8NrYzcKJpiQ8jXGColqhLPkoxxjS4msNoI59g6O8eKxl88Zkaw9rjNoGvDxPvRxZsG Na4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=dpH72NVjSEz8gPuLBqVVUM62om0pxxM3CuVXIosSo0M=; b=h4qJwMqzaiwcLA8Pk+QFLzchGdbNNcBQzVgu9JhyHW2M7Sx6megeRiygZoF1krR7fz ERGuRdauSTwJzq2TvK6W23BGoF78L5sev3z0BuNmRhw5A4r9pJkVSiuU95wlsQjB7EjP tbcdu16GIFEX3fBBxPU77151006PaYbeBBOB+596oaL8HAv16I4oVJO73F2dI575k59S dGgHZEYi6OHf4/KGg98aKlGOBIsKVmi7d3mJyOG+Y8HyanNSyhTHlL4WECUYbJQ0vMU+ FGsL8Dg9d+65IHAOirQZ6Kmxcw/cU42LSZ9ZnHJmn4Htn0PEvGoZD+Am4o61P1CPii3H x6BA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c7si328176ybk.63.2017.10.31.04.31.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 31 Oct 2017 04:31:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:44895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9UlT-0007qd-7k for patch@linaro.org; Tue, 31 Oct 2017 07:31:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9Ugh-0003mr-0I for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:26:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9Ugd-0000Hj-RC for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:26:31 -0400 Received: from mail.ispras.ru ([83.149.199.45]:45270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9Ugd-0000HK-FR for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:26:27 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 7D28254006A; Tue, 31 Oct 2017 14:26:26 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 31 Oct 2017 14:26:27 +0300 Message-ID: <20171031112627.10516.92024.stgit@pasha-VirtualBox> In-Reply-To: <20171031112457.10516.8971.stgit@pasha-VirtualBox> References: <20171031112457.10516.8971.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFC PATCH 16/26] replay: make locking visible outside replay code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, pavel.dovgaluk@ispras.ru, mst@redhat.com, jasowang@redhat.com, quintela@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, boost.lists@gmail.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée The replay_mutex_lock/unlock/locked functions are now going to be used for ensuring lock-step behaviour between the two threads. Make them public API functions and also provide stubs for non-QEMU builds on common paths. Signed-off-by: Alex Bennée Tested-by: Pavel Dovgalyuk --- include/sysemu/replay.h | 14 ++++++++++++++ replay/replay-internal.c | 5 ++--- replay/replay-internal.h | 5 ++--- stubs/replay.c | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index b86d6bb..9973849 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -47,6 +47,20 @@ extern ReplayMode replay_mode; /* Name of the initial VM snapshot */ extern char *replay_snapshot; +/* Replay locking + * + * The locks are needed to protect the shared structures and log file + * when doing record/replay. They also are the main sync-point between + * the main-loop thread and the vCPU thread. This was a role + * previously filled by the BQL which has been busy trying to reduce + * its impact across the code. This ensures blocks of events stay + * sequential and reproducible. + */ + +void replay_mutex_lock(void); +void replay_mutex_unlock(void); +bool replay_mutex_locked(void); + /* Replay process control functions */ /*! Enables recording or saving event log with specified parameters */ diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 157c863..e6b2fdb 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -181,7 +181,7 @@ void replay_mutex_destroy(void) static __thread bool replay_locked; -static bool replay_mutex_locked(void) +bool replay_mutex_locked(void) { return replay_locked; } @@ -204,7 +204,7 @@ void replay_mutex_unlock(void) void replay_save_instructions(void) { if (replay_file && replay_mode == REPLAY_MODE_RECORD) { - replay_mutex_lock(); + g_assert(replay_mutex_locked()); int diff = (int)(replay_get_current_step() - replay_state.current_step); /* Time can only go forward */ @@ -215,6 +215,5 @@ void replay_save_instructions(void) replay_put_dword(diff); replay_state.current_step += diff; } - replay_mutex_unlock(); } } diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 8e4c701..f5f8e96 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -100,12 +100,11 @@ int64_t replay_get_qword(void); void replay_get_array(uint8_t *buf, size_t *size); void replay_get_array_alloc(uint8_t **buf, size_t *size); -/* Mutex functions for protecting replay log file */ +/* Mutex functions for protecting replay log file and ensuring + * synchronisation between vCPU and main-loop threads. */ void replay_mutex_init(void); void replay_mutex_destroy(void); -void replay_mutex_lock(void); -void replay_mutex_unlock(void); /*! Checks error status of the file. */ void replay_check_error(void); diff --git a/stubs/replay.c b/stubs/replay.c index 9991ee5..cb050ef 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -73,3 +73,18 @@ uint64_t blkreplay_next_id(void) { return 0; } + +void replay_mutex_lock(void) +{ + abort(); +} + +void replay_mutex_unlock(void) +{ + abort(); +} + +bool replay_mutex_locked(void) +{ + return false; +}