From patchwork Sun Feb 25 15:20:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 206073 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1622839dyb; Sun, 25 Feb 2024 07:23:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX9o4yVnrd1fE5YW+pkfl9jYwVPCqb716CHihGHOQD1YlcbaWi0r0rFqr39gAttZWHdRwhPbRioMYE/0WGUo0+hnCQwHw== X-Google-Smtp-Source: AGHT+IGLxBYsj3FIXNN30DXBC/w9FgECK9pfdX1543NQLUHUMdASWXJXNLwwSp7WS2amc1TgG9Hu X-Received: by 2002:a17:902:d510:b0:1dc:7845:5376 with SMTP id b16-20020a170902d51000b001dc78455376mr5847578plg.57.1708874633922; Sun, 25 Feb 2024 07:23:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708874633; cv=pass; d=google.com; s=arc-20160816; b=uueIyLbcWJPK9xGsAWySszkOyqSg6NTiTiER7KqTpGnEyxkuCyf/D+0sFKeCrc6Fud /ub7pfJ/g7bWJR+ltEltvmfHu4jM3UqMf8C9FHhUYz7BLBhPaLljahQ7xeTmfqiKuOlZ F0QRrCZj4fdUxmTqXPnoZr3uB9WXkcDwkiPclOc4FyjRB590hu2kxXoKWCszqJz4BpWf Txd58DdoLNSSQd28N+Yl2SlWt2vOZkhoy/jwN44DTlbCXeOVdwxPHNvi6KE2cIWCCnUm Jrrrrgv2JHcr8Av9OwURp3IZbplWFb5dnO/HPFw1tYEtXz9gGoLnqNcGvJGzF1y/M4ta lJZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=j926EWqfo0g9vIUVygZM8OTFYJPm6KP/dXgYh+R7ao4=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=t8VPxrPJfYgv3hmyxqRmtFkCEYRDejCVce8e/uepwHmP3OfElzrkECC3j+mbRjD1vt BpNVpCVHfphpctNGHJ6taHr9s0a1xzV8ni+phPTwqWYVskOQCMkMto45OECiaIcLkRsB lq9nBT1UZzhoYAoSfLMshUnqayBHxCNmjWoLzwauwwTNnrdG+f8k4GqfZM3azkxJ6mLn hAYRsLDtY87ukoBI2UkpKN5FI5nv697gZS7GDbOpIeP5pvH7/Z2t3LDkggSVZg+5+tWs zncLLIpvYkgLWs/QV/ukk8gV9qnturhgfKPSFicnXmQdHXzV921ctNBpalpYdSsH1TmE pUpQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MITlJryZ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80160-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80160-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id mf7-20020a170902fc8700b001db98ad6ec2si2219499plb.609.2024.02.25.07.23.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 07:23:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80160-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MITlJryZ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80160-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80160-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B69F6281BE3 for ; Sun, 25 Feb 2024 15:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 262D71F606; Sun, 25 Feb 2024 15:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MITlJryZ" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3649514F90; Sun, 25 Feb 2024 15:21:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874460; cv=none; b=muWvJXH+IDDEgyD6IzG/1UfZIGjYBKBAuAfZyf+vcHaj5eVvGIsLwBubB7CBx08Mkxc4CnFBUuMwHlJvCi952VJQDRhywWHOqiIn6mLnipYkKHzvNwJHc4kZn4bWXWKOK2lRK1xvwpA6lV+0/32Bh4X1fsrdqtxhJbv7E4L3j5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874460; c=relaxed/simple; bh=V7BE8q0MmiFvaddSn9SJAfAslRoLC7k0iroDoA8t4/U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=b1+nGGiXpnmWDp9x0WjfScyS7d96YrhzJez/IvGfuLEV8LnEpuNqo+HBIEWVAZQ/rYNQERC/Oit1bA7XtJA05HpgWkLPglaQgDvnb+EjWUj9m3J+LIu/p6vJPrb/0MtRrkva8Xv8ipKzcV0v+8VlYwjSP2q67brKkjtOP7qD0as= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MITlJryZ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB34DC43390; Sun, 25 Feb 2024 15:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708874460; bh=V7BE8q0MmiFvaddSn9SJAfAslRoLC7k0iroDoA8t4/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MITlJryZZJrvGRDAyCVPgXyAjhE7BZVnMVnxJyFgZH+ju5rINfwXinEh0bfbq6sAk GWdDAAWQmdmRuiMANdGunFW4OzbTJyoQXCStJqUcMRxfFROIv9MNps6L0/OeDK2K3o uaeKrIx4WjJ/bOuYM6fpZ9psjIYshWHH51Lz4VaY0XvaLmzFJ1tsZ+dIjcHeXUEnBC kHri8qT7Eo2xODVQ8XFwuae+sAxZb09ip82LrBTtyhUDDsegxUOw0i/ZjURpAmeUmC nK0mAPdRpoicLQ24csfQZytJyG+8Zb6GjrXh7qqm7kucfzok+ulQDjCBYNr+BBwsiB NyhcQbAjdgSZw== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v8 32/35] tracing/fprobe: Remove nr_maxactive from fprobe Date: Mon, 26 Feb 2024 00:20:54 +0900 Message-Id: <170887445438.564249.3628227840747431149.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170887410337.564249.6360118840946697039.stgit@devnote2> References: <170887410337.564249.6360118840946697039.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791884928135678056 X-GMAIL-MSGID: 1791884928135678056 From: Masami Hiramatsu (Google) Remove depercated fprobe::nr_maxactive. This involves fprobe events to rejects the maxactive number. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Newly added. --- include/linux/fprobe.h | 2 -- kernel/trace/trace_fprobe.c | 44 ++++++------------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h index 08b37b0d1d05..c28d06ddfb8e 100644 --- a/include/linux/fprobe.h +++ b/include/linux/fprobe.h @@ -47,7 +47,6 @@ struct fprobe_hlist { * @nmissed: The counter for missing events. * @flags: The status flag. * @entry_data_size: The private data storage size. - * @nr_maxactive: The max number of active functions. (*deprecated) * @entry_handler: The callback function for function entry. * @exit_handler: The callback function for function exit. * @hlist_array: The fprobe_hlist for fprobe search from IP hash table. @@ -56,7 +55,6 @@ struct fprobe { unsigned long nmissed; unsigned int flags; size_t entry_data_size; - int nr_maxactive; int (*entry_handler)(struct fprobe *fp, unsigned long entry_ip, unsigned long ret_ip, struct ftrace_regs *regs, diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index 7d2a66135f83..d96de0dbc0cb 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -375,7 +375,6 @@ static struct trace_fprobe *alloc_trace_fprobe(const char *group, const char *event, const char *symbol, struct tracepoint *tpoint, - int maxactive, int nargs, bool is_return) { struct trace_fprobe *tf; @@ -395,7 +394,6 @@ static struct trace_fprobe *alloc_trace_fprobe(const char *group, tf->fp.entry_handler = fentry_dispatcher; tf->tpoint = tpoint; - tf->fp.nr_maxactive = maxactive; ret = trace_probe_init(&tf->tp, event, group, false); if (ret < 0) @@ -974,12 +972,11 @@ static int __trace_fprobe_create(int argc, const char *argv[]) * FETCHARG:TYPE : use TYPE instead of unsigned long. */ struct trace_fprobe *tf = NULL; - int i, len, new_argc = 0, ret = 0; + int i, new_argc = 0, ret = 0; bool is_return = false; char *symbol = NULL; const char *event = NULL, *group = FPROBE_EVENT_SYSTEM; const char **new_argv = NULL; - int maxactive = 0; char buf[MAX_EVENT_NAME_LEN]; char gbuf[MAX_EVENT_NAME_LEN]; char sbuf[KSYM_NAME_LEN]; @@ -1000,33 +997,13 @@ static int __trace_fprobe_create(int argc, const char *argv[]) trace_probe_log_init("trace_fprobe", argc, argv); - event = strchr(&argv[0][1], ':'); - if (event) - event++; - - if (isdigit(argv[0][1])) { - if (event) - len = event - &argv[0][1] - 1; - else - len = strlen(&argv[0][1]); - if (len > MAX_EVENT_NAME_LEN - 1) { - trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; - } - memcpy(buf, &argv[0][1], len); - buf[len] = '\0'; - ret = kstrtouint(buf, 0, &maxactive); - if (ret || !maxactive) { + if (argv[0][1] != '\0') { + if (argv[0][1] != ':') { + trace_probe_log_set_index(0); trace_probe_log_err(1, BAD_MAXACT); goto parse_error; } - /* fprobe rethook instances are iterated over via a list. The - * maximum should stay reasonable. - */ - if (maxactive > RETHOOK_MAXACTIVE_MAX) { - trace_probe_log_err(1, MAXACT_TOO_BIG); - goto parse_error; - } + event = &argv[0][2]; } trace_probe_log_set_index(1); @@ -1036,12 +1013,6 @@ static int __trace_fprobe_create(int argc, const char *argv[]) if (ret < 0) goto parse_error; - if (!is_return && maxactive) { - trace_probe_log_set_index(0); - trace_probe_log_err(1, BAD_MAXACT_TYPE); - goto parse_error; - } - trace_probe_log_set_index(0); if (event) { ret = traceprobe_parse_event_name(&event, &group, gbuf, @@ -1095,8 +1066,7 @@ static int __trace_fprobe_create(int argc, const char *argv[]) } /* setup a probe */ - tf = alloc_trace_fprobe(group, event, symbol, tpoint, maxactive, - argc, is_return); + tf = alloc_trace_fprobe(group, event, symbol, tpoint, argc, is_return); if (IS_ERR(tf)) { ret = PTR_ERR(tf); /* This must return -ENOMEM, else there is a bug */ @@ -1172,8 +1142,6 @@ static int trace_fprobe_show(struct seq_file *m, struct dyn_event *ev) seq_putc(m, 't'); else seq_putc(m, 'f'); - if (trace_fprobe_is_return(tf) && tf->fp.nr_maxactive) - seq_printf(m, "%d", tf->fp.nr_maxactive); seq_printf(m, ":%s/%s", trace_probe_group_name(&tf->tp), trace_probe_name(&tf->tp));