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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 05E70C433E1 for ; Thu, 27 Aug 2020 06:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5DB522B47 for ; Thu, 27 Aug 2020 06:48:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="dRn11BBb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727792AbgH0GsL (ORCPT ); Thu, 27 Aug 2020 02:48:11 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:9230 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726123AbgH0GsK (ORCPT ); Thu, 27 Aug 2020 02:48:10 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07R6WXpH099752; Thu, 27 Aug 2020 02:47:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=/9/XNb+k4drSuw0ye3N+q7AQ87Ov3T4VUndBh3B43TI=; b=dRn11BBbatUw4K0KoypRMDSdCzLtqWtjTK/ICOQjJy3YMzFS/9bj4Ddlg/hdxK08oueV TcqpRd5uzlh8w3VLcYsbaVWGTmEbykoQptVcUUA1DSF8Kn3TVGw2S5LKYlTbDxkf2XWJ 70ymoDdLf4FZ31VEfIgYVVHN36plv7rgfzIU4iBNSGYcsEs/ZGcv7kv00Gs5FFQVIzh/ Mi0Nb846J9wTlJszujZOamJG6lEsXp276TU0x+6zyQ9k2benpTVuiNNkvrueyebMUoEE yXDxUa7s8BUasJYIPFWa45tcTnDjO6KXPDjxHfio7Dz1XvIS3tzEW4gkHyBzl+rlD+nj yA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3366qj9wh2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2020 02:47:51 -0400 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 07R6Wwgr101443; Thu, 27 Aug 2020 02:47:50 -0400 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 3366qj9wg5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2020 02:47:50 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07R6gnP4008163; Thu, 27 Aug 2020 06:47:48 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma06ams.nl.ibm.com with ESMTP id 332uk6dc79-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2020 06:47:47 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07R6ljns31523174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Aug 2020 06:47:45 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EEED652050; Thu, 27 Aug 2020 06:47:44 +0000 (GMT) Received: from localhost.localdomain.com (unknown [9.77.207.180]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 0712F52051; Thu, 27 Aug 2020 06:47:39 +0000 (GMT) From: Kajol Jain To: acme@kernel.org, peterz@infradead.org Cc: jolsa@redhat.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, maddy@linux.ibm.com, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, daniel@iogearbox.net, brho@google.com, srikar@linux.vnet.ibm.com, kjain@linux.ibm.com Subject: [PATCH] perf/core: Fix hung issue on perf stat command during cpu hotplug Date: Thu, 27 Aug 2020 12:17:32 +0530 Message-Id: <20200827064732.20860-1-kjain@linux.ibm.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-27_01:2020-08-27,2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 adultscore=0 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270048 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 2ed6edd33a21 ("perf: Add cond_resched() to task_function_call()") added assignment of ret value as -EAGAIN in case function call to 'smp_call_function_single' fails. For non-zero ret value, it did 'ret = !ret ? data.ret : -EAGAIN;', which always assign -EAGAIN to ret and make second if condition useless. In scenarios like when executing a perf stat with --per-thread option, and if any of the monitoring cpu goes offline, the 'smp_call_function_single' function could return -ENXIO, and with the above check, task_function_call hung and increases CPU usage (because of repeated 'smp_call_function_single()') Recration scenario: # perf stat -a --per-thread && (offline a CPU ) Patch here removes the tertiary condition added as part of that commit and added a check for NULL and -EAGAIN. Fixes: 2ed6edd33a21("perf: Add cond_resched() to task_function_call()") Signed-off-by: Kajol Jain Reported-by: Srikar Dronamraju Reviewed-by: Barret Rhoden Tested-by: Srikar Dronamraju --- kernel/events/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Changelog: - Remove RFC tag - Resolve some nits issues like space after if and added -ENXIO in comment msg of function 'task_function_call' as suggested by Barret Rhoden. Link to the RFC: https://lkml.org/lkml/2020/8/26/896 diff --git a/kernel/events/core.c b/kernel/events/core.c index 5bfe8e3c6e44..cef646084198 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -99,7 +99,7 @@ static void remote_function(void *data) * retry due to any failures in smp_call_function_single(), such as if the * task_cpu() goes offline concurrently. * - * returns @func return value or -ESRCH when the process isn't running + * returns @func return value or -ESRCH or -ENXIO when the process isn't running */ static int task_function_call(struct task_struct *p, remote_function_f func, void *info) @@ -115,7 +115,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info) for (;;) { ret = smp_call_function_single(task_cpu(p), remote_function, &data, 1); - ret = !ret ? data.ret : -EAGAIN; + if (!ret) + ret = data.ret; if (ret != -EAGAIN) break; -- 2.26.2