From nobody Sat Feb 7 21:24:13 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E71FD186E2E for ; Fri, 14 Nov 2025 02:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763088934; cv=none; b=k4W8NosfB7kXjFg4TGM/HzE5GMb1CYn/bobF5H72Nnmx4MkN4M7x0+Qt75NDFmYg1dt+fNAGYZ92xpPDjf/1HIOTa7/KifJHjY1lYXhQ6jsIUIKAyVfLGghCkaGrpMgiyZD9i6+OY/Yvr9dl+8a8oaGCNfvNAe+6wAkfWTLcDQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763088934; c=relaxed/simple; bh=fI0rIZyVxQFQ6/HqLuOMm+2OvH4S28Xhk9P1ne+davk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ZcIRIq/BNCUpL1BtwZ19COzH9ntK7qLrIwDYYe4KpUotAkxiR9KCgKAj8uhdNeHcKTUmbMjYwFUo1prRd1aOsQl4iP1jrmKGAZBQ/CBOj6icOWu1894EUJaVv4mcNveLX3CEPeUZLXm11CanFSQoKB//Z3y2PML1vhiFKRmul5U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Co8hFqxY; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Co8hFqxY" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7b852bb31d9so1777557b3a.0 for ; Thu, 13 Nov 2025 18:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763088931; x=1763693731; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v37eCbakcwuAvGLWP6SkDqrWN2mB2BAA/YBGPG5AFmo=; b=Co8hFqxYbdZhP1PxnY1bKLcyO27MBWDrkvB4B5cLacLTaWnU+BJ8q5nbwFuDJrFmrw SDzpo4pLZeHC3VM6DYrXhaU+OQmFnHVikqWB9A9K5tMx//ziGPgNfuIH9KMvGgqk43Ys bfm7mapmQH0xaFMYmVKSbJDlfjmh5I5N3CRKArYzc1sb8r46Rb+iCDdo9WsF/7Dw11zM ZEdojzT4JrZtQO2LSUfqY7mFqpg5Uq5k1J2AZjb4OnZnjgSTlN1pBt1jNPkN8qD42REt YiCaNrTiU4afQEsfM0KNEyJEGJUmz4txdUthKvfPTpL1lvfEZybWBWFiEflIU5qKXIzg 7cBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763088931; x=1763693731; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=v37eCbakcwuAvGLWP6SkDqrWN2mB2BAA/YBGPG5AFmo=; b=nLdMaj5KKc3sGboEpY4R4i/KwNvGVrxIKczG3778dAZhTa6iE8unCtWUe3/4UemhNF 0lxWUZJP/MvrB5DNGsI6fU5wnZEDXgw08oo2ZYh5TgNewOgzv9gadk2R9hwXAxvL+kAB IzLUqlZZDqGi5nz6tVnXcGBXD2y7+C/eTL8DgELTujDdQb8/TjsKxEVrRcXTt8aad2Pz tqDXQUU1/pyjij3G2cIuitG6gBYzFJu3ktzV5w+Mkyj4ZvOMKfHdRj/louUtGQe+YCd5 1G8vlmdJZJG0Sq3M4QLsWWgprC0FKsm/08b3TDlZ1tQ94rf2Z6kiNrZB7GVRtK+TxnmY 99TQ== X-Forwarded-Encrypted: i=1; AJvYcCWWuknecfDGd34E5iUFyuTQXM2O0e0jgTYc8II01j6g5YLAi5XfCxxMcB/vUZxy2thNvSB8Iie3QsBQSS4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz78iiNNicrxSY3/Gw5HE7F1ZdWiDV1fAg8AQHcjkm4UMm/2iDZ 6DDVk5xapR7Ht5mtS4D5eFGAz+UnO6I6AJJ4ZVcYZesDHg9K7LfWTiVo X-Gm-Gg: ASbGnct/TMTNHIDKZT4nlFge4CGynVM0pmF3CCR1SLgOi478GZ7CnBee2nBo1iyHGVi WMv+rwiWDure4I3+OcmhJnh/nhyFqc/n9HvEUbXtwyYm4u7dUheUi1K0K7RNTQlhM6XWnuEycDf MIQTmTjjyuER522sInBlF4GvEcRI3rt/8j2nn1Ojnbwm/LEtdUm+l70K2t9mHmdCV6/ho6CxwrR +d/XidhFZfuxm5rGWW4D0W3k67UIltJFToIuS81bIxi+LewMIrDwh20O/04D1QxvVLjMFgTQzl2 zXmpjhs6rXTLONvgjkCzvYQED4SO0U0jD8pxiqGs3hl/ghi4sQSwYEFQNkTWcS8p16Ktt2CYOPH Gy2+kVZU/pcY+I6vykEm5Y47sVUDlzv0eK4N17yj3yM5oYG7NUoprzN0l94R6/vAO/qacrXjamm ++EIDBacqyJjgnMXFSCbSIX3ZgaKX5OO+h821yJw== X-Google-Smtp-Source: AGHT+IF1JRqnMMjNOthJDc90h1x7rQ3zelcCgJxNN0jxYHmR5j0eOmsKZfKR9yq3ifaZDhDR0EjGbQ== X-Received: by 2002:a05:6a21:6d99:b0:353:ec70:30dd with SMTP id adf61e73a8af0-35ba259aab2mr2450969637.51.1763088931133; Thu, 13 Nov 2025 18:55:31 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bc36ed72cd1sm3279807a12.11.2025.11.13.18.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 18:55:30 -0800 (PST) From: Donglin Peng To: rostedt@goodmis.org Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Donglin Peng , Sven Schnelle , Masami Hiramatsu Subject: [PATCH v7] function_graph: Enable funcgraph-args and funcgraph-retaddr to work simultaneously Date: Fri, 14 Nov 2025 10:55:22 +0800 Message-Id: <20251114025522.2115359-1-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Donglin Peng Currently, the funcgraph-args and funcgraph-retaddr features are mutually exclusive. This patch resolves this limitation by modifying funcgraph-retaddr to adopt the same implementation approach as funcgraph-args, specifically by storing the return address in the first entry of the args array. As a result, both features now coexist seamlessly and function as intended. To verify the change, use perf to trace vfs_write with both options enabled: Before: # perf ftrace -G vfs_write --graph-opts args,retaddr ...... down_read() { /* <-n_tty_write+0xa3/0x540 */ __cond_resched(); /* <-down_read+0x12/0x160 */ preempt_count_add(); /* <-down_read+0x3b/0x160 */ preempt_count_sub(); /* <-down_read+0x8b/0x160 */ } After: # perf ftrace -G vfs_write --graph-opts args,retaddr ...... down_read(sem=3D0xffff8880100bea78) { /* <-n_tty_write+0xa3/0x540 */ __cond_resched(); /* <-down_read+0x12/0x160 */ preempt_count_add(val=3D1); /* <-down_read+0x3b/0x160 */ preempt_count_sub(val=3D1); /* <-down_read+0x8b/0x160 */ } Cc: Steven Rostedt (Google) Cc: Sven Schnelle Cc: Masami Hiramatsu Signed-off-by: Donglin Peng Acked-by: Masami Hiramatsu (Google) --- v7: - Remove nr_args to eliminate a multiplication instruction - Link to v6: https://lore.kernel.org/all/20251114023453.2061590-1-dolinux.= peng@gmail.com/ v6: - Initialize retaddr to NULL to silence uninitialized variable warning. - Use ARGS_OFFS(size) macro instead of args_offs variable to eliminate "set but not used" warning - Link to v5: https://lore.kernel.org/all/20251113072938.333657-1-dolinux.p= eng@gmail.com/ v5: - Avoid unnecessary branch overhead by first verifying CONFIG_FUNCTION_GRAPH_RETADDR is enabled prior to testing the TRACE_GRAPH_PRINT_RETADDR flag - Link to v4: https://lore.kernel.org/all/20251112093650.3345108-1-dolinux.= peng@gmail.com/ v4: - Remove redundant TRACE_GRAPH_ARGS flag check - Eliminate unnecessary retaddr initialization - Resend to add missing add Acked-by tags - Link to v3: https://lore.kernel.org/all/20251112034333.2901601-1-dolinux.= peng@gmail.com/ v3: - Replace min() with min_t() to improve type safety and maintainability - Keep only one Signed-off-by for cleaner attribution - Code refactoring for improved readability - Link to v2: https://lore.kernel.org/all/20251111135432.2143993-1-dolinux.= peng@gmail.com/ v2: - Preserve retaddr event functionality (suggested by Steven) - Store the retaddr in args[0] (suggested by Steven) - Refactor implementation logic and commit message clarity - Link to v1: https://lore.kernel.org/all/20251011164156.3678012-1-dolinux.= peng@gmail.com/ --- include/linux/ftrace.h | 11 --- kernel/trace/trace.h | 4 - kernel/trace/trace_entries.h | 6 +- kernel/trace/trace_functions_graph.c | 140 ++++++++++++--------------- 4 files changed, 64 insertions(+), 97 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 7ded7df6e9b5..88cb54d73bdb 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -1129,17 +1129,6 @@ struct ftrace_graph_ent { int depth; } __packed; =20 -/* - * Structure that defines an entry function trace with retaddr. - * It's already packed but the attribute "packed" is needed - * to remove extra padding at the end. - */ -struct fgraph_retaddr_ent { - unsigned long func; /* Current function */ - int depth; - unsigned long retaddr; /* Return address */ -} __packed; - /* * Structure that defines a return function trace. * It's already packed but the attribute "packed" is needed diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 85eabb454bee..9fac291b913a 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -955,10 +955,6 @@ extern void graph_trace_close(struct trace_iterator *i= ter); extern int __trace_graph_entry(struct trace_array *tr, struct ftrace_graph_ent *trace, unsigned int trace_ctx); -extern int __trace_graph_retaddr_entry(struct trace_array *tr, - struct ftrace_graph_ent *trace, - unsigned int trace_ctx, - unsigned long retaddr); extern void __trace_graph_return(struct trace_array *tr, struct ftrace_graph_ret *trace, unsigned int trace_ctx, diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h index de294ae2c5c5..593a74663c65 100644 --- a/kernel/trace/trace_entries.h +++ b/kernel/trace/trace_entries.h @@ -95,14 +95,14 @@ FTRACE_ENTRY_PACKED(fgraph_retaddr_entry, fgraph_retadd= r_ent_entry, TRACE_GRAPH_RETADDR_ENT, =20 F_STRUCT( - __field_struct( struct fgraph_retaddr_ent, graph_ent ) + __field_struct( struct ftrace_graph_ent, graph_ent ) __field_packed( unsigned long, graph_ent, func ) __field_packed( unsigned int, graph_ent, depth ) - __field_packed( unsigned long, graph_ent, retaddr ) + __dynamic_array(unsigned long, args ) ), =20 F_printk("--> %ps (%u) <- %ps", (void *)__entry->func, __entry->depth, - (void *)__entry->retaddr) + (void *)__entry->args[0]) ); =20 #else diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_func= tions_graph.c index a7f4b9a47a71..18babcd66227 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -16,6 +16,15 @@ #include "trace.h" #include "trace_output.h" =20 +#ifdef CONFIG_FUNCTION_GRAPH_RETADDR +#define HAVE_RETADDR 1 +#define ARGS_OFFS(args_size) \ + ((args_size) > FTRACE_REGS_MAX_ARGS * sizeof(long) ? 1 : 0) +#else +#define HAVE_RETADDR 0 +#define ARGS_OFFS(args_size) 0 +#endif + /* When set, irq functions will be ignored */ static int ftrace_graph_skip_irqs; =20 @@ -27,21 +36,25 @@ struct fgraph_cpu_data { unsigned long enter_funcs[FTRACE_RETFUNC_DEPTH]; }; =20 +/* + * fgraph_retaddr_ent_entry and ftrace_graph_ent_entry share layout, ent + * member repurposed for storage + */ struct fgraph_ent_args { struct ftrace_graph_ent_entry ent; - /* Force the sizeof of args[] to have FTRACE_REGS_MAX_ARGS entries */ - unsigned long args[FTRACE_REGS_MAX_ARGS]; + /* + * Force the sizeof of args[] to have (FTRACE_REGS_MAX_ARGS + HAVE_RETADD= R) + * entries with the first entry storing the return address for + * TRACE_GRAPH_RETADDR_ENT. + */ + unsigned long args[FTRACE_REGS_MAX_ARGS + HAVE_RETADDR]; }; =20 struct fgraph_data { struct fgraph_cpu_data __percpu *cpu_data; =20 /* Place to preserve last processed entry. */ - union { - struct fgraph_ent_args ent; - /* TODO allow retaddr to have args */ - struct fgraph_retaddr_ent_entry rent; - }; + struct fgraph_ent_args ent; struct ftrace_graph_ret_entry ret; int failed; int cpu; @@ -127,22 +140,38 @@ static int __graph_entry(struct trace_array *tr, stru= ct ftrace_graph_ent *trace, struct ring_buffer_event *event; struct trace_buffer *buffer =3D tr->array_buffer.buffer; struct ftrace_graph_ent_entry *entry; - int size; + unsigned long retaddr =3D 0; + int size =3D sizeof(*entry); + int type =3D TRACE_GRAPH_ENT; + + if (IS_ENABLED(CONFIG_FUNCTION_GRAPH_RETADDR) && + tracer_flags_is_set(TRACE_GRAPH_PRINT_RETADDR)) { + retaddr =3D ftrace_graph_top_ret_addr(current); + type =3D TRACE_GRAPH_RETADDR_ENT; + size +=3D sizeof(long); + } =20 /* If fregs is defined, add FTRACE_REGS_MAX_ARGS long size words */ - size =3D sizeof(*entry) + (FTRACE_REGS_MAX_ARGS * !!fregs * sizeof(long)); + if (!!fregs) + size +=3D FTRACE_REGS_MAX_ARGS * sizeof(long); =20 - event =3D trace_buffer_lock_reserve(buffer, TRACE_GRAPH_ENT, size, trace_= ctx); + event =3D trace_buffer_lock_reserve(buffer, type, size, trace_ctx); if (!event) return 0; =20 entry =3D ring_buffer_event_data(event); entry->graph_ent =3D *trace; =20 + /* Store the retaddr in args[0] */ + if (type =3D=3D TRACE_GRAPH_RETADDR_ENT) + entry->args[0] =3D retaddr; + #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API if (fregs) { - for (int i =3D 0; i < FTRACE_REGS_MAX_ARGS; i++) - entry->args[i] =3D ftrace_regs_get_argument(fregs, i); + for (int i =3D 0; i < FTRACE_REGS_MAX_ARGS; i++) { + entry->args[i + ARGS_OFFS(size)] =3D + ftrace_regs_get_argument(fregs, i); + } } #endif =20 @@ -158,38 +187,6 @@ int __trace_graph_entry(struct trace_array *tr, return __graph_entry(tr, trace, trace_ctx, NULL); } =20 -#ifdef CONFIG_FUNCTION_GRAPH_RETADDR -int __trace_graph_retaddr_entry(struct trace_array *tr, - struct ftrace_graph_ent *trace, - unsigned int trace_ctx, - unsigned long retaddr) -{ - struct ring_buffer_event *event; - struct trace_buffer *buffer =3D tr->array_buffer.buffer; - struct fgraph_retaddr_ent_entry *entry; - - event =3D trace_buffer_lock_reserve(buffer, TRACE_GRAPH_RETADDR_ENT, - sizeof(*entry), trace_ctx); - if (!event) - return 0; - entry =3D ring_buffer_event_data(event); - entry->graph_ent.func =3D trace->func; - entry->graph_ent.depth =3D trace->depth; - entry->graph_ent.retaddr =3D retaddr; - trace_buffer_unlock_commit_nostack(buffer, event); - - return 1; -} -#else -int __trace_graph_retaddr_entry(struct trace_array *tr, - struct ftrace_graph_ent *trace, - unsigned int trace_ctx, - unsigned long retaddr) -{ - return 1; -} -#endif - static inline int ftrace_graph_ignore_irqs(void) { if (!ftrace_graph_skip_irqs || trace_recursion_test(TRACE_IRQ_BIT)) @@ -211,7 +208,6 @@ static int graph_entry(struct ftrace_graph_ent *trace, struct trace_array *tr =3D gops->private; struct fgraph_times *ftimes; unsigned int trace_ctx; - int ret =3D 0; =20 if (*task_var & TRACE_GRAPH_NOTRACE) return 0; @@ -262,15 +258,7 @@ static int graph_entry(struct ftrace_graph_ent *trace, return 1; =20 trace_ctx =3D tracing_gen_ctx(); - if (IS_ENABLED(CONFIG_FUNCTION_GRAPH_RETADDR) && - tracer_flags_is_set(TRACE_GRAPH_PRINT_RETADDR)) { - unsigned long retaddr =3D ftrace_graph_top_ret_addr(current); - ret =3D __trace_graph_retaddr_entry(tr, trace, trace_ctx, retaddr); - } else { - ret =3D __graph_entry(tr, trace, trace_ctx, fregs); - } - - return ret; + return __graph_entry(tr, trace, trace_ctx, fregs); } =20 int trace_graph_entry(struct ftrace_graph_ent *trace, @@ -634,13 +622,9 @@ get_return_for_leaf(struct trace_iterator *iter, * Save current and next entries for later reference * if the output fails. */ - if (unlikely(curr->ent.type =3D=3D TRACE_GRAPH_RETADDR_ENT)) { - data->rent =3D *(struct fgraph_retaddr_ent_entry *)curr; - } else { - int size =3D min((int)sizeof(data->ent), (int)iter->ent_size); + int size =3D min_t(int, sizeof(data->ent), iter->ent_size); =20 - memcpy(&data->ent, curr, size); - } + memcpy(&data->ent, curr, size); /* * If the next event is not a return type, then * we only care about what type it is. Otherwise we can @@ -811,21 +795,21 @@ print_graph_duration(struct trace_array *tr, unsigned= long long duration, =20 #ifdef CONFIG_FUNCTION_GRAPH_RETADDR #define __TRACE_GRAPH_PRINT_RETADDR TRACE_GRAPH_PRINT_RETADDR -static void print_graph_retaddr(struct trace_seq *s, struct fgraph_retaddr= _ent_entry *entry, - u32 trace_flags, bool comment) +static void print_graph_retaddr(struct trace_seq *s, unsigned long retaddr= , u32 trace_flags, + bool comment) { if (comment) trace_seq_puts(s, " /*"); =20 trace_seq_puts(s, " <-"); - seq_print_ip_sym(s, entry->graph_ent.retaddr, trace_flags | TRACE_ITER_SY= M_OFFSET); + seq_print_ip_sym(s, retaddr, trace_flags | TRACE_ITER_SYM_OFFSET); =20 if (comment) trace_seq_puts(s, " */"); } #else #define __TRACE_GRAPH_PRINT_RETADDR 0 -#define print_graph_retaddr(_seq, _entry, _tflags, _comment) do { } while= (0) +#define print_graph_retaddr(_seq, _retaddr, _tflags, _comment) do { } whi= le (0) #endif =20 #if defined(CONFIG_FUNCTION_GRAPH_RETVAL) || defined(CONFIG_FUNCTION_GRAPH= _RETADDR) @@ -869,10 +853,12 @@ static void print_graph_retval(struct trace_seq *s, s= truct ftrace_graph_ent_entr trace_seq_printf(s, "%ps", func); =20 if (args_size >=3D FTRACE_REGS_MAX_ARGS * sizeof(long)) { - print_function_args(s, entry->args, (unsigned long)func); + print_function_args(s, entry->args + ARGS_OFFS(args_size), + (unsigned long)func); trace_seq_putc(s, ';'); - } else + } else { trace_seq_puts(s, "();"); + } =20 if (print_retval || print_retaddr) trace_seq_puts(s, " /*"); @@ -882,8 +868,7 @@ static void print_graph_retval(struct trace_seq *s, str= uct ftrace_graph_ent_entr } =20 if (print_retaddr) - print_graph_retaddr(s, (struct fgraph_retaddr_ent_entry *)entry, - trace_flags, false); + print_graph_retaddr(s, entry->args[0], trace_flags, false); =20 if (print_retval) { if (hex_format || (err_code =3D=3D 0)) @@ -964,10 +949,12 @@ print_graph_entry_leaf(struct trace_iterator *iter, trace_seq_printf(s, "%ps", (void *)ret_func); =20 if (args_size >=3D FTRACE_REGS_MAX_ARGS * sizeof(long)) { - print_function_args(s, entry->args, ret_func); + print_function_args(s, entry->args + ARGS_OFFS(args_size), + ret_func); trace_seq_putc(s, ';'); - } else + } else { trace_seq_puts(s, "();"); + } } trace_seq_putc(s, '\n'); =20 @@ -1016,7 +1003,7 @@ print_graph_entry_nested(struct trace_iterator *iter, args_size =3D iter->ent_size - offsetof(struct ftrace_graph_ent_entry, ar= gs); =20 if (args_size >=3D FTRACE_REGS_MAX_ARGS * sizeof(long)) - print_function_args(s, entry->args, func); + print_function_args(s, entry->args + ARGS_OFFS(args_size), func); else trace_seq_puts(s, "()"); =20 @@ -1024,8 +1011,7 @@ print_graph_entry_nested(struct trace_iterator *iter, =20 if (flags & __TRACE_GRAPH_PRINT_RETADDR && entry->ent.type =3D=3D TRACE_GRAPH_RETADDR_ENT) - print_graph_retaddr(s, (struct fgraph_retaddr_ent_entry *)entry, - tr->trace_flags, true); + print_graph_retaddr(s, entry->args[0], tr->trace_flags, true); trace_seq_putc(s, '\n'); =20 if (trace_seq_has_overflowed(s)) @@ -1202,7 +1188,7 @@ print_graph_entry(struct ftrace_graph_ent_entry *fiel= d, struct trace_seq *s, * it can be safely saved at the stack. */ struct ftrace_graph_ent_entry *entry; - u8 save_buf[sizeof(*entry) + FTRACE_REGS_MAX_ARGS * sizeof(long)]; + u8 save_buf[sizeof(*entry) + (FTRACE_REGS_MAX_ARGS + HAVE_RETADDR) * size= of(long)]; =20 /* The ent_size is expected to be as big as the entry */ if (iter->ent_size > sizeof(save_buf)) @@ -1429,16 +1415,12 @@ print_graph_function_flags(struct trace_iterator *i= ter, u32 flags) trace_assign_type(field, entry); return print_graph_entry(field, s, iter, flags); } -#ifdef CONFIG_FUNCTION_GRAPH_RETADDR case TRACE_GRAPH_RETADDR_ENT: { - struct fgraph_retaddr_ent_entry saved; struct fgraph_retaddr_ent_entry *rfield; =20 trace_assign_type(rfield, entry); - saved =3D *rfield; - return print_graph_entry((struct ftrace_graph_ent_entry *)&saved, s, ite= r, flags); + return print_graph_entry((typeof(field))rfield, s, iter, flags); } -#endif case TRACE_GRAPH_RET: { struct ftrace_graph_ret_entry *field; trace_assign_type(field, entry); --=20 2.34.1