From patchwork Tue Aug 21 17:02:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 960653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rtOxUP3c"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vyds6QjVz9s7X for ; Wed, 22 Aug 2018 03:41:21 +1000 (AEST) Received: from localhost ([::1]:55141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAec-0004D1-VA for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:41:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4n-0002IG-RR for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4Y-0006se-Iq for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:11 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:53598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4X-0006p8-Lh for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:02 -0400 Received: by mail-wm0-x243.google.com with SMTP id s9-v6so3626333wmh.3 for ; Tue, 21 Aug 2018 10:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=UL37P/PVM+DWTYC/C7CpOadT2asAFlFAO6FuAW3p08E=; b=rtOxUP3cO2OeeFbHqfo3u6MVEK86vUWT5B+MuKJKOH8PYmhv557QQ7pLC5mDjV5aKK C4Q+4dfnY/IYQ66v7Y+/T0vJnL2gFyzBHLvK9Yt9Av9Iq+g9kSDV1HxaJyw81S0ljHS0 XdZpo8sOTgL9Lr5/vUXfz9BQlY+0L3Ovzk2EoIsuL0wT8UN3gxKvZkotelCnOCEpcXVb e8R/mLWSQkrw2OosZPYZrqd6TUrPdCeWYp1zo//p37uBH/GZcG8lXKZGQ9IN13tGnScK EhDzW4B3avqX+9bUv85KVmfqh9o0NpHAfmx3rmemsxGnsUcFiOOZ7e6zJuh907FeEkMv ZujQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=UL37P/PVM+DWTYC/C7CpOadT2asAFlFAO6FuAW3p08E=; b=AaG8vCetVquSuVcWUsujfniH1B0EaactWP1n4oBEqnUMa3s7NFl5ep6vOXQ/oGohDk 1EbY92qxbUkzLfP7beo18CWoyTcXyKktbdcPG2KrmQVFBz062+kqW4AmS2kADGdYbW47 hSiDJnn/Oa/Zoc3PByGNZBAkRewG6/oAVeimjtM0ubX1eSXqj/QkqjAthH2wM+3PUfGL eBTfG6y5abA7Vw2Z4QhMdzbyqBNxq+X4Gw0DIvGOyY3CmDtUtKG6MJ2NomVE9mkodRuD yJT9OqiJE78pcMFOZYXg3ux31j4zyep50FNIULlWZBq2yulAdzOABGszXrN0oEfygsqm 2rAQ== X-Gm-Message-State: APzg51DOpx9llKN2CNRiSjeuZVSYJmkFhMxuK6m47lf1569BgoO/fnE8 SLf3Vco1iSFlGFAyAZ5TY1Gvhv14 X-Google-Smtp-Source: ANB0Vdb/O9TCDM+8HSJp8lbNe2tuOruFbtIurJDsJm/EBd3MtH82cA2qVt3JPu1KEJSMBa2E4YzVew== X-Received: by 2002:a1c:9550:: with SMTP id x77-v6mr112592wmd.135.1534871040096; Tue, 21 Aug 2018 10:04:00 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:25 +0200 Message-Id: <1534870966-9287-54-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 53/74] cpus: allow cpu_get_ticks out of BQL 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Because of cpu_ticks_prev, we cannot use a seqlock. But then the conversion is even easier. :) Signed-off-by: Paolo Bonzini --- cpus.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/cpus.c b/cpus.c index a810a95..8ee6e5d 100644 --- a/cpus.c +++ b/cpus.c @@ -316,11 +316,26 @@ int64_t cpu_icount_to_ns(int64_t icount) return icount << atomic_read(&timers_state.icount_time_shift); } +static int64_t cpu_get_ticks_locked(void) +{ + int64_t ticks = timers_state.cpu_ticks_offset; + if (timers_state.cpu_ticks_enabled) { + ticks += cpu_get_host_ticks(); + } + + if (timers_state.cpu_ticks_prev > ticks) { + /* Non increasing ticks may happen if the host uses software suspend. */ + timers_state.cpu_ticks_offset += timers_state.cpu_ticks_prev - ticks; + ticks = timers_state.cpu_ticks_prev; + } + + timers_state.cpu_ticks_prev = ticks; + return ticks; +} + /* return the time elapsed in VM between vm_start and vm_stop. Unless * icount is active, cpu_get_ticks() uses units of the host CPU cycle * counter. - * - * Caller must hold the BQL */ int64_t cpu_get_ticks(void) { @@ -330,19 +345,9 @@ int64_t cpu_get_ticks(void) return cpu_get_icount(); } - ticks = timers_state.cpu_ticks_offset; - if (timers_state.cpu_ticks_enabled) { - ticks += cpu_get_host_ticks(); - } - - if (timers_state.cpu_ticks_prev > ticks) { - /* Note: non increasing ticks may happen if the host uses - software suspend */ - timers_state.cpu_ticks_offset += timers_state.cpu_ticks_prev - ticks; - ticks = timers_state.cpu_ticks_prev; - } - - timers_state.cpu_ticks_prev = ticks; + qemu_spin_lock(&timers_state.vm_clock_lock); + ticks = cpu_get_ticks_locked(); + qemu_spin_unlock(&timers_state.vm_clock_lock); return ticks; }