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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 B5699C3A5A0 for ; Tue, 20 Aug 2019 00:09:50 +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 8803322CE8 for ; Tue, 20 Aug 2019 00:09:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fUfIv1VE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="asBsoarR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8803322CE8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:Mime-Version:References:In-Reply-To: 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=MYyQ0tt6CJwNC2KlgRw1DnWxcAoa5oY+sOZAc5gxdNs=; b=fUfIv1VEbZKIks 3/N77YfvzQe63UopdqfcsxrSiytuLo1aH+xxGHStY8dzeaqdPWix1U5WJlxmEFKQYSv12SCB8Dkh9 56Gl7wqHuouJOONlOliSYJpVOjInMbaeZo45XVMQX5+DpNRpvYKbDzvHyQkIovIcmuwN+8vzvBCRS ymxiD6b8PHrM2D/AlwH65PYvvFv+zIqnPFsh/xQadmb9ppsJGTaV+RFaHFjejoahNB9M8WEbOtp8g gjNVSiGyNR4vIsbfRCf8OwfJ7drEdW9qMRKIyjEwERh6DL4cd3zt11ztmAsi0P8LxvsL7iaBP+BXN 2U7ZEkqXgeJUv2ftelQw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hzriZ-0003CK-UR; Tue, 20 Aug 2019 00:09:43 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hzriX-0003Bx-Dj for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2019 00:09:42 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190819_170941_486896_25A9E180 X-CRM114-Status: GOOD ( 16.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , "x86@kernel.org" , "linux-kernel@vger.kernel.org" , Anil S Keshavamurthy , Ingo Molnar , Borislav Petkov , Steven Rostedt , "H. Peter Anvin" , "Naveen N. Rao" , Thomas Gleixner , Will Deacon , "David S. Miller" , "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 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel