{"id":810758,"url":"http://patchwork.ozlabs.org/api/patches/810758/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150472292357.24907.8416317535071720615.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":"<150472292357.24907.8416317535071720615.stgit@frigg.lan>","list_archive_url":null,"date":"2017-09-06T18:35:23","name":"[v4,18/20] instrument: Add event 'guest_user_syscall'","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"62c66fd4529b0ba3bbc2302eb10447d29409feab","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/150472292357.24907.8416317535071720615.stgit@frigg.lan/mbox/","series":[{"id":1859,"url":"http://patchwork.ozlabs.org/api/series/1859/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1859","date":"2017-09-06T17:22:41","name":"instrument: Add basic event instrumentation","version":4,"mbox":"http://patchwork.ozlabs.org/series/1859/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810758/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810758/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 3xnXNF4R40z9t2W\n\tfor ;\n\tThu, 7 Sep 2017 04:36:12 +1000 (AEST)","from localhost ([::1]:37457 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpfBK-0001C0-59\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 14:36:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55692)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpfAy-0001Br-Jc\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:35:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpfAt-0004dx-Ah\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:35:48 -0400","from roura.ac.upc.es ([147.83.33.10]:33047)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpfAs-0004dY-UW\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:35:43 -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 v86IZUrY005405;\n\tWed, 6 Sep 2017 20:35:30 +0200","from localhost (unknown [31.210.187.58])\n\tby correu-1.ac.upc.es (Postfix) with ESMTPSA id EC3658AF;\n\tWed, 6 Sep 2017 20:35:24 +0200 (CEST)"],"From":"=?utf-8?b?TGx1w61z?= Vilanova ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 21:35:23 +0300","Message-Id":"<150472292357.24907.8416317535071720615.stgit@frigg.lan>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<150471856141.24907.274176769201097378.stgit@frigg.lan>","References":"<150471856141.24907.274176769201097378.stgit@frigg.lan>","User-Agent":"StGit/0.17.1-dirty","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\tv86IZUrY005405","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 v4 18/20] instrument: Add event\n\t'guest_user_syscall'","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 , Laurent Vivier ,\n\t\"Emilio G. Cota\" ,\n\tStefan Hajnoczi , Paolo Bonzini\n\t, =?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 | 14 ++++++++++++++\n instrument/events.h | 7 +++++++\n instrument/events.inc.h | 16 ++++++++++++++++\n instrument/load.c | 1 +\n instrument/qemu-instr/control.h | 15 +++++++++++++++\n linux-user/syscall.c | 1 +\n stubs/instrument.c | 3 +++\n 8 files changed, 60 insertions(+)","diff":"diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c\nindex 3230f722f3..43f8887529 100644\n--- a/bsd-user/syscall.c\n+++ b/bsd-user/syscall.c\n@@ -324,6 +324,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1,\n #ifdef DEBUG\n gemu_log(\"freebsd syscall %d\\n\", num);\n #endif\n+ instr_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);\n trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);\n if(do_strace)\n print_freebsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6);\n@@ -423,6 +424,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1,\n #ifdef DEBUG\n gemu_log(\"netbsd syscall %d\\n\", num);\n #endif\n+ instr_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0);\n trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0);\n if(do_strace)\n print_netbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6);\n@@ -499,6 +501,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1,\n #ifdef DEBUG\n gemu_log(\"openbsd syscall %d\\n\", num);\n #endif\n+ instr_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0);\n trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0);\n if(do_strace)\n print_openbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6);\ndiff --git a/instrument/control.c b/instrument/control.c\nindex f39e81d7c7..7e84dadf24 100644\n--- a/instrument/control.c\n+++ b/instrument/control.c\n@@ -121,3 +121,17 @@ QI_VPUBLIC void qi_event_set_guest_mem_before_exec(\n ERROR_IF(!instr_get_state(), \"called outside instrumentation\");\n instr_set_event(guest_mem_before_exec, fn);\n }\n+\n+\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+\n+QI_VPUBLIC void qi_event_set_guest_user_syscall(\n+ void (*fn)(QICPU vcpu, uint64_t num, uint64_t arg1, uint64_t arg2,\n+ uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6,\n+ uint64_t arg7, uint64_t arg8))\n+{\n+ ERROR_IF(!instr_get_state(), \"called outside instrumentation\");\n+ instr_set_event(guest_user_syscall, fn);\n+}\ndiff --git a/instrument/events.h b/instrument/events.h\nindex 6507b26867..8c944e1f91 100644\n--- a/instrument/events.h\n+++ b/instrument/events.h\n@@ -68,6 +68,13 @@ extern void (*instr_event__guest_mem_before_exec)(\n static inline void instr_guest_mem_before_exec(\n CPUState *vcpu, uint64_t vaddr, TraceMemInfo info);\n \n+extern 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+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 \n #include \"instrument/events.inc.h\"\n \ndiff --git a/instrument/events.inc.h b/instrument/events.inc.h\nindex d7a3065ac1..9c64497533 100644\n--- a/instrument/events.inc.h\n+++ b/instrument/events.inc.h\n@@ -77,3 +77,19 @@ static inline void instr_guest_mem_before_exec(\n instr_set_state(INSTR_STATE_DISABLE);\n }\n }\n+\n+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+ void (*cb)(QICPU vcpu, uint64_t num, uint64_t arg1, uint64_t arg2,\n+ uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6,\n+ uint64_t arg7, uint64_t arg8)\n+ = instr_get_event(guest_user_syscall);\n+ if (cb) {\n+ instr_set_state(INSTR_STATE_ENABLE);\n+ QICPU vcpu_ = instr_cpu_set(vcpu);\n+ (*cb)(vcpu_, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);\n+ instr_set_state(INSTR_STATE_DISABLE);\n+ }\n+}\ndiff --git a/instrument/load.c b/instrument/load.c\nindex 1df660d5d1..d977049082 100644\n--- a/instrument/load.c\n+++ b/instrument/load.c\n@@ -153,6 +153,7 @@ InstrUnloadError instr_unload(int64_t handle_id)\n instr_set_event(guest_cpu_reset, NULL);\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 \n /* this should never fail */\n if (dlclose(handle->dlhandle) < 0) {\ndiff --git a/instrument/qemu-instr/control.h b/instrument/qemu-instr/control.h\nindex 4fa99a968d..cba8ade54e 100644\n--- a/instrument/qemu-instr/control.h\n+++ b/instrument/qemu-instr/control.h\n@@ -134,6 +134,21 @@ void qi_event_gen_guest_mem_before_exec(\n void qi_event_set_guest_mem_before_exec(\n void (*fn)(QICPU vcpu, uint64_t vaddr, QIMemInfo info));\n \n+/*\n+ * Start executing a guest system call in syscall emulation mode.\n+ *\n+ * @num: System call number.\n+ * @arg*: System call argument value.\n+ *\n+ * Mode: user\n+ * Targets: TCG(all)\n+ * Time: exec\n+ */\n+void qi_event_set_guest_user_syscall(\n+ void (*fn)(QICPU vcpu, uint64_t num, uint64_t arg1, uint64_t arg2,\n+ uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6,\n+ uint64_t arg7, uint64_t arg8));\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/linux-user/syscall.c b/linux-user/syscall.c\nindex e73a07fa6f..c0c33d4a75 100644\n--- a/linux-user/syscall.c\n+++ b/linux-user/syscall.c\n@@ -7723,6 +7723,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,\n #ifdef DEBUG\n gemu_log(\"syscall %d\", num);\n #endif\n+ instr_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);\n trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);\n if(do_strace)\n print_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6);\ndiff --git a/stubs/instrument.c b/stubs/instrument.c\nindex c6c279c85e..dbd8b1438d 100644\n--- a/stubs/instrument.c\n+++ b/stubs/instrument.c\n@@ -18,3 +18,6 @@ void (*instr_event__guest_mem_before_trans)(\n QICPU vcpu_trans, QITCGv_cpu vcpu_exec, QITCGv vaddr, QIMemInfo info);\n void (*instr_event__guest_mem_before_exec)(\n QICPU vcpu_trans, QITCGv_cpu vcpu_exec, QITCGv vaddr, QIMemInfo info);\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","prefixes":["v4","18/20"]}