From patchwork Tue Feb 6 15:10:15 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: 197522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1626323dyb; Tue, 6 Feb 2024 07:41:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6YC8xUAGwuSIvSlF0DFPXoiuok9yUeUpvO5MGMDeHOMMYdEiVi5sTdHN61mu9fvMPZF3V X-Received: by 2002:aa7:8b91:0:b0:6e0:395f:d8aa with SMTP id r17-20020aa78b91000000b006e0395fd8aamr2285316pfd.12.1707234092955; Tue, 06 Feb 2024 07:41:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707234092; cv=pass; d=google.com; s=arc-20160816; b=rHY2S8b8asZKRCYtlxIfGADt8qyw6kFHWLBfrUm5mJ05o3uzgLg6LDuMYQ/HVjgXmQ cwSJh7aTshTuyf5DQJjU3l5ed6gI61BSGeyVWv9wnPhJRXLi2/t5OHtte1/iCen9gFxO i+2pNvhCxhElgiA8m5SFzwGy5iTKKJyzSt7f3zu2FMgR3YOlBv/T7iBLmXcw5X+sVNeC 8mzEDJiydqzmgHVomSt1/YIHqF2PFrHgY4QagOKumZDUyO4Jq/79ZKlZjcYnbGYhaWUi duZaDqV0a2bAj9RWJG14jMK+oCaR1QCDvskgQXGNEd+uxYTuUmJ+kEL/9efw9MIWqisF jhKA== 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=eq8JLCXeQ3c7UTs5Ah9ph1WbxcRSqoDw11nekl/kEz0=; fh=z2vW3fSDCBOQcVgw+R2jeirybWDzTjwNMK+zCeoPQ+k=; b=tkE876EF8ujAmNkejKmw+y29r9hCg5D/GNrkUZrhTdR6J/w3p+5v02u0JhSx0MjUcs O6gTa+8Jb21NsrLduCumUFNXlzII4Hf12j7MbaSBXIdyhSM4dzDQSTiDAca//Z5Igh9i idLy5KzXwuXTlpzc47jwrxd58XlB9DVd1fIuTK1bvLlqykeDAkvRNGD0jy9OA2RjGh8o 1QMNiv12Y2/YuxYeUDAm14QbQj6dJaFUIa9NOL7ri1ZQiiarNzW6Qv6pGxtsYUFGHV5D SicqHYkiObkFI02/81laYWDwOOBULK3n+Qzjk2COdOpONzsGIk/SQ3blDtbKSdQ+fGuh 947w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oTPcZnML; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-55193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55193-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCUk2ZhuAvVU+k3r2r/HmpuR4rjJXR4PP7vgN+tT+mMlXN3+JhUXJ06ErVNUNX+jufbAA4ILt0aV/fp4tRI8LNimYKInAg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id jo23-20020a056a00909700b006e04f0080f4si1843885pfb.335.2024.02.06.07.41.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 07:41:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oTPcZnML; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-55193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55193-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 44107B2CCCA for ; Tue, 6 Feb 2024 15:14:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C4281332BC; Tue, 6 Feb 2024 15:10:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oTPcZnML" 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 6C65F132C3F; Tue, 6 Feb 2024 15:10:22 +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=1707232222; cv=none; b=YHmlANjB/uXwiC/UMnkJLj0ry1fVCDZ5QjIFYg+gfgqe8DGuPuyoqAUHJl5tAx76L6P2eCQjfMQiIm2GMIhq4VMUI6dJrVcijZpI7KllDEkZyY50+ofXJ1+vET1JFM84m/KCJcC+r/omr8rFkbMxvwqJZ35x9Ie7ZM/TdiTqyzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707232222; c=relaxed/simple; bh=P2BCaLHD3WJJXWFdYDNVArinhnc1JMb+mPWQZqnSqls=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=PetvOT8qYIWCuaMj9QAehQNe0p2al8oPA1hrHLBepHmUeFB0P6QG62QPRinFaaaE3flYSrTg3ZhVCnY/kjFH15jbMq29qBn1tykP8Gy7Q9ipthFxYNnQr3bRvBMLO1Z/ycz7JZZtNeba7aXB6dG6Dr3UjQ/GGlnaHbRLyyz/TFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oTPcZnML; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F721C433C7; Tue, 6 Feb 2024 15:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707232222; bh=P2BCaLHD3WJJXWFdYDNVArinhnc1JMb+mPWQZqnSqls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oTPcZnMLbAqb4UgMsnFRT06QxVi+DgCqfr5UguCEOK4RJcP4ebRf7FJ21Gn3XV5jz rxW7QNd3C0hHbDOM2VYk60FoMTYkYQ3hiTNiO9Z8trKcEdYH62g153g7zOGBffxKFN ZqVtu2UswBu5gLNndjBfQv55CY/FxZp81ZjqhoO97QUEujOAx2RSHDfD6uUebSprwE le8saDEMJCErml/Q9MZ8gJQsSRc+DAJZeZTIWWqADr1ulCN/FIaw29FcUp4Y17DoiV zc8pNlzkd/8VmZlYdbOw/erWFxCo/4rJwpuxF8rjMGHuK/fvZv5y6tqT41G14Z/Y36 QptC41XmN0brA== 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 v7 15/36] function_graph: Add "task variables" per task for fgraph_ops Date: Wed, 7 Feb 2024 00:10:15 +0900 Message-Id: <170723221579.502590.1810414801014910989.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170723204881.502590.11906735097521170661.stgit@devnote2> References: <170723204881.502590.11906735097521170661.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: 1790164696240568174 X-GMAIL-MSGID: 1790164696240568174 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 323a74623543..4705681e65fd 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);