From patchwork Sat Dec 10 13:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1337395wrr; Sat, 10 Dec 2022 06:24:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf6sEWQ9S4wcT14l3XXNrKgFPLqM4I5aYz1SrLDTpphru0cTmj/2pEjcQoPnPXJeA5DVKmJP X-Received: by 2002:a17:907:8d16:b0:7c1:5098:907a with SMTP id tc22-20020a1709078d1600b007c15098907amr2247368ejc.35.1670680817327; Sat, 10 Dec 2022 06:00:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680817; cv=none; d=google.com; s=arc-20160816; b=fE3CSqmUJ0MVsU91zBMvhMezLbWclon6JTyNVWLRtL1MuDbrDYg/LvliYWwGP9YXjF OL8fg1tgpTGDrXRm7JXUemV7QWMJD/Nej3M4oI0AHDfEmkEPviK68ufbzlnJzFfeJd9T HEE6SzEwRykLdQ0S3sMOlhrd11XzWxpizp7IM7FIbxYpRfAONweFhVwwJcB9b+EfHxZl spC6hOFbcKBZod77gWjNqtHumTSEiJqqODGH+vMujtwFqoB57AeFyGLFkZlcE2jEj/II jANQGjFh3j0B+3oFQjC0cB8of4y4/UfyehRrkjEu71NYTxEQ0nSXiQE0rw346s3Ikhjv UD2Q== 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=dLKuIFy2a5MX31UMB1yj9sLvxSEDasF1CzbBPmeT1H8=; b=S1DHDzNHE3HAWR9w6ErfEBTxmucDqotjsKeRY2SjMHuUbi9T6qv9uhz9N4+UFuJ+qq X7mlLajIX5NIQXgyu1P4etLwOtI4GHAbmWnr2zJMcKk+JysvhIaaOopMnMzTIPDggTXj LJTVn3DLdJYhkv3QoL7MpAmtR+eTB46SlBX2MsD1stOeZ8eIfztSqG+cEPmEfVw8rPT9 RTFg6Kn2YB3sqxqpWetwBJUuaO5sYMRqKscqjyzXtTl5UvduSVhBF5ntBeo00fuHtp1R 2ywintXaKqWJarwMpVJi9D7duxwxH7Jf//lmlqB7eA2UQ/GJm80l6Hk2HShlxKGSppKO qExg== 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 ji5-20020a170907980500b007c0c2ec3683si2380336ejc.106.2022.12.10.05.59.54; Sat, 10 Dec 2022 06:00:17 -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 S229954AbiLJN7R (ORCPT + 99 others); Sat, 10 Dec 2022 08:59:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbiLJN62 (ORCPT ); Sat, 10 Dec 2022 08:58:28 -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 6D6C6183A8; Sat, 10 Dec 2022 05:58:27 -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 D874B60C2E; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4A73C43392; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40Mz-000ksM-2i; Sat, 10 Dec 2022 08:58:25 -0500 Message-ID: <20221210135825.707936469@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:58:06 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , , stable@vger.kernel.org, Zheng Yejian Subject: [for-next][PATCH 16/25] tracing: Fix issue of missing one synthetic field References: <20221210135750.425719934@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?1751835808690492622?= X-GMAIL-MSGID: =?utf-8?q?1751835808690492622?= From: Zheng Yejian The maximum number of synthetic fields supported is defined as SYNTH_FIELDS_MAX which value currently is 64, but it actually fails when try to generate a synthetic event with 64 fields by executing like: # echo "my_synth_event int v1; int v2; int v3; int v4; int v5; int v6;\ int v7; int v8; int v9; int v10; int v11; int v12; int v13; int v14;\ int v15; int v16; int v17; int v18; int v19; int v20; int v21; int v22;\ int v23; int v24; int v25; int v26; int v27; int v28; int v29; int v30;\ int v31; int v32; int v33; int v34; int v35; int v36; int v37; int v38;\ int v39; int v40; int v41; int v42; int v43; int v44; int v45; int v46;\ int v47; int v48; int v49; int v50; int v51; int v52; int v53; int v54;\ int v55; int v56; int v57; int v58; int v59; int v60; int v61; int v62;\ int v63; int v64" >> /sys/kernel/tracing/synthetic_events Correct the field counting to fix it. Link: https://lore.kernel.org/linux-trace-kernel/20221207091557.3137904-1-zhengyejian1@huawei.com Cc: Cc: Cc: stable@vger.kernel.org Fixes: c9e759b1e845 ("tracing: Rework synthetic event command parsing") Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index c3b582d19b62..67592eed0be8 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -1282,12 +1282,12 @@ static int __create_synth_event(const char *name, const char *raw_fields) goto err_free_arg; } - fields[n_fields++] = field; if (n_fields == SYNTH_FIELDS_MAX) { synth_err(SYNTH_ERR_TOO_MANY_FIELDS, 0); ret = -EINVAL; goto err_free_arg; } + fields[n_fields++] = field; n_fields_this_loop++; }