{"id":813110,"url":"http://patchwork.ozlabs.org/api/patches/813110/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150525519047.15988.7515219035767609489.stgit@frigg.lan/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<150525519047.15988.7515219035767609489.stgit@frigg.lan>","list_archive_url":null,"date":"2017-09-12T22:26:30","name":"[v5,21/22] instrument: Add event 'guest_user_syscall_ret'","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"829a3a1da55a9ef0acbad93ac160d4eced16f7ac","submitter":{"id":9099,"url":"http://patchwork.ozlabs.org/api/people/9099/?format=json","name":"Lluís Vilanova","email":"vilanova@ac.upc.edu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150525519047.15988.7515219035767609489.stgit@frigg.lan/mbox/","series":[{"id":2775,"url":"http://patchwork.ozlabs.org/api/series/2775/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2775","date":"2017-09-12T21:01:42","name":"instrument: Add basic event instrumentation","version":5,"mbox":"http://patchwork.ozlabs.org/series/2775/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813110/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813110/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsKFm6sY9z9t39\n\tfor ;\n\tWed, 13 Sep 2017 08:28:44 +1000 (AEST)","from localhost ([::1]:38998 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drtff-0005ND-4i\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 18:28:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53138)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drtdt-0004W9-N3\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:26:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drtdq-0006r1-3o\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:26:53 -0400","from roura.ac.upc.es ([147.83.33.10]:56010)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drtdp-0006qb-PD\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:26:50 -0400","from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91])\n\tby roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v8CMQdxS023789;\n\tWed, 13 Sep 2017 00:26:39 +0200","from localhost (unknown [31.210.187.58])\n\tby correu-1.ac.upc.es (Postfix) with ESMTPSA id 3A7832EB;\n\tWed, 13 Sep 2017 00:26:33 +0200 (CEST)"],"From":"=?utf-8?b?TGx1w61z?= Vilanova ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 01:26:30 +0300","Message-Id":"<150525519047.15988.7515219035767609489.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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"quoted-printable","X-MIME-Autoconverted":"from 8bit to quoted-printable by roura.ac.upc.es id\n\tv8CMQdxS023789","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 21/22] instrument: Add event\n\t'guest_user_syscall_ret'","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Riku Voipio , Markus Armbruster , \n\tLaurent Vivier , \"Emilio G. Cota\" ,\n\tStefan Hajnoczi ,\n\tPaolo Bonzini , =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Lluís Vilanova \n---\n bsd-user/syscall.c | 3 +++\n instrument/control.c | 15 +++++++++++++++\n instrument/events.h | 5 +++++\n instrument/events.inc.h | 13 +++++++++++++\n instrument/load.c | 1 +\n instrument/qemu-instr/control.h | 13 +++++++++++++\n linux-user/syscall.c | 1 +\n stubs/instrument.c | 2 ++\n 8 files changed, 53 insertions(+)","diff":"diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c\nindex 0d92eaf8c4..fb468c0574 100644\n--- a/bsd-user/syscall.c\n+++ b/bsd-user/syscall.c\n@@ -407,6 +407,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1,\n #endif\n if (do_strace)\n print_freebsd_syscall_ret(num, ret);\n+ instr_guest_user_syscall_ret(cpu, num, ret);\n trace_guest_user_syscall_ret(cpu, num, ret);\n return ret;\n efault:\n@@ -485,6 +486,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1,\n #endif\n if (do_strace)\n print_netbsd_syscall_ret(num, ret);\n+ instr_guest_user_syscall_ret(cpu, num, ret);\n trace_guest_user_syscall_ret(cpu, num, ret);\n return ret;\n efault:\n@@ -563,6 +565,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1,\n #endif\n if (do_strace)\n print_openbsd_syscall_ret(num, ret);\n+ instr_guest_user_syscall_ret(cpu, num, ret);\n trace_guest_user_syscall_ret(cpu, num, ret);\n return ret;\n efault:\ndiff --git a/instrument/control.c b/instrument/control.c\nindex b3ef03798e..b5b1e0503d 100644\n--- a/instrument/control.c\n+++ b/instrument/control.c\n@@ -210,3 +210,18 @@ SYM_PUBLIC void qi_event_set_guest_user_syscall(\n #endif\n instr_set_event(guest_user_syscall, fn);\n }\n+\n+\n+void (*instr_event__guest_user_syscall_ret)(\n+ QICPU vcpu, uint64_t num, uint64_t ret);\n+\n+SYM_PUBLIC void qi_event_set_guest_user_syscall_ret(\n+ void (*fn)(QICPU vcpu, uint64_t num, uint64_t ret))\n+{\n+ ERROR_IF(!instr_get_state(), \"called outside instrumentation\");\n+ ERROR_IF(!tcg_enabled(), \"called without TCG\");\n+#if !defined(CONFIG_USER_ONLY)\n+ ERROR_IF(true, \"called in full-system mode\");\n+#endif\n+ instr_set_event(guest_user_syscall_ret, fn);\n+}\ndiff --git a/instrument/events.h b/instrument/events.h\nindex 8c944e1f91..6197ece466 100644\n--- a/instrument/events.h\n+++ b/instrument/events.h\n@@ -75,6 +75,11 @@ static inline void instr_guest_user_syscall(\n CPUState *vcpu, uint64_t num, uint64_t arg1, uint64_t arg2, uint64_t arg3,\n uint64_t arg4, uint64_t arg5, uint64_t arg6, uint64_t arg7, uint64_t arg8);\n \n+extern void (*instr_event__guest_user_syscall_ret)(\n+ QICPU vcpu, uint64_t num, uint64_t ret);\n+static inline void instr_guest_user_syscall_ret(\n+ CPUState *vcpu, uint64_t num, uint64_t ret);\n+\n \n #include \"instrument/events.inc.h\"\n \ndiff --git a/instrument/events.inc.h b/instrument/events.inc.h\nindex e2f4315fb0..d31dec54b8 100644\n--- a/instrument/events.inc.h\n+++ b/instrument/events.inc.h\n@@ -94,3 +94,16 @@ static inline void instr_guest_user_syscall(\n instr_set_state(INSTR_STATE_DISABLE);\n }\n }\n+\n+static inline void instr_guest_user_syscall_ret(\n+ CPUState *vcpu, uint64_t num, uint64_t ret)\n+{\n+ void (*cb)(QICPU vcpu, uint64_t num, uint64_t ret)\n+ = instr_get_event(guest_user_syscall_ret);\n+ if (cb) {\n+ instr_set_state(INSTR_STATE_ENABLE);\n+ QICPU vcpu_ = instr_cpu_to_qicpu(vcpu);\n+ (*cb)(vcpu_, num, ret);\n+ instr_set_state(INSTR_STATE_DISABLE);\n+ }\n+}\ndiff --git a/instrument/load.c b/instrument/load.c\nindex a76f76e1d1..be13a90286 100644\n--- a/instrument/load.c\n+++ b/instrument/load.c\n@@ -165,6 +165,7 @@ InstrUnloadError instr_unload(const char *id)\n instr_set_event(guest_mem_before_trans, NULL);\n instr_set_event(guest_mem_before_exec, NULL);\n instr_set_event(guest_user_syscall, NULL);\n+ instr_set_event(guest_user_syscall_ret, NULL);\n \n instr_cpu_stop_all_end(&info);\n cpu_list_unlock();\ndiff --git a/instrument/qemu-instr/control.h b/instrument/qemu-instr/control.h\nindex 136058af4f..bc4e49bef1 100644\n--- a/instrument/qemu-instr/control.h\n+++ b/instrument/qemu-instr/control.h\n@@ -157,6 +157,19 @@ void qi_event_set_guest_user_syscall(\n uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6,\n uint64_t arg7, uint64_t arg8));\n \n+/*\n+ * Finish executing a guest system call in syscall emulation mode.\n+ *\n+ * @num: System call number.\n+ * @ret: System call result value.\n+ *\n+ * Mode: user\n+ * Targets: TCG(all)\n+ * Time: exec\n+ */\n+void qi_event_set_guest_user_syscall_ret(\n+ void (*fn)(QICPU vcpu, uint64_t num, uint64_t ret));\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/linux-user/syscall.c b/linux-user/syscall.c\nindex c9f0b9fa56..44b91e3c52 100644\n--- a/linux-user/syscall.c\n+++ b/linux-user/syscall.c\n@@ -12398,6 +12398,7 @@ fail:\n #endif\n if(do_strace)\n print_syscall_ret(num, ret);\n+ instr_guest_user_syscall_ret(cpu, num, ret);\n trace_guest_user_syscall_ret(cpu, num, ret);\n return ret;\n efault:\ndiff --git a/stubs/instrument.c b/stubs/instrument.c\nindex 77c9861b71..5c56c1a322 100644\n--- a/stubs/instrument.c\n+++ b/stubs/instrument.c\n@@ -71,3 +71,5 @@ void (*instr_event__guest_mem_before_exec)(\n void (*instr_event__guest_user_syscall)(\n QICPU vcpu, uint64_t num, uint64_t arg1, uint64_t arg2, uint64_t arg3,\n uint64_t arg4, uint64_t arg5, uint64_t arg6, uint64_t arg7, uint64_t arg8);\n+void (*instr_event__guest_user_syscall_ret)(\n+ QICPU vcpu, uint64_t num, uint64_t ret);\n","prefixes":["v5","21/22"]}