From patchwork Tue May 6 23:32:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Bassel X-Patchwork-Id: 29743 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 C4117202E6 for ; Tue, 6 May 2014 23:33:01 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf1034702iec.7 for ; Tue, 06 May 2014 16:33:01 -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=8AwVs517/0NqeDU5hZi3OCRyQhvADtxVKZjy4oiIWWs=; b=PR3543UfwnYJnRg01OWdh4CvZFklgGhmr6KG94dpEaMfkTwxPuXnsABEaNBgpzE8wN ZxUKU889K/rnKNC3C7tcwnTvLL2TjxPwaVQad3B5nh81AYqEJ0vIx1JJn/1RpVeNnjH3 IR24cRY5GqtklGkv2LHRgB7SiK6kfc2zXDPsnqxuomFtpHMiKoiFWTrxvow+333/nzOv 6/ssytc438x6QLORKcejdAyMH8Nefnvm3VaBnyrxWZeEmfSYkjluKSuof2OJtuScePk2 ozRLyCb9GO982KC7njWLEz27YHyBr+RP+tfr7joCSKb5Ixqs3GVaUTrdDVhktg3E5qjL 2qRA== X-Gm-Message-State: ALoCoQnsXblUYUIc85n4hUdAiI7KZ1sF2qgtE9sFyrqD7mXx4OoPFvkmpj+SYwtqzsM4WwWoQp71 X-Received: by 10.42.229.194 with SMTP id jj2mr1036769icb.18.1399419181166; Tue, 06 May 2014 16:33:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.72 with SMTP id j66ls1396631qge.99.gmail; Tue, 06 May 2014 16:33:01 -0700 (PDT) X-Received: by 10.221.64.80 with SMTP id xh16mr3226667vcb.35.1399419181058; Tue, 06 May 2014 16:33:01 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id uv3si2286042vdc.77.2014.05.06.16.33.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 May 2014 16:33:00 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so249827veb.31 for ; Tue, 06 May 2014 16:33:00 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr9112335vec.28.1399419180863; Tue, 06 May 2014 16:33:00 -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 ib8csp263223vcb; Tue, 6 May 2014 16:33:00 -0700 (PDT) X-Received: by 10.66.240.4 with SMTP id vw4mr11733303pac.26.1399419179809; Tue, 06 May 2014 16:32:59 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ap2si827117pbc.218.2014.05.06.16.32.59; Tue, 06 May 2014 16:32:59 -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 S1754300AbaEFXcy (ORCPT + 27 others); Tue, 6 May 2014 19:32:54 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:61803 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701AbaEFXcq (ORCPT ); Tue, 6 May 2014 19:32:46 -0400 Received: by mail-qc0-f169.google.com with SMTP id e16so243244qcx.14 for ; Tue, 06 May 2014 16:32:45 -0700 (PDT) X-Received: by 10.224.119.131 with SMTP id z3mr13095135qaq.91.1399419165887; Tue, 06 May 2014 16:32:45 -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 104sm17635231qgq.1.2014.05.06.16.32.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 May 2014 16:32:45 -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 v2 2/2] arm64: enable context tracking Date: Tue, 6 May 2014 16:32:29 -0700 Message-Id: <1399419149-26685-3-git-send-email-larry.bassel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399419149-26685-1-git-send-email-larry.bassel@linaro.org> References: <1399419149-26685-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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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). 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). In order to avoid saving registers, the slow syscall path is forced (as x86 does). 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 | 22 ++++++++++++++++++++++ 3 files changed, 24 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 d920d7f..5fe447c 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -30,6 +30,22 @@ #include /* + * Context tracking subsystem. Used to instrument transitions + * between user and kernel mode. + */ + .macro ct_user_exit +#ifdef CONFIG_CONTEXT_TRACKING + bl context_tracking_user_exit +#endif + .endm + + .macro ct_user_enter +#ifdef CONFIG_CONTEXT_TRACKING + bl context_tracking_user_enter +#endif + .endm + +/* * Bad Abort numbers *----------------- */ @@ -88,6 +104,7 @@ .macro kernel_exit, el, ret = 0 ldp x21, x22, [sp, #S_PC] // load ELR, SPSR .if \el == 0 + ct_user_enter ldr x23, [sp, #S_SP] // load return stack pointer .endif .if \ret @@ -427,6 +444,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 @@ -443,6 +461,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 @@ -511,6 +530,7 @@ el0_irq_naked: bl trace_hardirqs_off #endif + ct_user_exit irq_handler get_thread_info tsk @@ -633,10 +653,12 @@ el0_svc_naked: // compat entry point isb enable_dbg enable_irq + ct_user_exit get_thread_info tsk ldr x16, [tsk, #TI_FLAGS] // check for syscall tracing tbnz x16, #TIF_SYSCALL_TRACE, __sys_trace // are we tracing syscalls? + tbnz x16, #TIF_NOHZ, __sys_trace adr lr, ret_fast_syscall // return address cmp scno, sc_nr // check upper syscall limit b.hs ni_sys