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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B1920C55186 for ; Wed, 22 Apr 2020 10:13:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9060920780 for ; Wed, 22 Apr 2020 10:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550385; bh=6FOR2zsEhJsNHgTc8D9F4CP+7uChdEDp9K6YjoSstNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QPhOg9iecW8WMbOn6GHbiYxqFYuYffhpsIAF13OoEEHULYlFMcr2xm8dWd3+AaFXv hTama/SZpfaI+u4vU4g6RKL9YaRyqUFOp0449Drr9bHSLpaDMkpTsoJOJqpdkYnCx3 hCmFiIo+pGC2EHN1YARNUyA37xQUZwky+Y6/Iq78= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729417AbgDVKNE (ORCPT ); Wed, 22 Apr 2020 06:13:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:46186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726974AbgDVKMt (ORCPT ); Wed, 22 Apr 2020 06:12:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 598B820575; Wed, 22 Apr 2020 10:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550368; bh=6FOR2zsEhJsNHgTc8D9F4CP+7uChdEDp9K6YjoSstNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mm1B3xwVpwVPbhuk5oOso12vOQyOc3DIW+y5XVGJVQ/5SWKDJt5S2dmJjXKDK21du DC5r3tmbz3Yhz8oncUPrwU2w2lRpY94g97OqESenqWBZQkIm+Z7EB1uvvWGQmQ2lcW dYTyqPqMjKuoGJUI9OjxP7q2jHOB9uP0cCSyVcYc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Taeung Song , Masami Hiramatsu , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 4.14 101/199] ftrace/kprobe: Show the maxactive number on kprobe_events Date: Wed, 22 Apr 2020 11:57:07 +0200 Message-Id: <20200422095107.998120837@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu [ Upstream commit 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 ] 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) Signed-off-by: Sasha Levin --- kernel/trace/trace_kprobe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index ea20274a105ae..d66aed6e9c75f 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -877,6 +877,8 @@ static int probes_seq_show(struct seq_file *m, void *v) 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)); -- 2.20.1