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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 63235C433FF for ; Tue, 13 Aug 2019 21:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EA172084D for ; Tue, 13 Aug 2019 21:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbfHMVVR (ORCPT ); Tue, 13 Aug 2019 17:21:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:54302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726102AbfHMVVR (ORCPT ); Tue, 13 Aug 2019 17:21:17 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 CC7FD20842; Tue, 13 Aug 2019 21:21:14 +0000 (UTC) Date: Tue, 13 Aug 2019 17:21:12 -0400 From: Steven Rostedt To: LKML Cc: Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Alexander Shishkin , Wang Nan , He Kuang , Michal Marek , Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= , Stephane Eranian , Paul Turner , David Carrillo-Cisneros , Tzvetomir Stoyanov Subject: Re: [PATCH] tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file Message-ID: <20190813172112.34fadd4e@gandalf.local.home> In-Reply-To: <20190805130150.25acfeb1@gandalf.local.home> References: <20190805130150.25acfeb1@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 5 Aug 2019 13:01:50 -0400 Steven Rostedt wrote: > [ > Not sure why I wasn't Cc'd on the original patch (or the one before that) > but I guess I need to add tools/lib/traceevent under MAINTAINERs for > perhaps tracing? > ] > Ping? -- Steve > From: "Steven Rostedt (VMware)" > > The tools/lib/traceevent/Makefile had a test added to it to detect a failure > of the "nm" when making the dynamic list file (whatever that is). The > problem is that the test sorts the values "U W w" and some versions of sort > will place "w" ahead of "W" (even though it has a higher ASCII value, and > break the test. > > Add 'tr "w" "W"' to merge the two and not worry about the ordering. > > Cc: stable@vger.kernel.org > Fixes: 6467753d61399 ("tools lib traceevent: Robustify do_generate_dynamic_list_file") > Reported-by: Tzvetomir Stoyanov > Signed-off-by: Steven Rostedt (VMware) > --- > tools/lib/traceevent/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile > index 3292c290654f..8352d53dcb5a 100644 > --- a/tools/lib/traceevent/Makefile > +++ b/tools/lib/traceevent/Makefile > @@ -266,8 +266,8 @@ endef > > define do_generate_dynamic_list_file > symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ > - xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ > - if [ "$$symbol_type" = "U W w" ];then \ > + xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ > + if [ "$$symbol_type" = "U W" ];then \ > (echo '{'; \ > $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ > echo '};'; \