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=-6.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 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 DD734C2BA19 for ; Wed, 15 Apr 2020 12:25:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB1F3208FE for ; Wed, 15 Apr 2020 12:25:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586953518; bh=ARdAH8mgBcZG5ceiTXnZZ3YY3KRl37YIxqitFk5ws1Q=; h=Subject:To:Cc:From:Date:List-ID:From; b=tLo4QPXKdZaVQJ6svseszmYMYd1pzqhz1JiUQmg1FOepFIpn29IAEPwumTgg2e0Dd P2vaUfZHObVOOo2/JqUd5cqN7+YsUTmh3ZWb3K8TsdUsxJKzT0R0nkuU674PQ6dqJ1 F3OFQnFyZOVAlHM1oUBVrkcxX4k/N402V4EL5iOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393972AbgDOMZO (ORCPT ); Wed, 15 Apr 2020 08:25:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:38321 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409173AbgDOLpb (ORCPT ); Wed, 15 Apr 2020 07:45:31 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 5970F5C0181; Wed, 15 Apr 2020 07:45:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 15 Apr 2020 07:45:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=WMyrnH i4ZWfvyuD+1TmOibS/4igfZQsw5MUC8I/3ZeE=; b=FCNsKuDpUzL1Jz2nrUyMi0 23G7btvCr1sJ6WofJRdekZ1YDprcwzN/K3RQ/CX2fuM9d4jGdwIlL9hKW/18LAs3 ZBvApWGTUorb8nnGmT/jocqsvTn4zypEdXDpl49TjAHzjovh5SigNcAEnjtvBrUh rvNSOqug8sAyqAwS+nnvTisLLPylSffM7byH4Bem2Mz26QpgouYMfUOqRf6PItAM irvJzZxlAawOkYpwejPvyxTiPpbq4k0xBh96icrlzw1I6ogctq6GylVXeNNg6oZC rfPri/6QcEcbgNynbK48yTR5iSARsc7/SwqiaZL8XmN9Rf4ex9CbMI2loTjMcjrA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfeefgdefvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeekfedrkeeirdekledrud dtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehg rhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id D2396328005A; Wed, 15 Apr 2020 07:45:27 -0400 (EDT) Subject: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.14-stable tree To: mhiramat@kernel.org, rostedt@goodmis.org, treeze.taeung@gmail.com Cc: From: Date: Wed, 15 Apr 2020 13:45:26 +0200 Message-ID: <158695112664211@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-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 ------------------ original commit in Linus's tree ------------------ >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) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 362cca52f5de..d0568af4a0ef 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1078,6 +1078,8 @@ static int trace_kprobe_show(struct seq_file *m, struct dyn_event *ev) 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", trace_probe_group_name(&tk->tp), trace_probe_name(&tk->tp));