From patchwork Tue Sep 29 10:59:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 291186 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 B003AC47423 for ; Tue, 29 Sep 2020 11:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 621EA20848 for ; Tue, 29 Sep 2020 11:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378079; bh=luAx4X+I/dJfTAXORFZBzGx6TP/aQbWoHfjFpBNUjR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OywSyDhNEBbDAswGK++2nLyrvzZ9m32Gm/dA7gBf5gzTwYvEaIMCWLMYcg4rEV1Hq 0WDC1iT7h8WWcBWlMt0D7qG6WY4lEEgoL9ErXlyE2qj9OFR0e/Zm7rFHg1VVRMBRjE 9L+9igQsrAoIRU3m5F0WWIwDOP6aXyhSXrMy2cLc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729436AbgI2LOi (ORCPT ); Tue, 29 Sep 2020 07:14:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:57660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbgI2LOc (ORCPT ); Tue, 29 Sep 2020 07:14:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FC0021D41; Tue, 29 Sep 2020 11:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378071; bh=luAx4X+I/dJfTAXORFZBzGx6TP/aQbWoHfjFpBNUjR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z8H6T32SbQhX6EWxwe6S2qNo8z5yK5wRtfWa+PedaFMVXcrrWVYL8cVy2/cLQXdDf QapX9YH4zbF5wwcIK6Uot74UEKZfivrrxxArC/Jqw3YED8Yfj7IyrhG+yeC86s1yX8 lev03jlJ7Klsl6jJPwOaQpx5K4wlB7ZBSPZboVI0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 4.14 050/166] tracing: Set kernel_stacks caller size properly Date: Tue, 29 Sep 2020 12:59:22 +0200 Message-Id: <20200929105937.701380697@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 e3a658bac10fe..ff91acff72946 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"