From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF800C43464 for ; Fri, 18 Sep 2020 02:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 854C6235F8 for ; Fri, 18 Sep 2020 02:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600397327; bh=rwwQId0ktPLHBLBj7FZ6Nu8yi/7jnx/kKizPNBHg5UU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1AUhyF9CCcM5aqeQpmmGO4oP+IALRy7XJNUuhTiPa8+TVGjL44j5y1hhtLV/rwr5v OVM/B6yIJztpulQgc9YT73Yoz0DYhaYPTkGTsIeL0ms0fPYsKHSKBCCd63f2uMyzFo g9Fwx10VltX/7ID6IeM2nN9YRns82FGCrzv/ZSpg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728154AbgIRCsp (ORCPT ); Thu, 17 Sep 2020 22:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:60978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728247AbgIRCJL (ORCPT ); Thu, 17 Sep 2020 22:09:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3C9D23770; Fri, 18 Sep 2020 02:09:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394951; bh=rwwQId0ktPLHBLBj7FZ6Nu8yi/7jnx/kKizPNBHg5UU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RdopWYbqJtOvkIMzhfz4bLVAgcfhflh9vQYrKm6GvQwnub8iHNIT1s+JdPMvzWv4H APO2OTNAB3QT7v6zk+kY+H7/Kq/1okfx9na8U2GMwgiUJnZBFWqLZ/MQJNlVcL3wKY exarC0E0eTWW9Um5Ty51y6dWzXEz1+du6r3mvF9Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , Steven Rostedt , Sasha Levin Subject: [PATCH AUTOSEL 4.19 058/206] tracing: Set kernel_stack's caller size properly Date: Thu, 17 Sep 2020 22:05:34 -0400 Message-Id: <20200918020802.2065198-58-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020802.2065198-1-sashal@kernel.org> References: <20200918020802.2065198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik [ Upstream commit cbc3b92ce037f5e7536f6db157d185cd8b8f615c ] I noticed when trying to use the trace-cmd python interface that reading the raw buffer wasn't working for kernel_stack events. This is because it uses a stubbed version of __dynamic_array that doesn't do the __data_loc trick and encode the length of the array into the field. Instead it just shows up as a size of 0. So change this to __array and set the len to FTRACE_STACK_ENTRIES since this is what we actually do in practice and matches how user_stack_trace works. Link: http://lkml.kernel.org/r/1411589652-1318-1-git-send-email-jbacik@fb.com Signed-off-by: Josef Bacik [ Pulled from the archeological digging of my INBOX ] Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- kernel/trace/trace_entries.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h index 06bb2fd9a56c5..a97aad105d367 100644 --- a/kernel/trace/trace_entries.h +++ b/kernel/trace/trace_entries.h @@ -179,7 +179,7 @@ FTRACE_ENTRY(kernel_stack, stack_entry, F_STRUCT( __field( int, size ) - __dynamic_array(unsigned long, caller ) + __array( unsigned long, caller, FTRACE_STACK_ENTRIES ) ), F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n" -- 2.25.1