From patchwork Mon Jun 23 12:18:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 899205 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:191c:b0:290:25b2:841c with SMTP id v28csp3837996ltt; Mon, 23 Jun 2025 05:20:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUV4TWvxvg4vebz2UzQo7ZcbupdYWoTOCC8/8rDn+Gweur79SRXIfb/bSJPAakkuX7kHvLkg==@linaro.org X-Google-Smtp-Source: AGHT+IFoQYM3v0HmV5PpB7wtALIh2OYggxQkm37dGENTlxXlEFHTAW4EMlpXqu8zF5wxePjBDtU1 X-Received: by 2002:ad4:5f4a:0:b0:6e8:9086:261 with SMTP id 6a1803df08f44-6fd0a4645a6mr174368296d6.3.1750681229691; Mon, 23 Jun 2025 05:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750681229; cv=none; d=google.com; s=arc-20240605; b=JQLeHEzSlU3skgIJ9mncjkcc33jFXyqWwQc4LmDeXJCGIS0q9Q6HaoKuOUp1Lm9vLn 9s50JgrRb4CDbpc9tKNFudSs6bDECj0XkOBkgbUMs+kwAfMFZFSnQYNoUvei0DOduhV9 mfVnT9Nfg5W2nofZe8l64p7r9n5pQz2oTqVB1b262BDxpTP6uE+NrGQQ9w/EtKSpPH6p Zpf+lG+NGfN1sLmOYBORcDk/v8j1iJLqEq/P2EDXLCpTlQOsfRLFbg5hn/7L3Xt1ejzH KqqGTP5AoCM3Q9hVukz3VeHazjavrnuKYlWllKeaOvHU9cIYMu4R+GeK1Ezi8LRZxg/B zj9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; fh=x5VJDl6FrykOwQuDK8d67WYnSid/uzpvpvankGNJv0o=; b=IUp6vab+ocf9NwUca1B0A9YcYpcmkOFcFIH8PpVsRDDzjRy3KEB4hhss41VK6EdOpJ RRVLqEezLNlhaTUdBVaweLwg3HGboomvk55ruUgeE6jIrLpkmOUrQqejCMpgRHGzT85t wNRbtVluFfyPD84KVvUkSKbE67VgF20ShAOgbi5idtrM87uu/jqGtBxO5HOcezczBWfy iJhQDavP/W3QKke11YnbYRRW81JSVOgxpEWBtVlEFEiDSJiHJWbFeNpg62AIYJknqpgf S5gH059JNjuDbchWMMdLYpwJVL3WdRyahhSDfai3OeDvd6P3DdGb8vPctGTIT8MJI5oM c0CQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LPB75Qos; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fd09530f96si84584556d6.177.2025.06.23.05.20.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jun 2025 05:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LPB75Qos; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg99-0001R0-80; Mon, 23 Jun 2025 08:19:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTg95-0001PZ-D5 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg93-0000Vx-3l for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:30 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a536ecbf6fso2281125f8f.2 for ; Mon, 23 Jun 2025 05:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681164; x=1751285964; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; b=LPB75QosysKBIu72/h9rHK7gFs5UE7R9g+Pgymju0JxaxaQYQGnVxuMnRMoXq4s6jg iJRW2k5lCYu2qKIdBn5nbs+d9BRk2p5JmM2+IC4uV0v+i3nZgD0liwpfZO6nPU/y03T+ 1WE0+jY6VbNO224f2EUI+afrpEr9ibtmgYj6ICqmnNVQeYJdxsqdB8jq3bmYG/mpZNVa LbOpaBpWYTM7QEPf62EHh/70zjEu5qndxXFGGkMGf773ZvxXSUaFcf5JVGRUYI2hPWhv V3EQIixTiX42iYX8Y1L37c1toPkTRErl0GZ381ffr+mZf1mbId4fBtzK6eZUkNJh/3X9 HbfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681164; x=1751285964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; b=i0/WGlVbgwfwVf99zvz3WwRrRgrld8GM9VTgyyu/xQ8We3BxT71G6iG8LY5Qy+jmao Jqyua6Z3L31h8vz528k0jDhZ1yUOOLTqcP8foPd6DzTtVmr3Yb5IUv67BEDKnFfXq3I3 rVDS6PxIC+qY2loK9/xHVvtd2BJ0TcyP5nZXIxcQ60jB2il+wpSzEKD9bbocb4rQcq1D zHMlqRu0S9U7NYBy/6uxKvP0+MC4ZbCkmF36TsfX7SOWRb/uQ1QyL7krp0oxRi7Thjvp c+plRKG6u02E3FEH2B4IeaPkFjdpD8EUMWReoFDSvW2sGjdyXW5SMWY8aaP27UC3xOlB vihQ== X-Gm-Message-State: AOJu0YwJZjgR/ub9WeVtNRtnUwpVL9+GPtQ5uS7edpIFS0fS2KnPBnAU WvEf/gMcRGpo7IQpoegLJ4bO7EAb33VugXflyj35Rcrcp+X168qVeIXo2u3svYWi/yeq8GMMfX8 fOWY1 X-Gm-Gg: ASbGnctG/+mko2GebkeGFMbaBdebMABC/a5UMrTHqyJOGd3VPXT2cFoHbrAC3Cg+ajG 8P7Jf5/1BJNv2rNwjuTQQNDuHnnp2IQFbkB2FYkI+rGOTM9kKQBuoSieFO4NvlY17THz5i4BqFV 4hbm8hPzBbbQeUD41xe3zGYQGlIEfp/YceSLl/OqgxLxOj+CO+xkGS98Ge1iBjnAEAUwWNobt3U IINJLqevXx9p26kTWKXEQ6ZYOp0siVIaA5eaYG9h///eVVND94NAVjmCpo7zNwYorORg5KnPV6u 8GTHXcTkf8nWiSyZXty3MgtDkocntwTuFMlUaAm/x8pvlNI/Yd0zYrnqn9Xo7O3wf9w+npsVdd0 XhHevkoi/J+/gETQZshC/sabv2F2lCPohMPOG X-Received: by 2002:a05:6000:38e:b0:3a4:fc37:70e4 with SMTP id ffacd0b85a97d-3a6d1331ec7mr9866453f8f.58.1750681163851; Mon, 23 Jun 2025 05:19:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535eada7adsm144615895e9.35.2025.06.23.05.19.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?utf-8?q?Mar?= =?utf-8?q?c-Andr=C3=A9_Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PATCH v3 07/26] accel/hvf: Trace VM memory mapping Date: Mon, 23 Jun 2025 14:18:26 +0200 Message-ID: <20250623121845.7214-8-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Trace memory mapped / unmapped in the guest. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- meson.build | 1 + accel/hvf/trace.h | 2 ++ accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/hvf/trace-events | 7 +++++++ 4 files changed, 16 insertions(+) create mode 100644 accel/hvf/trace.h create mode 100644 accel/hvf/trace-events diff --git a/meson.build b/meson.build index 34729c2a3dd..5004678a26b 100644 --- a/meson.build +++ b/meson.build @@ -3633,6 +3633,7 @@ if have_block endif if have_system trace_events_subdirs += [ + 'accel/hvf', 'accel/kvm', 'audio', 'backends', diff --git a/accel/hvf/trace.h b/accel/hvf/trace.h new file mode 100644 index 00000000000..83a1883343a --- /dev/null +++ b/accel/hvf/trace.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "trace/trace-accel_hvf.h" diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d60446b85b8..b38977207d2 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -59,6 +59,7 @@ #include "system/hvf_int.h" #include "system/runstate.h" #include "qemu/guest-random.h" +#include "trace.h" HVFState *hvf_state; @@ -97,6 +98,7 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory_flags_t flags) if (macslot->present) { if (macslot->size != slot->size) { macslot->present = 0; + trace_hvf_vm_unmap(macslot->gpa_start, macslot->size); ret = hv_vm_unmap(macslot->gpa_start, macslot->size); assert_hvf_ok(ret); } @@ -109,6 +111,10 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory_flags_t flags) macslot->present = 1; macslot->gpa_start = slot->start; macslot->size = slot->size; + trace_hvf_vm_map(slot->start, slot->size, slot->mem, flags, + flags & HV_MEMORY_READ ? 'R' : '-', + flags & HV_MEMORY_WRITE ? 'W' : '-', + flags & HV_MEMORY_EXEC ? 'E' : '-'); ret = hv_vm_map(slot->mem, slot->start, slot->size, flags); assert_hvf_ok(ret); return 0; diff --git a/accel/hvf/trace-events b/accel/hvf/trace-events new file mode 100644 index 00000000000..2fd3e127c74 --- /dev/null +++ b/accel/hvf/trace-events @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# See docs/devel/tracing.rst for syntax documentation. + +# hvf-accel-ops.c +hvf_vm_map(uint64_t paddr, uint64_t size, void *vaddr, uint8_t flags, const char r, const char w, const char e) "paddr:0x%016"PRIx64" size:0x%08"PRIx64" vaddr:%p flags:0x%02x/%c%c%c" +hvf_vm_unmap(uint64_t paddr, uint64_t size) "paddr:0x%016"PRIx64" size:0x%08"PRIx64