From patchwork Wed Feb 26 14:03:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 868534 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f56:0:b0:38f:210b:807b with SMTP id cm22csp820901wrb; Wed, 26 Feb 2025 06:12:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvbJ6P2EOBnvQFNLsOqCxfABzekfB7dksOHwZS04K66b3rE+ysj4DnEN+2S8RhbL7IelwDZA==@linaro.org X-Google-Smtp-Source: AGHT+IGW9BVVueWEpUonwXlWD8iYNkdg0AmctF58gw3Awq8fKzRxz0xGpPUIGhCeGgzMQgyu7xv+ X-Received: by 2002:a05:6102:32cc:b0:4bb:d688:9bf8 with SMTP id ada2fe7eead31-4bfc27ed54fmr11125634137.13.1740579175845; Wed, 26 Feb 2025 06:12:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740579175; cv=none; d=google.com; s=arc-20240605; b=TND0czaJIIADe0KnvVP+gp7PDhPIDJI/RqRLU9s1kxBUA48v+9iP4KnrRj5PfRdVET +GDTq/S5zeqabVPlA9b8eHCVOM4MJNbNki0szDCnWoY2QyU+C/FJwJ1YQ/9onjHQELhX 50YaoiIrVvoOUurTqAuarmKSmmYLj/Fv1qcEBQSaws7VkYyqcLKaIXjXgoh0M1yJBIhR I907/eKSnC8Vw7wP8H6tVhRW/hXKFmWiDsmHG76lUvL6w/+suC8t8xzWG7BWLl8uDxra USRxYZ3oHWGNqTn6shdP4+cSse7VNOuqqOKNbkrzFDvcoa4iEhioj5WcG4D+js1gmB/+ 3NRQ== 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=RFdASjaX52m/LFBMdNIH+YRGWtE+XbpwGlPffnilBbc=; fh=fySNGfDYHed5hYuWeyYWBmz9AHLCfB1G33J0dTYFdV4=; b=lpCW9WhTteQYDnp5Tq8+ME81CjBTe57B7D0KoPtc2ppK8SHKCCHHYp4+Ta39cMtb3E 9vtUOEafUvVMAsNEMDP67QRLlx7fcAvhEd83ySTreL5PXtgimVyB9yK855bKcWtJt285 AGk4cD13vnTXlI8IyFFuw4uAxKYNq2JUA9Se4LS344bJvsMErExs3xgXULbm1XQb4dn0 nAJHmkD74wzzDDKdu6TEu9fH4s07/r5CFwPX04AQnHwMzPmp341NJb2IQV/XE/lki5EP GkQOm+7HoarPsZlN3Fn0uXz40iVkkGLugOk4g/Vlj66fQ6tWCLsckSU5WCCqhQvSaYAW mWiA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=syisNZss; 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 ada2fe7eead31-4c00c57e80fsi665321137.80.2025.02.26.06.12.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Feb 2025 06:12:55 -0800 (PST) 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=syisNZss; 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 1tnI9G-0007CJ-LD; Wed, 26 Feb 2025 09:12:30 -0500 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 1tnI8b-0005RC-8m for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:54 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI8X-0007ZC-5B for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:48 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so60168425e9.1 for ; Wed, 26 Feb 2025 06:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579103; x=1741183903; 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=RFdASjaX52m/LFBMdNIH+YRGWtE+XbpwGlPffnilBbc=; b=syisNZssjAHCxXkFkV0CllLHmJDGR/vW0g4InZ2ZUnGYxFslVT5C0RPqUD87j/JU0r pgn8UN1ZabsVXtAzZuDz21wioGVXJh0zcX6U5vh9ezUu2LUmZu+KhOIMEZCbzr+kyWDW 37oXcE37gq2KOVB2+4wM9RKrVnkrKsvZt8+wRoGpR7uU9Os6nuWRjauLXwToKGrQ/vjq rLM0UoiL+LOyKgmhIyb+NMv8BNZg1n8U671t6Swe/ELfrRHOOX4U25jGYGATR/IIx5In nIuVV556dhQ9oLQXmDxM65lJcCCTLLs3e1VzY/5mXIKv9XKe6zzf6M7vUAvddoOeVbrp 9Jpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579103; x=1741183903; 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=RFdASjaX52m/LFBMdNIH+YRGWtE+XbpwGlPffnilBbc=; b=dd7tkhn9U472dtiHiD1OkGmUWV1KWEQdVHjeun9fmVa9hS1pnvtQOXdgRjhMlpxuvs F/+Xr0/Mo8QMHLdpr3FOX8cNoatxP8ZN4n3ivRmI1M7P096MefVk/0LjvX0QOEmHccsl 8t0eZUW/PcsA5gW//kwEDR2drSvtX+9xML3OrVwMTNtMtbym6IUwHCe2cndegahJROLr iZpHc1iiQM1VmmGne/S4zGCrrZ/zjOgNynXlMD1OhcOirE0xDc5fqcl/6dOIDsf17xm9 C0QH6iui9cgKVV+e6JODCuimWGy3LG/9U6bOIB0cyVMo53by7lk84c7j1mNYtgmEG47e QTMg== X-Gm-Message-State: AOJu0YzS1oXDnA5LpsE5fsuR6iMyJm6zWcaogV/wQ1FdHI4jg/3/yA2x sAeB7ke35SuhejQUrpbgIGSR/mJsR1cSMyKL8iCVEKBA9CEU3OZw8iULcTViKy8= X-Gm-Gg: ASbGncsRaIzLSPqm36XsEPHNT3tKRYnOkgyK26pe4OuQ6yY8wAZgOKs8EAqxWuOiXR2 o1Gz+VyoPTZkR55WbCGuqvWNjgZE/s63gsaYleXb7GnMwwoyS5Y01u0lu39Tkw84eQSPK9W1Ecu PiFO9utq3RZ4E0+9DoMyGHCPQeJbw0CsIF9jbJzSbZzgqgAGoF2ckDstl0qUyoaiKIt1hj+12/6 ggleVL9p3vajIci0Ylgm179cgj0xeUAv4OlRnxYN/uMC6yfQRrmOEaKuxEOxzs0J2FCbw4L9lc9 IRTxorFhW6PwSo+1YHrqJQCvQRZ8 X-Received: by 2002:a05:600c:444e:b0:439:9543:9488 with SMTP id 5b1f17b1804b1-43ab9015589mr26128155e9.21.1740579103243; Wed, 26 Feb 2025 06:11:43 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba532d33sm22850475e9.15.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1DBB66086F; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 22/25] plugins/api: split out the vaddr/hwaddr helpers Date: Wed, 26 Feb 2025 14:03:40 +0000 Message-Id: <20250226140343.3907080-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 These only work for system-mode and are NOPs for user-mode. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-9-alex.bennee@linaro.org> --- plugins/api-system.c | 58 ++++++++++++++++++++++++++++++++++++ plugins/api-user.c | 40 +++++++++++++++++++++++++ plugins/api.c | 70 -------------------------------------------- plugins/meson.build | 2 +- 4 files changed, 99 insertions(+), 71 deletions(-) create mode 100644 plugins/api-user.c diff --git a/plugins/api-system.c b/plugins/api-system.c index cb0dd8f730..38560de342 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -12,6 +12,10 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qapi/error.h" +#include "migration/blocker.h" +#include "hw/boards.h" +#include "qemu/plugin-memory.h" #include "qemu/plugin.h" /* @@ -37,3 +41,57 @@ uint64_t qemu_plugin_entry_code(void) { return 0; } + +/* + * Virtual Memory queries + */ + +static __thread struct qemu_plugin_hwaddr hwaddr_info; + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + CPUState *cpu = current_cpu; + unsigned int mmu_idx = get_mmuidx(info); + enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); + hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; + + assert(mmu_idx < NB_MMU_MODES); + + if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, + hwaddr_info.is_store, &hwaddr_info)) { + error_report("invalid use of qemu_plugin_get_hwaddr"); + return NULL; + } + + return &hwaddr_info; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return haddr->is_io; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + if (haddr) { + return haddr->phys_addr; + } + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + if (h && h->is_io) { + MemoryRegion *mr = h->mr; + if (!mr->name) { + unsigned maddr = (uintptr_t)mr; + g_autofree char *temp = g_strdup_printf("anon%08x", maddr); + return g_intern_string(temp); + } else { + return g_intern_string(mr->name); + } + } else { + return g_intern_static_string("RAM"); + } +} diff --git a/plugins/api-user.c b/plugins/api-user.c new file mode 100644 index 0000000000..867b420339 --- /dev/null +++ b/plugins/api-user.c @@ -0,0 +1,40 @@ +/* + * QEMU Plugin API - user-mode only implementations + * + * This provides the APIs that have a user-mode specific + * implementations or are only relevant to user-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" + +/* + * Virtual Memory queries - these are all NOPs for user-mode which + * only ever has visibility of virtual addresses. + */ + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + return NULL; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return false; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + return g_intern_static_string("Invalid"); +} diff --git a/plugins/api.c b/plugins/api.c index ffccd71e4b..82241699a5 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -383,76 +383,6 @@ qemu_plugin_mem_value qemu_plugin_mem_get_value(qemu_plugin_meminfo_t info) return value; } -/* - * Virtual Memory queries - */ - -#ifdef CONFIG_SOFTMMU -static __thread struct qemu_plugin_hwaddr hwaddr_info; -#endif - -struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, - uint64_t vaddr) -{ -#ifdef CONFIG_SOFTMMU - CPUState *cpu = current_cpu; - unsigned int mmu_idx = get_mmuidx(info); - enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); - hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; - - assert(mmu_idx < NB_MMU_MODES); - - if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, - hwaddr_info.is_store, &hwaddr_info)) { - error_report("invalid use of qemu_plugin_get_hwaddr"); - return NULL; - } - - return &hwaddr_info; -#else - return NULL; -#endif -} - -bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - return haddr->is_io; -#else - return false; -#endif -} - -uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - if (haddr) { - return haddr->phys_addr; - } -#endif - return 0; -} - -const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) -{ -#ifdef CONFIG_SOFTMMU - if (h && h->is_io) { - MemoryRegion *mr = h->mr; - if (!mr->name) { - unsigned maddr = (uintptr_t)mr; - g_autofree char *temp = g_strdup_printf("anon%08x", maddr); - return g_intern_string(temp); - } else { - return g_intern_string(mr->name); - } - } else { - return g_intern_static_string("RAM"); - } -#else - return g_intern_static_string("Invalid"); -#endif -} - int qemu_plugin_num_vcpus(void) { return plugin_num_vcpus(); diff --git a/plugins/meson.build b/plugins/meson.build index 9c9bc9e5bb..942b59e904 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -58,7 +58,7 @@ if host_os == 'windows' ) endif -user_ss.add(files('user.c')) +user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) common_ss.add(files('loader.c'))