From patchwork Wed Dec 10 16:38:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 5470801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4486FBEEA8 for ; Wed, 10 Dec 2014 16:41:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 560B720121 for ; Wed, 10 Dec 2014 16:41:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5557E20114 for ; Wed, 10 Dec 2014 16:40:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XykHz-0007Vx-Pn; Wed, 10 Dec 2014 16:38:59 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XykHu-0007NM-PX for linux-arm-kernel@lists.infradead.org; Wed, 10 Dec 2014 16:38:55 +0000 Received: by mail-wi0-f169.google.com with SMTP id r20so13895556wiv.0 for ; Wed, 10 Dec 2014 08:38:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=s02fASUePeChtxe/mdv0G/oAwFPjbSeR56ZuJeCiESc=; b=ROawGK4DCsKxYO66nyig4RP0I3RJezwpVjOD0OBFDCg/gYGcck4iD8GRi80hPpP4r/ MFtsYixZvdGNgKOrHuvCgRMj6TYHdBvgyX/ob2Finr376q/KXxM4fim6kxrIpemaO8to 8KRwiom05c70cRQL+sIgdccjiRRztj2DLPdEqCTDnIW/YEOOp295sRrArwmoJNddLcga 8+lvoDraGnZ8SKFpF1GkJw/M8MfjmBhWot1fPBJnaKD74bmilnRuk+ilzs5evhjgnLIP W/SFknXmEy3EzWwruCCmtmndvhxuXeNT8aNJXG3qMvsU95cbAJRb7cB1CSmrHhiSy66z l18w== X-Gm-Message-State: ALoCoQlkNRXM6NAT0mJj6EisV0opdVrW/vQ4UpJKFe7r6M6kuoxHnyLLMzR7EAvCUMeUSqQoZVUi X-Received: by 10.194.87.100 with SMTP id w4mr8296624wjz.65.1418229512447; Wed, 10 Dec 2014 08:38:32 -0800 (PST) Received: from linaro.org (marmot.wormnet.eu. [2a03:9800:10:2d:3203:b3a5:8bdc:5b68]) by mx.google.com with ESMTPSA id ck7sm6516598wjb.13.2014.12.10.08.38.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 10 Dec 2014 08:38:31 -0800 (PST) Date: Wed, 10 Dec 2014 16:38:18 +0000 From: Steve Capper To: David Long Subject: Re: [PATCH v3 0/5] ARM64: Add kernel probes(Kprobes) support Message-ID: <20141210163817.GA27500@linaro.org> References: <547F242D.1060705@redhat.com> <547F94B0.1000902@linaro.org> <547FB5DD.901@redhat.com> <547FCB73.1010707@linaro.org> <54803ADD.2090201@hitachi.com> <54804B1F.3020703@hitachi.com> <20141209133340.GA20265@linaro.org> <548706C6.2050105@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <548706C6.2050105@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141210_083854_984366_5A5AD337 X-CRM114-Status: GOOD ( 25.67 ) X-Spam-Score: -0.7 (/) Cc: "Jon Medhurst \(Tixy\)" , Russell King , Ananth N Mavinakayanahalli , Sandeepa Prabhu , Catalin Marinas , Will Deacon , "linux-kernel@vger.kernel.org" , Anil S Keshavamurthy , Masami Hiramatsu , William Cohen , David Miller , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Dec 09, 2014 at 09:27:18AM -0500, David Long wrote: > On 12/09/14 08:33, Steve Capper wrote: > >On Thu, Dec 04, 2014 at 08:53:03PM +0900, Masami Hiramatsu wrote: [...] > > > >Not sure if this is helpful, but the following also caused a crash for > >me: > > > >echo "p:trace_event_buffer_lock_reserve trace_event_buffer_lock_reserve" > /sys/kernel/debug/tracing/kprobe_events > >echo "p:memcpy memcpy" >> /sys/kernel/debug/tracing/kprobe_events > >echo 1 > /sys/kernel/debug/tracing/events/kprobes/enable > > > >[immediate crash] > > > >The crash point for me is in the arm64 ASID allocator, it again looks > >like the interrupts are in an unexpected state. > >(check_and_switch_context goes down the irqs disabled code path, I > >think incorrectly). > > > >This occurred for me both with and without the proposed irq saving fix. > > > >I will do some more digging. > > > > Thanks, more information is good. > Hi, Some good news, I think I've fixed the problem I've been experiencing. Basically, I've torn out all the interrupt save/restore and have narrowed the scope to just sandwich the instruction single-step. This simplifies a lot of logic, and I've now been able to perf record a kprobe on memcpy (and the trace_event_buffer_lock_reserve + memcpy test) without any issues on a Juno platform. I may have been somewhat over-zealous with the chainsaw, so please do put this fix through its paces. Cheers, --- Steve From d3f4d80ce19bec71bd03209beb2fbfd8084d6543 Mon Sep 17 00:00:00 2001 From: Steve Capper Date: Mon, 1 Dec 2014 11:30:10 +0000 Subject: [PATCH] Fix the interrupt handling for kprobes --- arch/arm64/kernel/kprobes.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c index be7c330..d39d826 100644 --- a/arch/arm64/kernel/kprobes.c +++ b/arch/arm64/kernel/kprobes.c @@ -229,10 +229,6 @@ skip_singlestep_missed(struct kprobe_ctlblk *kcb, struct pt_regs *regs) { /* set return addr to next pc to continue */ instruction_pointer(regs) += sizeof(kprobe_opcode_t); - - if (kcb->kprobe_status != KPROBE_REENTER) - kprobes_restore_local_irqflag(regs); - } static void __kprobes setup_singlestep(struct kprobe *p, @@ -259,7 +255,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, spsr_set_debug_flag(regs, 0); /* IRQs and single stepping do not mix well. */ - local_irq_disable(); + kprobes_save_local_irqflag(regs); kernel_enable_single_step(regs); instruction_pointer(regs) = slot; } else { @@ -326,7 +322,6 @@ post_kprobe_handler(struct kprobe_ctlblk *kcb, struct pt_regs *regs) } reset_current_kprobe(); - kprobes_restore_local_irqflag(regs); } int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr) @@ -380,8 +375,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr) return 1; break; - default: - break; } return 0; } @@ -446,7 +439,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs) * handling of this interrupt is appropriate. * Return back to original instruction, and continue. */ - kprobes_restore_local_irqflag(regs); return; } else if (cur) { /* We probably hit a jprobe. Call its break handler. */ @@ -459,7 +451,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs) /* breakpoint is removed, now in a race * Return back to original instruction & continue. */ - kprobes_restore_local_irqflag(regs); } } @@ -485,6 +476,7 @@ kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr) retval = kprobe_ss_hit(kcb, instruction_pointer(regs)); if (retval == DBG_HOOK_HANDLED) { + kprobes_restore_local_irqflag(regs); kernel_disable_single_step(); if (kcb->kprobe_status == KPROBE_REENTER) @@ -499,7 +491,6 @@ kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr) static int __kprobes kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr) { - kprobes_save_local_irqflag(regs); kprobe_handler(regs); return DBG_HOOK_HANDLED; } @@ -563,7 +554,6 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) memcpy((void *)stack_addr, kcb->jprobes_stack, MIN_STACK_SIZE(stack_addr)); preempt_enable_no_resched(); - kprobes_restore_local_irqflag(regs); return 1; } return 0; @@ -655,8 +645,6 @@ trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) kfree(ri); } - kprobes_restore_local_irqflag(regs); - /* return 1 so that post handlers not called */ return 1; }