Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755931AbcCCIBy (ORCPT ); Thu, 3 Mar 2016 03:01:54 -0500 Received: from foss.arm.com ([217.140.101.70]:34944 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279AbcCCIBx (ORCPT ); Thu, 3 Mar 2016 03:01:53 -0500 Date: Thu, 3 Mar 2016 08:01:39 +0000 From: Marc Zyngier To: David Long Cc: Catalin Marinas , Will Deacon , Sandeepa Prabhu , William Cohen , Pratyush Anand , Steve Capper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dave P Martin , Mark Rutland , Robin Murphy , Ard Biesheuvel , Jens Wiklander , Christoffer Dall , Alex =?ISO-8859-1?Q?Benn=E9e?= , Yang Shi , Greg Kroah-Hartman , Viresh Kumar , "Suzuki K. Poulose" , Kees Cook , Zi Shen Lim , John Blackwood , Feng Kan , Balamurugan Shanmugam , James Morse , Vladimir Murzin , Mark Salyzyn , Petr Mladek , Andrew Morton , Mark Brown Subject: Re: [PATCH v10 6/9] arm64: kprobes instruction simulation support Message-ID: <20160303080139.3d415d17@arm.com> In-Reply-To: <56D7C573.8030401@linaro.org> References: <1456801047-29014-1-git-send-email-dave.long@linaro.org> <1456801047-29014-7-git-send-email-dave.long@linaro.org> <56D5D9A0.9090205@arm.com> <56D7C573.8030401@linaro.org> Organization: ARM Ltd X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3340 Lines: 91 On Thu, 3 Mar 2016 00:02:43 -0500 David Long wrote: > On 03/01/2016 01:04 PM, Marc Zyngier wrote: > > On 01/03/16 02:57, David Long wrote: > >> From: Sandeepa Prabhu > >> > >> Kprobes needs simulation of instructions that cannot be stepped > >> from different memory location, e.g.: those instructions > >> that uses PC-relative addressing. In simulation, the behaviour > >> of the instruction is implemented using a copy of pt_regs. > >> > >> Following instruction catagories are simulated: > >> - All branching instructions(conditional, register, and immediate) > >> - Literal access instructions(load-literal, adr/adrp) > >> > >> Conditional execution is limited to branching instructions in > >> ARM v8. If conditions at PSTATE do not match the condition fields > >> of opcode, the instruction is effectively NOP. Kprobes considers > >> this case as 'miss'. > >> > >> This code also replaces the use of arch/arm/opcodes.c for > >> arm_check_condition(). > > > > Outdated comment? > > > > Yeah. I'll remove it. > > >> > >> Thanks to Will Cohen for assorted suggested changes. > >> > >> Signed-off-by: Sandeepa Prabhu > >> Signed-off-by: William Cohen > >> Signed-off-by: David A. Long > >> --- > >> arch/arm64/include/asm/insn.h | 1 + > >> arch/arm64/include/asm/probes.h | 5 +- > >> arch/arm64/kernel/Makefile | 3 +- > >> arch/arm64/kernel/insn.c | 1 + > >> arch/arm64/kernel/kprobes-arm64.c | 29 +++++ > >> arch/arm64/kernel/kprobes.c | 32 +++++- > >> arch/arm64/kernel/probes-simulate-insn.c | 187 +++++++++++++++++++++++++++++++ > >> arch/arm64/kernel/probes-simulate-insn.h | 28 +++++ > >> 8 files changed, 280 insertions(+), 6 deletions(-) > >> create mode 100644 arch/arm64/kernel/probes-simulate-insn.c > >> create mode 100644 arch/arm64/kernel/probes-simulate-insn.h > >> [...] > >> +/* > >> + * instruction simulation functions > >> + */ > >> +void __kprobes > >> +simulate_adr_adrp(u32 opcode, long addr, struct pt_regs *regs) > >> +{ > >> + long imm, xn, val; > >> + > >> + xn = opcode & 0x1f; > >> + imm = ((opcode >> 3) & 0x1ffffc) | ((opcode >> 29) & 0x3); > >> + imm = sign_extend(imm, 20); > >> + if (opcode & 0x80000000) > >> + val = (imm<<12) + (addr & 0xfffffffffffff000); > >> + else > >> + val = imm + addr; > >> + > >> + regs->regs[xn] = val; > > > > What happens when you have something like "adr xzr, blah"? I haven't > > found out where you are writing that back yet, but that could be really > > fun for SP... > > > > It hadn't occurred to me that xzr could be an output register. Sigh. > That could mean a bit of repeated code to handle this special case. I > wonder what the implications would be of adding xzr to the pt_regs > structure to avoid that. xzr is not a register. It is an encoding that tells the CPU to discard the result of an operation. As such, there is no need to store it. An easy fix for this would be to have an accessor that actually checks for the register number, and only allows the range 0-30. We've used similar things in KVM for the same reasons (vcpu_get_reg/vcpu_set_reg). Thanks, M. -- Jazz is not dead. It just smells funny.