From patchwork Wed Nov 27 02:53:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 21798 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C0B8202DA for ; Wed, 27 Nov 2013 02:54:01 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at1sf21346353iec.7 for ; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=HIgEqiAMTf0lsaFIMMCbkBN6RtH3sFgrhl1XMaf1iCo=; b=NNNAXdHRrjdUj1DZNSLOkp6DbOJlqEeGPxMUmzZQVGtMgRchf5B02Vcxq5SczgUd1z hNsxnrJChs4tkdUzx6IC2BO5tGaZ4/JBM2Hklkgn0QmWBXeRrxmre2xjFU3sVp8YzVnW fmRBM63V36SlAS7Hf/ZNVaSVsDjJdTt7zzyYQkxuXPHR7XmFdBI/+1AoeJK1Q2X93d9M 6rP3S4BqfmqEXV4RfSL9ieHtU0uj664cAk9fVM6sZSJItNPDcNCi+gotRxBc6HuQXuE/ YIOA0CREJ0Y0dZkjIdhvd9TTFyAl1x7x7hZKhYQhOU3sXVBQRc8fR+vU5iqVAdpj2i9G lB/Q== X-Gm-Message-State: ALoCoQnmupLkYc1QE7gU2AilD1z5pIWfzoSewM+9yLZlOGV9T2kVgNso9LB8xpCizrSB/Gvu1gLB X-Received: by 10.182.204.33 with SMTP id kv1mr11791235obc.26.1385520840752; Tue, 26 Nov 2013 18:54:00 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.41 with SMTP id nl9ls2923925qeb.56.gmail; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Received: by 10.58.178.239 with SMTP id db15mr33446218vec.9.1385520840591; Tue, 26 Nov 2013 18:54:00 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id a15si20404782vew.7.2013.11.26.18.54.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:54:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ia6so4451962vcb.18 for ; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Received: by 10.221.19.5 with SMTP id qi5mr31792416vcb.15.1385520840508; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp254150vcz; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Received: by 10.49.117.196 with SMTP id kg4mr62301877qeb.21.1385520840095; Tue, 26 Nov 2013 18:54:00 -0800 (PST) Received: from mail-qa0-f54.google.com (mail-qa0-f54.google.com [209.85.216.54]) by mx.google.com with ESMTPS id e10si13096737qae.189.2013.11.26.18.54.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:54:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.54 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.54; Received: by mail-qa0-f54.google.com with SMTP id f11so9774620qae.6 for ; Tue, 26 Nov 2013 18:54:00 -0800 (PST) X-Received: by 10.49.98.35 with SMTP id ef3mr4417689qeb.30.1385520839930; Tue, 26 Nov 2013 18:53:59 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id fc16sm56880235qeb.3.2013.11.26.18.53.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:53:58 -0800 (PST) From: David Long To: linux-arm-kernel@lists.infradead.org, Russell King Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org Subject: [PATCH v3 13/15] ARM: Add an emulate flag to the kprobes/uprobes instruction decode functions Date: Tue, 26 Nov 2013 21:53:32 -0500 Message-Id: <1385520814-10663-14-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1385520814-10663-1-git-send-email-dave.long@linaro.org> References: <1385520814-10663-1-git-send-email-dave.long@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: dave.long@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "David A. Long" Add an emulate flag into the instruction interpreter, primarily for uprobes support. Signed-off-by: David A. Long --- arch/arm/kernel/kprobes.c | 3 ++- arch/arm/kernel/kprobes.h | 1 + arch/arm/kernel/probes-arm.c | 4 ++-- arch/arm/kernel/probes-arm.h | 2 +- arch/arm/kernel/probes-thumb.c | 8 ++++---- arch/arm/kernel/probes-thumb.h | 4 ++-- arch/arm/kernel/probes.c | 32 +++++++++++++++++++++++--------- arch/arm/kernel/probes.h | 2 +- 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c index 0d9d49b..04690f9 100644 --- a/arch/arm/kernel/kprobes.c +++ b/arch/arm/kernel/kprobes.c @@ -87,7 +87,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) p->opcode = insn; p->ainsn.insn = tmp_insn; - switch ((*decode_insn)(insn, &p->ainsn, actions)) { + switch ((*decode_insn)(insn, &p->ainsn, + true, actions)) { case INSN_REJECTED: /* not supported */ return -EINVAL; diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/kernel/kprobes.h index e1305a8..580d82c 100644 --- a/arch/arm/kernel/kprobes.h +++ b/arch/arm/kernel/kprobes.h @@ -35,6 +35,7 @@ kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_specific_insn *asi, typedef enum probes_insn (kprobe_decode_insn_t)(kprobe_opcode_t, struct arch_specific_insn *, + bool, const union decode_item *); #ifdef CONFIG_THUMB2_KERNEL diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/kernel/probes-arm.c index a44c3ad..01e99f7 100644 --- a/arch/arm/kernel/probes-arm.c +++ b/arch/arm/kernel/probes-arm.c @@ -723,10 +723,10 @@ static void __kprobes arm_singlestep(probes_opcode_t insn, */ enum probes_insn __kprobes arm_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *actions) + bool emulate, const union decode_item *actions) { asi->insn_singlestep = arm_singlestep; asi->insn_check_cc = probes_condition_checks[insn>>28]; return probes_decode_insn(insn, asi, probes_decode_arm_table, false, - actions); + emulate, actions); } diff --git a/arch/arm/kernel/probes-arm.h b/arch/arm/kernel/probes-arm.h index 7f81199..904033c 100644 --- a/arch/arm/kernel/probes-arm.h +++ b/arch/arm/kernel/probes-arm.h @@ -66,7 +66,7 @@ void __kprobes simulate_mov_ipsp(probes_opcode_t opcode, extern const union decode_item probes_decode_arm_table[]; enum probes_insn arm_probes_decode_insn(probes_opcode_t, - struct arch_specific_insn *, + struct arch_specific_insn *, bool emulate, const union decode_item *actions); #endif diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/kernel/probes-thumb.c index 3f250e9..2ad0880 100644 --- a/arch/arm/kernel/probes-thumb.c +++ b/arch/arm/kernel/probes-thumb.c @@ -861,20 +861,20 @@ static void __kprobes thumb32_singlestep(probes_opcode_t opcode, enum probes_insn __kprobes thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *actions) + bool emulate, const union decode_item *actions) { asi->insn_singlestep = thumb16_singlestep; asi->insn_check_cc = thumb_check_cc; return probes_decode_insn(insn, asi, probes_decode_thumb16_table, true, - actions); + emulate, actions); } enum probes_insn __kprobes thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *actions) + bool emulate, const union decode_item *actions) { asi->insn_singlestep = thumb32_singlestep; asi->insn_check_cc = thumb_check_cc; return probes_decode_insn(insn, asi, probes_decode_thumb32_table, true, - actions); + emulate, actions); } diff --git a/arch/arm/kernel/probes-thumb.h b/arch/arm/kernel/probes-thumb.h index 556f067..78be667 100644 --- a/arch/arm/kernel/probes-thumb.h +++ b/arch/arm/kernel/probes-thumb.h @@ -87,9 +87,9 @@ extern const union decode_item probes_decode_thumb16_table[]; enum probes_insn __kprobes thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *actions); + bool emulate, const union decode_item *actions); enum probes_insn __kprobes thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *actions); + bool emulate, const union decode_item *actions); #endif diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c index a0a4220..e691e12 100644 --- a/arch/arm/kernel/probes.c +++ b/arch/arm/kernel/probes.c @@ -193,7 +193,7 @@ void __kprobes probes_emulate_none(probes_opcode_t opcode, */ static probes_opcode_t __kprobes prepare_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - bool thumb) + bool thumb) { #ifdef CONFIG_THUMB2_KERNEL if (thumb) { @@ -218,7 +218,7 @@ prepare_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, */ static void __kprobes set_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - bool thumb) + bool thumb) { #ifdef CONFIG_THUMB2_KERNEL if (thumb) { @@ -253,7 +253,7 @@ set_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, * non-zero value, the corresponding nibble in pinsn is validated and modified * according to the type. */ -static bool __kprobes decode_regs(probes_opcode_t *pinsn, u32 regs) +static bool __kprobes decode_regs(probes_opcode_t *pinsn, u32 regs, bool modify) { probes_opcode_t insn = *pinsn; probes_opcode_t mask = 0xf; /* Start at least significant nibble */ @@ -317,9 +317,16 @@ static bool __kprobes decode_regs(probes_opcode_t *pinsn, u32 regs) /* Replace value of nibble with new register number... */ insn &= ~mask; insn |= new_bits & mask; + if (modify) { + /* Replace value of nibble with new register number */ + insn &= ~mask; + insn |= new_bits & mask; + } } - *pinsn = insn; + if (modify) + *pinsn = insn; + return true; reject: @@ -380,14 +387,15 @@ static const int decode_struct_sizes[NUM_DECODE_TYPES] = { */ int __kprobes probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *table, bool thumb, - const union decode_item *actions) + const union decode_item *table, bool thumb, + bool emulate, const union decode_item *actions) { struct decode_header *h = (struct decode_header *)table; struct decode_header *next; bool matched = false; - insn = prepare_emulated_insn(insn, asi, thumb); + if (emulate) + insn = prepare_emulated_insn(insn, asi, thumb); for (;; h = next) { enum decode_type type = h->type_regs.bits & DECODE_TYPE_MASK; @@ -402,7 +410,7 @@ probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, if (!matched && (insn & h->mask.bits) != h->value.bits) continue; - if (!decode_regs(&insn, regs)) + if (!decode_regs(&insn, regs, emulate)) return INSN_REJECTED; switch (type) { @@ -415,7 +423,8 @@ probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, case DECODE_TYPE_CUSTOM: { struct decode_custom *d = (struct decode_custom *)h; - return actions[d->decoder.bits].decoder(insn, asi, h); + return actions[d->decoder.bits].decoder(insn, + asi, h); } case DECODE_TYPE_SIMULATE: { @@ -426,6 +435,11 @@ probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, case DECODE_TYPE_EMULATE: { struct decode_emulate *d = (struct decode_emulate *)h; + + if (!emulate) + return actions[d->handler.bits].decoder(insn, + asi, h); + asi->insn_handler = actions[d->handler.bits].handler; set_emulated_insn(insn, asi, thumb); return INSN_GOOD; diff --git a/arch/arm/kernel/probes.h b/arch/arm/kernel/probes.h index 9591c2c..233ab7b 100644 --- a/arch/arm/kernel/probes.h +++ b/arch/arm/kernel/probes.h @@ -389,7 +389,7 @@ probes_insn_handler_t probes_emulate_none; int __kprobes probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, - const union decode_item *table, bool thumb, + const union decode_item *table, bool thumb, bool emulate, const union decode_item *actions); #endif