From patchwork Tue Jan 17 15:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 44713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1819100wrn; Tue, 17 Jan 2023 07:28:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsISZUmaOlA4ltfeuvqsC6yMF0ezLj/2JgE2H6PeyuVpbMcrpmSUxmpyhifvxAHXFfZ2eWB X-Received: by 2002:a05:6a20:e195:b0:ac:ab16:442 with SMTP id ks21-20020a056a20e19500b000acab160442mr2854873pzb.4.1673969295344; Tue, 17 Jan 2023 07:28:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673969295; cv=none; d=google.com; s=arc-20160816; b=lRgw3axc0QHtL0VpO+s4HHcR2cjxj2ku86SL19NJyi59cQTtAipPbQvLCi2Et4fiwT lE1KuLJJHLdf1iwjMByz8HeNB8b47274CdNhpFGdtTwKMq2ZFEg0IBhNuSyawIVLKoCP D96JHiLFvrGydrp71WIAOATQGNdbeWCvT8u0g/x/dUxNyFCOFkzX33mn+ai3qZ/m1cBZ 6X1RT8lwRQ9FpEkpHeVLj2qHH3m6Jpb+Ch9ehR0UkEaoiOxV6+XTzZmuKpirnF+7RsFS xL/+2EaF/guE4QOrMcVeYpI8CsrmZrwkbirkHd8vB6LdyLZLcvM8X3IjWM2bJDlAi7+g s+qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=tMWVAgd3vbo35ZgEX12ihD6tUB1TaOQKBgfT5IIvpBU=; b=t51owC063+il5+wnRw+eN/9eWv6yMDEKNQacoF6QKBky/P4xaGBxgIqlAqEmGRJrff hE8sXaZqLZVvVDoAeUzHr1WxiOPGeVxLqwbs1zPJhmnf6m3fKq6z6bhpHSiOokB/5R3C hUQwclt3YPl0RgYyxQbapNfgYQXBMYNnDzBkGAfRdFzStCWduC0toSRe786sIwziCUJK lfwjHifkw+yhdEDpciwHvHQ5FCfd5aahIfALDoz2cA+9qGMLkRIiN12IHft9P0G9WGST AazBwhgZ1dvCfp7Usxqeuodp6XepVTpMUFO9deZ17RugGyCDhB5/ERKDEc9pvioewmM8 KTlw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020a6557cb000000b00491ad1ca2f1si33284509pgr.836.2023.01.17.07.28.02; Tue, 17 Jan 2023 07:28:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232231AbjAQPXf (ORCPT + 99 others); Tue, 17 Jan 2023 10:23:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231205AbjAQPWl (ORCPT ); Tue, 17 Jan 2023 10:22:41 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2B48303FB; Tue, 17 Jan 2023 07:22:40 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id C6F08CE157F; Tue, 17 Jan 2023 15:22:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C18CAC433F0; Tue, 17 Jan 2023 15:22:36 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pHnnH-001vhh-2h; Tue, 17 Jan 2023 10:22:35 -0500 Message-ID: <20230117152235.698632147@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 17 Jan 2023 10:21:26 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Tom Zanussi , Ross Zwisler , Ching-lin Yu Subject: [PATCH 1/6 v2] tracing: Simplify calculating entry size using struct_size() References: <20230117152125.268986282@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755284027551134065?= X-GMAIL-MSGID: =?utf-8?q?1755284027551134065?= From: "Steven Rostedt (Google)" When tracing a dynamic string field for a synthetic event, the offset calculation for where to write the next event can use struct_size() to find what the current size of the structure is. This simplifies the code and makes it less error prone. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_synth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 67592eed0be8..9f79cd689b79 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -416,8 +416,7 @@ static unsigned int trace_string(struct synth_trace_event *entry, if (is_dynamic) { u32 data_offset; - data_offset = offsetof(typeof(*entry), fields); - data_offset += event->n_u64 * sizeof(u64); + data_offset = struct_size(entry, fields, event->n_u64); data_offset += data_size; len = kern_fetch_store_strlen((unsigned long)str_val);