Received: by 2002:a05:7412:e794:b0:fa:551:50a7 with SMTP id o20csp2196646rdd; Fri, 12 Jan 2024 02:16:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHV8y3Yd3IQxIaKD4gZIQE03Qw272D/VN+3lkSonfNmYiZS4a0kIvukhyE2r9u0H5c2Qn6q X-Received: by 2002:a17:907:990a:b0:a28:1061:9715 with SMTP id ka10-20020a170907990a00b00a2810619715mr488819ejc.60.1705054589891; Fri, 12 Jan 2024 02:16:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705054589; cv=none; d=google.com; s=arc-20160816; b=H8Mec3gsjD/8+1CnNOLCmYG2D/3GYu2OwqdcubWXc9hC+PZUd8NtGSwLkTfcm3jmvY 4eG+L52QlnFC+Un/foHNv5HgKYaTig74yptvKItfqF1cX/1+0Wx0bAPyWBvNYl7mOP9l asaBoeWfMHxucyT54/kcPWz39KhgQ33yeUN0yo1OMu9OuoSlpRW3hLHqysHPFug3WCd1 rKKt3u2O/tvkbInORulMaJRnv3JAUz9PUo5GnSGB6F+6gj4KJ6FLW9IpPcvfgq4WzO0f fXWEs9U01y6Nj+h6hs04Ht7x42qsFD46Pvg7oOSTnDL6evW80ebMoHFHiIvJ3EKMpEAW dRGw== ARC-Message-Signature: i=1; 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=MPh+m7he4s7AOIrwQ5dUjcsL294EHtHtJiIcuGFs1mA=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=EffJ19l3OU/Q6RMkZZBuSZyZAOLsRMFCa1mvI8m+lSJdyUQa1GInyNuvv80gTdZWJI dDGgdfF1c1dvhwqyLUN1+6X2gDreciLABSrb+t4VT2mQxoXR+PEyKWWnlW1GuK1RdAcg rWcJAxt9cRnVEw4ZCkcXrMy4msrIe8htHHeLehwP5CYWTDuvbnd6s9LjDOgjXmRoRrKC oP33wuaROnv5U0Gi8qW+oqhxmYgot0V/OwjzdclOiYsUY6sjUwMf2zJ4y/cA0Vpl3sOP a+WLfyt305ivQpuqGcxoXH5LREQuWPyRpW++4x/7PKd3a5yGhl1M5sAMOD+7O3q50VfO ES6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OeQVfn0S; spf=pass (google.com: domain of linux-kernel+bounces-24562-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24562-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 x3-20020a1709064a8300b00a2caa345ebdsi541824eju.417.2024.01.12.02.16.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 02:16:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-24562-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=OeQVfn0S; spf=pass (google.com: domain of linux-kernel+bounces-24562-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24562-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 6B9BE1F223C5 for ; Fri, 12 Jan 2024 10:16:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1F1F85EE85; Fri, 12 Jan 2024 10:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OeQVfn0S" 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 411A05EE66; Fri, 12 Jan 2024 10:13:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FE9DC433F1; Fri, 12 Jan 2024 10:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705054434; bh=dvBZGtr7WXccTAPNoVsk5fYBLF5EMCyUAEgpkrbGiSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OeQVfn0SCqEU66Nn0PJlNjmJbHypif6ZjMaN423CSWh4sfmZAwtAa/2GxwEsADLSB HXOAmEl4qHte2PCDF1+EqAHTC2bDkQVII4FmKn4YFqrrezDUcWgEo21P/TXEjbJ9LE pXjy85LOYtyDGHssE+1vuO73pcVdxasvzt3D6J2WqgLs641eUfT4L4f3FHHUj9lZKi YeX5yoPqoua5bnebyS5AmXxCZjXObKzfHhdpGAwQgvqWcfSLo07fJn3YhfDuQolk6m icCOHMRcQv45qIaF1Qp6FWPFFvCNItb87ZBYZt2f/X9WgcAuLUCyUcFBt4RLG7ksDB tgmVM953l31uw== 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 v6 15/36] function_graph: Add "task variables" per task for fgraph_ops Date: Fri, 12 Jan 2024 19:13:48 +0900 Message-Id: <170505442865.459169.16989493613988810562.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170505424954.459169.10630626365737237288.stgit@devnote2> References: <170505424954.459169.10630626365737237288.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 3d9e74ea6065..737f84104577 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 ad4ea196b76e..4ff5d2864fd2 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; @@ -182,6 +190,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 @@ -791,6 +837,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: */ @@ -851,6 +898,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; @@ -949,6 +997,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; @@ -998,6 +1064,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);