From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179032-2-3287827880543426478 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=1517179031; b=hDDZtffy9L58S0PpNM5YkwrftAyZbmQwBL4vONYOZR7TK/6 lg2phsglY0LudgAnDgkp60KqkC2im8baO8nYzVF03nT3t+wvb3ZUqRWAj74YsbBl eRaeWe021O4XxfvsWDnkQPsfF74EWATx4NkQ3VRN2NPO7taQcwTbIYTaH50S1paW JXQ8KLaCG9LO0K3bYlqypPvkOIWcB+WqAfZcctKFVEetGG9ALuJkLDHqwsQVbruY jrgwzoCq3mI8vG9RFRYhGmjHD1rohH4mF7uxbqeWypr0OhXHf+qxw2JcI8Sr3e1s wQZIl0eQ/hJ4a47o8qxNNfdA8Qlh7aQYFabISNw== 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=1517179031; bh=pPkSCr N+ywL1nPaBnGoTM047D8i3DI1mEdu8dgfvH2Q=; b=lAtRgtC/XHdFTF+Y9eKmT0 qbuHIQwav/L2U+UU1UbKewSrq8htXt5rdbEecDdpil2iRFIAMrY+Mf9kqaN5drLc ySm8GUxkobqocf7/R7eWJBMjL04u++CdIdENaUIdEHInu/xXcpreLVzB2OYCE0zo hQ68duUg4QWgc6Ukog5TSmxJy82AZ13+CT9oF9c3BM4ujRmQpIjkn5L3teYE9iMI muU+rQOZ7cR6x3Cl3Moe/Iaz1eDDy1TUt2Zyoruwe/lw8b0b2XSN6km0coDyP1vO tQaFrQwFne2kAznLUAuJOd0Ky1s7JsZd+CeGYSziRpG9bmvGJ8NjAj4Gi3tTAk3g == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=bK4Kb7Cd 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=bK4Kb7Cd 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 S932641AbeA1Wg5 (ORCPT ); Sun, 28 Jan 2018 17:36:57 -0500 Received: from mail-bl2nam02on0093.outbound.protection.outlook.com ([104.47.38.93]:45074 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932600AbeA1Wab (ORCPT ); Sun, 28 Jan 2018 17:30:31 -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 3.18 04/25] perf top: Fix window dimensions change handling Thread-Topic: [PATCH AUTOSEL for 3.18 04/25] perf top: Fix window dimensions change handling Thread-Index: AQHTmId+4CE2IBUHGUCSgGIVxEY8zw== Date: Sun, 28 Jan 2018 22:29:43 +0000 Message-ID: <20180128222931.7781-4-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-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;MW2PR2101MB1098;7:Rfd52jnHP+xMhTZUUFIkcYfmkbUUOazLEtFyTrRYa2pDBXoOUP/24S8EAt2hqJ5l+yNCjWpMNYqP3aJJj5MXLnnpwS5mKvF/n7pgnwYHmw2MerrRHij4Sy2KuxcJPNIANa0Dip/wn7afO3+tQI34YlSpzqRiIMn1fpwT5o6ALlsQJSYvVWc8Q0ALeT030yertCTxOwlGEF8oNUqQ9REl5yt7IEu5lAY1bl344XSmm5oyVKzrJZeqfTGB62gAoZJe x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 5a406496-a041-43ea-f832-08d5669ebba1 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: 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)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(966005)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(59450400001)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6306002)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(575784001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(39060400002)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: XsRDYk1JItd+CDmttd1TFn0tqB0AzDlVW60xvdrFkP40tOANz8F6SU6y5p1AAEH2XNprrP932Kfhu+mYYOJ+9Q== 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: 5a406496-a041-43ea-f832-08d5669ebba1 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:43.2654 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 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 0aa7747ff139..8e37334db4fa 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -70,6 +70,7 @@ #include =20 static volatile int done; +static volatile int resize; =20 #define HEADER_LINE_NR 5 =20 @@ -79,10 +80,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); } @@ -461,7 +465,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); @@ -997,6 +1001,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