From patchwork Wed Mar 29 19:45:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 76798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp654122vqo; Wed, 29 Mar 2023 13:01:30 -0700 (PDT) X-Google-Smtp-Source: AKy350a3WTogEuNx2gHiOZAj+YdmAigeUAZMCyYl50UsO5CWDwTM2/B6NvhyORea1kdHli+JeCMs X-Received: by 2002:a62:4ec9:0:b0:575:b783:b6b3 with SMTP id c192-20020a624ec9000000b00575b783b6b3mr17790722pfb.28.1680120089682; Wed, 29 Mar 2023 13:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680120089; cv=none; d=google.com; s=arc-20160816; b=MutKbV1q6gY0bAeL9aomvxmdzbiiKVhjgUqZwZ+IaO4XfvTo4zu/i/osCuAv9IAqHg +E+04HKCG75G0Gi+2ymGtlVjvRuGL4C3JtDC3BAmZ5CfXzhHgEg9mNKQL/QAMWxXEuNh sBSFvABkgTFhIwysRV6PI4KT8qQzzVk5FOiRI0hYpFaCnSv7BWfukuU3+y58WjpoB5XV ogu7spFQt/DviQGkmrZLA+jSxRRVsxHDee253J02RRJZi+hF0REwk9dD07r0x9juGRfA TouwG3ZH77PaS/2JRTEANQh6mGoWqtnbQayfaujpUWKnGExKhUX5LHZuAwhp27rI4X+p Jk/Q== 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=KGEOlHe+k6gxddAwVCYvOeV3jhRToCRNVqwPHbaYUUI=; b=axLXsXFkGYxjQ8yokhdMtylPuOJVmbLqZXi2IwZLY9NJXHq1V7+YqObCu6/ssi4/u9 EtSNWZCafhVRl2ASob6S1GTeF1piK7wAbHoS8fx2IgtwQEK2K66ImCz1g4GaOp3hOIc2 1lOjFv1KqBhIntdmK2/HWggNk25sG3xyyqpiXv2/iDyCHRy6L0lXOix5xVkYkb2bAXHO UZhiziqVYuNN87NGntkW+L8OF3TYNSj3GYNcT7KiWjwHg3PCmDf8WBSPFvNdqqZxSwHF /O/nzT0EeKCjLMHXcPBVf9cedwCErYiBM0kHZksddSOg8D79W1QrEQxXhipHj7MK6D0E Tr2A== 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 q79-20020a632a52000000b0051334c90cbcsi11532824pgq.455.2023.03.29.13.01.03; Wed, 29 Mar 2023 13:01:29 -0700 (PDT) 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 S230422AbjC2TqW (ORCPT + 99 others); Wed, 29 Mar 2023 15:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229955AbjC2Tpy (ORCPT ); Wed, 29 Mar 2023 15:45:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 673431B8 for ; Wed, 29 Mar 2023 12:45:53 -0700 (PDT) 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 0A518B82433 for ; Wed, 29 Mar 2023 19:45:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4EB9C433A4; Wed, 29 Mar 2023 19:45:50 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1phbjx-002Rfp-2V; Wed, 29 Mar 2023 15:45:49 -0400 Message-ID: <20230329194549.595038894@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 29 Mar 2023 15:45:19 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Florent Revest , Will Deacon Subject: [for-next][PATCH 03/25] fprobe: Add nr_maxactive to specify rethook_node pool size References: <20230329194516.146147554@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761733603268338971?= X-GMAIL-MSGID: =?utf-8?q?1761733603268338971?= 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'. Link: https://lkml.kernel.org/r/167526697917.433354.17779774988245113106.stgit@mhiramat.roam.corp.google.com Cc: Florent Revest Cc: Mark Rutland Cc: Will Deacon Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (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;