From patchwork Sun Jan 11 04:03:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 42942 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4164F218E0 for ; Sun, 11 Jan 2015 04:03:29 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z12sf7480384lbi.2 for ; Sat, 10 Jan 2015 20:03:28 -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=Fn3FJxx4f7i7bidaXadHA9CvnLnx8xz1+O52vS4OQQw=; b=N7lDnFa2qklF2maquwb7SPNyB7YSJ9Ldfjc2gJg8QkEPbQCO9fTMVxdmBuOSdjI8U7 m1RRDnKc8HsqL6fDPpjHpHX40VlRiOBN91Afv8Tf1mq5eM0PCQ+k64YQJTtpr6s6A59s XEp3yf4rbamvAet7+7JEziLmVdTxWgUPcJfpUw37eEHQ/vkIfclkuJR3IresaAOed6zj MDuOPnoIdBKOPvRHBKo8ZRWN2h02y7gbKhtXOPbdxvXQpe1vFlO/ggY6FrQUC0zL+Md4 UeoAsGBrRfVy2TZn7olaun05QQagEqPdFhe7EFcVQqJ5QJfrrHKL8dA7YsjbAUn9hzNN ZZsA== X-Gm-Message-State: ALoCoQkBS8nxl1B4Uoh1oROuEgg5WQvJzYDK6WQrVeOAil86SubNazi8OGm+x7xy6f44Z1PTAcys X-Received: by 10.180.98.199 with SMTP id ek7mr420329wib.1.1420949008172; Sat, 10 Jan 2015 20:03:28 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.228 with SMTP id uh4ls574209lac.108.gmail; Sat, 10 Jan 2015 20:03:27 -0800 (PST) X-Received: by 10.152.25.129 with SMTP id c1mr30344128lag.65.1420949007889; Sat, 10 Jan 2015 20:03:27 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id h2si17787540lbv.49.2015.01.10.20.03.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 10 Jan 2015 20:03:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so13385572lbi.10 for ; Sat, 10 Jan 2015 20:03:27 -0800 (PST) X-Received: by 10.112.84.225 with SMTP id c1mr29789910lbz.22.1420949007739; Sat, 10 Jan 2015 20:03:27 -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.112.9.200 with SMTP id c8csp744874lbb; Sat, 10 Jan 2015 20:03:26 -0800 (PST) X-Received: by 10.140.43.195 with SMTP id e61mr36636398qga.13.1420949006205; Sat, 10 Jan 2015 20:03:26 -0800 (PST) Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com. [209.85.216.177]) by mx.google.com with ESMTPS id k8si17960973qat.73.2015.01.10.20.03.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 10 Jan 2015 20:03:26 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.216.177 as permitted sender) client-ip=209.85.216.177; Received: by mail-qc0-f177.google.com with SMTP id x3so14255749qcv.8 for ; Sat, 10 Jan 2015 20:03:25 -0800 (PST) X-Received: by 10.224.129.132 with SMTP id o4mr38974062qas.66.1420949005608; Sat, 10 Jan 2015 20:03:25 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-249.cncdnh.fast00.myfairpoint.net. [72.71.243.249]) by mx.google.com with ESMTPSA id l91sm11357784qge.34.2015.01.10.20.03.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 10 Jan 2015 20:03:25 -0800 (PST) From: David Long To: linux-arm-kernel@lists.infradead.org, Russell King Cc: Sandeepa Prabhu , William Cohen , Steve Capper , Catalin Marinas , Will Deacon , "Jon Medhurst (Tixy)" , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/6] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature Date: Sat, 10 Jan 2015 23:03:16 -0500 Message-Id: <1420949002-3726-2-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1420949002-3726-1-git-send-email-dave.long@linaro.org> References: <1420949002-3726-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) 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 HAVE_REGS_AND_STACK_ACCESS_API feature for arm64. Signed-off-by: David A. Long --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/ptrace.h | 29 +++++++++ arch/arm64/include/uapi/asm/ptrace.h | 36 +++++++++++ arch/arm64/kernel/ptrace.c | 119 +++++++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1f9a20..12b3fd6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -64,6 +64,7 @@ config ARM64 select HAVE_PERF_EVENTS select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP + select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RCU_TABLE_FREE select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 41ed9e1..3613e49 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -111,6 +111,8 @@ struct pt_regs { u64 syscallno; }; +#define MAX_REG_OFFSET (sizeof(struct user_pt_regs) - sizeof(u64)) + #define arch_has_single_step() (1) #ifdef CONFIG_COMPAT @@ -139,11 +141,38 @@ struct pt_regs { #define user_stack_pointer(regs) \ (!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp) +/** + * regs_get_register() - get register value from its offset + * @regs: pt_regs from which register value is gotten + * @offset: offset number of the register. + * + * regs_get_register returns the value of a register whose offset from @regs. + * The @offset is the offset of the register in struct pt_regs. + * If @offset is bigger than MAX_REG_OFFSET, this returns 0. + */ +static inline u64 regs_get_register(struct pt_regs *regs, + unsigned int offset) +{ + if (unlikely(offset > MAX_REG_OFFSET)) + return 0; + return *(u64 *)((u64)regs + offset); +} + +/* Valid only for Kernel mode traps. */ +static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) +{ + return regs->ARM_sp; +} + static inline unsigned long regs_return_value(struct pt_regs *regs) { return regs->regs[0]; } +extern int regs_query_register_offset(const char *name); +extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, + unsigned int n); + /* * Are the current registers suitable for user mode? (used to maintain * security in signal handlers) diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index 6913643..700d28b 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -61,6 +61,42 @@ #ifndef __ASSEMBLY__ +#define ARM_cpsr pstate +#define ARM_pc pc +#define ARM_sp sp +#define ARM_lr regs[30] +#define ARM_fp regs[29] +#define ARM_x28 regs[28] +#define ARM_x27 regs[27] +#define ARM_x26 regs[26] +#define ARM_x25 regs[25] +#define ARM_x24 regs[24] +#define ARM_x23 regs[23] +#define ARM_x22 regs[22] +#define ARM_x21 regs[21] +#define ARM_x20 regs[20] +#define ARM_x19 regs[19] +#define ARM_x18 regs[18] +#define ARM_ip1 regs[17] +#define ARM_ip0 regs[16] +#define ARM_x15 regs[15] +#define ARM_x14 regs[14] +#define ARM_x13 regs[13] +#define ARM_x12 regs[12] +#define ARM_x11 regs[11] +#define ARM_x10 regs[10] +#define ARM_x9 regs[9] +#define ARM_x8 regs[8] +#define ARM_x7 regs[7] +#define ARM_x6 regs[6] +#define ARM_x5 regs[5] +#define ARM_x4 regs[4] +#define ARM_x3 regs[3] +#define ARM_x2 regs[2] +#define ARM_x1 regs[1] +#define ARM_x0 regs[0] +#define ARM_ORIG_x0 orig_x0 + /* * User structures for general purpose, floating point and debug registers. */ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index d882b83..9115b25 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -48,6 +48,125 @@ #define CREATE_TRACE_POINTS #include +struct pt_regs_offset { + const char *name; + int offset; +}; + +#define REG_OFFSET_NAME(r) \ + {.name = #r, .offset = offsetof(struct pt_regs, ARM_##r)} +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +static const struct pt_regs_offset regoffset_table[] = { + REG_OFFSET_NAME(x0), + REG_OFFSET_NAME(x1), + REG_OFFSET_NAME(x2), + REG_OFFSET_NAME(x3), + REG_OFFSET_NAME(x4), + REG_OFFSET_NAME(x5), + REG_OFFSET_NAME(x6), + REG_OFFSET_NAME(x7), + REG_OFFSET_NAME(x8), + REG_OFFSET_NAME(x9), + REG_OFFSET_NAME(x10), + REG_OFFSET_NAME(x11), + REG_OFFSET_NAME(x12), + REG_OFFSET_NAME(x13), + REG_OFFSET_NAME(x14), + REG_OFFSET_NAME(x15), + REG_OFFSET_NAME(ip0), + REG_OFFSET_NAME(ip1), + REG_OFFSET_NAME(x18), + REG_OFFSET_NAME(x19), + REG_OFFSET_NAME(x20), + REG_OFFSET_NAME(x21), + REG_OFFSET_NAME(x22), + REG_OFFSET_NAME(x23), + REG_OFFSET_NAME(x24), + REG_OFFSET_NAME(x25), + REG_OFFSET_NAME(x26), + REG_OFFSET_NAME(x27), + REG_OFFSET_NAME(x28), + REG_OFFSET_NAME(fp), + REG_OFFSET_NAME(lr), +/* + REG_OFFSET_NAME(ip), +*/ + REG_OFFSET_NAME(sp), + REG_OFFSET_NAME(pc), + REG_OFFSET_NAME(cpsr), + REG_OFFSET_NAME(ORIG_x0), + REG_OFFSET_END, +}; + +/** + * regs_query_register_offset() - query register offset from its name + * @name: the name of a register + * + * regs_query_register_offset() returns the offset of a register in struct + * pt_regs from its name. If the name is invalid, this returns -EINVAL; + */ +int regs_query_register_offset(const char *name) +{ + const struct pt_regs_offset *roff; + + for (roff = regoffset_table; roff->name != NULL; roff++) + if (!strcmp(roff->name, name)) + return roff->offset; + return -EINVAL; +} + +/** + * regs_query_register_name() - query register name from its offset + * @offset: the offset of a register in struct pt_regs. + * + * regs_query_register_name() returns the name of a register from its + * offset in struct pt_regs. If the @offset is invalid, this returns NULL; + */ +const char *regs_query_register_name(unsigned int offset) +{ + const struct pt_regs_offset *roff; + + for (roff = regoffset_table; roff->name != NULL; roff++) + if (roff->offset == offset) + return roff->name; + return NULL; +} + +/** + * regs_within_kernel_stack() - check the address in the stack + * @regs: pt_regs which contains kernel stack pointer. + * @addr: address which is checked. + * + * regs_within_kernel_stack() checks @addr is within the kernel stack page(s). + * If @addr is within the kernel stack, it returns true. If not, returns false. + */ +bool regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr) +{ + return ((addr & ~(THREAD_SIZE - 1)) == + (kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1))); +} + +/** + * regs_get_kernel_stack_nth() - get Nth entry of the stack + * @regs: pt_regs which contains kernel stack pointer. + * @n: stack entry number. + * + * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which + * is specified by @regs. If the @n th entry is NOT in the kernel stack, + * this returns 0. + */ +unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n) +{ + unsigned long *addr = (unsigned long *)kernel_stack_pointer(regs); + + addr += n; + if (regs_within_kernel_stack(regs, (unsigned long)addr)) + return *addr; + else + return 0; +} + /* * TODO: does not yet catch signals sent when the child dies. * in exit.c or in signal.c.