From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180062-2-14304469126809172638 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180062; b=S40WXnEBU2h2Bu1qYvrTmixprFQw9oTEEJX5xc5CVNWd0KC im+l0IXLJ+YAact8uCgyaZnYq0ZNkRB0GjkzmkrJ3HVG4PLoNLqPej263sNKRppn IKqhClL3wXXDEzmtTqbECQxX+BD+ffdYSqECE/RZcvKbZl6pltU9ILgg4LiKUqzN MUZewTmWzeEZLFpV7F0gA+8eHfGDoUxOa6K92/RN3gebUW5E/9WN8gJML6vcNahc Lxnu0+SYC4qCBY1EHne3P6/azvbEE6R/LGaVjqPvyLTPVzlimm2mXHuyqfgjVckF GK1Ubfb2j8dalv3pumpFP/eX9bo/asSZIn1P3iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180062; bh=BjeBu8 wy4UiZUxuT9vopws//vajypcWTdus4i6rOLSo=; b=uWHp9uEZZ1g737y7cKnMs4 iNKXzaJMh39B2wXg4cawg6tVBIt/C8v9QLN8JJADa6dONIp3qDmAxqVbG9TToYWZ oKir2i5Yencxs/IV0Fz+sQmNSyWHwPE5oTSomiPQCbdgkTBwP4iEIQb8Cu/XE8vO FvAALIgTO96bAcPRajP3vw1jusp1wrdc6wsjusG5HotBiCsbb4sxzAFLP4JMSXs0 bLAzeMlkiOfjLf+k4AOkA9Wt34V1BYoiKflGsqPssdqLlGSp2RszBvyxkERpslSh xpu/3OPIoatmSKkgsTrVNq8yDM9TBKVzZMekwXx+cudZ60LN3C6vUat1PgeaML2Q == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FxDKdzPn x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FxDKdzPn x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080AbeA1WyS (ORCPT ); Sun, 28 Jan 2018 17:54:18 -0500 Received: from mail-sn1nam02on0134.outbound.protection.outlook.com ([104.47.36.134]:55568 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753684AbeA1W2a (ORCPT ); Sun, 28 Jan 2018 17:28:30 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Jiri Olsa , Adrian Hunter , Andi Kleen , David Ahern , "Namhyung Kim" , Wang Nan , "Arnaldo Carvalho de Melo" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 09/49] perf top: Fix window dimensions change handling Thread-Topic: [PATCH AUTOSEL for 4.9 09/49] perf top: Fix window dimensions change handling Thread-Index: AQHTmIc1I+Bewq0il0mJ1qMGt7eRGQ== Date: Sun, 28 Jan 2018 22:27:41 +0000 Message-ID: <20180128222727.22404-9-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1017;7:O6gJNkpM++h9QTCLHJHD+sfeUOQt12ZPZA3l73TdchmBXGkGBB0zxDHZX8aw1ZqBDeB83hEfg9zGUtR8vUEIFXXMm/VTlrpvT8tyz8UaxGHZ+TAj9pTA2KvZdRpEcIDlUvH8upmCgTEGOHzPo+5W0KyFcMJJ/+/vbwVtl1bojC3SZC8Mny0WOWHWCj0oi9KWhmoPZsLJYGOM4abOBNOZYrb2v4wTzKZ4vGr9sz/7gDBWdu4kVs4ATREK8FpKUCRE x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f6c04ce4-e721-4129-d1d8-08d5669e7174 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1017; x-ms-traffictypediagnostic: MW2PR2101MB1017: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(50582790962513)(85827821059158)(42068640409301)(84791874153150)(104084551191319)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231101)(944501161)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB1017;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1017; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(189003)(199004)(59450400001)(81156014)(6666003)(305945005)(2900100001)(76176011)(68736007)(86612001)(3660700001)(8676002)(3280700002)(6506007)(102836004)(6116002)(105586002)(7736002)(2950100002)(3846002)(1076002)(106356001)(36756003)(5660300001)(2906002)(8936002)(66066001)(10090500001)(6486002)(6512007)(25786009)(53936002)(186003)(316002)(6436002)(86362001)(575784001)(14454004)(478600001)(6306002)(2501003)(966005)(5250100002)(72206003)(39060400002)(99286004)(97736004)(107886003)(4326008)(54906003)(81166006)(110136005)(26005)(10290500003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1017;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: kNBUxdVxK4fRE0N6O04ZPOWdumn312l3+RLLlLzg0cs7NKTGQu0vBad6CmZg2FOH7P1zialwm46EBkf2cJKUsw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6c04ce4-e721-4129-d1d8-08d5669e7174 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:41.5891 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1017 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Jiri Olsa [ Upstream commit 89d0aeab4252adc2a7ea693637dd21c588bfa2d1 ] The stdio perf top crashes when we change the terminal window size. The reason is that we assumed we get the perf_top pointer as a signal handler argument which is not the case. Changing the SIGWINCH handler logic to change global resize variable, which is checked in the main thread loop. Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Tested-by: Ravi Bangoria Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ysuzwz77oev1ftgvdscn9bpu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-top.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 0b613e701736..c61e012e9771 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -73,6 +73,7 @@ #include =20 static volatile int done; +static volatile int resize; =20 #define HEADER_LINE_NR 5 =20 @@ -82,10 +83,13 @@ static void perf_top__update_print_entries(struct perf_= top *top) } =20 static void perf_top__sig_winch(int sig __maybe_unused, - siginfo_t *info __maybe_unused, void *arg) + siginfo_t *info __maybe_unused, void *arg __maybe_unused) { - struct perf_top *top =3D arg; + resize =3D 1; +} =20 +static void perf_top__resize(struct perf_top *top) +{ get_term_dimensions(&top->winsize); perf_top__update_print_entries(top); } @@ -472,7 +476,7 @@ static bool perf_top__handle_keypress(struct perf_top *= top, int c) .sa_sigaction =3D perf_top__sig_winch, .sa_flags =3D SA_SIGINFO, }; - perf_top__sig_winch(SIGWINCH, NULL, top); + perf_top__resize(top); sigaction(SIGWINCH, &act, NULL); } else { signal(SIGWINCH, SIG_DFL); @@ -1003,6 +1007,11 @@ static int __cmd_top(struct perf_top *top) =20 if (hits =3D=3D top->samples) ret =3D perf_evlist__poll(top->evlist, 100); + + if (resize) { + perf_top__resize(top); + resize =3D 0; + } } =20 ret =3D 0; --=20 2.11.0