[v2,1/6] linux-user: convert target_mprotect debug to tracepoint

Message ID 20191205122518.10010-2-alex.bennee@linaro.org
State Superseded
Headers show
Series
  • linux-user mmap debug cleanup
Related show

Commit Message

Alex Bennée Dec. 5, 2019, 12:25 p.m.
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>


---
v2
  - don't both with ascii conversion
---
 linux-user/mmap.c       | 10 ++--------
 linux-user/trace-events |  3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

-- 
2.20.1

Comments

Richard Henderson Dec. 5, 2019, 3:43 p.m. | #1
On 12/5/19 4:25 AM, Alex Bennée wrote:
> 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>

> 

> ---

> v2

>   - don't both with ascii conversion

> ---

>  linux-user/mmap.c       | 10 ++--------

>  linux-user/trace-events |  3 +++

>  2 files changed, 5 insertions(+), 8 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>



r~
Laurent Vivier Dec. 11, 2019, 2:46 p.m. | #2
Le 05/12/2019 à 13:25, Alex Bennée a écrit :
> 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>

> 

> ---

> v2

>   - don't both with ascii conversion

> ---

>  linux-user/mmap.c       | 10 ++--------

>  linux-user/trace-events |  3 +++

>  2 files changed, 5 insertions(+), 8 deletions(-)


Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Patch

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"