From nobody Sun Nov 24 07:35:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1724795662; cv=none; d=zohomail.com; s=zohoarc; b=deCgHpna3cNL2+OQK4J9+8OI8JA/Myr3Sz9vkZNByq+O/2zmYU8QIxgmpv0+lJoqryNqITiSSW4mK8o0IYO7O+KW9VZ/c0nPHoSRWJesfuCskPotJCRATrwB/S6ZVJTnSW0HzjAF6iAhYddwTnBIdKv1pw/iALv5FVBQcBmUj6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724795662; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=witZCXcE7KUJfJbgxXp83/OpY1XcCKoZDa2zRQ4MDjQ=; b=jkMSB8t1kpL1hLdRJWTubmUk8gvW8CsDUBIjEgZljyAykA5eMnx7m/Sg7KOlvxAigk11rmnGlf5ki8PWjMmGAbRLP34jDsMSsY3mvhLdATHrFWrLffm1u9EKt8t9dmy9B8z/XuxY0I4h96x/egYm/4PJ96n5eLQzbYgLOCgPntM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1724795662264576.6127057070695; Tue, 27 Aug 2024 14:54:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sj489-0002u8-2V; Tue, 27 Aug 2024 17:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sj487-0002qx-1U for qemu-devel@nongnu.org; Tue, 27 Aug 2024 17:53:35 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sj485-0000uU-CE for qemu-devel@nongnu.org; Tue, 27 Aug 2024 17:53:34 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2d3c0d587e4so4274270a91.2 for ; Tue, 27 Aug 2024 14:53:33 -0700 (PDT) Received: from chaos.lan ([50.46.173.74]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d613b1f0d5sm12671445a91.55.2024.08.27.14.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 14:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724795612; x=1725400412; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=witZCXcE7KUJfJbgxXp83/OpY1XcCKoZDa2zRQ4MDjQ=; b=MsDTq9cBwxv0WDWHGTauKGUsep/srzJMkpKVo6g8PjHbSq6BT4QzkxWT1pzSXBiZE4 DtNpW3prKURfwhhmjFOh7jPVxmLE4jaEvtecrbkUniCLnoLG/DR1yzQLoUyqsf3EgCC7 SF+aEWhMBJm9P3FeAOoHgJgcC45tdgiJ0zauuTFfcaxVJTE4SiiyUyP0Q23E5amjGdLw O3PXhT/yWo3Zs9oDSOySurgJyeWPM7mqSPgOd8HXN1E37h9mMosuQjQn8osuoVWGHBY2 9w9ocw7mXWL3xKaAuaBZB+pfE3Nql4dkocO3xWIIXPYtY2tmtYQJCTOnN8rYYohFY//e 9sPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724795612; x=1725400412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=witZCXcE7KUJfJbgxXp83/OpY1XcCKoZDa2zRQ4MDjQ=; b=ZLfd0aOjOarxfYxKv4HnXKqAqx2THaswA/o34MRReVLULNVBxe8HwsEh67YZDaP9f+ 33ZGruY/hzvwwxAB+hZa+LL5VlfrYsDCgZqL05FGySfL1vfRUdgp9sWkIlnceGn7l+r9 o4sA/vewPotykC1I4vXJyzcRsLF4/b9vLHwCneCYUkEgU1hu+wsRE1NF9jH3nPnVEC7H 9LjbJSBbzzxpW3yWYjYN9TMtLIwzLArgRFhPpm8WAPTZUWsAknX2PE9pCBXinOgLi4qM yQ4EeEnZLRMQWSTLc4gyuUVZ9kobGJUb2w9QoCt8TCj+0hNkdi1yCdS4DCdiClLRfNrp vaLg== X-Gm-Message-State: AOJu0YyO1nR3dfvFs7HNriLU05rZ7bz/EBJ6Yh4jR92fdsIBFwAzTqfl Q6SXpBe8M2S7s2J9CAl60X11vlrw/jsyBOmTctf/1Q0stOtod7J0JN4NtLRDrdFMtg== X-Google-Smtp-Source: AGHT+IH5xAmuMekrohjpciXkJSaV1vThH65JzTaBSEZGwm6NvkM2F9Cwh7Xy8MX2ZQaghPnr/A6UCQ== X-Received: by 2002:a17:90b:4ac3:b0:2cb:50fa:b01e with SMTP id 98e67ed59e1d1-2d8441dad61mr73485a91.41.1724795611616; Tue, 27 Aug 2024 14:53:31 -0700 (PDT) From: Rowan Hart To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mahmoud Mandour , Rowan Hart Subject: [PATCH v3 1/2] plugins: add plugin API to read guest memory Date: Tue, 27 Aug 2024 14:53:28 -0700 Message-ID: <20240827215329.248434-2-rowanbhart@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827215329.248434-1-rowanbhart@gmail.com> References: <20240827215329.248434-1-rowanbhart@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=rowanbhart@gmail.com; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1724795663391116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Rowan Hart Reviewed-by: Pierrick Bouvier --- include/qemu/qemu-plugin.h | 32 +++++++++++++++++++++++++++++++- plugins/api.c | 20 ++++++++++++++++++++ plugins/qemu-plugins.symbols | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index c71c705b69..e4068f823b 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -57,11 +57,19 @@ typedef uint64_t qemu_plugin_id_t; * - Remove qemu_plugin_register_vcpu_{tb, insn, mem}_exec_inline. * Those functions are replaced by *_per_vcpu variants, which guarantee * thread-safety for operations. + * + * version 3: + * - modified arguments and return value of qemu_plugin_insn_data to copy + * the data into a user-provided buffer instead of returning a pointer + * to the data. + * + * version 4: + * - added qemu_plugin_read_memory_vaddr */ =20 extern QEMU_PLUGIN_EXPORT int qemu_plugin_version; =20 -#define QEMU_PLUGIN_VERSION 3 +#define QEMU_PLUGIN_VERSION 4 =20 /** * struct qemu_info_t - system information for plugins @@ -852,6 +860,28 @@ typedef struct { QEMU_PLUGIN_API GArray *qemu_plugin_get_registers(void); =20 +/** + * qemu_plugin_read_memory_vaddr() - read from memory using a virtual addr= ess + * + * @addr: A virtual address to read from + * @data: A byte array to store data into + * @len: The number of bytes to read, starting from @addr + * + * @len bytes of data is read starting at @addr and stored into @data. If = @data + * is not large enough to hold @len bytes, it will be expanded to the nece= ssary + * size, reallocating if necessary. @len must be greater than 0. + * + * This function does not ensure writes are flushed prior to reading, so + * callers should take care when calling this function in plugin callbacks= to + * avoid attempting to read data which may not yet be written and should u= se + * the memory callback API instead. + * + * Returns true on success and false on failure. + */ +QEMU_PLUGIN_API +bool qemu_plugin_read_memory_vaddr(uint64_t addr, + GByteArray *data, size_t len); + /** * qemu_plugin_read_register() - read register for current vCPU * diff --git a/plugins/api.c b/plugins/api.c index 2ff13d09de..cb7d818918 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -527,6 +527,26 @@ GArray *qemu_plugin_get_registers(void) return create_register_handles(regs); } =20 +bool qemu_plugin_read_memory_vaddr(vaddr addr, GByteArray *data, size_t le= n) +{ + g_assert(current_cpu); + + if (len =3D=3D 0) { + return false; + } + + g_byte_array_set_size(data, len); + + int result =3D cpu_memory_rw_debug(current_cpu, addr, data->data, + data->len, 0); + + if (result < 0) { + return false; + } + + return true; +} + int qemu_plugin_read_register(struct qemu_plugin_register *reg, GByteArray= *buf) { g_assert(current_cpu); diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index ca773d8d9f..3ad479a924 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -20,6 +20,7 @@ qemu_plugin_num_vcpus; qemu_plugin_outs; qemu_plugin_path_to_binary; + qemu_plugin_read_memory_vaddr; qemu_plugin_read_register; qemu_plugin_register_atexit_cb; qemu_plugin_register_flush_cb; --=20 2.46.0 From nobody Sun Nov 24 07:35:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1724795663; cv=none; d=zohomail.com; s=zohoarc; b=F/9Tzts417uG9OHKtCqUEAssJPe0f/mhaRHG4+CEz+UWyOj87/h87rmEdNtby9rvilRYbr5T6PHbaUgmkfkRUlU7ksiBZEAOe0GDK3jxo5N1qQvf6Bfq3G82UuAwsClDSgvJg/3QdozyzWMCNusxZCnWm36BfWxQ9tnSlDZhrSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724795663; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aahftweEp2bhThMsu5oRGRZbfrczxAqb0hpyuKnwTu4=; b=JhECRjmt+LyaIYjgP1Heq7DCvLletCUk5AoqdG7gXrfWJyMki9lLuY9ErfG7ls/Z2BiCUO7SGBsyuHgiKBWbuFmcn2HmlZO/o9TwsJw9Xa2196vBj4QgT/Mxe5cA+HlVm1wqOVw5ygOJKk8sjxM1KUj77/G9Tl5vdhFc98SFR08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1724795663315538.6104829722284; Tue, 27 Aug 2024 14:54:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sj48A-0002zE-CR; Tue, 27 Aug 2024 17:53:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sj488-0002rY-15 for qemu-devel@nongnu.org; Tue, 27 Aug 2024 17:53:36 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sj486-0000ud-7z for qemu-devel@nongnu.org; Tue, 27 Aug 2024 17:53:35 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2d3ec4bacc5so87797a91.1 for ; Tue, 27 Aug 2024 14:53:33 -0700 (PDT) Received: from chaos.lan ([50.46.173.74]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d613b1f0d5sm12671445a91.55.2024.08.27.14.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 14:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724795613; x=1725400413; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aahftweEp2bhThMsu5oRGRZbfrczxAqb0hpyuKnwTu4=; b=mAvkKpvaHDdFPg/gfrUpIY1r4kh5F7wGo6oUNlbW+P0s5Vks+PORMVqcUkZ18BvPyI pbijOUo3zUkUw94zUki6+HYv/ItVTVG4p0LaZsyGHtIJ99XeH7D82mvUvFargOjN4PC8 oU0bG5xNlr3xwHSbJqC388JmufMJP0wTplU39uS3ZgDwRb52E/NNxWpKl/pEAyEd6uCl O6wtObl7/iuJtcXMi3eK6/hKGCotpBKjg+h4MPoidmKZ394bB+au9eWMbBGR2KTg9roP RpXNm8GUt7vAND42ICzMFr0WZz08CoI3AAjKGC/B26zG1HhPuZpA/HxF0Xu1kv833Foy zynw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724795613; x=1725400413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aahftweEp2bhThMsu5oRGRZbfrczxAqb0hpyuKnwTu4=; b=PmQtHrb3zdFMNJLat0F/p3hFzETwI/24t/FMIIJkFt8phMe03ppf7ETFxCDIU2KD05 VJFEKrAwZn45eiFn70D8A6tclUB/dl0j36Ooy/iyOKT86EFlJLHnwGAeG5vYTwlvk8dI dhrB8zh3v1eCZbj2xfAEAY06APxRc1bzn8fWaCK4ta4k33/0q00CXvs7JOAS0jIr0jP+ 1vUkBafnXotiao8kT5jp+6YYPEzPDb1GqHBASOHKUV26DOr558t3nIl5zJV555Ee+ZMW 1dbsGt7xSh5vFEZ4jmilvPnDvfkoCYCCtO4bigCKaZeNtHLOT1Qwb1fHUj1aInYj+SaH A93w== X-Gm-Message-State: AOJu0YyekM278u76EW9HTTfJO9p/m3B2VslyXel+04bK2PxCHtLmwOxC 3smELdhAwihDE210s7eMzUpy0jA+y0zxNHvrQA2ZtH9z6e2QVUcPVHW65suqbCsVSw== X-Google-Smtp-Source: AGHT+IFs4VDcjVERLxFjTo7m9jtL/S55TAgbigTKem1/xn6CsOwUDKqzmjEC377L9sQhg0F+WYcfIg== X-Received: by 2002:a17:90a:1783:b0:2cb:5829:a491 with SMTP id 98e67ed59e1d1-2d843dae854mr202300a91.20.1724795612580; Tue, 27 Aug 2024 14:53:32 -0700 (PDT) From: Rowan Hart To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mahmoud Mandour , Rowan Hart Subject: [PATCH v3 2/2] plugins: add option to dump write argument to syscall plugin Date: Tue, 27 Aug 2024 14:53:29 -0700 Message-ID: <20240827215329.248434-3-rowanbhart@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827215329.248434-1-rowanbhart@gmail.com> References: <20240827215329.248434-1-rowanbhart@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=rowanbhart@gmail.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1724795665137116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Rowan Hart Reviewed-by: Pierrick Bouvier Tested-by: Pierrick Bouvier --- docs/about/emulation.rst | 14 ++++- tests/tcg/plugins/syscall.c | 117 ++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst index eea1261baa..e85d494ff0 100644 --- a/docs/about/emulation.rst +++ b/docs/about/emulation.rst @@ -388,6 +388,19 @@ run:: 160 1 0 135 1 0 =20 +Behaviour can be tweaked with the following arguments: + +.. list-table:: Syscall plugin arguments + :widths: 20 80 + :header-rows: 1 + + * - Option + - Description + * - print=3Dtrue|false + - Print the number of times each syscall is called + * - log_writes=3Dtrue|false + - Log the buffer of each write syscall in hexdump format + Test inline operations ...................... =20 @@ -777,4 +790,3 @@ Other emulation features When running system emulation you can also enable deterministic execution which allows for repeatable record/replay debugging. See :ref:`Record/Replay` for more details. - diff --git a/tests/tcg/plugins/syscall.c b/tests/tcg/plugins/syscall.c index 72e1a5bf90..7c92f798b5 100644 --- a/tests/tcg/plugins/syscall.c +++ b/tests/tcg/plugins/syscall.c @@ -22,8 +22,57 @@ typedef struct { int64_t errors; } SyscallStats; =20 +struct SyscallInfo { + const char *name; + int64_t write_sysno; +}; + +const struct SyscallInfo arch_syscall_info[] =3D { + { "aarch64", 64 }, + { "aarch64_be", 64 }, + { "alpha", 4 }, + { "arm", 4 }, + { "armeb", 4 }, + { "avr", -1 }, + { "cris", -1 }, + { "hexagon", 64 }, + { "hppa", -1 }, + { "i386", 4 }, + { "loongarch64", -1 }, + { "m68k", 4 }, + { "microblaze", 4 }, + { "microblazeel", 4 }, + { "mips", 1 }, + { "mips64", 1 }, + { "mips64el", 1 }, + { "mipsel", 1 }, + { "mipsn32", 1 }, + { "mipsn32el", 1 }, + { "or1k", -1 }, + { "ppc", 4 }, + { "ppc64", 4 }, + { "ppc64le", 4 }, + { "riscv32", 64 }, + { "riscv64", 64 }, + { "rx", -1 }, + { "s390x", -1 }, + { "sh4", -1 }, + { "sh4eb", -1 }, + { "sparc", 4 }, + { "sparc32plus", 4 }, + { "sparc64", 4 }, + { "tricore", -1 }, + { "x86_64", 1 }, + { "xtensa", 13 }, + { "xtensaeb", 13 }, + { NULL, -1 }, +}; + static GMutex lock; static GHashTable *statistics; +static GByteArray *memory_buffer; +static bool do_log_writes; +static int64_t write_sysno =3D -1; =20 static SyscallStats *get_or_create_entry(int64_t num) { @@ -39,6 +88,44 @@ static SyscallStats *get_or_create_entry(int64_t num) return entry; } =20 +/* + * Hex-dump a GByteArray to the QEMU plugin output in the format: + * 61 63 63 65 6c 09 09 20 20 20 66 70 75 09 09 09 | accel.....fpu... + * 20 6d 6f 64 75 6c 65 2d 63 6f 6d 6d 6f 6e 2e 63 | .module-common.c + */ +static void hexdump(const GByteArray *data) +{ + g_autoptr(GString) out =3D g_string_new(""); + + for (guint index =3D 0; index < data->len; index +=3D 16) { + for (guint col =3D 0; col < 16; col++) { + if (index + col < data->len) { + g_string_append_printf(out, "%02x ", data->data[index + co= l]); + } else { + g_string_append(out, " "); + } + } + + g_string_append(out, " | "); + + for (guint col =3D 0; col < 16; col++) { + if (index + col >=3D data->len) { + break; + } + + if (g_ascii_isgraph(data->data[index + col])) { + g_string_append_printf(out, "%c", data->data[index + col]); + } else { + g_string_append(out, "."); + } + } + + g_string_append(out, "\n"); + } + + qemu_plugin_outs(out->str); +} + static void vcpu_syscall(qemu_plugin_id_t id, unsigned int vcpu_index, int64_t num, uint64_t a1, uint64_t a2, uint64_t a3, uint64_t a4, uint64_t a5, @@ -54,6 +141,14 @@ static void vcpu_syscall(qemu_plugin_id_t id, unsigned = int vcpu_index, g_autofree gchar *out =3D g_strdup_printf("syscall #%" PRIi64 "\n"= , num); qemu_plugin_outs(out); } + + if (do_log_writes && num =3D=3D write_sysno) { + if (qemu_plugin_read_memory_vaddr(a2, memory_buffer, a3)) { + hexdump(memory_buffer); + } else { + fprintf(stderr, "Error reading memory from vaddr %lu\n", a2); + } + } } =20 static void vcpu_syscall_ret(qemu_plugin_id_t id, unsigned int vcpu_idx, @@ -127,6 +222,10 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin= _id_t id, if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_print)) { fprintf(stderr, "boolean argument parsing failed: %s\n", o= pt); } + } else if (g_strcmp0(tokens[0], "log_writes") =3D=3D 0) { + if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_log_writ= es)) { + fprintf(stderr, "boolean argument parsing failed: %s\n", o= pt); + } } else { fprintf(stderr, "unsupported argument: %s\n", argv[i]); return -1; @@ -137,6 +236,24 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin= _id_t id, statistics =3D g_hash_table_new_full(NULL, g_direct_equal, NULL, g= _free); } =20 + if (do_log_writes) { + for (const struct SyscallInfo *syscall_info =3D arch_syscall_info; + syscall_info->name !=3D NULL; syscall_info++) { + + if (g_strcmp0(syscall_info->name, info->target_name) =3D=3D 0)= { + write_sysno =3D syscall_info->write_sysno; + break; + } + } + + if (write_sysno =3D=3D -1) { + fprintf(stderr, "write syscall number not found\n"); + return -1; + } + + memory_buffer =3D g_byte_array_new(); + } + qemu_plugin_register_vcpu_syscall_cb(id, vcpu_syscall); qemu_plugin_register_vcpu_syscall_ret_cb(id, vcpu_syscall_ret); qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); --=20 2.46.0