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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 90CE5C43381 for ; Fri, 1 Mar 2019 14:17:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A8CD2084D for ; Fri, 1 Mar 2019 14:17:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ej2MhdpK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A8CD2084D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1kTwQWgz6q25GvM/mO5UOA4e9PeNdMuMngClMyzO1VQ=; b=Ej2MhdpKvs3yPu /Pm5Ctbr+IHct07pyfk9vfN1MgNOxB4dB6s6Hm1UkWuPvRoIGj//fl+V576neQ+ytqaNLbt0I1Xo5 8DWhNuib7T17bAfaOTB1EhJDWUw18nmmmLRwgFFBEWttpZ56EfvIQJfywMr0TNKphmyipG+RtB9kK R/X4Ad1VKCYQIwmHiEZxWb0ZBqVACMz1UEYCH+OOvmlUsoyAlb7J70kqcToOAGMfke9y5+2AuX3MX l1e2Dy85WI7Mn3vCXd0a3rwZ6KgFdfdtQHf7ZyhAZxN7UAl+wckAKvvhGLJu82g40SPRlRAF/ubaF Q4Wv4Q87rrqcbCJL5tsw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gziyU-0005mb-Oz; Fri, 01 Mar 2019 14:17:18 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gziyR-0005mB-Ow for linux-arm-kernel@lists.infradead.org; Fri, 01 Mar 2019 14:17:17 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 77CD4A78; Fri, 1 Mar 2019 06:17:15 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AF85B3F720; Fri, 1 Mar 2019 06:17:14 -0800 (PST) Date: Fri, 1 Mar 2019 14:17:12 +0000 From: Mark Rutland To: Will Deacon Subject: Re: [PATCH 10/10] arm64: debug: Clean up brk_handler() Message-ID: <20190301141712.GK15517@lakrids.cambridge.arm.com> References: <20190301132809.24653-1-will.deacon@arm.com> <20190301132809.24653-11-will.deacon@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190301132809.24653-11-will.deacon@arm.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190301_061715_824190_D6B63756 X-CRM114-Status: GOOD ( 14.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 01, 2019 at 01:28:09PM +0000, Will Deacon wrote: > brk_handler() now looks pretty strange and can be refactored to drop its > funny 'handler_found' local variable altogether. > > Signed-off-by: Will Deacon Reviewed-by: Mark Rutland Mark. > --- > arch/arm64/kernel/debug-monitors.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c > index 55d46ed6ccc2..480d2fa0ac78 100644 > --- a/arch/arm64/kernel/debug-monitors.c > +++ b/arch/arm64/kernel/debug-monitors.c > @@ -328,14 +328,12 @@ NOKPROBE_SYMBOL(call_break_hook); > static int brk_handler(unsigned long unused, unsigned int esr, > struct pt_regs *regs) > { > - bool handler_found = false; > - > - if (!handler_found && call_break_hook(regs, esr) == DBG_HOOK_HANDLED) > - handler_found = true; > + if (call_break_hook(regs, esr) == DBG_HOOK_HANDLED) > + return 0; > > - if (!handler_found && user_mode(regs)) { > + if (user_mode(regs)) { > send_user_sigtrap(TRAP_BRKPT); > - } else if (!handler_found) { > + } else { > pr_warn("Unexpected kernel BRK exception at EL1\n"); > return -EFAULT; > } > -- > 2.11.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel