From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753534AbdDMIus convert rfc822-to-8bit (ORCPT ); Thu, 13 Apr 2017 04:50:48 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:39232 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750746AbdDMIuq (ORCPT ); Thu, 13 Apr 2017 04:50:46 -0400 Date: Thu, 13 Apr 2017 08:50:33 +0000 From: "Naveen N. Rao" Subject: Re: [PATCH v2 4/5] powerpc: kprobes: factor out code to emulate instruction into a helper To: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Ingo Molnar , Michael Ellerman References: <6058a453bd013d5fad41201c01915889cccb0ac6.1491991939.git.naveen.n.rao@linux.vnet.ibm.com> <20170413133448.d13e8489238b4dc8bee9471c@kernel.org> In-Reply-To: <20170413133448.d13e8489238b4dc8bee9471c@kernel.org> User-Agent: astroid/0.8 (https://github.com/astroidmail/astroid) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT X-TM-AS-MML: disable x-cbid: 17041308-0008-0000-0000-00000554F225 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17041308-0009-0000-0000-000013618AD3 Message-Id: <1492073293.wa42fra50w.astroid@naverao1-tp.none> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-13_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704130073 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Excerpts from Masami Hiramatsu's message of April 13, 2017 10:04: > On Wed, 12 Apr 2017 16:28:27 +0530 > "Naveen N. Rao" wrote: > >> This helper will be used in a subsequent patch to emulate instructions >> on re-entering the kprobe handler. No functional change. > > In this case, please merge this patch into the next patch which > actually uses the factored out function unless that changes > too much. In hindsight, this patch actually just refactors the code so that the helper can be re-used subsequently. Using the helper constitutes a separate unrelated change, so I'm keeping this patch as is. I am updating the description to convey this better. - Naveen > > Thank you, > >> >> Acked-by: Ananth N Mavinakayanahalli >> Signed-off-by: Naveen N. Rao >> --- >> arch/powerpc/kernel/kprobes.c | 52 ++++++++++++++++++++++++++----------------- >> 1 file changed, 31 insertions(+), 21 deletions(-) >> >> diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c >> index 0732a0291ace..8b48f7d046bd 100644 >> --- a/arch/powerpc/kernel/kprobes.c >> +++ b/arch/powerpc/kernel/kprobes.c >> @@ -207,6 +207,35 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, >> regs->link = (unsigned long)kretprobe_trampoline; >> } >> >> +int __kprobes try_to_emulate(struct kprobe *p, struct pt_regs *regs) >> +{ >> + int ret; >> + unsigned int insn = *p->ainsn.insn; >> + >> + /* regs->nip is also adjusted if emulate_step returns 1 */ >> + ret = emulate_step(regs, insn); >> + if (ret > 0) { >> + /* >> + * Once this instruction has been boosted >> + * successfully, set the boostable flag >> + */ >> + if (unlikely(p->ainsn.boostable == 0)) >> + p->ainsn.boostable = 1; >> + } else if (ret < 0) { >> + /* >> + * We don't allow kprobes on mtmsr(d)/rfi(d), etc. >> + * So, we should never get here... but, its still >> + * good to catch them, just in case... >> + */ >> + printk("Can't step on instruction %x\n", insn); >> + BUG(); >> + } else if (ret == 0) >> + /* This instruction can't be boosted */ >> + p->ainsn.boostable = -1; >> + >> + return ret; >> +} >> + >> int __kprobes kprobe_handler(struct pt_regs *regs) >> { >> struct kprobe *p; >> @@ -302,18 +331,9 @@ int __kprobes kprobe_handler(struct pt_regs *regs) >> >> ss_probe: >> if (p->ainsn.boostable >= 0) { >> - unsigned int insn = *p->ainsn.insn; >> + ret = try_to_emulate(p, regs); >> >> - /* regs->nip is also adjusted if emulate_step returns 1 */ >> - ret = emulate_step(regs, insn); >> if (ret > 0) { >> - /* >> - * Once this instruction has been boosted >> - * successfully, set the boostable flag >> - */ >> - if (unlikely(p->ainsn.boostable == 0)) >> - p->ainsn.boostable = 1; >> - >> if (p->post_handler) >> p->post_handler(p, regs, 0); >> >> @@ -321,17 +341,7 @@ int __kprobes kprobe_handler(struct pt_regs *regs) >> reset_current_kprobe(); >> preempt_enable_no_resched(); >> return 1; >> - } else if (ret < 0) { >> - /* >> - * We don't allow kprobes on mtmsr(d)/rfi(d), etc. >> - * So, we should never get here... but, its still >> - * good to catch them, just in case... >> - */ >> - printk("Can't step on instruction %x\n", insn); >> - BUG(); >> - } else if (ret == 0) >> - /* This instruction can't be boosted */ >> - p->ainsn.boostable = -1; >> + } >> } >> prepare_singlestep(p, regs); >> kcb->kprobe_status = KPROBE_HIT_SS; >> -- >> 2.12.1 >> > > > -- > Masami Hiramatsu > >