| Message ID | 20191205122518.10010-6-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-user mmap debug cleanup | expand |
Le 05/12/2019 à 13:25, Alex Bennée a écrit : > Convert the final bit of DEBUG_MMAP to a tracepoint and remove the > last remanents of the #ifdef hackery. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > --- > linux-user/mmap.c | 9 ++------- > linux-user/trace-events | 1 + > 2 files changed, 3 insertions(+), 7 deletions(-) > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Laurent Vivier <laurent@vivier.eu> writes: > Le 05/12/2019 à 13:25, Alex Bennée a écrit : >> Convert the final bit of DEBUG_MMAP to a tracepoint and remove the >> last remanents of the #ifdef hackery. >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> linux-user/mmap.c | 9 ++------- >> linux-user/trace-events | 1 + >> 2 files changed, 3 insertions(+), 7 deletions(-) >> > > Reviewed-by: Laurent Vivier <laurent@vivier.eu> Are you going to take this series via your tree or would you like me to put the PR together? -- Alex Bennée
Le 16/12/2019 à 13:00, Alex Bennée a écrit : > > Laurent Vivier <laurent@vivier.eu> writes: > >> Le 05/12/2019 à 13:25, Alex Bennée a écrit : >>> Convert the final bit of DEBUG_MMAP to a tracepoint and remove the >>> last remanents of the #ifdef hackery. >>> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >>> --- >>> linux-user/mmap.c | 9 ++------- >>> linux-user/trace-events | 1 + >>> 2 files changed, 3 insertions(+), 7 deletions(-) >>> >> >> Reviewed-by: Laurent Vivier <laurent@vivier.eu> > > Are you going to take this series via your tree or would you like me to > put the PR together? > As you prefer. Thanks, Laurent
Laurent Vivier <laurent@vivier.eu> writes: > Le 16/12/2019 à 13:00, Alex Bennée a écrit : >> >> Laurent Vivier <laurent@vivier.eu> writes: >> >>> Le 05/12/2019 à 13:25, Alex Bennée a écrit : >>>> Convert the final bit of DEBUG_MMAP to a tracepoint and remove the >>>> last remanents of the #ifdef hackery. >>>> >>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >>>> --- >>>> linux-user/mmap.c | 9 ++------- >>>> linux-user/trace-events | 1 + >>>> 2 files changed, 3 insertions(+), 7 deletions(-) >>>> >>> >>> Reviewed-by: Laurent Vivier <laurent@vivier.eu> >> >> Are you going to take this series via your tree or would you like me to >> put the PR together? >> > > As you prefer. Very well queued to pullreq/testing-logging-misc, thanks. > > Thanks, > Laurent -- Alex Bennée
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 3d90fa459ca..8685f02e7e9 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -21,8 +21,6 @@ #include "exec/log.h" #include "qemu.h" -//#define DEBUG_MMAP - static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; static __thread int mmap_lock_count; @@ -597,11 +595,8 @@ int target_munmap(abi_ulong start, abi_ulong len) abi_ulong end, real_start, real_end, addr; int prot, ret; -#ifdef DEBUG_MMAP - printf("munmap: start=0x" TARGET_ABI_FMT_lx " len=0x" - TARGET_ABI_FMT_lx "\n", - start, len); -#endif + trace_target_munmap(start, len); + if (start & ~TARGET_PAGE_MASK) return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); diff --git a/linux-user/trace-events b/linux-user/trace-events index 6d6aeef7b52..f6de1b8befc 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -16,3 +16,4 @@ user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_add target_mprotect(uint64_t start, uint64_t len, int flags) "start=0x%"PRIx64 " len=0x%"PRIx64 " prot=0x%x" target_mmap(uint64_t start, uint64_t len, int pflags, int mflags, int fd, uint64_t offset) "start=0x%"PRIx64 " len=0x%"PRIx64 " prot=0x%x flags=0x%x fd=%d offset=0x%"PRIx64 target_mmap_complete(uint64_t retaddr) "retaddr=0x%"PRIx64 +target_munmap(uint64_t start, uint64_t len) "start=0x%"PRIx64" len=0x%"PRIx64