From patchwork Tue Jan 31 16:15:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 50963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1000wrn; Tue, 31 Jan 2023 08:30:46 -0800 (PST) X-Google-Smtp-Source: AK7set9Zv2yy374MKxpOfASpQ03/9X+MTYcwZoCWyWJwzCrFOHB1G2zbOmiMKNFHqMe5LCZKBhjS X-Received: by 2002:a17:90b:3849:b0:22c:1a96:d3b8 with SMTP id nl9-20020a17090b384900b0022c1a96d3b8mr13696084pjb.49.1675182646557; Tue, 31 Jan 2023 08:30:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675182646; cv=none; d=google.com; s=arc-20160816; b=qr3FqE2QxlNWMOLtA/sWL7E/GXG/5zWIBEzO+W31x2/1I6K3oAUrmwTWvVFaAiSbtg M59spDPEK5eR6cVv0OrmFtaB7CpcNRxR0mCMZW0D+y0npYtu8eAOjZv7E2AzxgPTQOMM h9b6bStJot/v1IKw0o3oZQlR9OImN2Ovwpmna7eJj6ebvVQauxv7n7w3TukleBq3rbSs 0ru59QvZa9ExDdZ5Gl5pLR2q4qq/yPAhFtRQKoyw8AmhEA3E2Dss38Aq2HOim5v7cfHG 9xaw/dlxid3av1GW2Jxcb43Njd13T+e4BErFw4O8JCe5H5X5Go4Dtdcm8E9LBUNl7qLn 5coA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m8ZD7OdX+naM8TDvuxfAXgHmlWN3WM5LibwsMO+5WzY=; b=Kf4t3i7mqtIENc7cCm3Sy7MPdPpi9uCXQlDUi/H6g/+oEunsNFWFAJ2GgE5thKZ3oU ZyNqi68dGa+8DY08M69zrjG33Z7fqFzlwEKOPsEwYThFmDJEFtI6YBzJr9+b41p0xcaY u7i8Rl4IbXUHGLo5PoUOyUrOoSOnXltayAj2bpI1hgtx6pMTVcwHOfJjdiIyQpqc/l2P YVrcl+mYeAcUObpiaj7TwYMWTrUptBgSorqAKDxidJMos0tzYajLD+d2D/t9qf+7X+Z8 PiOuRJj7oal41K48eAIyaADxUBXFec3Es4a/olPsykuxJT4FQo+lUJirKkqKuHzC+Awo FT2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KtFLR8z6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t186-20020a6381c3000000b004d23a59d6e9si16257473pgd.373.2023.01.31.08.30.33; Tue, 31 Jan 2023 08:30:46 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KtFLR8z6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231945AbjAaQPq (ORCPT + 99 others); Tue, 31 Jan 2023 11:15:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbjAaQPo (ORCPT ); Tue, 31 Jan 2023 11:15:44 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 140B853E7F; Tue, 31 Jan 2023 08:15:35 -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 A3E4861593; Tue, 31 Jan 2023 16:15:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0E4EC433EF; Tue, 31 Jan 2023 16:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675181734; bh=uMXIDE3N6tRBHy0qXfA/qokcfkSD+HhNMwAWfevtvoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KtFLR8z6+ix5fyiDnip6/lv75UwxP+ZlQrvlcyrKxb9EX0Xe3XeJTlhFAAEElHE1A A2aY54HCUUWFDXRvxE71mdMIFKG5lqf2Z3xFvQwKJ/kjdSQWHS52cVXlVMwJIEvnkx j536sTjugBoIsHl8FRwqFZ7yO/sTOK/T1LEXLNbezh60PL2HNFGZZC5K2rh2fZod/S uvEontAV7r8VSFBMxC62cp56aN2jmfeDR1J4BqKosfRp2aDUJjs//VheIXlWIRbO8l 3Ti4T6jWfJ9Oiv3SV9Ma1RuwHiAQ5r64UyG5cG4UwGS/a5opb0GGz52Zsmabh4qPoE wijUL1Fs0nslw== From: "Masami Hiramatsu (Google)" To: linux-trace-kernel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Steven Rostedt , mhiramat@kernel.org, Florent Revest , Mark Rutland , Will Deacon Subject: [PATCH v2 03/10] fprobe: Add nr_maxactive to specify rethook_node pool size Date: Wed, 1 Feb 2023 01:15:30 +0900 Message-Id: <167518173031.336834.3343880383483990761.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <167518170369.336834.15310137713178284219.stgit@mhiramat.roam.corp.google.com> References: <167518170369.336834.15310137713178284219.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1756556319011047441?= X-GMAIL-MSGID: =?utf-8?q?1756556319011047441?= From: Masami Hiramatsu (Google) Add nr_maxactive to specify rethook_node pool size. This means the maximum number of actively running target functions concurrently for probing by exit_handler. Note that if the running function is preempted or sleep, it is still counted as 'active'. Signed-off-by: Masami Hiramatsu (Google) --- include/linux/fprobe.h | 2 ++ kernel/trace/fprobe.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h index e0d4e6136249..678f741a7b33 100644 --- a/include/linux/fprobe.h +++ b/include/linux/fprobe.h @@ -14,6 +14,7 @@ * @flags: The status flag. * @rethook: The rethook data structure. (internal data) * @entry_data_size: The private data storage size. + * @nr_maxactive: The max number of active functions. * @entry_handler: The callback function for function entry. * @exit_handler: The callback function for function exit. */ @@ -31,6 +32,7 @@ struct fprobe { unsigned int flags; struct rethook *rethook; size_t entry_data_size; + int nr_maxactive; void (*entry_handler)(struct fprobe *fp, unsigned long entry_ip, struct pt_regs *regs, void *entry_data); diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index fa25d09c9d57..f222848571f2 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -143,7 +143,10 @@ static int fprobe_init_rethook(struct fprobe *fp, int num) } /* Initialize rethook if needed */ - size = num * num_possible_cpus() * 2; + if (fp->nr_maxactive) + size = fp->nr_maxactive; + else + size = num * num_possible_cpus() * 2; if (size < 0) return -E2BIG;