Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1354795imm; Wed, 1 Aug 2018 14:35:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdXOL0r/QJqBJsQbcnSecinD4cy5irE5UqC5fCP2TpnatgHrjOGI1Y3icQ0/6YLilL3AM1d X-Received: by 2002:a17:902:3a2:: with SMTP id d31-v6mr31387pld.287.1533159307854; Wed, 01 Aug 2018 14:35:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533159307; cv=none; d=google.com; s=arc-20160816; b=u7/g9EZWVjGQj6Sv6ttmtkdlZ3tt02fxFJG4QgjF7zHFpleBvpaaDvxc5V8C1QfEd8 PDYLOl6m/NHonIBuyXCn/DSrXUrlSr3YvPtk1S0E2kVq4RYZVm3QY/pih0Mwmp+UfirK CsfZBo6LeC2kyrMZM7Lgc37qQHDBwTi/3Nr+o1MZ7FgtZYiD37j073jOVAMvuduiuDmV JsD32Uw7obWXXvacJ1FFJrKpULgDCZJ1KELtfdACb+55ZpYtduHUFuq/8EHcRqaWuxsC 9hmnuIrYv+BXre2lLTCdDrU2qwCu/9K+3eqEWBcI4cTOskuAsKCBaAsMlHhfszUxEH3h McxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=la4u2tBuLgNlnOC2k6pkZsdl6HQTMYKTn4E0rD9rvIM=; b=Un3dOK+RTRPyqJvdQkfswWjqNIqMB/CzwFpnojTKfGIEdZUrx5mQG7GXZWD7fbxfAq gPubhA5H9sxn2PUrwr6AZM7W7IEGSsWfAl66a7bdrzXUzaD7h0zNludZ2Me3FU1TaEPW 73bKEdijWfitfivKzvkFNrXZ0Zt9GvGpaErPf9eaB9l0pPMgq5jy/hNu5S2wkp8YjFA7 dgV16rHyEGU4zR+2TRRd7EcZMz2AuNUpmZH0FvEGOptBpUcGOIxpQC3JyljFlBO9QUJL WSMdvjmbHy43VlmkU+jm88ZFecIJPAslIDdUWA4Uj+bPQEqKd41cww1qd1N3bSdEt37o 4HRw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9-v6si31830plt.302.2018.08.01.14.34.53; Wed, 01 Aug 2018 14:35:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732378AbeHAXVq (ORCPT + 99 others); Wed, 1 Aug 2018 19:21:46 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:42186 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725881AbeHAXVq (ORCPT ); Wed, 1 Aug 2018 19:21:46 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w71LOAsY086863 for ; Wed, 1 Aug 2018 17:33:59 -0400 Received: from e11.ny.us.ibm.com (e11.ny.us.ibm.com [129.33.205.201]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kkjfm5q2y-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 01 Aug 2018 17:33:59 -0400 Received: from localhost by e11.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Aug 2018 17:33:58 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e11.ny.us.ibm.com (146.89.104.198) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 1 Aug 2018 17:33:52 -0400 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w71LXqKb10420718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 1 Aug 2018 21:33:52 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B53AAC05F; Wed, 1 Aug 2018 17:34:30 -0400 (EDT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0119AC059; Wed, 1 Aug 2018 17:34:25 -0400 (EDT) Received: from kermit-br-ibm-com.ibmmodules.com (unknown [9.80.99.86]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 1 Aug 2018 17:34:25 -0400 (EDT) From: Murilo Opsfelder Araujo To: linux-kernel@vger.kernel.org Cc: "Alastair D'Silva" , Andrew Donnellan , Balbir Singh , Benjamin Herrenschmidt , Christophe Leroy , Cyril Bur , "Eric W . Biederman" , Joe Perches , Michael Ellerman , Michael Neuling , Murilo Opsfelder Araujo , Nicholas Piggin , Paul Mackerras , Simon Guo , Sukadev Bhattiprolu , "Tobin C . Harding" , linuxppc-dev@lists.ozlabs.org, Segher Boessenkool Subject: [PATCH v4 1/6] powerpc/traps: Print unhandled signals in a separate function Date: Wed, 1 Aug 2018 18:33:15 -0300 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801213320.11203-1-muriloo@linux.ibm.com> References: <20180801213320.11203-1-muriloo@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18080121-2213-0000-0000-000002D313CA X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009468; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01068949; UDB=6.00549596; IPR=6.00847297; MB=3.00022446; MTD=3.00000008; XFM=3.00000015; UTC=2018-08-01 21:33:56 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080121-2214-0000-0000-00005B0BE884 Message-Id: <20180801213320.11203-2-muriloo@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-01_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1808010217 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Isolate the logic of printing unhandled signals out of _exception_pkey(). No functional change, only code rearrangement. Signed-off-by: Murilo Opsfelder Araujo --- arch/powerpc/kernel/traps.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 0e17dcb48720..cbd3dc365193 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -301,26 +301,32 @@ void user_single_step_siginfo(struct task_struct *tsk, info->si_addr = (void __user *)regs->nip; } +static void show_signal_msg(int signr, struct pt_regs *regs, int code, + unsigned long addr) +{ + const char fmt32[] = KERN_INFO "%s[%d]: unhandled signal %d " \ + "at %08lx nip %08lx lr %08lx code %x\n"; + const char fmt64[] = KERN_INFO "%s[%d]: unhandled signal %d " \ + "at %016lx nip %016lx lr %016lx code %x\n"; + + if (show_unhandled_signals && unhandled_signal(current, signr)) { + printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32, + current->comm, current->pid, signr, + addr, regs->nip, regs->link, code); + } +} void _exception_pkey(int signr, struct pt_regs *regs, int code, - unsigned long addr, int key) + unsigned long addr, int key) { siginfo_t info; - const char fmt32[] = KERN_INFO "%s[%d]: unhandled signal %d " \ - "at %08lx nip %08lx lr %08lx code %x\n"; - const char fmt64[] = KERN_INFO "%s[%d]: unhandled signal %d " \ - "at %016lx nip %016lx lr %016lx code %x\n"; if (!user_mode(regs)) { die("Exception in kernel mode", regs, signr); return; } - if (show_unhandled_signals && unhandled_signal(current, signr)) { - printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32, - current->comm, current->pid, signr, - addr, regs->nip, regs->link, code); - } + show_signal_msg(signr, regs, code, addr); if (arch_irqs_disabled() && !arch_irq_disabled_regs(regs)) local_irq_enable(); -- 2.17.1