From nobody Sat Nov 15 00:06:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1759161417; cv=none; d=zohomail.com; s=zohoarc; b=I8SqD/x/Ylu/DwZ8pqVQVm7BVAaC0P6ZeCWjmoaXnKhUzeGREBShDlfrDnPnl5UfZu7lFCoEGH7KmzZQ+mF5+ZT+u+5SDP2bcBCC3QDEYta1ClEwof/YQVyrYb5rblfRDpHZVhegSGuM8uJXMSQXtNVwHzkquPuEi7jdHav7uB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759161417; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kjND0aUj9KRlLexwJ1p+kxgUGn2cNQpl2JPdVKoLLh0=; b=EOdc6lIcLCB8NTtmCyoF0FSCK7OwiVv9UTH6P1Cxa+zvzyPS1CvZlTQHlgolFG6ga/taGx447Met0ff8ot9FZmfktGrDSKMLVkAeYmIsZ1hW4E5fzwsWVR2OtvYyELJAGAC5Ne7FM0fIb69/TGW1Rv3+Pu3Msw95UytHsIwSISY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175916141769956.37302164102948; Mon, 29 Sep 2025 08:56:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G9d-0001LF-DF; Mon, 29 Sep 2025 11:51:09 -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 1v3G8r-0000pv-Gk for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:50:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3G8X-0000LS-NR for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:50:17 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-feaH2fCJMfqggnFtMGtygg-1; Mon, 29 Sep 2025 11:49:56 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-634c2fc71c9so3960433a12.3 for ; Mon, 29 Sep 2025 08:49:56 -0700 (PDT) Received: from [192.168.10.48] ([176.206.127.188]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b3ae61b7260sm490844766b.48.2025.09.29.08.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 08:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759160998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kjND0aUj9KRlLexwJ1p+kxgUGn2cNQpl2JPdVKoLLh0=; b=ckI5cV2xodQxFlw4EfCOh0r9FtF9mW+vvc6hZwBcAqpYAwdLqVByczE+Jx87YAnLJ846kF vtmlI+p1U3gf3mFAZtJXCvwp7uZRXnkhFx4wpdztYu9UfLE0rWUUXentyUuq/QytgjSqXt QCGG7N2/sjA8703/57iWz3Du81HLqMQ= X-MC-Unique: feaH2fCJMfqggnFtMGtygg-1 X-Mimecast-MFC-AGG-ID: feaH2fCJMfqggnFtMGtygg_1759160995 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160994; x=1759765794; 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=kjND0aUj9KRlLexwJ1p+kxgUGn2cNQpl2JPdVKoLLh0=; b=UQet9JsRqCiss607G5CFM3ekkuZvGE1aSRwzkHQ8gHjyPvFXekbWpit9Rocnw4aGaH egbOJF5FPJF9TKGV1SdZweebF2643YZvorCa9QDy/NxXFywytUAi1IpmzIAqVSiwixkb JAJF5AXS9NtJerfXV0vKQRWIt+5++iLFDv1Jg1eXhidRZfbVUaVn5PUMt7LK7BFpU2D7 24qBETBgiRITZ5+mXoIzEvEY84IH0lX7ewkc+FFf1SELcyLE9z3/XM3K8hEmWLCy61iF RjxQisbbMzv67nGN6J64JiUMlxAKhQH+Dyj4wBoQPCQgxdtmbOdiHLbHUiFMTY1dp1qF Yhzw== X-Gm-Message-State: AOJu0YxO7ME+dDf5j0GlX5o8frgAx6dqX3lrwxKTGFQLLfHPiKjKaHnv flAKMJ9CW9b8RW+HigC/TqzfH1H1epbNMfxKRYyllVzQ0dPg8RzGvpUe5+9m6GCdpkFD5j21HuU L9EKO79aCnUfQwZlK742DOI22Yp99hI6UB7iswmQtCN6E/u05ZHrO+upFl4aQqpIRsrTtiwFWee 509VoRZzTb2gu4OJNMF88zaACW/HemyCExKKEnueKO X-Gm-Gg: ASbGnctKXIp7Yz6218PHN7LgeDmO+h1VtPFUEhhYhDdYrIlVywPGjtRc4wMfHtfe8Rw KTIxTgNa+Th6mU59iN0dYEcLmX/+9Idz9ZDWWHph89XaUhcrrj7PbC7/IVsrZ/d67byNJ736SMY QM0F0hY7cK8TpEgWqZEL+C0hoKr2YtwaxxgsmJnpaI7C+6GwNmBOGKsNeciXbazb8w2gSr6CA5w aLu+W+CFbsInfKRU6TyfCCHNijvGL1A60rDSJiOjXv1Usr4dh7jAPu80hgqydRBVBJ26K80ajZv WQ+OszvxAgn8BIBh3TeKmTvAwqbKDln5FzAo0AimTQc9in3bSjjLCsY0RM8PrvIemPzTrsTAbJP 4p2mWgE0NdKBQoBQlhNL++I7Tj/hw4gotgZUyVbI+ONhVbQ== X-Received: by 2002:a17:907:9719:b0:b04:1957:8e72 with SMTP id a640c23a62f3a-b34bd053b67mr1751123566b.65.1759160993995; Mon, 29 Sep 2025 08:49:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKO9VryLhKU504aYLxA60cVWk4YbnI4yzk6F9rOZvT0rFxzsDRodNbJ93yIEvGPTluvssMZw== X-Received: by 2002:a17:907:9719:b0:b04:1957:8e72 with SMTP id a640c23a62f3a-b34bd053b67mr1751120366b.65.1759160993538; Mon, 29 Sep 2025 08:49:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tanish Desai , Stefan Hajnoczi , Manos Pitsidianakis , Mads Ynddal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Zhao Liu , qemu-rust@nongnu.org Subject: [PATCH 05/16] trace/ftrace: move snprintf+write from tracepoints to ftrace.c Date: Mon, 29 Sep 2025 17:49:27 +0200 Message-ID: <20250929154938.594389-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154938.594389-1-pbonzini@redhat.com> References: <20250929154938.594389-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1759161418361116600 Content-Type: text/plain; charset="utf-8" This simplifies the Python code and reduces the size of the tracepoints. Reviewed-by: Manos Pitsidianakis Reviewed-by: Zhao Liu Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- tests/tracetool/ftrace.h | 28 ++++++---------------------- trace/ftrace.h | 1 + trace/ftrace.c | 15 +++++++++++++++ scripts/tracetool/backend/ftrace.py | 12 ++---------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/tests/tracetool/ftrace.h b/tests/tracetool/ftrace.h index fe22ea0f09f..1dfe4239413 100644 --- a/tests/tracetool/ftrace.h +++ b/tests/tracetool/ftrace.h @@ -21,18 +21,10 @@ extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; =20 static inline void trace_test_blah(void *context, const char *filename) { - { - char ftrace_buf[MAX_TRACE_STRLEN]; - int unused __attribute__ ((unused)); - int trlen; - if (trace_event_get_state(TRACE_TEST_BLAH)) { + if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" - trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN, - "test_blah " "Blah context=3D%p filename=3D%s= " "\n" , context, filename); -#line 33 "ftrace.h" - trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1); - unused =3D write(trace_marker_fd, ftrace_buf, trlen); - } + ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); +#line 28 "ftrace.h" } } =20 @@ -42,18 +34,10 @@ static inline void trace_test_blah(void *context, const= char *filename) =20 static inline void trace_test_wibble(void *context, int value) { - { - char ftrace_buf[MAX_TRACE_STRLEN]; - int unused __attribute__ ((unused)); - int trlen; - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { + if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" - trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN, - "test_wibble " "Wibble context=3D%p value=3D%= d" "\n" , context, value); -#line 54 "ftrace.h" - trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1); - unused =3D write(trace_marker_fd, ftrace_buf, trlen); - } + ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); +#line 41 "ftrace.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/trace/ftrace.h b/trace/ftrace.h index cb5e35d2171..16c122816d1 100644 --- a/trace/ftrace.h +++ b/trace/ftrace.h @@ -8,5 +8,6 @@ extern int trace_marker_fd; =20 bool ftrace_init(void); +G_GNUC_PRINTF(1, 2) void ftrace_write(const char *fmt, ...); =20 #endif /* TRACE_FTRACE_H */ diff --git a/trace/ftrace.c b/trace/ftrace.c index 9749543d9b2..6875faedb9c 100644 --- a/trace/ftrace.c +++ b/trace/ftrace.c @@ -38,6 +38,21 @@ static int find_mount(char *mount_point, const char *fst= ype) return ret; } =20 +void ftrace_write(const char *fmt, ...) +{ + char ftrace_buf[MAX_TRACE_STRLEN]; + int unused __attribute__ ((unused)); + int trlen; + va_list ap; + + va_start(ap, fmt); + trlen =3D vsnprintf(ftrace_buf, MAX_TRACE_STRLEN, fmt, ap); + va_end(ap); + + trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1); + unused =3D write(trace_marker_fd, ftrace_buf, trlen); +} + bool ftrace_init(void) { char mount_point[PATH_MAX]; diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index a14aafcee62..8c0ce3f23a0 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -28,18 +28,10 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - out(' {', - ' char ftrace_buf[MAX_TRACE_STRLEN];', - ' int unused __attribute__ ((unused));', - ' int trlen;', - ' if (trace_event_get_state(%(event_id)s)) {', + out(' if (trace_event_get_state(%(event_id)s)) {', '#line %(event_lineno)d "%(event_filename)s"', - ' trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN,', - ' "%(name)s " %(fmt)s "\\n" %(argnames= )s);', + ' ftrace_write("%(name)s " %(fmt)s "\\n" %(argnames)s);', '#line %(out_next_lineno)d "%(out_filename)s"', - ' trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1);', - ' unused =3D write(trace_marker_fd, ftrace_buf, trlen);= ', - ' }', ' }', name=3Devent.name, args=3Devent.args, --=20 2.51.0