From nobody Tue Feb 10 02:54:47 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574978091; cv=none; d=zohomail.com; s=zohoarc; b=LebmcxclV4tgmUqgA32FAjBjwgKa0Lxq6LKg8+4/J0eNUGXODG/WO2B5D3kxSvIPlylPYcl3TDjMwmqiRNqPklaoR6Gtt5eBxni2RFDXt7hFYfcrVIfaiQ5UcPRHJk3DDHjXIhGcyaTWN2wLazq3WhrDpRGgAmrM6s7Do0ktkp0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574978091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MNn7wi779g5wDhZisTPTovBof5tUb05aT8JmY/Sn4ZM=; b=bKgeJ16BcoT1PmxtVjGirGSbsrv/XHcl1zsj2iG2Na9gW3iidgNEpnWnGKOBpNCgpU0LGKtqh+JuBDpPS1EbszyMZOgGBAJ7Q4b/uxAQhdLrFGPntAaXS5Enw3J4vQUOCZJ0xq8t+cbheSz0PSCIvyNqERwcPzAQJ/IuFjFgO1A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574978091083558.4493060881464; Thu, 28 Nov 2019 13:54:51 -0800 (PST) Received: from localhost ([::1]:53510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaRkO-00077J-ER for importer@patchew.org; Thu, 28 Nov 2019 16:54:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49585) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaPpR-0005iK-NP for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:53:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaPk0-0005Dh-J0 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:46:20 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iaPjz-00050w-AD for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:46:15 -0500 Received: by mail-wm1-x343.google.com with SMTP id s14so5983685wmh.4 for ; Thu, 28 Nov 2019 11:46:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d20sm25667791wra.4.2019.11.28.11.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 11:46:04 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A36471FF8F; Thu, 28 Nov 2019 19:46:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MNn7wi779g5wDhZisTPTovBof5tUb05aT8JmY/Sn4ZM=; b=Xk19NKkJuv3ddzTRqZvOv6E+lh6JikLWMvvdvU2iUdCCS1BT4SPGudnI9KaiktsVE9 NCp8jG7Yo7tdnd5Q9WjhlS4SRw5byo8p/mWuoYeymXyo2uTdwi88hWSx2zj+28uWdXHg Low/RnLOYJ0kWZNbQQQnh9w9v0xaoNtvLLlBcogdVK5dZONbPA02QylYT93pPbw6xJFp xoLLDkxqKT8dGPA89pZsZ/b310zLOVGXlG+zDXhYWPVFsv3UZNx3tzfak4gSqvZNf2ir 5/0zZu4K6jAiWm/mPOgsQLgTeta0eXVrCRQ+6FGym3wbxGtLZk4wc/C5smM6jv98Jjuv XCSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MNn7wi779g5wDhZisTPTovBof5tUb05aT8JmY/Sn4ZM=; b=EPYd9im8AC/zOBGSoCw897WdrstZpZsPTXnn7sqw305hTQflS4VM9Qq2/iwxoN7TEk AYXq0NuWs8KNVAnm5G8Ades5Ue1Z1PutuYlAL+mzJWcwsrXyTZg/nR07b5Ch+DGbfsVJ 8J9HAZCZfqZmmehj5QENRW3GB63CGvO7MyVZLudFcdcPjt5fj7btaJYDFnfOLGLN0Rv9 KLsiPdl6yXv/F7HkT6Z9DDKYGHZAU/QA+rZ0gEM3VYRDhF3fnW3c1V3xHpQmUU7/TPtv WNJ4hEmi6JCEFWEsQx/eVVF6K+gqeTCbjGpiTGywfQVAZntA64WP7RVct5VT2HQNb2wg jrrA== X-Gm-Message-State: APjAAAU2LD3HcyOjf2nVsbaEopEE9HhWJUl2+2SAR1yMEqyCZRhqEDIR 0vtYgdVp2Y/emXi0t/6WRSXmPdXrK64= X-Google-Smtp-Source: APXvYqza2m5Rq4xbgsu5S6cOGsn728vrFXE+VcLGsMrZRv3tVmTbP5tqc8bXYq7zfQvYrHoVExSJ3A== X-Received: by 2002:a1c:b7c4:: with SMTP id h187mr5439956wmf.105.1574970368433; Thu, 28 Nov 2019 11:46:08 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/5] linux-user: convert target_mmap debug to tracepoint Date: Thu, 28 Nov 2019 19:46:00 +0000 Message-Id: <20191128194603.24818-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191128194603.24818-1-alex.bennee@linaro.org> References: <20191128194603.24818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e --- linux-user/mmap.c | 51 +++++++++++++++++++++++------------------ linux-user/trace-events | 1 + 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 66868762519..c81fd85fbd2 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -60,6 +60,15 @@ void mmap_fork_end(int child) pthread_mutex_unlock(&mmap_mutex); } =20 +/* mmap prot pretty printer */ +static void pp_prot(char (*str)[4], int prot) +{ + (*str)[0] =3D prot & PROT_READ ? 'r' : '-'; + (*str)[1] =3D prot & PROT_WRITE ? 'w' : '-'; + (*str)[2] =3D prot & PROT_EXEC ? 'x' : '-'; + (*str)[3] =3D 0; +} + /* NOTE: all the constants are the HOST ones, but addresses are target. */ int target_mprotect(abi_ulong start, abi_ulong len, int prot) { @@ -68,10 +77,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int = prot) =20 if (TRACE_TARGET_MPROTECT_ENABLED) { char prot_str[4]; - prot_str[0] =3D prot & PROT_READ ? 'r' : '-'; - prot_str[1] =3D prot & PROT_WRITE ? 'w' : '-'; - prot_str[2] =3D prot & PROT_EXEC ? 'x' : '-'; - prot_str[3] =3D 0; + pp_prot(&prot_str, prot); trace_target_mprotect(start, len, prot_str); } =20 @@ -370,32 +376,33 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, = int prot, abi_ulong ret, end, real_start, real_end, retaddr, host_offset, host_l= en; =20 mmap_lock(); -#ifdef DEBUG_MMAP - { - printf("mmap: start=3D0x" TARGET_ABI_FMT_lx - " len=3D0x" TARGET_ABI_FMT_lx " prot=3D%c%c%c flags=3D", - start, len, - prot & PROT_READ ? 'r' : '-', - prot & PROT_WRITE ? 'w' : '-', - prot & PROT_EXEC ? 'x' : '-'); - if (flags & MAP_FIXED) - printf("MAP_FIXED "); - if (flags & MAP_ANONYMOUS) - printf("MAP_ANON "); - switch(flags & MAP_TYPE) { + if (TRACE_TARGET_MMAP_ENABLED) { + char prot_str[4]; + g_autoptr(GString) flag_str =3D g_string_new(NULL); + + pp_prot(&prot_str, prot); + + if (flags & MAP_FIXED) { + g_string_append(flag_str, "MAP_FIXED "); + } + if (flags & MAP_ANONYMOUS) { + g_string_append(flag_str, "MAP_ANON "); + } + + switch (flags & MAP_TYPE) { case MAP_PRIVATE: - printf("MAP_PRIVATE "); + g_string_append(flag_str, "MAP_PRIVATE "); break; case MAP_SHARED: - printf("MAP_SHARED "); + g_string_append(flag_str, "MAP_SHARED "); break; default: - printf("[MAP_TYPE=3D0x%x] ", flags & MAP_TYPE); + g_string_append_printf(flag_str, "[MAP_TYPE=3D0x%x] ", + flags & MAP_TYPE); break; } - printf("fd=3D%d offset=3D" TARGET_ABI_FMT_lx "\n", fd, offset); + trace_target_mmap(start, len, prot_str, flag_str->str, fd, offset); } -#endif =20 if (!len) { errno =3D EINVAL; diff --git a/linux-user/trace-events b/linux-user/trace-events index 41d72e61abb..9411ab357c9 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -14,3 +14,4 @@ user_s390x_restore_sigregs(void *env, uint64_t sc_psw_add= r, uint64_t env_psw_add =20 # mmap.c target_mprotect(uint64_t start, uint64_t len, char *flags) "start=3D0x%"PR= Ix64 " len=3D0x%"PRIx64 " prot=3D%s" +target_mmap(uint64_t start, uint64_t len, char *pflags, char *mflags, int = fd, uint64_t offset) "start=3D0x%"PRIx64 " len=3D0x%"PRIx64 " prot=3D%s fla= gs=3D%s fd=3D%d offset=3D0x%"PRIx64 --=20 2.20.1