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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 AE568C3A5A0 for ; Tue, 20 Aug 2019 00:09:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EBBB22CE8 for ; Tue, 20 Aug 2019 00:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566259783; bh=3dePchIXUrHARNvoOUntsAh0qrfK9lM9QkGh3Z6XwXo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=oVqV6zUXVZgUQ7hJ6OcmQKRwdAm/XXInm0e5gomYnTX21JtxX0ZaNdzv+2akea+hN iHPc7+1XufPTP3d1TGNUiuPRSszAMhsm3r4gIA6P1La3ceEZoWmszCyyu4fFn5JkPF 76xM61OrEmUJQKUT6KLKzKrI2tsS8Fk2xzeL9tZw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728772AbfHTAJm (ORCPT ); Mon, 19 Aug 2019 20:09:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:39134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728578AbfHTAJm (ORCPT ); Mon, 19 Aug 2019 20:09:42 -0400 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FDC02087E; Tue, 20 Aug 2019 00:09:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566259781; bh=3dePchIXUrHARNvoOUntsAh0qrfK9lM9QkGh3Z6XwXo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=asBsoarRoTvoLiVFt3+6TN9ttHcpCBbaKi0T2wz6/m7GAH1tqy4MWMmFLOhED4cK3 qqtSRzJQSaez3m8UMAWsjKj54yK2lF4gBVmrDXmygSG1/UeQhQqf2x5QatOGhp9pgK hf+Sv8OU67xeW3NyS67PCYvJOf7nczxq91oNirvQ= Date: Tue, 20 Aug 2019 09:09:35 +0900 From: Masami Hiramatsu To: Jisheng Zhang Cc: Catalin Marinas , Will Deacon , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , "David S. Miller" , Anil S Keshavamurthy , "Naveen N. Rao" , Steven Rostedt , "x86@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 2/4] kprobes/x86: use instruction_pointer and instruction_pointer_set Message-Id: <20190820090935.a8357e7f8531340c054275f2@kernel.org> In-Reply-To: <20190819192543.32cec143@xhacker.debian> References: <20190819192422.5ed79702@xhacker.debian> <20190819192543.32cec143@xhacker.debian> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 19 Aug 2019 11:36:48 +0000 Jisheng Zhang wrote: > This is to make the kprobe_ftrace_handler() common, so we can move it > to common code in next patch. > BTW, this patch looks good, without next patch. Could you update the patch description and resend it with my Ack? Acked-by: Masami Hiramatsu Thank you, > Signed-off-by: Jisheng Zhang > --- > arch/x86/kernel/kprobes/ftrace.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/kprobes/ftrace.c b/arch/x86/kernel/kprobes/ftrace.c > index 681a4b36e9bb..c2ad0b9259ca 100644 > --- a/arch/x86/kernel/kprobes/ftrace.c > +++ b/arch/x86/kernel/kprobes/ftrace.c > @@ -28,9 +28,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, > if (kprobe_running()) { > kprobes_inc_nmissed_count(p); > } else { > - unsigned long orig_ip = regs->ip; > + unsigned long orig_ip = instruction_pointer(regs); > /* Kprobe handler expects regs->ip = ip + 1 as breakpoint hit */ > - regs->ip = ip + sizeof(kprobe_opcode_t); > + instruction_pointer_set(regs, ip + sizeof(kprobe_opcode_t)); > > __this_cpu_write(current_kprobe, p); > kcb->kprobe_status = KPROBE_HIT_ACTIVE; > @@ -39,12 +39,13 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, > * Emulate singlestep (and also recover regs->ip) > * as if there is a 5byte nop > */ > - regs->ip = (unsigned long)p->addr + MCOUNT_INSN_SIZE; > + instruction_pointer_set(regs, > + (unsigned long)p->addr + MCOUNT_INSN_SIZE); > if (unlikely(p->post_handler)) { > kcb->kprobe_status = KPROBE_HIT_SSDONE; > p->post_handler(p, regs, 0); > } > - regs->ip = orig_ip; > + instruction_pointer_set(regs, orig_ip); > } > /* > * If pre_handler returns !0, it changes regs->ip. We have to > -- > 2.23.0.rc1 > -- Masami Hiramatsu