From patchwork Fri May 9 21:51:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Bassel X-Patchwork-Id: 29927 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9B79220534 for ; Fri, 9 May 2014 21:52:56 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kq14sf3959444pab.2 for ; Fri, 09 May 2014 14:52:55 -0700 (PDT) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=MJq7v5N5CJJF/bOmDysj/rEo1NL4te1loWKasxnby0s=; b=CE2xQcoH5yhevNsFxXntdzn+8t5sAdGKi4o4PfwimN+PRkOAAjR8FTcoPo4bUOx9jW wGXE5A3I+zQWgQVV/eo26Mu41V//FoxFOCc8ePGn0KtjAWEIOt0+660NEeu3sbEl+nga CMPZMT/GF5VJA3b1tvVl6wCteUlifRuzWYNdELpGXhvAk3WjZLew/MliqA/nepm7gq/D 7ofWyjJLqrY9xijMJt0TpI8blh2nhYYyU5pBrKx4VddbpEKmvAgHkOKUhPES1OC6cwkC oRKUIqscvm8YmEJb4RrDTwOFkoH4ws7Oazkn0W1wfv2tlq2y2pQZpjZJtNhi8iEUjblj jFJQ== X-Gm-Message-State: ALoCoQnizjIbHKk2IaECf90N1w+uPgrG9NbJNZ5l8ayN5966fBlrobxKZAzhoLn+JKLGLsy42w2n X-Received: by 10.66.65.142 with SMTP id x14mr6526172pas.14.1399672375831; Fri, 09 May 2014 14:52:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.72 with SMTP id i66ls544601qgf.78.gmail; Fri, 09 May 2014 14:52:55 -0700 (PDT) X-Received: by 10.221.37.1 with SMTP id tc1mr3183865vcb.32.1399672375669; Fri, 09 May 2014 14:52:55 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id u5si928323vdo.112.2014.05.09.14.52.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 May 2014 14:52:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ld13so5409733vcb.26 for ; Fri, 09 May 2014 14:52:55 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr9952814vcb.19.1399672375575; Fri, 09 May 2014 14:52:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp1317vcb; Fri, 9 May 2014 14:52:55 -0700 (PDT) X-Received: by 10.66.190.73 with SMTP id go9mr25381288pac.18.1399672374687; Fri, 09 May 2014 14:52:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ov9si2880712pbc.84.2014.05.09.14.52.49; Fri, 09 May 2014 14:52:49 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757241AbaEIVwd (ORCPT + 27 others); Fri, 9 May 2014 17:52:33 -0400 Received: from mail-ob0-f177.google.com ([209.85.214.177]:34977 "EHLO mail-ob0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757881AbaEIVwJ (ORCPT ); Fri, 9 May 2014 17:52:09 -0400 Received: by mail-ob0-f177.google.com with SMTP id gq1so5380968obb.36 for ; Fri, 09 May 2014 14:52:09 -0700 (PDT) X-Received: by 10.60.179.80 with SMTP id de16mr17024500oec.69.1399672329178; Fri, 09 May 2014 14:52:09 -0700 (PDT) Received: from localhost.localdomain (adsl-71-136-229-99.dsl.sndg02.pacbell.net. [71.136.229.99]) by mx.google.com with ESMTPSA id pz8sm5213561obc.11.2014.05.09.14.52.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 May 2014 14:52:08 -0700 (PDT) From: Larry Bassel To: catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, khilman@linaro.org, Larry Bassel Subject: [PATCH v3 2/2] arm64: enable context tracking Date: Fri, 9 May 2014 14:51:50 -0700 Message-Id: <1399672310-9061-3-git-send-email-larry.bassel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399672310-9061-1-git-send-email-larry.bassel@linaro.org> References: <1399672310-9061-1-git-send-email-larry.bassel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: larry.bassel@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.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Make calls to ct_user_enter when the kernel is exited and ct_user_exit when the kernel is entered (in el0_da, el0_ia, el0_svc, el0_irq and all of the "error" paths). These macros expand to function calls which will only work properly if el0_sync and related code has been rearranged (in a previous patch of this series). The calls to ct_user_exit are made after hw debugging has been enabled (enable_dbg). The call to ct_user_enter is made at the beginning of the kernel_exit macro. This patch is based on earlier work by Kevin Hilman. Signed-off-by: Kevin Hilman Signed-off-by: Larry Bassel --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/thread_info.h | 1 + arch/arm64/kernel/entry.S | 49 ++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e6e4d37..152d92b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -55,6 +55,7 @@ config ARM64 select RTC_LIB select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE + select HAVE_CONTEXT_TRACKING help ARM 64-bit (AArch64) Linux support. diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 720e70b..301ea6a 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -108,6 +108,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_SINGLESTEP 21 #define TIF_32BIT 22 /* 32bit process */ #define TIF_SWITCH_MM 23 /* deferred switch_mm */ +#define TIF_NOHZ 24 #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 136bb7d..c839bab 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -30,6 +30,44 @@ #include /* + * Context tracking subsystem. Used to instrument transitions + * between user and kernel mode. + */ + .macro ct_user_exit, save = 0 +#ifdef CONFIG_CONTEXT_TRACKING + bl context_tracking_user_exit + .if \save == 1 + /* + * save/restore needed during syscalls. Restore syscall arguments from + * the values already saved on stack during kernel_entry + */ + ldp x0, x1, [sp] + ldp x2, x3, [sp, #S_X2] + ldp x4, x5, [sp, #S_X4] + ldp x6, x7, [sp, #S_X6] + .endif +#endif + .endm + + .macro ct_user_enter, save = 0 +#ifdef CONFIG_CONTEXT_TRACKING + .if \save == 1 + /* + * save/restore only needed on syscall fastpath, which uses + * x0-x2 + */ + push x2, x3 + push x0, x1 + .endif + bl context_tracking_user_enter + .if \save == 1 + pop x0, x1 + pop x2, x3 + .endif +#endif + .endm + +/* * Bad Abort numbers *----------------- */ @@ -88,6 +126,7 @@ .macro kernel_exit, el, ret = 0 ldp x21, x22, [sp, #S_PC] // load ELR, SPSR .if \el == 0 + ct_user_enter \ret ldr x23, [sp, #S_SP] // load return stack pointer .endif .if \ret @@ -425,6 +464,7 @@ el0_da: enable_dbg // enable interrupts before calling the main handler enable_irq + ct_user_exit mov x0, x26 bic x0, x0, #(0xff << 56) mov x1, x25 @@ -441,6 +481,7 @@ el0_ia: enable_dbg // enable interrupts before calling the main handler enable_irq + ct_user_exit mov x0, x26 orr x1, x25, #1 << 24 // use reserved ISS bit for instruction aborts mov x2, sp @@ -450,6 +491,7 @@ el0_fpsimd_acc: /* * Floating Point or Advanced SIMD access */ + ct_user_exit mov x0, x25 mov x1, sp adr lr, ret_from_exception @@ -458,6 +500,7 @@ el0_fpsimd_exc: /* * Floating Point or Advanced SIMD exception */ + ct_user_exit mov x0, x25 mov x1, sp adr lr, ret_from_exception @@ -472,6 +515,7 @@ el0_sp_pc: enable_dbg // enable interrupts before calling the main handler enable_irq + ct_user_exit mov x0, x26 mov x1, x25 mov x2, sp @@ -484,6 +528,7 @@ el0_undef: mov x26, sp // enable interrupts before calling the main handler enable_irq + ct_user_exit mov x0, x26 adr lr, ret_from_exception b do_undefinstr @@ -494,12 +539,14 @@ el0_dbg: tbnz x24, #0, el0_inv // EL0 only mrs x26, far_el1 disable_step x1 + ct_user_exit mov x0, x26 mov x1, x25 mov x2, sp adr lr, ret_from_exception b do_debug_exception el0_inv: + ct_user_exit mov x0, sp mov x1, #BAD_SYNC mrs x2, esr_el1 @@ -518,6 +565,7 @@ el0_irq_naked: bl trace_hardirqs_off #endif + ct_user_exit irq_handler get_thread_info tsk @@ -640,6 +688,7 @@ el0_svc_naked: // compat entry point isb enable_dbg enable_irq + ct_user_exit 1 get_thread_info tsk ldr x16, [tsk, #TI_FLAGS] // check for syscall tracing