From patchwork Wed Aug 29 12:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Motai.Hirotaka@aj.MitsubishiElectric.co.jp" X-Patchwork-Id: 10580149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 798D2174A for ; Wed, 29 Aug 2018 12:36:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6880D2AF5A for ; Wed, 29 Aug 2018 12:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CAEA2AF84; Wed, 29 Aug 2018 12:36:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 937882AF5A for ; Wed, 29 Aug 2018 12:36:35 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 47515CB8; Wed, 29 Aug 2018 12:36:35 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D6C85CAC for ; Wed, 29 Aug 2018 12:36:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx05.melco.co.jp (mx05.melco.co.jp [192.218.140.145]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 10C9A4FA for ; Wed, 29 Aug 2018 12:36:33 +0000 (UTC) Received: from mr05.melco.co.jp (mr05 [133.141.98.165]) by mx05.melco.co.jp (Postfix) with ESMTP id D86773A326C for ; Wed, 29 Aug 2018 21:18:08 +0900 (JST) Received: from mr05.melco.co.jp (unknown [127.0.0.1]) by mr05.imss (Postfix) with ESMTP id 420l5D5vQgzRkCl for ; Wed, 29 Aug 2018 21:18:08 +0900 (JST) Received: from mf04_second.melco.co.jp (unknown [192.168.20.184]) by mr05.melco.co.jp (Postfix) with ESMTP id 420l5D5btkzRkC3 for ; Wed, 29 Aug 2018 21:18:08 +0900 (JST) Received: from mf04.melco.co.jp (unknown [133.141.98.184]) by mf04_second.melco.co.jp (Postfix) with ESMTP id 420l5D5clvzRkCw for ; Wed, 29 Aug 2018 21:18:08 +0900 (JST) Received: from JPN01-TY1-obe.outbound.protection.outlook.com (unknown [23.103.139.179]) by mf04.melco.co.jp (Postfix) with ESMTP id 420l5D5QXszRkCn for ; Wed, 29 Aug 2018 21:18:08 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mitsubishielectricgroup.onmicrosoft.com; s=selector1-mitsubishielectricgroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1eYibDaoOO6WmBGGobdQC/HNa02Pcg3CHFCGXk824SE=; b=d8749u5WZBzpxCL7ORfB4CJyz9+t8pk41evhr5HnFbSRDTYR5R+ppoO68LjFYFwtgUwapgx0B2fFQMkC11O/kGnnh3qdVCtlXkbycGW1ij8UBAu0IpNUSr1nIpgO/faFo7m0522Xo1yfFScJ7P0CgS00GbBPKVWAm2n36WUGgzw= Received: from TY1PR01MB1692.jpnprd01.prod.outlook.com (52.133.160.145) by TY1PR01MB0762.jpnprd01.prod.outlook.com (10.167.158.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.15; Wed, 29 Aug 2018 12:18:08 +0000 Received: from TY1PR01MB1692.jpnprd01.prod.outlook.com ([fe80::d04e:e6f6:c782:22fa]) by TY1PR01MB1692.jpnprd01.prod.outlook.com ([fe80::d04e:e6f6:c782:22fa%2]) with mapi id 15.20.1080.015; Wed, 29 Aug 2018 12:18:08 +0000 From: "Motai.Hirotaka@aj.MitsubishiElectric.co.jp" To: "ltsi-dev@lists.linuxfoundation.org" Thread-Topic: [LTSI-dev] [PATCH 45/54] tracing: Don't add flag strings when displaying variable references Thread-Index: AdQ/jPlZH4Ra6q1qSTW+XcGGfh5wHg== Date: Wed, 29 Aug 2018 12:17:12 +0000 Deferred-Delivery: Wed, 29 Aug 2018 12:15:00 +0000 Message-ID: Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-melpop: 1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=Motai.Hirotaka@aj.MitsubishiElectric.co.jp; x-originating-ip: [153.231.200.201] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; TY1PR01MB0762; 6:FDml/XykSCZz3H76XAc7vzUcgJB6xVS1foynNALxvkBsJKwNAXz12fzTiBvlXwbsf0EPF+Oy0NG02ODasQclsnsas3mmzOfzatwDdhisclpEejO/qQNpqfuxer2DULmVE+uNd6TkxF3u7h5cdkeHNfkDSFFKeosYfohgK/QL0uGq5HjFxzt2EnqoXlfSnPXfax/VEI11BnEMSX6XrjFF3jY1u6CP6C/5GrBlCL80LJ6SdpIv8/wjYDjU69bOYQYckMQ454/vZShmsgU01G9+8IYiZMJf+3KJS1/gcnc4K4BXcvpKNH88x3ox07LTD8OWRimROFr/GQrpiF55RsIDDxG5yBdUkVmSaBx679TnW8S3mjshha5xNyb17xDzjsEHK5gWLgnDNZa0Y1L+CuMjUBcH9/OM7GamVaDaFYh348pmw/86IKNu0X4KHyrK4mx8lJhsaqnORY8EE4MlvYHs6w==; 5:gKXcwaXLDHyTuM7OJ+1L2K/JCjCrWmkKi/g6tGzG5tytM/L44qTcVfZzgGq0cUEADz4HG46CbVzQdbQfM09UxGf+E7Fblkvdc21zSQTbR+kqlx6tcnnLksImEssDFGDmeBMhIlGcr0rPgrXaP9DErbjJtRJiuH2LKmewZFyuSyE=; 7:3VNEPXhLL5Go/Vr36K+WktsYLz7NvNez3V0OATS6xbyDsKi/1yOfwy1x0kbJ8ZK/HDREcKlWSZsLgcVzJj+XhM1nxFKEzpH+bQvqm7WT95g/qTaJwxaE0rDp9ymPIpWFwOG8Zh0De7pBcHtx+lUWqExgVJhhckURGPONOx1d4eU6+SphCwsTdt6/GFNwp4p/04sFKLeFQuVD9Qm/gYfm51dUnqXwtIGcvcbrD6tDy1nBOdOHyGckbwB20Aacx92f x-ms-office365-filtering-correlation-id: 1ffecd45-eb1f-4522-f31c-08d60da97afe x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB0762; x-ms-traffictypediagnostic: TY1PR01MB0762: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(42068640409301)(228905959029699); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016); SRVR:TY1PR01MB0762; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB0762; x-forefront-prvs: 077929D941 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(346002)(376002)(136003)(366004)(199004)(189003)(7696005)(186003)(72206003)(6116002)(478600001)(3846002)(1857600001)(256004)(74482002)(5250100002)(5660300001)(14444005)(966005)(2501003)(99286004)(2900100001)(8936002)(53936002)(68736007)(33656002)(9686003)(2906002)(97736004)(6306002)(26005)(476003)(7736002)(305945005)(74316002)(6666003)(316002)(14454004)(486006)(55016002)(81166006)(5640700003)(66066001)(8676002)(86362001)(6436002)(2351001)(6506007)(106356001)(25786009)(6916009)(105586002)(102836004)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB0762; H:TY1PR01MB1692.jpnprd01.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; MX:1; received-spf: None (protection.outlook.com: aj.MitsubishiElectric.co.jp does not designate permitted sender hosts) x-microsoft-antispam-message-info: h3K/ADUJb6jzRFvmpux/rVaKBO9pL3ChYL3s5BpDts+n5RLEV1FX63V0ebWxUgea6abgkyIlrSPYFJ0dlYj6EY/83mA5BEB/Vhun4KhYphT+ytBmwbokONwL4YbnnJPdrRE/XffuO+swQXZrj2xZUosc2cCXEZeMdJAFAK2Hmtd/T9H2XY8yDsNtStaFmQxmx89IitiCZK2NasTWAMjS7KrCTDXiCF/P3tIrDyhBcCPV/NNzm9jS25ga3IA11B3OtSAzyb6PUUWZK4dkKMoGjV/+OfkC/9iZ6y0oaQmB4+nUN2tZ1CqYTWyCZaj1XyAjMligw7df/BEDhsLzxFAu8b7oqg1RUHIYA+JFiikWxhQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aj.MitsubishiElectric.co.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 1ffecd45-eb1f-4522-f31c-08d60da97afe X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Aug 2018 12:17:22.6477 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c5a75b62-4bff-4c96-a720-6621ce9978e5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB0762 Subject: [LTSI-dev] [PATCH 45/54] tracing: Don't add flag strings when displaying variable references X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP Variable references should never have flags appended when displayed - prevent that from happening. Before: # cat /sys/kernel/debug/tracing/events/sched/sched_switch/trigger hist:keys=next_pid:vals=hitcount:wakeup_lat=common_timestamp.usecs-$ts0.usecs:... After: hist:keys=next_pid:vals=hitcount:wakeup_lat=common_timestamp.usecs-$ts0:... Link: http://lkml.kernel.org/r/913318a5610ef6b24af2522575f671fa6ee19b6b.1522256721.git.tom.zanussi@linux.intel.com Signed-off-by: Tom Zanussi Signed-off-by: Steven Rostedt (VMware) (cherry picked from commit 76690945f59e2f329f148e1266d9d13800629463) Signed-off-by: Hirotaka MOTAI --- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 4f4792f4..d867502a 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -2047,17 +2047,17 @@ static const char *get_hist_field_flags(struct hist_field *hist_field) static void expr_field_str(struct hist_field *field, char *expr) { if (field->flags & HIST_FIELD_FL_VAR_REF) strcat(expr, "$"); strcat(expr, hist_field_name(field, 0)); - if (field->flags) { + if (field->flags && !(field->flags & HIST_FIELD_FL_VAR_REF)) { const char *flags_str = get_hist_field_flags(field); if (flags_str) { strcat(expr, "."); strcat(expr, flags_str); } } }