Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1415600lqp; Mon, 15 Apr 2024 06:08:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV7OzaauBW6zLQ+x9td2/bLLMQ1VE2MiRB8jjLMvtvSqTUR2WoEGbmelqx9+EmxwHjx3qgM7GsAwiKfWsny+sjmK2rM9YYOZKZLDYKf6g== X-Google-Smtp-Source: AGHT+IG7thsjKN5Gt39v5utFEDcgGTaKWseuhp/jf4+7iBk48dFt6iJzGnSGTAj+UuIm8tK/HbLs X-Received: by 2002:a17:907:720c:b0:a55:358f:783c with SMTP id dr12-20020a170907720c00b00a55358f783cmr207606ejc.24.1713186536643; Mon, 15 Apr 2024 06:08:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713186536; cv=pass; d=google.com; s=arc-20160816; b=cKx49L1uxjKxbYq5Pnh/PGNwn5IC4+zuHMhqXdFPbsn9xQexzOvf8wQzyqCQUQv6kE 8tS+PA84a79KInj7XKbSlhP3jOUlUDxRU6B3LNQ9G81eKGq9sn0/UJrNisAe1BCZ9gay UctLvSe4x6s0+P5C+mGeiR3D3RWObiVSzscxU3t/gTqcHWd1Vi7EB6Nar0RqIF/ioVt9 a8u1Kvo8iEgOcA3el9qgGr0oNtQPTw62JK9IeOI7A/4iTVrVANNZcdNN2tMephooyQip 9FL3SJB0cUXZfn4YzfBM2gKb30lXRn4qN/leGGhYpcqRsq1dL75WYy40RhwSZfp6jQfj QJZg== 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=bpztdAHnwDS5K94Zs0upcDqcaFrPyKSzFy4V8MQrlKw=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=qLaX2EIgCJLe/qZtEgkgmq/ITug84awRo0+1vLPUfSq9vUE8V8pfWmnQXbWT5/gmt3 D52glh/wzt4tsvmHgb+GGn9M35JacQ3MZsv5oJFMVqMEAaiAnb7lyd4JxGFw4Y4Wyx+K oXvnLRfH4IozXlMYoV1cu8gT15zb6dH6o36u8VZgqlrHxAEeV6yWGkwuXaweu0SDZBB0 GqlYl+G3Mh9sD8fcwD1xSgKEMzkyPIc1DAiTjFEhDlxPOR2goLi20U0Te8LSg1fhRONf 7YoUeUjYieXbqrBR9/Fq7yCeNXxmYnQb6N1gxknhh/saBpfaYWsqhF8b65y+bjTyW1fi vPVA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jkX3CPO4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-145176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-145176-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id oz3-20020a170906cd0300b00a52041e7eb0si4424078ejb.60.2024.04.15.06.08.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 06:08:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-145176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jkX3CPO4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-145176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-145176-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 3B8491F21E2B for ; Mon, 15 Apr 2024 13:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4790139CF1; Mon, 15 Apr 2024 12:51:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jkX3CPO4" 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 DFD2A7316F; Mon, 15 Apr 2024 12:51:49 +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=1713185510; cv=none; b=q2itCgNIaAG+mjQdAeUWIaGpiodUqt6XGR3hXcEgdIPHqn3Gk4v93yeg4ysCEYb7e5FTGP5kb/3K8EM57ezsmsqtE88krFtEb29X5PrIUvgcW/Xc6Bggxf3uka2WzfBzRI7SyBXbRLe2jF7NHvL9qJGLLusPlgDxTIqEO2eeEzw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713185510; c=relaxed/simple; bh=vJfVo8eWC9hai0W1x7R7zOGQFh5VrIe3RO+4eor6C8o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ZllMsRd2oL4u7CHxf/sPqiT6IMSR2ZHhMG25IoNI7R7Pzjx+4Fgc8OVAE8JQ1xB6b4ztlFhkVzlg3lnJmQacQuxYTMEw5nOJH4x3iGtHmzCjkDhkIDf2Ws959zUeRN8Wz0IaVjPe5m0lJiBMGwB5/hlDy0JwiVHIj5oalJZp54c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jkX3CPO4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9562AC2BD10; Mon, 15 Apr 2024 12:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713185509; bh=vJfVo8eWC9hai0W1x7R7zOGQFh5VrIe3RO+4eor6C8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jkX3CPO4lMRC+JDMCQ8MCLebb3NkhLj9EqR3kl6t4uSlQjycYYoDdURlGMOnLnn2H kJEndDPobPLkXfqFEPEH8srxjH9mr/jYnzroeupsQR4Z/mx4A1aEZw2+84DRoaUuVU HZhcsuci9RLXOYxN/J/Rr+1VkAcSaWuoUnFtKBZRWSEzfdDXyq5+ClhyQ2TxyYepY6 9D1Dc2cnMq9KZDwr643uaR96Fb4o3psfBZe1Bky6n+oOKb2ULQ0PgDxeKk76v1tAH9 Qt9O2VPNHpEV8ZEJyI4DsvYds2IffT1EC1wB+OkmOsmkm/wTyjWdNT88Pga1ZvFwEq WupsDWqQy3Gng== 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 v9 14/36] function_graph: Add "task variables" per task for fgraph_ops Date: Mon, 15 Apr 2024 21:51:43 +0900 Message-Id: <171318550323.254850.5300919241097917132.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <171318533841.254850.15841395205784342850.stgit@devnote2> References: <171318533841.254850.15841395205784342850.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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit From: Steven Rostedt (VMware) Add a "task variables" array on the tasks shadow ret_stack that is the size of longs for each possible registered fgraph_ops. That's a total of 16, taking up 8 * 16 = 128 bytes (out of a page size 4k). This will allow for fgraph_ops to do specific features on a per task basis having a way to maintain state for each task. Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu (Google) --- Changes in v3: - Move fgraph_ops::idx to previous patch in the series. Changes in v2: - Make description lines shorter than 76 chars. --- include/linux/ftrace.h | 1 + kernel/trace/fgraph.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 6aaca057a078..85b887973e02 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -1116,6 +1116,7 @@ ftrace_graph_get_ret_stack(struct task_struct *task, int idx); unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, unsigned long ret, unsigned long *retp); +unsigned long *fgraph_get_task_var(struct fgraph_ops *gops); /* * Sometimes we don't want to trace a function with the function diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 7e73bc3eab8b..2a6e91c293fe 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -92,10 +92,18 @@ enum { #define SHADOW_STACK_SIZE (PAGE_SIZE) #define SHADOW_STACK_INDEX (SHADOW_STACK_SIZE / sizeof(long)) /* Leave on a buffer at the end */ -#define SHADOW_STACK_MAX_INDEX (SHADOW_STACK_INDEX - (FGRAPH_RET_INDEX + 1)) +#define SHADOW_STACK_MAX_INDEX \ + (SHADOW_STACK_INDEX - (FGRAPH_RET_INDEX + 1 + FGRAPH_ARRAY_SIZE)) #define RET_STACK(t, index) ((struct ftrace_ret_stack *)(&(t)->ret_stack[index])) +/* + * Each fgraph_ops has a reservered unsigned long at the end (top) of the + * ret_stack to store task specific state. + */ +#define SHADOW_STACK_TASK_VARS(ret_stack) \ + ((unsigned long *)(&(ret_stack)[SHADOW_STACK_INDEX - FGRAPH_ARRAY_SIZE])) + DEFINE_STATIC_KEY_FALSE(kill_ftrace_graph); int ftrace_graph_active; @@ -186,6 +194,44 @@ static void return_run(struct ftrace_graph_ret *trace, struct fgraph_ops *ops) { } +static void ret_stack_set_task_var(struct task_struct *t, int idx, long val) +{ + unsigned long *gvals = SHADOW_STACK_TASK_VARS(t->ret_stack); + + gvals[idx] = val; +} + +static unsigned long * +ret_stack_get_task_var(struct task_struct *t, int idx) +{ + unsigned long *gvals = SHADOW_STACK_TASK_VARS(t->ret_stack); + + return &gvals[idx]; +} + +static void ret_stack_init_task_vars(unsigned long *ret_stack) +{ + unsigned long *gvals = SHADOW_STACK_TASK_VARS(ret_stack); + + memset(gvals, 0, sizeof(*gvals) * FGRAPH_ARRAY_SIZE); +} + +/** + * fgraph_get_task_var - retrieve a task specific state variable + * @gops: The ftrace_ops that owns the task specific variable + * + * Every registered fgraph_ops has a task state variable + * reserved on the task's ret_stack. This function returns the + * address to that variable. + * + * Returns the address to the fgraph_ops @gops tasks specific + * unsigned long variable. + */ +unsigned long *fgraph_get_task_var(struct fgraph_ops *gops) +{ + return ret_stack_get_task_var(current, gops->idx); +} + /* * @offset: The index into @t->ret_stack to find the ret_stack entry * @index: Where to place the index into @t->ret_stack of that entry @@ -795,6 +841,7 @@ static int alloc_retstack_tasklist(unsigned long **ret_stack_list) if (t->ret_stack == NULL) { atomic_set(&t->trace_overrun, 0); + ret_stack_init_task_vars(ret_stack_list[start]); t->curr_ret_stack = 0; t->curr_ret_depth = -1; /* Make sure the tasks see the 0 first: */ @@ -855,6 +902,7 @@ static void graph_init_task(struct task_struct *t, unsigned long *ret_stack) { atomic_set(&t->trace_overrun, 0); + ret_stack_init_task_vars(ret_stack); t->ftrace_timestamp = 0; t->curr_ret_stack = 0; t->curr_ret_depth = -1; @@ -953,6 +1001,24 @@ static int start_graph_tracing(void) return ret; } +static void init_task_vars(int idx) +{ + struct task_struct *g, *t; + int cpu; + + for_each_online_cpu(cpu) { + if (idle_task(cpu)->ret_stack) + ret_stack_set_task_var(idle_task(cpu), idx, 0); + } + + read_lock(&tasklist_lock); + for_each_process_thread(g, t) { + if (t->ret_stack) + ret_stack_set_task_var(t, idx, 0); + } + read_unlock(&tasklist_lock); +} + int register_ftrace_graph(struct fgraph_ops *gops) { int command = 0; @@ -999,6 +1065,8 @@ int register_ftrace_graph(struct fgraph_ops *gops) ftrace_graph_return = return_run; ftrace_graph_entry = entry_run; command = FTRACE_START_FUNC_RET; + } else { + init_task_vars(gops->idx); } ret = ftrace_startup(&gops->ops, command);