qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Riku Voipio" <riku.voipio@iki.fi>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 19/25] linux-user: convert target_mprotect debug to tracepoint
Date: Thu, 19 Dec 2019 10:49:28 +0000	[thread overview]
Message-ID: <20191219104934.866-20-alex.bennee@linaro.org> (raw)
In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org>

It is a pain to re-compile when you need to debug and tracepoints are
a fairly low impact way to instrument QEMU.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191205122518.10010-2-alex.bennee@linaro.org>

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 46a6e3a761a..26a83e74069 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-
+#include "trace.h"
 #include "qemu.h"
 
 //#define DEBUG_MMAP
@@ -66,13 +66,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot)
     abi_ulong end, host_start, host_end, addr;
     int prot1, ret;
 
-#ifdef DEBUG_MMAP
-    printf("mprotect: start=0x" TARGET_ABI_FMT_lx
-           "len=0x" TARGET_ABI_FMT_lx " prot=%c%c%c\n", start, len,
-           prot & PROT_READ ? 'r' : '-',
-           prot & PROT_WRITE ? 'w' : '-',
-           prot & PROT_EXEC ? 'x' : '-');
-#endif
+    trace_target_mprotect(start, len, prot);
 
     if ((start & ~TARGET_PAGE_MASK) != 0)
         return -TARGET_EINVAL;
diff --git a/linux-user/trace-events b/linux-user/trace-events
index 6df234bbb67..8419243de4e 100644
--- a/linux-user/trace-events
+++ b/linux-user/trace-events
@@ -11,3 +11,6 @@ user_handle_signal(void *env, int target_sig) "env=%p signal %d"
 user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d("
 user_queue_signal(void *env, int target_sig) "env=%p signal %d"
 user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr 0x%"PRIx64 " current psw.addr 0x%"PRIx64
+
+# mmap.c
+target_mprotect(uint64_t start, uint64_t len, int flags) "start=0x%"PRIx64 " len=0x%"PRIx64 " prot=0x%x"
-- 
2.20.1



  parent reply	other threads:[~2019-12-19 11:03 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-19 10:49 [PULL 00/25] testing and logging updates Alex Bennée
2019-12-19 10:49 ` [PULL 01/25] configure: allow disable of cross compilation containers Alex Bennée
2019-12-19 10:49 ` [PULL 02/25] tests/vm: Allow to set qemu-img path Alex Bennée
2019-12-19 10:49 ` [PULL 03/25] travis.yml: Run tcg tests with tci Alex Bennée
2019-12-19 10:49 ` [PULL 04/25] iotests: Provide a function for checking the creation of huge files Alex Bennée
2019-12-19 10:49 ` [PULL 05/25] iotests: Skip test 060 if it is not possible to create large files Alex Bennée
2019-12-19 10:49 ` [PULL 06/25] iotests: Skip test 079 " Alex Bennée
2019-12-19 10:49 ` [PULL 07/25] tests/hd-geo-test: Skip test when images can not be created Alex Bennée
2019-12-19 10:49 ` [PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Alex Bennée
2019-12-19 10:49 ` [PULL 09/25] travis.yml: Enable builds on arm64, ppc64le and s390x Alex Bennée
2019-12-19 10:49 ` [PULL 10/25] ci: build out-of-tree Alex Bennée
2019-12-19 10:49 ` [PULL 11/25] Fix double free issue in qemu_set_log_filename() Alex Bennée
2019-12-19 10:49 ` [PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and clarify Alex Bennée
2019-12-19 10:49 ` [PULL 13/25] Add a mutex to guarantee single writer to qemu_logfile handle Alex Bennée
2019-12-19 10:49 ` [PULL 14/25] qemu_log_lock/unlock now preserves the " Alex Bennée
2019-12-19 10:49 ` [PULL 15/25] Add use of RCU for qemu_logfile Alex Bennée
2019-12-19 10:49 ` [PULL 16/25] Added tests for close and change of logfile Alex Bennée
2019-12-19 10:49 ` [PULL 17/25] docker: gtester is no longer used Alex Bennée
2019-12-19 10:49 ` [PULL 18/25] travis.yml: Remove the redundant clang-with-MAIN_SOFTMMU_TARGETS entry Alex Bennée
2019-12-19 10:49 ` Alex Bennée [this message]
2019-12-19 10:49 ` [PULL 20/25] linux-user: convert target_mmap debug to tracepoint Alex Bennée
2019-12-19 10:49 ` [PULL 21/25] linux-user: add target_mmap_complete tracepoint Alex Bennée
2019-12-19 10:49 ` [PULL 22/25] linux-user: log page table changes under -d page Alex Bennée
2019-12-19 10:49 ` [PULL 23/25] linux-user: convert target_munmap debug to a tracepoint Alex Bennée
2019-12-19 10:49 ` [PULL 24/25] trace: replace hand-crafted pattern_glob with g_pattern_match_simple Alex Bennée
2019-12-19 10:49 ` [PULL 25/25] tests/tcg: ensure we re-configure if configure.sh is updated Alex Bennée
2019-12-20 16:36 ` [PULL 00/25] testing and logging updates Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191219104934.866-20-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=laurent@vivier.eu \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=riku.voipio@iki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).