From patchwork Wed Jan 25 17:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48227 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp387487wrn; Wed, 25 Jan 2023 09:14:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXuaOe1YEj0gFwIN7AgEqNCEh6IKuUtZUFr24zvKR4wAbVNL77e+kUymwZ9whb4nce+nuLji X-Received: by 2002:a17:907:874e:b0:872:27cb:9430 with SMTP id qo14-20020a170907874e00b0087227cb9430mr39590392ejc.74.1674666884341; Wed, 25 Jan 2023 09:14:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674666884; cv=none; d=google.com; s=arc-20160816; b=e2rmOzboYbloZ8OfKyFKyhfKcfrXy5p+kwgaDaFqZPqbZbS56/Q8h9YizpBMIACU00 WzB+YWh249cQd9Q78x8GdLCxP8OlRaL9h2XwM+u5AlvC1s/g18WSlfsLMtvS03z8ntIS S9TPQGf+Ezhs0fHY2Z/I548iGV5YRfEYxBY/QQAR0c2hNayeclPASBd/582X+5MCwQXz enenTxHWmwTIMcA1OB1ptfeS5/HfQHOScXGSDCRstuii4nltnyvr4LpZfhK9vt7VosnT MRCHy33IMa5xQAJ8oyDPLb3+zuISIBk4Q2jLZiYKhqC8gcT6hK/LaH5V1uapDjB/vg7j y5ZQ== 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=mkQnruujHYke86zr0a96Qu4G6mVJLFpGu9LAwBC22JE=; b=m29dbyniZ6EYT2gNkHn8dxfNQHh7FGTTf6FvCbfBb0lfuh8Vh+gI+7enmoa6Y5AjoI PIw4MH3Gz0QJh3tJaHO+BeuflNHMMTd/2wN6u3lmXna7+7m8p72HD4OP25rFZgnDPxqv WQySHFBLxDtV7uNggu2LICKTre1UAJf0X+fHpVnWJBp/EFAInaPHZvgQ9lZ1a3EcuQNT ybtFrzULUdk4xOu/QAUxTc1ouf1P4pYGvMJ5HPDfFVkdwe4L9ybceGVia3SAjlV5HyBI EFsl5sj6xJ1CSM+uO2cgWy7Vy0Le/DcBtVhhC9X01vquUgqyDDEoxwupbzQMvpCW1JWW ELhw== 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 j24-20020a170906105800b0086e0afb91c8si6058637ejj.514.2023.01.25.09.14.19; Wed, 25 Jan 2023 09:14:44 -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 S236014AbjAYRN6 (ORCPT + 99 others); Wed, 25 Jan 2023 12:13:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235195AbjAYRNw (ORCPT ); Wed, 25 Jan 2023 12:13:52 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AA5210CE for ; Wed, 25 Jan 2023 09:13:42 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B920361591 for ; Wed, 25 Jan 2023 17:13:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26DE2C433AA; Wed, 25 Jan 2023 17:13:41 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKjL9-004Nrt-1V; Wed, 25 Jan 2023 12:13:39 -0500 Message-ID: <20230125171339.278637143@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 12:12:57 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Tom Zanussi , Ross Zwisler , Ching-lin Yu Subject: [for-next][PATCH 05/12] tracing: Simplify calculating entry size using struct_size() References: <20230125171252.431857411@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?1756015502988976960?= X-GMAIL-MSGID: =?utf-8?q?1756015502988976960?= 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. Link: https://lkml.kernel.org/r/20230117152235.698632147@goodmis.org Cc: Masami Hiramatsu Cc: Andrew Morton Cc: Tom Zanussi Cc: Ross Zwisler Cc: Ching-lin Yu 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);