From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D64CC2BA19 for ; Thu, 16 Apr 2020 01:27:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67A472076D for ; Thu, 16 Apr 2020 01:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587000451; bh=YCSmFeIOSl5ceTT4kl1qbRapzXWrqXJIeGNdm4NzLOE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=l9gEeu4bAQ/kX4nxDEcbprAnmuOj1bmfPUUXlmbjkexpwpXHTyUAUfr9hy825zvbx leBAWnWlscLDXiCKbBTHF0RcgXx1iezCBnVyjWB4P7XbpiWywgje6nVaQszQe2kayY wXNMbE9RgB6R5EtF6QQeNdRs8kHOJQczyGdFJGF4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730596AbgDPB1X (ORCPT ); Wed, 15 Apr 2020 21:27:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:38244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729511AbgDPB1H (ORCPT ); Wed, 15 Apr 2020 21:27:07 -0400 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A08A2076D; Thu, 16 Apr 2020 01:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587000427; bh=YCSmFeIOSl5ceTT4kl1qbRapzXWrqXJIeGNdm4NzLOE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=y4XEGPXHeAdFN7Zbfh/ifqEBqdq1hvmmo/zL0QBHfXCVd/qAqEwD093ZNxPK1Y1F0 gwPLwYkEehTumrIypeEACh+p8p1byjeoldx8qb8Dg+89MhpveS6ji6CwCuIqgCHvbV hLNhXmCtKhOnkJizSufgdSY35lWhrX3c+2x2WbsI= Date: Thu, 16 Apr 2020 10:27:04 +0900 From: Masami Hiramatsu To: Steven Rostedt Cc: , mhiramat@kernel.org, treeze.taeung@gmail.com, Subject: Re: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree Message-Id: <20200416102704.8db39de3deaaf33b4fc5c597@kernel.org> In-Reply-To: <20200415151400.2347497b@gandalf.local.home> References: <158695112724822@kroah.com> <20200415151400.2347497b@gandalf.local.home> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, 15 Apr 2020 15:14:00 -0400 Steven Rostedt wrote: > On Wed, 15 Apr 2020 13:45:27 +0200 > wrote: > > > The patch below does not apply to the 4.19-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to . > > > > thanks, > > > > greg k-h > > > > > > This should apply to both 4.14 and 4.19 and fix the same issue: Thanks Steven for backporting! I confirmed this can applied on 4.19 and 4.14. Thanks! > > From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001 > From: Masami Hiramatsu > Date: Tue, 24 Mar 2020 16:34:48 +0900 > Subject: [PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events > > Show maxactive parameter on kprobe_events. > This allows user to save the current configuration and > restore it without losing maxactive parameter. > > Link: http://lkml.kernel.org/r/4762764a-6df7-bc93-ed60-e336146dce1f@gmail.com > Link: http://lkml.kernel.org/r/158503528846.22706.5549974121212526020.stgit@devnote2 > > Cc: stable@vger.kernel.org > Fixes: 696ced4fb1d76 ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events") > Reported-by: Taeung Song > Signed-off-by: Masami Hiramatsu > Signed-off-by: Steven Rostedt (VMware) > > Index: linux-test.git/kernel/trace/trace_kprobe.c > =================================================================== > --- linux-test.git.orig/kernel/trace/trace_kprobe.c > +++ linux-test.git/kernel/trace/trace_kprobe.c > @@ -975,6 +975,8 @@ static int probes_seq_show(struct seq_fi > int i; > > seq_putc(m, trace_kprobe_is_return(tk) ? 'r' : 'p'); > + if (trace_kprobe_is_return(tk) && tk->rp.maxactive) > + seq_printf(m, "%d", tk->rp.maxactive); > seq_printf(m, ":%s/%s", tk->tp.call.class->system, > trace_event_name(&tk->tp.call)); > > > > -- Steve -- Masami Hiramatsu