From patchwork Wed Jan 25 16:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362115wrn; Wed, 25 Jan 2023 08:23:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXsuym1u7XkPKI5SMBPJar/dbRS54xFBBXOQPQaoCLkxUeoNQ26oL5KXZVulv0iP6f+Sx2XL X-Received: by 2002:a05:6a20:3a83:b0:b6:5bde:3064 with SMTP id d3-20020a056a203a8300b000b65bde3064mr32046141pzh.16.1674663834404; Wed, 25 Jan 2023 08:23:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663834; cv=none; d=google.com; s=arc-20160816; b=YiJmzSKMUlN2l2zdicC+G56gLU7wGlZNqD2uNpYTv3cg3nQ1rF0ep2i0ghOZsjGX/c UKzh+5b7r17Scug+RP/Xtjw2Rbtf47x4Y6G+acwNEV56r8pW3Mmh3hD/SZB73wctUEZT AhlVjpg36sHvuczN7i0E/ELNrxchEF52SRSstJXnWLl97wcsd9kL9avZN9BW7xq/bsEx CwiZKYCegEgHwb2dmCjt3PXf2urDaX/BAblFT+W3EvWhgo5usOHRd95F9Ibh3nOpBIeH QOzgqnUcR1N8pwtLGo3j5aZgTeU5ViUf2edCzaKYuDguc741LkK9DkuLKDW1fCvefUrr QdHQ== 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=MOPHgUoUfmXe3GXAcVo9yKKovZ0kzrjKVpPi6p4/T6E=; b=pYI5FW5pQTFJh6p/F2JpgqQOmeQfjLIC27IgnYg/MzEnQC4EJT89PtLy7qeF6YGPT6 8uqfD4e4KENYQhSWQtKLabthIdbNpD24cP8Xy4M+AQOTWfJoKO9YpEYpxydtDduL9AmB Mma05sGgYugh9zQcRO9IKC9OWB8+oG3rGyPHmy/2z0xaxRex0YtmQqWdyQ6D2/oVwXAx PW+Ys84XzM0m5P8jM0tgUujBJpGS+zxaF+RKUAQ4XbCKtonqXj25rI7CNQ2bdqEesJCy /DntCo6/g8hvqQ3JLvvK3r1a1UDt0103u/B4tYah+h8yxqTjGKwYZGZHevbtBbHT3Khw 8xOg== 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 d25-20020a639919000000b004cf25b77142si5495943pge.665.2023.01.25.08.23.42; Wed, 25 Jan 2023 08:23:54 -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 S235786AbjAYQUQ (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235204AbjAYQUN (ORCPT ); Wed, 25 Jan 2023 11:20:13 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1958F16AD7; Wed, 25 Jan 2023 08:20:12 -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 9F2BE61216; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A35FC433EF; Wed, 25 Jan 2023 16:20:10 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVN-004Mpy-3D; Wed, 25 Jan 2023 11:20:10 -0500 Message-ID: <20230125162009.813204292@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:25 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Florent Revest , Mark Rutland Subject: [for-linus][PATCH 01/11] ftrace: Export ftrace_free_filter() to modules References: <20230125161824.332648375@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?1756012304793749023?= X-GMAIL-MSGID: =?utf-8?q?1756012304793749023?= From: Mark Rutland Setting filters on an ftrace ops results in some memory being allocated for the filter hashes, which must be freed before the ops can be freed. This can be done by removing every individual element of the hash by calling ftrace_set_filter_ip() or ftrace_set_filter_ips() with `remove` set, but this is somewhat error prone as it's easy to forget to remove an element. Make it easier to clean this up by exporting ftrace_free_filter(), which can be used to clean up all of the filter hashes after an ftrace_ops has been unregistered. Using this, fix the ftrace-direct* samples to free hashes prior to being unloaded. All other code either removes individual filters explicitly or is built-in and already calls ftrace_free_filter(). Link: https://lkml.kernel.org/r/20230103124912.2948963-3-mark.rutland@arm.com Cc: stable@vger.kernel.org Cc: Florent Revest Cc: Masami Hiramatsu Fixes: e1067a07cfbc ("ftrace/samples: Add module to test multi direct modify interface") Fixes: 5fae941b9a6f ("ftrace/samples: Add multi direct interface test module") Reviewed-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) Signed-off-by: Mark Rutland Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 23 ++++++++++++++++++++- samples/ftrace/ftrace-direct-multi-modify.c | 1 + samples/ftrace/ftrace-direct-multi.c | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 442438b93fe9..750aa3f08b25 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1248,12 +1248,17 @@ static void free_ftrace_hash_rcu(struct ftrace_hash *hash) call_rcu(&hash->rcu, __free_ftrace_hash_rcu); } +/** + * ftrace_free_filter - remove all filters for an ftrace_ops + * @ops - the ops to remove the filters from + */ void ftrace_free_filter(struct ftrace_ops *ops) { ftrace_ops_init(ops); free_ftrace_hash(ops->func_hash->filter_hash); free_ftrace_hash(ops->func_hash->notrace_hash); } +EXPORT_SYMBOL_GPL(ftrace_free_filter); static struct ftrace_hash *alloc_ftrace_hash(int size_bits) { @@ -5839,6 +5844,10 @@ EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi); * * Filters denote which functions should be enabled when tracing is enabled * If @ip is NULL, it fails to update filter. + * + * This can allocate memory which must be freed before @ops can be freed, + * either by removing each filtered addr or by using + * ftrace_free_filter(@ops). */ int ftrace_set_filter_ip(struct ftrace_ops *ops, unsigned long ip, int remove, int reset) @@ -5858,7 +5867,11 @@ EXPORT_SYMBOL_GPL(ftrace_set_filter_ip); * * Filters denote which functions should be enabled when tracing is enabled * If @ips array or any ip specified within is NULL , it fails to update filter. - */ + * + * This can allocate memory which must be freed before @ops can be freed, + * either by removing each filtered addr or by using + * ftrace_free_filter(@ops). +*/ int ftrace_set_filter_ips(struct ftrace_ops *ops, unsigned long *ips, unsigned int cnt, int remove, int reset) { @@ -5900,6 +5913,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, * * Filters denote which functions should be enabled when tracing is enabled. * If @buf is NULL and reset is set, all functions will be enabled for tracing. + * + * This can allocate memory which must be freed before @ops can be freed, + * either by removing each filtered addr or by using + * ftrace_free_filter(@ops). */ int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf, int len, int reset) @@ -5919,6 +5936,10 @@ EXPORT_SYMBOL_GPL(ftrace_set_filter); * Notrace Filters denote which functions should not be enabled when tracing * is enabled. If @buf is NULL and reset is set, all functions will be enabled * for tracing. + * + * This can allocate memory which must be freed before @ops can be freed, + * either by removing each filtered addr or by using + * ftrace_free_filter(@ops). */ int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf, int len, int reset) diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c index d52370cad0b6..a825dbd2c9cf 100644 --- a/samples/ftrace/ftrace-direct-multi-modify.c +++ b/samples/ftrace/ftrace-direct-multi-modify.c @@ -152,6 +152,7 @@ static void __exit ftrace_direct_multi_exit(void) { kthread_stop(simple_tsk); unregister_ftrace_direct_multi(&direct, my_tramp); + ftrace_free_filter(&direct); } module_init(ftrace_direct_multi_init); diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c index ec1088922517..d955a2650605 100644 --- a/samples/ftrace/ftrace-direct-multi.c +++ b/samples/ftrace/ftrace-direct-multi.c @@ -79,6 +79,7 @@ static int __init ftrace_direct_multi_init(void) static void __exit ftrace_direct_multi_exit(void) { unregister_ftrace_direct_multi(&direct, (unsigned long) my_tramp); + ftrace_free_filter(&direct); } module_init(ftrace_direct_multi_init); From patchwork Wed Jan 25 16:18: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: 48199 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362093wrn; Wed, 25 Jan 2023 08:23:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXuJdDdKwmDKSRjT9bRsmaa5Dy4LqyciAaTHm0kK9FRKNcRa/GzdD/McMNjNrpmYyqXYbJs7 X-Received: by 2002:a05:6a20:49a0:b0:b6:3b50:80f3 with SMTP id fs32-20020a056a2049a000b000b63b5080f3mr34174735pzb.55.1674663830253; Wed, 25 Jan 2023 08:23:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663830; cv=none; d=google.com; s=arc-20160816; b=n7UZpyEq135Hlb/SiT2thV5LNWA53KWRVEvxv3JldIwLD4Xs+5n99fLhUO4uqA/hry 163svdCleK80+yv9jbKSEbfENcYCKTdWMvscwicmBAHb/hOEXQ7S9vuPPY2kJe95s1iV 91Y+luGwnIkRX/C3DZbchnjk2gCgs1oED5XP5G5RoIshOVQYwaiob7P4xFjeuJ/ySNm/ yun4G0iS653bySRKSlXxEs76A48VAR5DlFMeMuJMDgB6jmLW0dWlQDs8EkVCKzaGWjqa 1wib31pKX5Nwbbps0CsamNCtWAzjL5IeuiMH9nodfbhmxRAbQzPn1UD9/wgTM/6e4NZa nC5A== 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=kWfj58PDaeVbiaxC4mQDixOp51jrg3nsBVuPcaDktuQ=; b=puhAXHo2skiIvWUQ09Ze9FS3qfgJt/24Y7K/DuXWt8mPMYwVcC6UeEQBkQLXu/QhoJ LsLSHw4vTfiw+SGluTnj5v45szWiUcUoA/KhDiUkyEg1+bY/BSn9ifNbavxdyKwVSjDr Q1hMc4WMYokdqnSOKeLEM4SsQqnt4Xlo+4ibdM/wF+CADpaKtFL0Kf5tS2DsVYJUZKyl OdjVaM072EghoyeLId9PONuLviUiW9+DRiTep4HThlUnTp8UumIjKmYdk6JomJlsUGGO G3meViqvwYExWcUqbPs615xzq6NcuqVBjJsNUSBzOrk4PN2dMhKVgH7ePq48HaDHQkDD MyXQ== 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 y63-20020a638a42000000b0046e9da9ac40si5591406pgd.556.2023.01.25.08.23.37; Wed, 25 Jan 2023 08:23:50 -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 S235691AbjAYQUO (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbjAYQUN (ORCPT ); Wed, 25 Jan 2023 11:20:13 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37F4055285; Wed, 25 Jan 2023 08:20:12 -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 C135E61226; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37CC1C433A0; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVO-004Mqq-0e; Wed, 25 Jan 2023 11:20:10 -0500 Message-ID: <20230125162010.016206071@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:26 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, "Joel Fernandes (Google)" Subject: [for-linus][PATCH 02/11] tracing: Make sure trace_printk() can output as soon as it can be used References: <20230125161824.332648375@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?1756012300502968535?= X-GMAIL-MSGID: =?utf-8?q?1756012300502968535?= From: "Steven Rostedt (Google)" Currently trace_printk() can be used as soon as early_trace_init() is called from start_kernel(). But if a crash happens, and "ftrace_dump_on_oops" is set on the kernel command line, all you get will be: [ 0.456075] -0 0dN.2. 347519us : Unknown type 6 [ 0.456075] -0 0dN.2. 353141us : Unknown type 6 [ 0.456075] -0 0dN.2. 358684us : Unknown type 6 This is because the trace_printk() event (type 6) hasn't been registered yet. That gets done via an early_initcall(), which may be early, but not early enough. Instead of registering the trace_printk() event (and other ftrace events, which are not trace events) via an early_initcall(), have them registered at the same time that trace_printk() can be used. This way, if there is a crash before early_initcall(), then the trace_printk()s will actually be useful. Link: https://lkml.kernel.org/r/20230104161412.019f6c55@gandalf.local.home Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Fixes: e725c731e3bb1 ("tracing: Split tracing initialization into two for early initialization") Reported-by: "Joel Fernandes (Google)" Tested-by: Joel Fernandes (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 ++ kernel/trace/trace.h | 1 + kernel/trace/trace_output.c | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a555a861b978..78ed5f1baa8c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10295,6 +10295,8 @@ void __init early_trace_init(void) static_key_enable(&tracepoint_printk_key.key); } tracer_alloc_buffers(); + + init_events(); } void __init trace_init(void) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index e46a49269be2..4eb6d6b97a9f 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1490,6 +1490,7 @@ extern void trace_event_enable_cmd_record(bool enable); extern void trace_event_enable_tgid_record(bool enable); extern int event_trace_init(void); +extern int init_events(void); extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr); extern int event_trace_del_tracer(struct trace_array *tr); extern void __trace_early_add_events(struct trace_array *tr); diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 57a13b61f186..bd475a00f96d 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1535,7 +1535,7 @@ static struct trace_event *events[] __initdata = { NULL }; -__init static int init_events(void) +__init int init_events(void) { struct trace_event *event; int i, ret; @@ -1548,4 +1548,3 @@ __init static int init_events(void) return 0; } -early_initcall(init_events); From patchwork Wed Jan 25 16:18:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362276wrn; Wed, 25 Jan 2023 08:24:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtCH6rMaaxloZnEXuDqBhEDGjB46v+jWgpJMwR63y8Bk+6Z5WjFvkueZOGw8/Ervp6Wp8Il X-Received: by 2002:a05:6402:528b:b0:49e:28c1:9375 with SMTP id en11-20020a056402528b00b0049e28c19375mr35046942edb.10.1674663859588; Wed, 25 Jan 2023 08:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663859; cv=none; d=google.com; s=arc-20160816; b=NPyKbVNUI3FC4SIREZmv6dPXn1FfZBz7J5/LgNcA7nQ9YoRd+fuY8aihReluRr9coV BiY6f1ciup2S7i8vnoSy+aMOhdBNIOzbxC8LM4rXnqr8Q/qDbko0hvPlfKcPJhH1KVoB Zh18GacGL3VtTdsdw3j0tknOiQFYrRWwc26IxU4i57iWetIzvlfxfoEBQQOtzxABnLuc ywXK5TFjmtjdCjEKiUZiTf3ndrPtaFcICn+Mz/dEEnsLgRPXYtPYBnPCLJeC8LVhMdu7 kYlh59F4b1mi1lIeHcTOoR7VM9SJynjyf8kS00DTNVawq8oFMwQQrCBQUUg/1HzuDZzF VNhw== 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=TSIPLNXRybj0mBiISpYrjyKG6jc7Sg5uT0/trj/PQEc=; b=uLwBKbY+iULdmSlN3b62okZPDVpN31vO+Yalg22DuNP1SzqZQnyOyUBwHGok+fD7+t SnPcirGP8gKP+vCbRp3lk4kpPu/ItrvnzK5AjrDXFJsXPkoOHVvshp6upPLvf3WxJi/v 2i+ZdriEvtxpKjEiVCFdocfNz/44wicwG1OunloeXIiOwuZ0W3B7h00h2oVrlt746Jku vDTsSeUoS/xueu7lGrf23cyUxsX225/LhtL3VymxX/3CXmd+Jfw/Rqyk0mOgZm4wqSpX /oDXO7xOw7BWBGNU9sWUrMEX8lSgBCv3wIWlt80Rcqu8fhlKtUXf1qUrnA1bTFEKCqiq JJNA== 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 fi14-20020a056402550e00b0049ffab53ab4si5515662edb.631.2023.01.25.08.23.55; Wed, 25 Jan 2023 08:24:19 -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 S235902AbjAYQUW (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235642AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -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 641C455286; Wed, 25 Jan 2023 08:20:12 -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 F017C61228; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63E0DC433A1; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVO-004MrO-1I; Wed, 25 Jan 2023 11:20:10 -0500 Message-ID: <20230125162010.222237421@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:27 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Mark Rutland Subject: [for-linus][PATCH 03/11] ftrace/scripts: Update the instructions for ftrace-bisect.sh References: <20230125161824.332648375@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?1756012330867072088?= X-GMAIL-MSGID: =?utf-8?q?1756012330867072088?= From: "Steven Rostedt (Google)" The instructions for the ftrace-bisect.sh script, which is used to find what function is being traced that is causing a kernel crash, and possibly a triple fault reboot, uses the old method. In 5.1, a new feature was added that let the user write in the index into available_filter_functions that maps to the function a user wants to set in set_ftrace_filter (or set_ftrace_notrace). This takes O(1) to set, as suppose to writing a function name, which takes O(n) (where n is the number of functions in available_filter_functions). The ftrace-bisect.sh requires setting half of the functions in available_filter_functions, which is O(n^2) using the name method to enable and can take several minutes to complete. The number method is O(n) which takes less than a second to complete. Using the number method for any kernel 5.1 and after is the proper way to do the bisect. Update the usage to reflect the new change, as well as using the /sys/kernel/tracing path instead of the obsolete debugfs path. Link: https://lkml.kernel.org/r/20230123112252.022003dd@gandalf.local.home Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Acked-by: Mark Rutland Fixes: f79b3f338564e ("ftrace: Allow enabling of filters via index of available_filter_functions") Signed-off-by: Steven Rostedt (Google) --- scripts/tracing/ftrace-bisect.sh | 34 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/scripts/tracing/ftrace-bisect.sh b/scripts/tracing/ftrace-bisect.sh index 926701162bc8..bb4f59262bbe 100755 --- a/scripts/tracing/ftrace-bisect.sh +++ b/scripts/tracing/ftrace-bisect.sh @@ -12,7 +12,7 @@ # (note, if this is a problem with function_graph tracing, then simply # replace "function" with "function_graph" in the following steps). # -# # cd /sys/kernel/debug/tracing +# # cd /sys/kernel/tracing # # echo schedule > set_ftrace_filter # # echo function > current_tracer # @@ -20,22 +20,40 @@ # # # echo nop > current_tracer # -# # cat available_filter_functions > ~/full-file +# Starting with v5.1 this can be done with numbers, making it much faster: +# +# The old (slow) way, for kernels before v5.1. +# +# [old-way] # cat available_filter_functions > ~/full-file +# +# [old-way] *** Note *** this process will take several minutes to update the +# [old-way] filters. Setting multiple functions is an O(n^2) operation, and we +# [old-way] are dealing with thousands of functions. So go have coffee, talk +# [old-way] with your coworkers, read facebook. And eventually, this operation +# [old-way] will end. +# +# The new way (using numbers) is an O(n) operation, and usually takes less than a second. +# +# seq `wc -l available_filter_functions | cut -d' ' -f1` > ~/full-file +# +# This will create a sequence of numbers that match the functions in +# available_filter_functions, and when echoing in a number into the +# set_ftrace_filter file, it will enable the corresponding function in +# O(1) time. Making enabling all functions O(n) where n is the number of +# functions to enable. +# +# For either the new or old way, the rest of the operations remain the same. +# # # ftrace-bisect ~/full-file ~/test-file ~/non-test-file # # cat ~/test-file > set_ftrace_filter # -# *** Note *** this will take several minutes. Setting multiple functions is -# an O(n^2) operation, and we are dealing with thousands of functions. So go -# have coffee, talk with your coworkers, read facebook. And eventually, this -# operation will end. -# # # echo function > current_tracer # # If it crashes, we know that ~/test-file has a bad function. # # Reboot back to test kernel. # -# # cd /sys/kernel/debug/tracing +# # cd /sys/kernel/tracing # # mv ~/test-file ~/full-file # # If it didn't crash. From patchwork Wed Jan 25 16:18:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp363131wrn; Wed, 25 Jan 2023 08:26:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXsaVYCUUGcg8MUa9Zr0o0dfy3bS56V3mE3LSLi9+y6zO73AEvf5UQTJSHOO1uz8nlwlSn6N X-Received: by 2002:a05:6a20:9b99:b0:b7:4f67:c2de with SMTP id mr25-20020a056a209b9900b000b74f67c2demr30544847pzb.40.1674663971572; Wed, 25 Jan 2023 08:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663971; cv=none; d=google.com; s=arc-20160816; b=01Ff6AJ4nOcdjNBakWmVJpvyYEuzmgwM6IEQu5D0Nb/Sy/i+HQsyhBrpjM8gAYk9Kp 2/xfLq/Fnswrn7W2tDlGTXzRfiBYNDLw77tj+OfisLYQVltNQnGd2H9uQ2zJLG+5KYOM rmoHv+W1zDR81Q1d3lIU5vlKWHmA+c0aiuljJVKO96DWAmOS4Ud+KWNhyfyu6MB9ne9s vJJi4AwxsJTKvWVWwfgsQrt8bDI1WNIuQMQj/u7CpYFjKObe1Su/K4xTj2jsHA1QW0Pa yWGTzGQDeOcXsqq70A1sy6CsezCOR+y3H1OmivzxpDCx0VV2p9nl3g90gXhCiOm6Ruf8 yr7Q== 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=1hcM7J/W4NoYw4qBUoANf63tW1EDMZN/u/8MOVnJyI8=; b=aD/WZSZ2XCZZWy5voQ+xxTR720grVCNIqvf72V4u8KCPRPrh0X6GTgdBnmKX06J/nk 8z9OG0shGMnBdh+QkwSemOWqbvHtiqq5smSvfS2B8lnsvhtiUuRr0wrtqvKHeZkXiFDf JGmpxHS9V/cn762SuoKrIgmthhRuH9vzODsSDV7KeHRIVv4Aed1fIcCKMPEGOMM58Ath bgOx8qfrFgN75frNYxKEbkxQulKk1WVxOl4sj3GDLQyBa4keEIi/obj59zaDbFZn0tWG yQibOn5acxikitM+xWmR5P++kCTi+7g1X2sUDMtcLYNZj/pfA94cJ9f1RM6cmjD0bpmq 5q5Q== 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 d3-20020a63a703000000b004da6950e1b1si1177562pgf.59.2023.01.25.08.25.59; Wed, 25 Jan 2023 08:26:11 -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 S235954AbjAYQUk (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235756AbjAYQUP (ORCPT ); Wed, 25 Jan 2023 11:20:15 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41FEE561B2 for ; Wed, 25 Jan 2023 08:20:14 -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 ams.source.kernel.org (Postfix) with ESMTPS id E7CF9B81A90 for ; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C72AC433A4; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVO-004Mrw-1y; Wed, 25 Jan 2023 11:20:10 -0500 Message-ID: <20230125162010.423848948@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:28 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Randy Dunlap Subject: [for-linus][PATCH 04/11] tracing: Kconfig: Fix spelling/grammar/punctuation References: <20230125161824.332648375@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?1756012448880205958?= X-GMAIL-MSGID: =?utf-8?q?1756012448880205958?= From: Randy Dunlap Fix some editorial nits in trace Kconfig. Link: https://lkml.kernel.org/r/20230124181647.15902-1-rdunlap@infradead.org Signed-off-by: Randy Dunlap Signed-off-by: Steven Rostedt (Google) --- kernel/trace/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 197545241ab8..d7043043f59c 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -933,8 +933,8 @@ config RING_BUFFER_RECORD_RECURSION default y help The ring buffer has its own internal recursion. Although when - recursion happens it wont cause harm because of the protection, - but it does cause an unwanted overhead. Enabling this option will + recursion happens it won't cause harm because of the protection, + but it does cause unwanted overhead. Enabling this option will place where recursion was detected into the ftrace "recursed_functions" file. @@ -1017,8 +1017,8 @@ config RING_BUFFER_STARTUP_TEST The test runs for 10 seconds. This will slow your boot time by at least 10 more seconds. - At the end of the test, statics and more checks are done. - It will output the stats of each per cpu buffer. What + At the end of the test, statistics and more checks are done. + It will output the stats of each per cpu buffer: What was written, the sizes, what was read, what was lost, and other similar details. From patchwork Wed Jan 25 16:18:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362153wrn; Wed, 25 Jan 2023 08:24:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGGHbKvabU+G9rW95grFhi0mvf69APPeFGaNu2xdzv+qG8WdMiMU3MvtrLBSJc8pEOyWKJ X-Received: by 2002:a17:902:f646:b0:194:46e0:1b61 with SMTP id m6-20020a170902f64600b0019446e01b61mr35087304plg.63.1674663840775; Wed, 25 Jan 2023 08:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663840; cv=none; d=google.com; s=arc-20160816; b=a+l5UKZbXw49aHgze6tK9FW79pK38YrsQadV1GD2EXHzzm28zTE02RP+LwIDn0xoWj 6Lp8RHMs5fT6mXO3V3n9SHp8Fpu9qNof/N3zcjyla5aOoEXXIM4CUsP5XU4wlGRIncLk 4jvV5NbWOKZaYmbeZwxk8/11RyXR7xzaTP9E07Rst5JMHxMP1VjDKp8KPtB0yVT3nW4z lLsltg2G3ouuCy5AdR1O8Dbdy+uSdV1xHNgnA9bv1H7NidV6HZTi9rv66JKJcziIko28 t++saazlVPU7wuksQ1SqYyL1ocBB7Ezlg88q/6pG64Grx5x9QwtlJMpxlZ6g1RhMJ6oA /bmw== 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=oPTylsnnXq4UGYIYDQY0lO+q4jGmakT1nuTzwkwoliU=; b=YxP0RiLNEMdBllEXIvdZVQhUloht04Rd7XqoRjU9omIY88eOa+l4YEf34/jqTZoar7 nWfxyxlgdeaSzlXnADRL6NFtEMFstSYL6iqNN6SMCKK2u7puo9gr4mX7rERP+/+d6hSj mA6VA1U5MtPvcyEeRyuVw2ktunpDfVoSAEwWDhTlRQ+tRZCyMJyjBCHZbG1QSdDUiQjo iKvoX3S+zUVSlCdQB0XK8uf/pX918/Som+AoMqdZAsjluF+QRXcyW0B5yzZsD5rna+hr P8eQgyFGGfIEui0PWj2+Be5T8g00/7nnC6kYU0FUupydwBgP3hNQIsHujQyef5nmIQ7I ocNg== 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 m6-20020a656a06000000b004cff99eb23asi6775025pgu.772.2023.01.25.08.23.48; Wed, 25 Jan 2023 08:24:00 -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 S235681AbjAYQUT (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235646AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFA6C5618F for ; Wed, 25 Jan 2023 08:20:12 -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 665D56144C for ; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D323FC433AA; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVO-004MsU-2b; Wed, 25 Jan 2023 11:20:10 -0500 Message-ID: <20230125162010.631776115@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:29 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Daniel Bristot de Oliveira , Chuang Wang Subject: [for-linus][PATCH 05/11] tracing/osnoise: Use built-in RCU list checking References: <20230125161824.332648375@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?1756012311204424153?= X-GMAIL-MSGID: =?utf-8?q?1756012311204424153?= From: Chuang Wang list_for_each_entry_rcu() has built-in RCU and lock checking. Pass cond argument to list_for_each_entry_rcu() to silence false lockdep warning when CONFIG_PROVE_RCU_LIST is enabled. Execute as follow: [tracing]# echo osnoise > current_tracer [tracing]# echo 1 > tracing_on [tracing]# echo 0 > tracing_on The trace_types_lock is held when osnoise_tracer_stop() or timerlat_tracer_stop() are called in the non-RCU read side section. So, pass lockdep_is_held(&trace_types_lock) to silence false lockdep warning. Link: https://lkml.kernel.org/r/20221227023036.784337-1-nashuiliang@gmail.com Cc: Masami Hiramatsu Fixes: dae181349f1e ("tracing/osnoise: Support a list of trace_array *tr") Acked-by: Daniel Bristot de Oliveira Signed-off-by: Chuang Wang Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_osnoise.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c index 94c1b5eb1dc0..210e1f168392 100644 --- a/kernel/trace/trace_osnoise.c +++ b/kernel/trace/trace_osnoise.c @@ -147,9 +147,8 @@ static void osnoise_unregister_instance(struct trace_array *tr) * register/unregister serialization is provided by trace's * trace_types_lock. */ - lockdep_assert_held(&trace_types_lock); - - list_for_each_entry_rcu(inst, &osnoise_instances, list) { + list_for_each_entry_rcu(inst, &osnoise_instances, list, + lockdep_is_held(&trace_types_lock)) { if (inst->tr == tr) { list_del_rcu(&inst->list); found = 1; From patchwork Wed Jan 25 16:18:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362571wrn; Wed, 25 Jan 2023 08:24:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXvblTEvgjMZBBS+ecFl9E8vOhBw3O+lxyGBA9GrAllGECVP+s6TMxf5eAFtyEZyT6I5Sebd X-Received: by 2002:a17:906:9f07:b0:877:60d7:3181 with SMTP id fy7-20020a1709069f0700b0087760d73181mr28156237ejc.17.1674663896800; Wed, 25 Jan 2023 08:24:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663896; cv=none; d=google.com; s=arc-20160816; b=MWshVh1CZCoU3NMPV7bBTzUmNcVbelZgovRapAGDnWYNuca6pjKesdi+aik5JTmQUx t9ciFTdGzBJxEp8b80YArPl1VilzbFJN1mswWf9eCY/fY0hcy/z7HFOjeRONG+uCI853 i71v1ZpKD1AB06BHtd7g1Td0l2Q1YClSZuYut2CeXm97HaY4B1ewVtCxegaW6aTi4Mgr wZedarrGLHxvLaFZ4MIuMFOK3+wOAIR89Q1bLd8dSQHATLMlFqfRgS/S/C5ejMLyYFHJ ANF72N7aSfjZLF6PP41BcQ9qAAN1zyVPkE7fX5zWJQxhKOqO4coOtm7LxCzfgbpK2xBz xtZQ== 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=eiJRvKNwUX0R6bwvvHgXYoDJh3aGea7RvGj+k8qeARk=; b=rPgy7BIBngcwAip/JmppQUphLG7x/rOYe3HdxX27tgIPn1j3RbQxR5NBEwwA1ACA7n xnMJpWomfhWbbYMDS3FBuxD+zOsIM87JnDZE4ysfGwRP09oLmzmN6BBVT2oyfRz58+ZX Y/6jixuShO6NuyK618AobGIqF8KPCkhIE1ye9mASG7ZGaQJuNi0W9G5S+mlL05p8JBT3 tr6UtxdqTnfHmlIx7WyYrRLDJtX6qUca8R1inOklj62gzKAd7yR6gqnxglyfMK/TlqCS QBpeqgpmsoKxviUm4KoSzmCmiGOH6bmTdKyadySV/QZlviMoDgD7d4L7g9hhWNSu3NoR kDBA== 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 su21-20020a17090703d500b00871119f4594si6083385ejb.304.2023.01.25.08.24.33; Wed, 25 Jan 2023 08:24:56 -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 S235906AbjAYQUY (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235649AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1D3756194; Wed, 25 Jan 2023 08:20:12 -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 6741F61465; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7460C433AC; Wed, 25 Jan 2023 16:20:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVP-004Mt2-02; Wed, 25 Jan 2023 11:20:11 -0500 Message-ID: <20230125162010.827695718@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:30 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Natalia Petrova Subject: [for-linus][PATCH 06/11] trace_events_hist: add check for return value of create_hist_field References: <20230125161824.332648375@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?1756012370024724640?= X-GMAIL-MSGID: =?utf-8?q?1756012370024724640?= From: Natalia Petrova Function 'create_hist_field' is called recursively at trace_events_hist.c:1954 and can return NULL-value that's why we have to check it to avoid null pointer dereference. Found by Linux Verification Center (linuxtesting.org) with SVACE. Link: https://lkml.kernel.org/r/20230111120409.4111-1-n.petrova@fintech.ru Cc: stable@vger.kernel.org Fixes: 30350d65ac56 ("tracing: Add variable support to hist triggers") Signed-off-by: Natalia Petrova Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index fcaf226b7744..5edbf6b1da3f 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1988,6 +1988,8 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, hist_field->fn_num = flags & HIST_FIELD_FL_LOG2 ? HIST_FIELD_FN_LOG2 : HIST_FIELD_FN_BUCKET; hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL); + if (!hist_field->operands[0]) + goto free; hist_field->size = hist_field->operands[0]->size; hist_field->type = kstrdup_const(hist_field->operands[0]->type, GFP_KERNEL); if (!hist_field->type) From patchwork Wed Jan 25 16:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362391wrn; Wed, 25 Jan 2023 08:24:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXvz9yzIfls05cFfXjbLSeQf1FetVVPigZYeVWldK/jd73FRAaPOk6h8Q2N+L5gW4VoBUkjt X-Received: by 2002:a17:902:ce8f:b0:195:f3e6:ab9f with SMTP id f15-20020a170902ce8f00b00195f3e6ab9fmr23237689plg.51.1674663871942; Wed, 25 Jan 2023 08:24:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663871; cv=none; d=google.com; s=arc-20160816; b=HAFSEbmYP7luaRF6TH6KtcfjyRsw5zezE3h1BZA4Fbn+XW+DfZOUP9INDs7zyrWF1q MDhCetAgJk5zjjRzqmd8w8XMw6/e/XGWWpQndE7UPGETX579n+SBaavMJRkwRDDLVLcs qr6Amfyr2efXwlIzAyyC9UWoFB6jrwxiHfhC/X/ChJVNWmc2ANv2ZIBjHb+gHnodhQaw Yvb6dfrm1xQp7kAu1qm9DM6V/RcrhOhbuKazoZQct8mWZ/1xP7iYEEJ8kXV+VeALh6fj cYssv+4CDarAwJYWj5NBYa3X3KBgrKzS0oO8z+9Ub7m8UOqKUKQZXTxZD3l9C3Ufav2p OiUg== 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=nMn9Ilyy+cSX/OjwZf2VfJcnLecNkaaOVTEoME9LXHU=; b=ZcWtf4axT8i+MqhPu1vtJvHVM0HgQKOP18ZUpsfsTWnOdFYHMCrsgM7ZRLt5zu15Q2 0FGL0cO78QDiTPWbdxDaB5PMXL+VMIeralGYqbzD0NhoZIHAHwIBui3vADvKhQplbbC7 UvVOhHD+jJfp2nMS69lXXX8FPnHwlWvXQmyW27E+9/aP3vRD5qYhEYMcPUx1WA+StnTJ g1+aGKcNEpW8S6iMoTGI6uH+IEHG5JaVEgzMK0KmWcb2f4xlWo3R44J0YyY6SXqJAL9V lnjlN6X2x+qjbrBQbEjEkU7DUTPF9aj/I5XN0hMTWQVRAzC/8q1g2RmpgaCzaxtWIyVd PAmw== 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 a19-20020a1709027d9300b00175449cf6f8si5624228plm.606.2023.01.25.08.24.19; Wed, 25 Jan 2023 08:24:31 -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 S235225AbjAYQU3 (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235714AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87C585619C for ; Wed, 25 Jan 2023 08:20:13 -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 CEC3A61509 for ; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49755C433B0; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVP-004Mtc-0i; Wed, 25 Jan 2023 11:20:11 -0500 Message-ID: <20230125162011.031705664@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:31 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Marco Elver , Dmitry Vyukov , kasan-dev@googlegroups.com, Randy Dunlap Subject: [for-linus][PATCH 07/11] lib: Kconfig: fix spellos References: <20230125161824.332648375@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?1756012344195187185?= X-GMAIL-MSGID: =?utf-8?q?1756012344195187185?= From: Randy Dunlap Fix spelling in lib/ Kconfig files. (reported by codespell) Link: https://lkml.kernel.org/r/20230124181655.16269-1-rdunlap@infradead.org Cc: Andrew Morton Cc: Marco Elver Cc: Dmitry Vyukov Cc: kasan-dev@googlegroups.com Reviewed-by: Marco Elver Signed-off-by: Randy Dunlap Signed-off-by: Steven Rostedt (Google) --- lib/Kconfig.debug | 2 +- lib/Kconfig.kcsan | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 881c3f84e88a..6426dbf99c12 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1917,7 +1917,7 @@ config FUNCTION_ERROR_INJECTION help Add fault injections into various functions that are annotated with ALLOW_ERROR_INJECTION() in the kernel. BPF may also modify the return - value of theses functions. This is useful to test error paths of code. + value of these functions. This is useful to test error paths of code. If unsure, say N diff --git a/lib/Kconfig.kcsan b/lib/Kconfig.kcsan index 375575a5a0e3..4dedd61e5192 100644 --- a/lib/Kconfig.kcsan +++ b/lib/Kconfig.kcsan @@ -194,7 +194,7 @@ config KCSAN_WEAK_MEMORY Enable support for modeling a subset of weak memory, which allows detecting a subset of data races due to missing memory barriers. - Depends on KCSAN_STRICT, because the options strenghtening certain + Depends on KCSAN_STRICT, because the options strengthening certain plain accesses by default (depending on !KCSAN_STRICT) reduce the ability to detect any data races invoving reordered accesses, in particular reordered writes. From patchwork Wed Jan 25 16:18:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp363233wrn; Wed, 25 Jan 2023 08:26:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOtCKgjpN10h7/p4artQpG0BVYHgyOWjHz6gN9Lq89pS7VvRrLJ++r2xB3bVaEZonjQV00 X-Received: by 2002:a17:907:7f12:b0:7c1:9eb:845b with SMTP id qf18-20020a1709077f1200b007c109eb845bmr59092929ejc.16.1674663986361; Wed, 25 Jan 2023 08:26:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663986; cv=none; d=google.com; s=arc-20160816; b=NQ9GCBeqdgoftXxpPjaOa/I4l39jcic2VRvndyq066y6WM79ZFg+P+CveOIYtSvj+D QIO0YOVGynWuhxziXa8NYOarBiij9d1d/T7MbXEnl3YW1Y4BcauC0XeRhd0xR61mPhNo faFczEjbGoPJkDLnRbI8fzPLkllBSLMH3iT/5n3aBuv7VrcTHGiaaCZwKhvapeYpzLy/ o8eBnolN3+djjWOeCBoEYKps8kMvEsqPZst5OnYCOruQaI/blGoZkPkfJBdCLo7+HfGt /YBYQifdiZ8sIapG0kDkbU3icSyQUTZDmVbdcCDKXGWsdcWR3xc8vakw0Up8xN1o6YTv Dzfg== 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=kniFR/mNV9rDYLkxbpvk9v8MQDL4sRex9cgdx6CtBEQ=; b=nDK5t7yxW6oy69dr4VCyAyObu64lcEKUqgWkxUYp6tAGYy9k95E/pePl8YNvJ2SVTq 8GDS9/n13RMT7a9YScn4t10ULsZ0+N7BuPyDaxDI42ojbKFWaQvE5yEkV76//06yVuyi hCND4sx/W3lBtOAKuqwCqRbEspa6KWSWenGBm/thoQwq4RkVCxuCiZCjN1hUFnvLm2OC 7PxpCFV+W0Dt9nE5ymV59p3OWcV705NKbndZ0IwTpfjStfycJZBXmonkjLJD00eYV9T1 6hX5HG+lWBklCG0dm5wmIaDZNY9PzbdEi11DYpidpEn27f4uXX5tdBhbcyEQp12FqU/v sicw== 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 up28-20020a170907cc9c00b00877e0202816si6549652ejc.122.2023.01.25.08.26.02; Wed, 25 Jan 2023 08:26:26 -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 S235961AbjAYQUn (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235762AbjAYQUQ (ORCPT ); Wed, 25 Jan 2023 11:20:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D79C016AD7 for ; Wed, 25 Jan 2023 08:20:14 -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 ams.source.kernel.org (Postfix) with ESMTPS id 7E0CAB81ACE for ; Wed, 25 Jan 2023 16:20:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F51AC433AE; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVP-004MuB-1M; Wed, 25 Jan 2023 11:20:11 -0500 Message-ID: <20230125162011.241146323@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:32 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Randy Dunlap Subject: [for-linus][PATCH 08/11] tracing/filter: fix kernel-doc warnings References: <20230125161824.332648375@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?1756012464363929141?= X-GMAIL-MSGID: =?utf-8?q?1756012464363929141?= From: Randy Dunlap Use the 'struct' keyword for a struct's kernel-doc notation and use the correct function parameter name to eliminate kernel-doc warnings: kernel/trace/trace_events_filter.c:136: warning: cannot understand function prototype: 'struct prog_entry ' kerne/trace/trace_events_filter.c:155: warning: Excess function parameter 'when_to_branch' description in 'update_preds' Also correct some trivial punctuation problems. Link: https://lkml.kernel.org/r/20230108021238.16398-1-rdunlap@infradead.org Signed-off-by: Randy Dunlap Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_filter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 96acc2b71ac7..e095c3b3a50d 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -128,7 +128,7 @@ static bool is_not(const char *str) } /** - * prog_entry - a singe entry in the filter program + * struct prog_entry - a singe entry in the filter program * @target: Index to jump to on a branch (actually one minus the index) * @when_to_branch: The value of the result of the predicate to do a branch * @pred: The predicate to execute. @@ -140,16 +140,16 @@ struct prog_entry { }; /** - * update_preds- assign a program entry a label target + * update_preds - assign a program entry a label target * @prog: The program array * @N: The index of the current entry in @prog - * @when_to_branch: What to assign a program entry for its branch condition + * @invert: What to assign a program entry for its branch condition * * The program entry at @N has a target that points to the index of a program * entry that can have its target and when_to_branch fields updated. * Update the current program entry denoted by index @N target field to be * that of the updated entry. This will denote the entry to update if - * we are processing an "||" after an "&&" + * we are processing an "||" after an "&&". */ static void update_preds(struct prog_entry *prog, int N, int invert) { From patchwork Wed Jan 25 16:18:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362369wrn; Wed, 25 Jan 2023 08:24:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXsT+u5/TsbVjnb5bWV1HUEURmR7xPFmfE4vNFhrYcYQ72KWK9n7IRbYzEbjp5lrIbzJK6tK X-Received: by 2002:a05:6a20:6702:b0:b8:c659:9d56 with SMTP id q2-20020a056a20670200b000b8c6599d56mr35052053pzh.46.1674663870157; Wed, 25 Jan 2023 08:24:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663870; cv=none; d=google.com; s=arc-20160816; b=k2D8FF7byn0PvAT2XwbMyxTJtjGptVqp1ryc7shTyad0TJNbcsGcy1TeZ0qY/YKcIP 19odm1dscRmZGsUb5kgB1evN17rcV0QqjLrpoqgdAFx70KFoVCiRHVWHPRuOFRUgBus4 ThhERbqFWIj1vyBu7EXpTLAwMg/ON5KedTrxn3Wv6JRxHCSHDfEaJzAoxqgC5Z/WTaFc 9BoD6omZU22NmD0sMDX65uBDbvj/O4ectsyl9HQxqo31j3YpKIa0bt/1k0oLo/eTFUmK kg7/c1gvEZdAUGEHYly+djkFeQbvmbWfuk8SjApSkmd6LRYCUA//qieLPz6qlmLpHnwx 9Abw== 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=WnAQ55jkfA/5vJfaAtdLEHSb2toAi6UUDQ36SecWIoQ=; b=hTUCaZse1Ir9oLamI0UfYnd2BrUXBXEpS+N4BlT2lNSNJJQKyyTzfhV3wQWDjGQPfW khA+Qe4YeDxp8DM/ALWnAdeNtuFzNPA61bY1SYUOKakCcPR2agckGjB2QBpX+RFcyv8J wcfyxY4Lx6fVhdnpRG1/gTjb4MvIMNAQC/xIY4jYamBu+cC1mvE3yOVFxCqPuEPR4VT9 9JrmcgFd2jjVZgABbNus4vyjxzpHrHi+LYVZjpjXfSqB4xOUn5MkfeCwdVQiUKpkzxnB g0PN05ezBzmTmtTzgJOC004n33kRJwnmb7NFcMc5LkH9hLTACXD1VfAHelALByHYkjOz vKag== 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 j64-20020a638b43000000b004da45c40f7fsi1568562pge.807.2023.01.25.08.24.13; Wed, 25 Jan 2023 08:24:30 -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 S235838AbjAYQU1 (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235656AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -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 8533355285 for ; Wed, 25 Jan 2023 08:20:13 -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 BA1C261225 for ; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9701AC433AA; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVP-004Muk-21; Wed, 25 Jan 2023 11:20:11 -0500 Message-ID: <20230125162011.443836539@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:33 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Mark Rutland Subject: [for-linus][PATCH 09/11] ftrace: Maintain samples/ftrace References: <20230125161824.332648375@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?1756012342217431898?= X-GMAIL-MSGID: =?utf-8?q?1756012342217431898?= From: Mark Rutland There's no entry in MAINTAINERS for samples/ftrace. Add one so that the FTRACE maintainers are kept in the loop. Link: https://lkml.kernel.org/r/20230103124912.2948963-2-mark.rutland@arm.com Acked-by: Masami Hiramatsu (Google) Signed-off-by: Mark Rutland Signed-off-by: Steven Rostedt (Google) --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index f781f936ae35..70be8603c8d3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8570,6 +8570,7 @@ F: kernel/trace/fgraph.c F: arch/*/*/*/*ftrace* F: arch/*/*/*ftrace* F: include/*/ftrace.h +F: samples/ftrace FUNGIBLE ETHERNET DRIVERS M: Dimitris Michailidis From patchwork Wed Jan 25 16:18:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp362752wrn; Wed, 25 Jan 2023 08:25:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtnZDopEt14Hc7rkyyjCi3usCUKslZJGUfgW1C2MJ0KvPaXGyOS180XiX1ML71n7BxvvgR6 X-Received: by 2002:a17:906:b50:b0:870:5ed6:74a0 with SMTP id v16-20020a1709060b5000b008705ed674a0mr36129383ejg.73.1674663922986; Wed, 25 Jan 2023 08:25:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663922; cv=none; d=google.com; s=arc-20160816; b=lK2nvlP16SBx2n8Tf5WhHHIig9gDSqa3Hfm3sgv1x21sTDx4NPjVQxMBA9JFSnIAlC 4C+CkyzuRQ8DVIVswKJwgPMPD1SK0vCSlxXlDLwlNutJN5cdWG/c/XIA3xdjdyWcPBrz 5PgeCR4wcN4dt3lhI+MJmVh2TijkDSrkQp/AJ3VN8Me+bKoMeVDMMhJrtPMIGPU2SEhx jS8j0fWdI5qaeX1rU2Y2HUqzB1+n4Xa7bBd3z6VwNvUAwpj/nLzZfY8PHo6kcgJQWda8 5aeTNUT6mvbVAXlly4ZuQ9EzikkfSZvK3h9JCcy4V40ZZxjoQAWvyizo6dTDktYdBQrQ CnwA== 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=GuHvbZWDxT42K+yWRQqTBVsartfwbQEsHX100oZnSz8=; b=sICtzFXWW/bE0CI21C7apKKtg99N7GNB41p4LFLACQNvzgirsARaqw/JkVntvNnXYE HJMpeWPsdDsBBultcYLyK8k9No0XvcP1J5BXbKuA6pj9Y7xmpnzWuCxMkoOg7AVSWSGC ex8f4hF+shRNfq2dkOIHqqk/lKlttgeSoO/jUtyphMbh35BtNAGjWrminFY6/pJaUMz+ gkAeUu+YpyIB58b8K2Xv0Hai6YkgZ4lfNPcRaRbhV7dOX8ze+wrW8blhK5XP8r5E/Vpq /3gaqSTEOG/gsASZvHcMjpMvUXYDAzeCIlqiIvksHV1k0auIft32YOvRE/Gs1q1f4Ls4 RQVA== 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 gi37-20020a1709070ca500b0084d2c9af2e9si5880857ejc.828.2023.01.25.08.24.59; Wed, 25 Jan 2023 08:25:22 -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 S235861AbjAYQUd (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235729AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C87B9561A3 for ; Wed, 25 Jan 2023 08:20:13 -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 E7F1D61539 for ; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C451BC433EF; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVP-004MvJ-2f; Wed, 25 Jan 2023 11:20:11 -0500 Message-ID: <20230125162011.647001295@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:34 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Daniel Bristot de Oliveira , Colin Ian King Subject: [for-linus][PATCH 10/11] rv: remove redundant initialization of pointer ptr References: <20230125161824.332648375@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?1756012397600998929?= X-GMAIL-MSGID: =?utf-8?q?1756012397600998929?= From: Colin Ian King The pointer ptr is being initialized with a value that is never read, it is being updated later on a call to strim. Remove the extraneous initialization. Link: https://lkml.kernel.org/r/20230116161612.77192-1-colin.i.king@gmail.com Cc: Daniel Bristot de Oliveira Cc: Masami Hiramatsu Signed-off-by: Colin Ian King Signed-off-by: Steven Rostedt (Google) --- kernel/trace/rv/rv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/rv/rv.c b/kernel/trace/rv/rv.c index 6c97cc2d754a..7e9061828c24 100644 --- a/kernel/trace/rv/rv.c +++ b/kernel/trace/rv/rv.c @@ -516,7 +516,7 @@ static ssize_t enabled_monitors_write(struct file *filp, const char __user *user struct rv_monitor_def *mdef; int retval = -EINVAL; bool enable = true; - char *ptr = buff; + char *ptr; int len; if (count < 1 || count > MAX_RV_MONITOR_NAME_SIZE + 1) From patchwork Wed Jan 25 16:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 48207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp363055wrn; Wed, 25 Jan 2023 08:26:02 -0800 (PST) X-Google-Smtp-Source: AK7set9ZlBgpb9Rb9dtSRlcvz5mQEvxhk2swQoSGwaK0JWobEQSfVZg7Wi/Guvi/xy4EBZh18Y9E X-Received: by 2002:a17:90b:1b03:b0:22b:efa5:d05 with SMTP id nu3-20020a17090b1b0300b0022befa50d05mr6623808pjb.40.1674663962200; Wed, 25 Jan 2023 08:26:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674663962; cv=none; d=google.com; s=arc-20160816; b=cy2vfObpCs5S3fovw0R2CQ78CYH8k9oAIZZw9hkFcynepTHuLfTxZewA1qTTbRroBW T9+Dz4XCXtJvVTvQlN8mnzSw9h4+GKD3YFvrcqWq6AQ+YD3UKu6BNJIfwP5wehF4u4Q3 JFl56gRU+op1ZCAgTgHuMek0xPu1cslsOSjdVyaNnC2IdF1ZaSei8grNUaEce8g1Aiwc L1rx4fmJafMqsWfSYgQIFGTSAYTccaQF0DfaJBcGqZfdXn5PwawlhIqVdZCRnol5eW8H Bia4gUOBnttxe4l7kQ6Y+9Y7S1qKQPDR6P+Wa/8wINTwA9fyfg1Lp4dJdTJrvj1W7srm 1UJA== 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=2enkkDlKssGK8xCrQOsLlATjXZY6YKdL1/QzhbJ2AoI=; b=pbhWmI7foV9kH+P/dZuKCyjKXsG3rVGaEaL6xAvu/Dgfe1HXZr+t7dxL0y6ecPCVGs rYR71v2rIGadVosxeTwAmOSCwtICyyYs0CpgB6BGUDivyxKKgHtAt1rYtFHiGiotMzum hXE9zsqpA+iMUfIHlzUM5mH477O+LmmwlqVnSdp5afjvZ34Gp558kBHZbLdn1HlTrUiH DrLF+huiGE9M/ein4Jou3HVYM4jwa64ELa7caVqw+7edIHdSe/Cf1LrB1/hIMy1B8e8n lsYCi45zsHNOfV6SdgoVMgBcFqYVNiDwjjdvfSSlDmIqCjOYfg9LYY57u81+KhYgMUJz XI4Q== 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 x189-20020a6386c6000000b00487c0222d24si5258182pgd.102.2023.01.25.08.25.50; Wed, 25 Jan 2023 08:26:02 -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 S235844AbjAYQUi (ORCPT + 99 others); Wed, 25 Jan 2023 11:20:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235727AbjAYQUO (ORCPT ); Wed, 25 Jan 2023 11:20:14 -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 C876816AD7 for ; Wed, 25 Jan 2023 08:20:13 -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 1070A6153F for ; Wed, 25 Jan 2023 16:20:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E19F6C433AF; Wed, 25 Jan 2023 16:20:12 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pKiVQ-004Mvt-07; Wed, 25 Jan 2023 11:20:12 -0500 Message-ID: <20230125162011.848693941@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 11:18:35 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton Subject: [for-linus][PATCH 11/11] bootconfig: Update MAINTAINERS file to add tree and mailing list References: <20230125161824.332648375@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?1756012439151124847?= X-GMAIL-MSGID: =?utf-8?q?1756012439151124847?= From: "Masami Hiramatsu (Google)" Since the bootconfig related changes will be handled on linux-trace tree, add the tree and mailing lists for EXTRA BOOT CONFIG. Link: https://lkml.kernel.org/r/167417138436.2333752.6988808113120359923.stgit@devnote3 Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 70be8603c8d3..e64ba36ced78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7894,7 +7894,11 @@ F: include/linux/extcon/ EXTRA BOOT CONFIG M: Masami Hiramatsu +L: linux-kernel@vger.kernel.org +L: linux-trace-kernel@vger.kernel.org +Q: https://patchwork.kernel.org/project/linux-trace-kernel/list/ S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git F: Documentation/admin-guide/bootconfig.rst F: fs/proc/bootconfig.c F: include/linux/bootconfig.h