From patchwork Wed Feb 7 12:05:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 127165 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp412071ljc; Wed, 7 Feb 2018 04:14:28 -0800 (PST) X-Google-Smtp-Source: AH8x224U468K3SRVIhkNkSo3iF7wFP/xbZr8oAbkkc484N0tZiQY+8cmNeK33gy7rGGCN6HQkKqr X-Received: by 10.129.27.12 with SMTP id b12mr3568455ywb.489.1518005667957; Wed, 07 Feb 2018 04:14:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518005667; cv=none; d=google.com; s=arc-20160816; b=CWTc3xUoAtRjjtwU6S41rzelFMUkDP893gf62sHcXhUyoZC6V/Abn167tlPDxlCRJ1 LTHDjkpWY+mE9c66vzUj9ULRgGfJIKVc0XjuqdaeiZVSoOK9eAVuDqNKxWetsAp8RVAs inf6VHmhCoGe7jVQjdrlFAXj7LvK9hVQsrC2uP39wPsutTFlbYOCrF8vXgaiw0UXgnCK n1drCOsQNqHhpSKwzDGYFHxEVN0dDj6juoi7ZxlZBEklj5IO7Xvuv+NVXpB6WEjF7iyQ lvnLpV/0b+06fGbvVOF2HTIKWnP0PCmSi5ov4IajcA1wJkRtXCCOxwuvScrR56S+qAPc vGpQ== 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=n+5/tS9c42r5JdvqQnkFKxZ0qgC7VaYSBZW72MeV6w0=; b=jDQU2yRLES8G0GMQdOGlsSyvFFLcPvU/wsedSqYSdrH4Y0Jk/+qN/71JWjPJtO+Qvm WldeGpkY9XtsCLJd48l/PNZ0v+8guANnwO6NiNvXLV6W+tjHDJiLlyQ4iwspjSOvmVVL UgvtIVtd0G6x9dvUwT+lveWO0Ql+fxsUKnx0lCzaSF88MIXmRpuPGvN1lC2bD89KaQR3 KeRsB/4rrJHmRO0YTuO0f/Hp8P2gUL8F2sIySNmc//y4SAwfTjf2zjp/bitnvlDy3TOl HI1T+4+fnEgdTLPmbGLh4J+H/NvaKtsDj1Iv4cKnUk7K5vb/jLMjZthMChFsmi6Icdo2 o7Dw== 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 a4si233118ywm.564.2018.02.07.04.14.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Feb 2018 04:14:27 -0800 (PST) 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]:57026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOcN-0000bE-8O for patch@linaro.org; Wed, 07 Feb 2018 07:14:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOTE-0000ia-Kl for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:05:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejOTD-0004GT-I0 for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:05:00 -0500 Received: from mail.ispras.ru ([83.149.199.45]:47546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOTD-0004G5-Am for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:04:59 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 7331854008B; Wed, 7 Feb 2018 15:04:58 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 07 Feb 2018 15:05:00 +0300 Message-ID: <20180207120500.5389.4855.stgit@pasha-VirtualBox> In-Reply-To: <20180207120353.5389.54531.stgit@pasha-VirtualBox> References: <20180207120353.5389.54531.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 v6 12/20] 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, war2jordan@live.com, pavel.dovgaluk@ispras.ru, quintela@redhat.com, ciro.santilli@gmail.com, jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.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 | 2 +- replay/replay-internal.h | 5 ++--- stubs/replay.c | 15 +++++++++++++++ 4 files changed, 32 insertions(+), 4 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 0d7e1d6..7cdefea 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -181,7 +181,7 @@ void replay_mutex_destroy(void) qemu_mutex_destroy(&lock); } -static bool replay_mutex_locked(void) +bool replay_mutex_locked(void) { return replay_locked; } 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; +}