From patchwork Tue Sep 12 22:02:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 813101 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=) 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 3xsJgx5lnjz9s4q for ; Wed, 13 Sep 2017 08:02:53 +1000 (AEST) Received: from localhost ([::1]:38874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drtGd-00055s-W0 for incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 18:02:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drtGI-00055S-VY for qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:02:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drtGG-0000Iu-6H for qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:02:31 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:43378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drtGF-0000I2-NR for qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:02:28 -0400 Received: from correu-2.ac.upc.es (correu-2.ac.upc.es [147.83.30.92]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v8CM2NdL023099; Wed, 13 Sep 2017 00:02:23 +0200 Received: from localhost (unknown [31.210.187.58]) by correu-2.ac.upc.es (Postfix) with ESMTPSA id F051E840; Wed, 13 Sep 2017 00:02:17 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 01:02:16 +0300 Message-Id: <150525373641.15988.12142967916976724761.stgit@frigg.lan> X-Mailer: git-send-email 2.14.1 In-Reply-To: <150525010239.15988.8172586618197849619.stgit@frigg.lan> References: <150525010239.15988.8172586618197849619.stgit@frigg.lan> User-Agent: StGit/0.18 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v8CM2NdL023099 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH v5 15/22] instrument: Add event 'guest_cpu_exit' 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: Markus Armbruster , "Emilio G. Cota" , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Llu=C3=ADs_Vilanova?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lluís Vilanova --- instrument/control.c | 9 +++++++++ instrument/events.h | 3 +++ instrument/events.inc.h | 11 +++++++++++ instrument/load.c | 17 +++++++++++++++++ instrument/qemu-instr/control.h | 11 +++++++++++ stubs/instrument.c | 1 + trace/control.c | 4 +++- 7 files changed, 55 insertions(+), 1 deletion(-) diff --git a/instrument/control.c b/instrument/control.c index 20ddffdc28..0be8065409 100644 --- a/instrument/control.c +++ b/instrument/control.c @@ -124,3 +124,12 @@ SYM_PUBLIC void qi_event_set_guest_cpu_enter(void (*fn)(QICPU vcpu)) ERROR_IF(!instr_get_state(), "called outside instrumentation"); instr_set_event(guest_cpu_enter, fn); } + + +void (*instr_event__guest_cpu_exit)(QICPU vcpu); + +SYM_PUBLIC void qi_event_set_guest_cpu_exit(void (*fn)(QICPU vcpu)) +{ + ERROR_IF(!instr_get_state(), "called outside instrumentation"); + instr_set_event(guest_cpu_exit, fn); +} diff --git a/instrument/events.h b/instrument/events.h index 947f120aa9..c743cb8180 100644 --- a/instrument/events.h +++ b/instrument/events.h @@ -36,6 +36,9 @@ extern void *instr_event__fini_data; extern void (*instr_event__guest_cpu_enter)(QICPU vcpu); static inline void instr_guest_cpu_enter(CPUState *vcpu); +extern void (*instr_event__guest_cpu_exit)(QICPU vcpu); +static inline void instr_guest_cpu_exit(CPUState *vcpu); + #include "instrument/events.inc.h" diff --git a/instrument/events.inc.h b/instrument/events.inc.h index e3f8024716..c88df7e42f 100644 --- a/instrument/events.inc.h +++ b/instrument/events.inc.h @@ -20,3 +20,14 @@ static inline void instr_guest_cpu_enter(CPUState *vcpu) instr_set_state(INSTR_STATE_DISABLE); } } + +static inline void instr_guest_cpu_exit(CPUState *vcpu) +{ + void (*cb)(QICPU vcpu) = instr_get_event(guest_cpu_exit); + if (cb) { + QICPU vcpu_ = instr_cpu_to_qicpu(vcpu); + instr_set_state(INSTR_STATE_ENABLE); + (*cb)(vcpu_); + instr_set_state(INSTR_STATE_DISABLE); + } +} diff --git a/instrument/load.c b/instrument/load.c index 218bca74b2..6808d361b5 100644 --- a/instrument/load.c +++ b/instrument/load.c @@ -11,7 +11,9 @@ #include "qemu-common.h" #include +#include "cpu.h" #include "exec/cpu-common.h" +#include "exec/exec-all.h" #include "instrument/control.h" #include "instrument/events.h" #include "instrument/load.h" @@ -127,6 +129,13 @@ out: return res; } + +static void instr_unload__cb(CPUState *cpu, void *data) +{ + tb_flush_sync(cpu); + instr_guest_cpu_exit(cpu); +} + InstrUnloadError instr_unload(const char *id) { InstrUnloadError res; @@ -139,6 +148,10 @@ InstrUnloadError instr_unload(const char *id) goto out; } + InstrCPUStop info; + cpu_list_lock(); + instr_cpu_stop_all_begin(&info, instr_unload__cb, NULL); + qi_fini_fn fini_fn = instr_get_event(fini_fn); if (fini_fn) { void *fini_data = instr_get_event(fini_data); @@ -147,6 +160,10 @@ InstrUnloadError instr_unload(const char *id) instr_set_event(fini_fn, NULL); instr_set_event(guest_cpu_enter, NULL); + instr_set_event(guest_cpu_exit, NULL); + + instr_cpu_stop_all_end(&info); + cpu_list_unlock(); /* this should never fail */ if (dlclose(handle->dlhandle) < 0) { diff --git a/instrument/qemu-instr/control.h b/instrument/qemu-instr/control.h index f61e7a2b6e..107ee8afe0 100644 --- a/instrument/qemu-instr/control.h +++ b/instrument/qemu-instr/control.h @@ -85,6 +85,17 @@ void qi_set_fini(qi_fini_fn fn, void *data); */ void qi_event_set_guest_cpu_enter(void (*fn)(QICPU vcpu)); +/* + * Hot-unplug a virtual (guest) CPU. + * + * Also triggered on each CPU when an instrumentation library is unloaded. + * + * Mode: user, softmmu + * Targets: all + * Time: exec + */ +void qi_event_set_guest_cpu_exit(void (*fn)(QICPU vcpu)); + #ifdef __cplusplus } #endif diff --git a/stubs/instrument.c b/stubs/instrument.c index 6b59ba9a7a..c4b1c791d9 100644 --- a/stubs/instrument.c +++ b/stubs/instrument.c @@ -47,3 +47,4 @@ void qmp_instr_unload(const char *id, Error **errp) __thread InstrState instr_cur_state; void (*instr_event__guest_cpu_enter)(QICPU *vcpu); +void (*instr_event__guest_cpu_exit)(QICPU *vcpu); diff --git a/trace/control.c b/trace/control.c index 82d8989c4d..946a0af818 100644 --- a/trace/control.c +++ b/trace/control.c @@ -1,13 +1,14 @@ /* * Interface for configuring and controlling the state of tracing events. * - * Copyright (C) 2011-2016 Lluís Vilanova + * Copyright (C) 2011-2017 Lluís Vilanova * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" +#include "instrument/events.h" #include "trace/control.h" #include "qemu/help_option.h" #ifdef CONFIG_TRACE_SIMPLE @@ -272,6 +273,7 @@ void trace_fini_vcpu(CPUState *vcpu) TraceEventIter iter; TraceEvent *ev; + instr_guest_cpu_exit(vcpu); trace_guest_cpu_exit(vcpu); trace_event_iter_init(&iter, NULL);