From patchwork Fri Jun 20 17:27:42 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: 898380 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f54:0:b0:3a4:ee3f:8f15 with SMTP id cm20csp1561055wrb; Fri, 20 Jun 2025 15:22:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLMH+/xmQ/owasB1yLx3DE8yS6L2LszvcfKM6Y3j9D2RFIt94JkqmFGF0utpZAvNf7uN+N7g==@linaro.org X-Google-Smtp-Source: AGHT+IGbTHvprMHzbODBHRFTJ6QOTMXIc6ljO0wrIPXqqJwx329lLJBLOxifjbIudZ+LlZp39rGX X-Received: by 2002:a05:6214:2267:b0:6fa:a625:be55 with SMTP id 6a1803df08f44-6fd0c969b7cmr67181126d6.15.1750458123417; Fri, 20 Jun 2025 15:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750458123; cv=none; d=google.com; s=arc-20240605; b=RJzzgkxNQMa7UexFstooXVh4tZ05s+8NHs3HNx7hqJ1xABe7vbqyektW4EtJYOIcjt kBDFmQNd1sPMt0x5nErGry5Xrrn1ZY2vn7WUbR3256ryBkq4MZflLXCbxQloEK6/69jF N/kjcLdM789NFLlmk9pewe25875vIvosEZUdV3ZeRdY7XQS/aC+LXqXz252FbsMuMTfz UykmoZSQcZX1z6by2f6nX+1f3WcF3jFPutwQh185vnAZkNagNMuC6MrC7YyxIAnSqeqO GNVBgC2szC5ZElOdLAOql9oELTSk52DTjI+kI/Z39qjrB+tWAvs/p137Ge1aGX8eQ9j/ OpRA== 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=CQvaTWJ84vGBT7RjC70BH9slhZwXcz3sDRCxnDfuym4=; fh=AyzBWpdZKvTUKIe2KsNBcRb7uNXo8uS2i+VtImaSwe4=; b=B6qGdCncdTGBJidz2o/Mi6RJQbKPfxzDCK5SYDOhzf8NKkrcQdptnsg1Wm+T2ER18/ 9mzREeyH9FCJ3DGuf95erE9DKi/FiPIv8QK3cUuFz5fHqQV0L2PO4EE5XSLOe2Rkkair 7JsFaTb7cMDWBLyCfhUvQ+NoSukvHKrvhI4LwMM8HxlxTeEKITZioAnFiR+RZhZFA2x1 A4MyDVYROxc2IJOsVLwvat5JuDEZESjlha4CVz8wihtZx1UneGrjpvr8Jj70x6zte6KB wYdO2FGbT/URuiuCcE9LemDiy6T0bm0y5KUlVljSqaJNWYmrDaJGumWOPtsFw/OIh8RL tSuA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tqUiTsG+; 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-6fd093e15d0si29873706d6.92.2025.06.20.15.22.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jun 2025 15:22:03 -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=tqUiTsG+; 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 1uSk5J-0002Wf-4e; Fri, 20 Jun 2025 18:19:45 -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 1uSfbr-00080y-69 for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:33:03 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSfbm-0006dD-Vu for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:33:01 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a589d99963so2076221f8f.1 for ; Fri, 20 Jun 2025 10:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750440769; x=1751045569; 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=CQvaTWJ84vGBT7RjC70BH9slhZwXcz3sDRCxnDfuym4=; b=tqUiTsG+Y+p8uYmdgaqZFkEenb5g8RtQvlIcyzhpvRS0uGjTFxF0U31PJzwvLPKwj3 SSR0OZS8YY8gBi08n1A8VJwjeBVD9Uys1WxvTNIPN+P4CADevFlIqFmETZHQ6GBvE4SE JihVYaJUQ5abKfZbp6fzPpLJlCCEDUHUlU0GwovhrXpiJY0Ez6tLRNH4gtVW3M9pjmw2 Gh1pOsT60oVsiaTiYH72LtmW/RBlGUhXbt0cU0mTs9/wVuJAtDxmZc/VrC9gXABzMLGo AH76Pqrq/3bio9HtL1+OT8vleFPnSKFBhsTag8zAKKuYeHPI8+CQeRTOwlS7qUtYXu50 d4uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750440769; x=1751045569; 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=CQvaTWJ84vGBT7RjC70BH9slhZwXcz3sDRCxnDfuym4=; b=Vi5gDtMJA8QWp7egMJH42RrDqTbAETdDRJdgJKj6lfeDrERlqgoCiiSnHWNrZ1izmg 83/npADNJire6JuhjexM8ghyz/R+dcPeTeKQHSBTsQ9OrqfkQeUYFXetO7BJROXWXf63 jpxaGvebWTQSLUkIhaGpQ9EsqkHpuKJdPj0RyVaLIHGw2sn3hDjH/totzQGD1zI4gcJJ hwGMM/XYVTwGVgwyTWYlIDWP+Qxw6d7jxnTNDj5+PPUWtkG5fYFBgqynSJNvVvKLfc5p 6f05FGPF1PV9dzM5HHZDzOa7HxnvEUkkesNyNNarNs/iK8pDkqoX7l3LlpFxF3ws4mMp B24A== X-Gm-Message-State: AOJu0YxiW4EYu/g+Yw3GXsSaUnIbn4EVzYY9DmK9PfqyM+MEvUxRgu9e BMHKq8HoDHx+bPc5aIH3iOTmYeHaSpgrUqJy6W1PoyJA3TiyE/VGDKh85LcUATL+LgR2T8RDRBs AHwobIaS3xA== X-Gm-Gg: ASbGnctDjcAhFSDrkGDeU5IYUF9umEnuyJETDZeN2zUTBePV9TzLAAcsQqOXzhN12Nj DxBI3goplw+A/kMMqFIG6pywumI8+tn4Hb2oPz51fnATEtYDhsMuCadhw33nMZY93Bzl1K5qIW6 jDaSSYNp1DQfUb0RT4oDjjvPIwlFoXobuND9s/7mlIlncUrrJ7TPm+0P1U+hX6XIvLnEybJabu4 sRAUCiuGvI0Ht4IMzG1f5INIO1Qnr4cU8Eb0DhqluN9KXSQZ4C65oL2i8lDxNohlsWrePvEFJjN eGypaEFqijVedXXffBTjiglhO/GJA8wRX6nDaMGJK2q//x8ovOZMEoM+Y8E6rPEui7wvMnL5XcX hgPM4Pl6SD3P9Re6DT95PEUl5VF2h6z5J0O4V1Fr+W878VUYbhe8VdmqZPvUiezE5FoA= X-Received: by 2002:a5d:584e:0:b0:3a3:648d:aa84 with SMTP id ffacd0b85a97d-3a6d128a59bmr3488790f8f.5.1750440768626; Fri, 20 Jun 2025 10:32:48 -0700 (PDT) Received: from localhost.localdomain (101.red-95-127-63.dynamicip.rima-tde.net. [95.127.63.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f1815dsm2551017f8f.28.2025.06.20.10.32.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jun 2025 10:32:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Graf , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Peter Maydell , Julian Armistead , Cameron Esfahani , Mark Burton , Thomas Huth , "Edgar E. Iglesias" , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [RFC PATCH RESEND 34/42] accel/split: Implement get_[vcpu]_stats() Date: Fri, 20 Jun 2025 19:27:42 +0200 Message-ID: <20250620172751.94231-35-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620172751.94231-1-philmd@linaro.org> References: <20250620172751.94231-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/split/split-accel.h | 5 +++++ accel/split/split-accel-ops.c | 24 +++++++++++++++++++++++- accel/split/split-all.c | 16 +++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/accel/split/split-accel.h b/accel/split/split-accel.h index 8a2888507f3..80a19bbb1e5 100644 --- a/accel/split/split-accel.h +++ b/accel/split/split-accel.h @@ -36,6 +36,11 @@ struct SplitAccelState { char *hw_name; char *sw_name; + + struct { + unsigned transitions; /* number of HW <-> SW transitions */ + uint64_t exec_count[2]; /* SW:0 HW:1 */ + } stats; }; struct AccelCPUState { diff --git a/accel/split/split-accel-ops.c b/accel/split/split-accel-ops.c index d59e70e0d9b..615faf1d96b 100644 --- a/accel/split/split-accel-ops.c +++ b/accel/split/split-accel-ops.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" +#include "qapi/type-helpers.h" #include "exec/cpu-common.h" #include "exec/cpu-interrupt.h" #include "hw/core/cpu.h" @@ -16,6 +17,7 @@ #include "system/cpus.h" #include "system/hw_accel.h" #include "system/tcg.h" +#include "monitor/monitor.h" #include "split-accel.h" #include "trace.h" @@ -70,6 +72,7 @@ static void *split_cpu_thread_routine(void *arg) r = swops->exec_vcpu_thread(cpu); trace_accel_split_exec_vcpu_thread_sw(r); } + sas->stats.exec_count[acs->use_hw]++; switch (r) { case 0: if (acs->use_hw) { @@ -103,6 +106,7 @@ static void *split_cpu_thread_routine(void *arg) assert(!acs->use_hw); trace_accel_split_hw_accelerate(); acs->use_hw = true; + sas->stats.transitions++; break; default: /* Ignore everything else? */ @@ -314,7 +318,25 @@ static void split_remove_all_breakpoints(CPUState *cpu) static void split_get_vcpu_stats(CPUState *cpu, GString *buf) { - g_assert_not_reached(); + SplitAccelState *sas = SPLIT_ACCEL(cpu->accel->accel); + AccelClass *hwc = ACCEL_GET_CLASS(sas->hw); + AccelClass *swc = ACCEL_GET_CLASS(sas->sw); + g_autofree char *cpu_model = + cpu_model_from_type(object_get_typename(OBJECT(cpu))); + + if (cpu->cluster_index != -1) { + g_string_append_printf(buf, "CPU#%d@%d: %s\n", + cpu->cpu_index, cpu->cluster_index, cpu_model); + } else { + g_string_append_printf(buf, "CPU#%d: %s\n", + cpu->cpu_index, cpu_model); + } + if (hwc->ops->get_vcpu_stats) { + hwc->ops->get_vcpu_stats(cpu, buf); + } + if (swc->ops->get_vcpu_stats) { + swc->ops->get_vcpu_stats(cpu, buf); + } } static void split_accel_ops_class_init(ObjectClass *oc, const void *data) diff --git a/accel/split/split-all.c b/accel/split/split-all.c index 413954af96c..9e0848db971 100644 --- a/accel/split/split-all.c +++ b/accel/split/split-all.c @@ -94,7 +94,21 @@ static int split_gdbstub_supported_sstep_flags(AccelState *as) static void split_get_stats(AccelState *as, GString *buf) { - g_assert_not_reached(); + SplitAccelState *sas = SPLIT_ACCEL(as); + AccelClass *hwc = ACCEL_GET_CLASS(sas->hw); + AccelClass *swc = ACCEL_GET_CLASS(sas->sw); + + g_string_append_printf(buf, + "%u transitions, %llu SW and %llu HW executions\n", + sas->stats.transitions, + sas->stats.exec_count[0], + sas->stats.exec_count[1]); + if (hwc->get_stats) { + hwc->get_stats(as, buf); + } + if (swc->get_stats) { + swc->get_stats(as, buf); + } } static char *split_get_hw(Object *obj, Error **errp)