From patchwork Fri May 26 16:53:53 2023 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: 685922 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1025149wrt; Fri, 26 May 2023 09:54:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KsL4BbDtP0pOPpZdkGXIyxXokWM0fqJHf5AA2O/ehOF8c9VHPFj0Qzdvgl+68qW8p3ooc X-Received: by 2002:a05:6214:e4c:b0:626:cbe:3c6d with SMTP id o12-20020a0562140e4c00b006260cbe3c6dmr1394920qvc.22.1685120056375; Fri, 26 May 2023 09:54:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685120056; cv=none; d=google.com; s=arc-20160816; b=pqtzQGSXeqZLAzc+ZvmCfhXpvtFM/j07EAqOP8TFpT8UTPDmkBmZ+ZD8C/+XoNG1ye K4U6Xc887XOGKqvpLIPD3jVX3K2AI/9XSUBc0y+syeDFFYdxSO0FQNb6EQHVLOsatnI9 JpP6nsGxU8XP9SofVEHEn7e03oci1XVERJgNTX49vL0XAwZKibiXM9fes1nPu1bQqoyH THOj/KYTyVJwjYldCe0BlOl8Ohf1n/jdKL+wH5Z3p+7/CaouBbs9NflTJOJ4F2kaaieI 6W0I98fAltKhc8zTiWJUgHVflMUxicGp3Lvwixg8Gqre/KpOKMyeZzRs+wIk3wZLaF3S ts9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:sender:errors-to:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to:delivered-to:dkim-signature; bh=qF6P+UabTb5zcsOWvNlJLYRb6FGcez1HPmoDCjERVyo=; b=ABkojwpARYlVR1qLoHqO7rvYhy8YrF4Dfh1hHVJXXgU+1qD4qPZDApZoai2PxQTtoJ 5UNmMx7uDOAhAF8sh2iRNGgUMCdzHZFyfGSCvKvlzILQaL9OY0+9C8n9yS7jDAXZQJMy /lqAyyIb3xBDpml5yj/9M3Oa6XJWh8bqZcFJ70i+wcDRAHj3WlT40po8piMAXkdI9NFc aGYlks+m9eHlW5qo77+MMKugVz0JKVIgSJMjcDpsFAH++XmL31SCbmi/is07q4jxkvGJ JEEIwssZj6JRHRJpIxXD4QmZ0M9SQd7x4HbJit27hnhE352//LZmthsY+p7+Q82AeCuq xrVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fvBw9WCH; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.129.124]) by mx.google.com with ESMTPS id f11-20020a0562141d2b00b005e8828d61c5si1574002qvd.517.2023.05.26.09.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:54:16 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fvBw9WCH; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685120055; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qF6P+UabTb5zcsOWvNlJLYRb6FGcez1HPmoDCjERVyo=; b=fvBw9WCHkxueTOXMX4Whyx/n2WCHiqyjcA4QUjhF1B7QkD4IhUkUqosXLB/mdi4lY8TYa5 RUxwxLhaUQv1SCEIPMzKZ7IZCcDUvkpgmg0gBy6E0I8oyIaUBmGQaNSZr83ClEIvDd3BGU AP8CDy4xmLlfhK0s9iyyGoIMrbZToek= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-303-fwLtZAKtMlSNeFEtVqzBcA-1; Fri, 26 May 2023 12:54:12 -0400 X-MC-Unique: fwLtZAKtMlSNeFEtVqzBcA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A90E63C1411C; Fri, 26 May 2023 16:54:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94BC140CFD45; Fri, 26 May 2023 16:54:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 461F21946A46; Fri, 26 May 2023 16:54:09 +0000 (UTC) X-Original-To: libvir-list@listman.corp.redhat.com Delivered-To: libvir-list@listman.corp.redhat.com Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BBF2B1946A41 for ; Fri, 26 May 2023 16:54:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ABF9AC154D3; Fri, 26 May 2023 16:54:07 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3B5FC154D1 for ; Fri, 26 May 2023 16:54:07 +0000 (UTC) Received: from us-smtp-inbound-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 67EE3101A53B for ; Fri, 26 May 2023 16:54:07 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-98-9subThkpN9Ofa4AxXTy3rQ-1; Fri, 26 May 2023 12:54:05 -0400 X-MC-Unique: 9subThkpN9Ofa4AxXTy3rQ-1 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-30addbb1b14so294844f8f.2 for ; Fri, 26 May 2023 09:54:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685120044; x=1687712044; 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=qF6P+UabTb5zcsOWvNlJLYRb6FGcez1HPmoDCjERVyo=; b=hRVZS9nKrZdJ+lT2LoyUJYkO1eTd8UamuguL1BQSAGW5ou350w3qQi5jL6Ffoj2GrM D4RwMmqb5DdMHy6Yzv/fkc4uYzLHh88+PTnRoYpUyCR+L5b9DutFyxHAGT8dMNGhl4ch Y5EeGfeb0+g8ENsaydyBzAAlul2Ip6lIUPBbUIjEhcPZ18drvM8Jlq7Z0m9Verumc0O9 PigZcIhxN9uR5GXI4iwNo2GCEqx0Ll37O5+KwLSeCxcr0eF0y+3pQVgvVVcIiM/8l2Sx +NrrdEvzJI38nVy/U2/B0PHNy+RIWfis7qfIIAdndUGLPyehcvOl59IsXG7/iRcrMpkJ 1iSw== X-Gm-Message-State: AC+VfDy4QmYfh59KDJw9WSyL3pMnq8uA4M2NrfGtl4kERusYeP3yt8vs kFoh4DyXLFCzO7mu8zpuTT2IeQ== X-Received: by 2002:a5d:630c:0:b0:30a:d7a7:3db4 with SMTP id i12-20020a5d630c000000b0030ad7a73db4mr1595931wru.12.1685120044311; Fri, 26 May 2023 09:54:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o8-20020adfcf08000000b00306c5900c10sm5709524wrj.9.2023.05.26.09.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:54:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0ED491FFBB; Fri, 26 May 2023 17:54:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PATCH v6 03/11] trace: remove vcpu_id from the TraceEvent structure Date: Fri, 26 May 2023 17:53:53 +0100 Message-Id: <20230526165401.574474-4-alex.bennee@linaro.org> In-Reply-To: <20230526165401.574474-1-alex.bennee@linaro.org> References: <20230526165401.574474-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , libvir-list@redhat.com, Kyle Evans , Riku Voipio , Richard Henderson , Markus Armbruster , Greg Kurz , Yanan Wang , Marcel Apfelbaum , Michael Roth , Paolo Bonzini , Christian Schoenebeck , Eric Blake , Warner Losh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linaro.org This does involve temporarily stubbing out some helper functions before we excise the rest of the code. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230524133952.3971948-4-alex.bennee@linaro.org> --- trace/control-internal.h | 4 ++-- trace/event-internal.h | 2 -- trace/control.c | 10 ---------- scripts/tracetool/format/c.py | 6 ------ scripts/tracetool/format/h.py | 11 +---------- 5 files changed, 3 insertions(+), 30 deletions(-) diff --git a/trace/control-internal.h b/trace/control-internal.h index 8b2b50a7cf..0178121720 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -27,12 +27,12 @@ static inline uint32_t trace_event_get_id(TraceEvent *ev) static inline uint32_t trace_event_get_vcpu_id(TraceEvent *ev) { - return ev->vcpu_id; + return 0; } static inline bool trace_event_is_vcpu(TraceEvent *ev) { - return ev->vcpu_id != TRACE_VCPU_EVENT_NONE; + return false; } static inline const char * trace_event_get_name(TraceEvent *ev) diff --git a/trace/event-internal.h b/trace/event-internal.h index f63500b37e..0c24e01b52 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -19,7 +19,6 @@ /** * TraceEvent: * @id: Unique event identifier. - * @vcpu_id: Unique per-vCPU event identifier. * @name: Event name. * @sstate: Static tracing state. * @dstate: Dynamic tracing state @@ -33,7 +32,6 @@ */ typedef struct TraceEvent { uint32_t id; - uint32_t vcpu_id; const char * name; const bool sstate; uint16_t *dstate; diff --git a/trace/control.c b/trace/control.c index d24af91004..5dfb609954 100644 --- a/trace/control.c +++ b/trace/control.c @@ -68,16 +68,6 @@ void trace_event_register_group(TraceEvent **events) size_t i; for (i = 0; events[i] != NULL; i++) { events[i]->id = next_id++; - if (events[i]->vcpu_id == TRACE_VCPU_EVENT_NONE) { - continue; - } - - if (likely(next_vcpu_id < CPU_TRACE_DSTATE_MAX_EVENTS)) { - events[i]->vcpu_id = next_vcpu_id++; - } else { - warn_report("too many vcpu trace events; dropping '%s'", - events[i]->name); - } } event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1); event_groups[nevent_groups].events = events; diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index c390c1844a..69edf0d588 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -32,19 +32,13 @@ def generate(events, backend, group): out('uint16_t %s;' % e.api(e.QEMU_DSTATE)) for e in events: - if "vcpu" in e.properties: - vcpu_id = 0 - else: - vcpu_id = "TRACE_VCPU_EVENT_NONE" out('TraceEvent %(event)s = {', ' .id = 0,', - ' .vcpu_id = %(vcpu_id)s,', ' .name = \"%(name)s\",', ' .sstate = %(sstate)s,', ' .dstate = &%(dstate)s ', '};', event = e.api(e.QEMU_EVENT), - vcpu_id = vcpu_id, name = e.name, sstate = "TRACE_%s_ENABLED" % e.name.upper(), dstate = e.api(e.QEMU_DSTATE)) diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index e94f0be7da..285d7b03a9 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -74,16 +74,7 @@ def generate(events, backend, group): out('}') - # tracer wrapper with checks (per-vCPU tracing) - if "vcpu" in e.properties: - trace_cpu = next(iter(e.args))[1] - cond = "trace_event_get_vcpu_state(%(cpu)s,"\ - " TRACE_%(id)s)"\ - % dict( - cpu=trace_cpu, - id=e.name.upper()) - else: - cond = "true" + cond = "true" out('', 'static inline void %(api)s(%(args)s)',