Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813106/?format=api
{ "id": 813106, "url": "http://patchwork.ozlabs.org/api/patches/813106/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/150525494801.15988.8042196515265137270.stgit@frigg.lan/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<150525494801.15988.8042196515265137270.stgit@frigg.lan>", "list_archive_url": null, "date": "2017-09-12T22:22:28", "name": "[v5,20/22] instrument: Add event 'guest_user_syscall'", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4aef305cc742ae617d64371d28ffe636a3060c60", "submitter": { "id": 9099, "url": "http://patchwork.ozlabs.org/api/people/9099/?format=api", "name": "Lluís Vilanova", "email": "vilanova@ac.upc.edu" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/150525494801.15988.8042196515265137270.stgit@frigg.lan/mbox/", "series": [ { "id": 2775, "url": "http://patchwork.ozlabs.org/api/series/2775/?format=api", "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/813106/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813106/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xsK7Z1kMpz9t61\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 08:23:22 +1000 (AEST)", "from localhost ([::1]:38972 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drtaS-0001Zt-Bt\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 18:23:20 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:50424)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1drta1-0001Xn-K7\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:22:55 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1drtZx-0003zr-6G\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:22:53 -0400", "from roura.ac.upc.es ([147.83.33.10]:55984)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1drtZw-0003ye-Mm\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 18:22:49 -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 v8CMMZdu023686;\n\tWed, 13 Sep 2017 00:22:35 +0200", "from localhost (unknown [31.210.187.58])\n\tby correu-1.ac.upc.es (Postfix) with ESMTPSA id B3BE877C;\n\tWed, 13 Sep 2017 00:22:29 +0200 (CEST)" ], "From": "=?utf-8?b?TGx1w61z?= Vilanova <vilanova@ac.upc.edu>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 13 Sep 2017 01:22:28 +0300", "Message-Id": "<150525494801.15988.8042196515265137270.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\tv8CMMZdu023686", "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 20/22] instrument: Add event\n\t'guest_user_syscall'", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Riku Voipio <riku.voipio@iki.fi>, Markus Armbruster <armbru@redhat.com>, \n\tLaurent Vivier <laurent@vivier.eu>, \"Emilio G. Cota\" <cota@braap.org>,\n\tStefan Hajnoczi <stefanha@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t<vilanova@ac.upc.edu>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>\n---\n bsd-user/syscall.c | 6 ++++++\n instrument/control.c | 18 ++++++++++++++++++\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 | 2 ++\n stubs/instrument.c | 3 +++\n 8 files changed, 68 insertions(+)", "diff": "diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c\nindex 3230f722f3..0d92eaf8c4 100644\n--- a/bsd-user/syscall.c\n+++ b/bsd-user/syscall.c\n@@ -324,6 +324,8 @@ 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,\n+ 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 +425,8 @@ 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,\n+ 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 +503,8 @@ 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,\n+ 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 4181e030f6..b3ef03798e 100644\n--- a/instrument/control.c\n+++ b/instrument/control.c\n@@ -192,3 +192,21 @@ SYM_PUBLIC void qi_event_set_guest_mem_before_exec(\n ERROR_IF(!tcg_enabled(), \"called without TCG\");\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+SYM_PUBLIC 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+ 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, 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 ebc8020715..e2f4315fb0 100644\n--- a/instrument/events.inc.h\n+++ b/instrument/events.inc.h\n@@ -78,3 +78,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_to_qicpu(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 f1d769b92d..a76f76e1d1 100644\n--- a/instrument/load.c\n+++ b/instrument/load.c\n@@ -164,6 +164,7 @@ InstrUnloadError instr_unload(const char *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 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 acd4b10f03..136058af4f 100644\n--- a/instrument/qemu-instr/control.h\n+++ b/instrument/qemu-instr/control.h\n@@ -142,6 +142,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..c9f0b9fa56 100644\n--- a/linux-user/syscall.c\n+++ b/linux-user/syscall.c\n@@ -7723,6 +7723,8 @@ 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,\n+ 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 045d31fd78..77c9861b71 100644\n--- a/stubs/instrument.c\n+++ b/stubs/instrument.c\n@@ -68,3 +68,6 @@ void helper_instr_guest_mem_before_exec(\n void (*instr_event__guest_mem_before_exec)(\n QICPU vcpu_trans, QITCGv_cpu vcpu_exec,\n 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": [ "v5", "20/22" ] }