From nobody Tue Feb 10 03:39:48 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=1574977634; cv=none; d=zohomail.com; s=zohoarc; b=amxGlICiYyGcXXz4Q747eeJnXLnjgmlA27RQcPPXiDR9r6/5ylyKuxUk/+jOsVv5mibkurraEVAwSWkyS8i9buuMq7Xcce7vEzcb9VAtsq2sgXOKvtdyJfkAlf8vA1oNDISqW9eVNOUEVimRy+YpRKKO97ze+6i27KkXuJwdaJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574977634; 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=IGkE42M4Q3eQbdw5NzOuWOoq/KgXpAh9fYfQ2Axv8vw=; b=kzt//QjlOAKV3MCI1RbNWOdDJtsGjS/EvSIvythPtJTYy9SH4ZiQQzx1qWEDbcYKfjWZ4/3DyE4t2bgE3dbdv6a5KhtqL0cLpDezgzu2Bok1musAAVWWN/gauoQNMCR5NXJ9tKInJX86BV6GYNOK/WEjcJHMv/cbH4+WzytXbsk= 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 1574977634709890.0757227666548; Thu, 28 Nov 2019 13:47:14 -0800 (PST) Received: from localhost ([::1]:53442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaRd2-0003j8-BK for importer@patchew.org; Thu, 28 Nov 2019 16:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaPpP-0005c5-Ra for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:51:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaPk4-0005J9-IQ for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:46:23 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iaPk0-00057J-Qc for qemu-devel@nongnu.org; Thu, 28 Nov 2019 14:46:19 -0500 Received: by mail-wr1-x444.google.com with SMTP id c14so7825079wrn.7 for ; Thu, 28 Nov 2019 11:46:14 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r6sm11550494wrv.40.2019.11.28.11.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 11:46:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E20F51FF92; 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=IGkE42M4Q3eQbdw5NzOuWOoq/KgXpAh9fYfQ2Axv8vw=; b=t5CELZuy5IsnSKVq33/vHd6UsAbIp+WNKtT/fV6zNifx6sXJzyMpnMpwLBdlrYGI7P Jc8h0ZR0o30ZgS64CpEajP24pPnCUCNR079/oMc56yejh3RtOhpu8LPJZlWFk35yr49P 8yO2L5QUmUg1RpGjcBElMpfRy0YeHjwtZxBjZekgHiE8JBHXHGwkJnh8PNBhOOc8kNP5 BWnS46LIdOHUN9FjMov7Kwbj/R0pckcADMxrFE1Azp6vWsVQe+fdc4BNCvI0qy8ltwhy 9hw+Tuk50kr//ovJbkyyhkcT2zVlDMQrB8x0Eqpq0mOdsRCAkjaXoDZa1lmMcRNYUlj0 P8Og== 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=IGkE42M4Q3eQbdw5NzOuWOoq/KgXpAh9fYfQ2Axv8vw=; b=DrI9ateNLqJfbPAtCHq1Q08xvQgAxYkrf4dfN6rT0IyITUDE5I9j59bUhnXQ80UESw iv4Njn+2eBRo7MzXTZ3S4R/TLFovHblgje+/4T2yYwGblOgLVljZ27MZMZ7opb+RWLEh mZ4CfvfREiZJz/L8+YfXcjwUD5g4qH3PoAtWr4+8OQyMfHx+Z0ATUwqStc74K9kFDMFd FuaaU1c/+izxrWhJlWStXBvA8FsZvRQsneswrQUCf/KA2xEb+wZdJATQ6yvsXmtKYjZL UWpxlgtFg6UfQgG8eeY50eFOlJae0MnRDXSQVG38nG8B8RTvI9VMjxlFna31f9Xssayk Tbpg== X-Gm-Message-State: APjAAAWKM8IzoUA8fElq+9PEYJuJ43MEgzcSC1H+3bTlnfDFgGJmT55E zR+L0Z/U5HrMkdVQdCUTDRggpA== X-Google-Smtp-Source: APXvYqzYEDxbwW18VYylleGOTbvv60+5s7sO3Gifiuvhgck1ZHOg9Wl3PXeRlDutt+lvHA7I5SWY+g== X-Received: by 2002:a5d:6886:: with SMTP id h6mr32189927wru.154.1574970372552; Thu, 28 Nov 2019 11:46:12 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/5] linux-user: convert target_munmap debug to a tracepoint Date: Thu, 28 Nov 2019 19:46:03 +0000 Message-Id: <20191128194603.24818-6-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::444 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) Convert the final bit of DEBUG_MMAP to a tracepoint and remove the last remanents of the #ifdef hackery. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- linux-user/mmap.c | 9 ++------- linux-user/trace-events | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index c2755fcba1f..137aa3eb95f 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -21,8 +21,6 @@ #include "exec/log.h" #include "qemu.h" =20 -//#define DEBUG_MMAP - static pthread_mutex_t mmap_mutex =3D PTHREAD_MUTEX_INITIALIZER; static __thread int mmap_lock_count; =20 @@ -639,11 +637,8 @@ int target_munmap(abi_ulong start, abi_ulong len) abi_ulong end, real_start, real_end, addr; int prot, ret; =20 -#ifdef DEBUG_MMAP - printf("munmap: start=3D0x" TARGET_ABI_FMT_lx " len=3D0x" - TARGET_ABI_FMT_lx "\n", - start, len); -#endif + trace_target_munmap(start, len); + if (start & ~TARGET_PAGE_MASK) return -TARGET_EINVAL; len =3D TARGET_PAGE_ALIGN(len); diff --git a/linux-user/trace-events b/linux-user/trace-events index 774280cefbd..bd897add252 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_add= r, uint64_t env_psw_add 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 target_mmap_complete(uint64_t retaddr) "retaddr=3D0x%"PRIx64 +target_munmap(uint64_t start, uint64_t len) "start=3D0x%"PRIx64" len=3D0x%= "PRIx64 --=20 2.20.1