From patchwork Wed Oct 28 13:11:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 55680 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp111539lbr; Wed, 28 Oct 2015 06:11:54 -0700 (PDT) X-Received: by 10.67.14.194 with SMTP id fi2mr8825932pad.146.1446037914536; Wed, 28 Oct 2015 06:11:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sh4si70319553pac.159.2015.10.28.06.11.54; Wed, 28 Oct 2015 06:11:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965681AbbJ1NLw (ORCPT + 28 others); Wed, 28 Oct 2015 09:11:52 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:34223 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932524AbbJ1NLu (ORCPT ); Wed, 28 Oct 2015 09:11:50 -0400 Received: by wikq8 with SMTP id q8so252225479wik.1 for ; Wed, 28 Oct 2015 06:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/DqSqUUK99HlatNTPvz3AvuCW/2gNfq7BldYCzXwE1w=; b=pE9Fxx4NGC/Hhb5hjDQMtBc/9N1k0uAcelwkw7hzbAW0aCHL6WrQYhOLJSacg1/neb J1x+4ck2iYcWwC2VZZGXrV+0V8qZfWcgizu1FfUrb0GWVa41ROWzUipj06DgnXKI2Gay 2PRH5U1EAHG5Wr+IMc7fnznpq7q8brrZa+JtUz0y+k1RCCjWEZngrzF/5ZC0duXh6nHV TqMs/0H+0mQ9QsWmnD5Ft29RSe19fk+FCPj0U2FqNjNm77Pb2c2dajNEC86DM4Q4YpI6 VnJg2abO+sbTI6jkfVV1woaqHbg9lB/oIscKBvhOX9D5nw1RHtoNXzZjSnkXep0azNLj xl1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/DqSqUUK99HlatNTPvz3AvuCW/2gNfq7BldYCzXwE1w=; b=LB5c/tOCSkYIQILFxkKJGRqBUl6PVk/HQslg81D7wSYpkP2oKF/C0rVoueA9RuGiBG zQy0AQ8Z2LRM8Vfp2DBkWVmX+PO3uClCfgmLVWa8KMGyQNsZezZnZzbNQCUATrlIGSZv vmy2Qs9f5kvOfjpcXwjlKszkLkjxdpUdVkB0RXpxjeAtBSV0n14SFd2uNE25qh97Fc7q GzB1QjmXretDsIX6xHZ7u2jfKJyxETEJ+nHinhAcNKaGyNb+SOtFnBQSaj0GN2U4H9G+ c1ozfLfrKG31sbREoJfWNdCmPruEgHs3KFLaaUzl9vN+7Abzps8BDC7W8ZXKXGbwsQ14 vmdA== X-Gm-Message-State: ALoCoQkysKV4ZDqK9z2MFlxNiQy015NClEgcpp9pO7oXCxRynu+w7sD5dG8Vl9pRHLA7/Vc9Htmx X-Received: by 10.180.96.202 with SMTP id du10mr2598975wib.22.1446037909208; Wed, 28 Oct 2015 06:11:49 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id lv4sm49967344wjb.43.2015.10.28.06.11.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 06:11:48 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: Jisheng Zhang , Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard , linux-arm-kernel@lists.infradead.org (moderated list:ARM/STI ARCHITECTURE), kernel@stlinux.com (open list:ARM/STI ARCHITECTURE), linux-kernel@vger.kernel.org (open list:CLOCKSOURCE, CLOC...) Subject: [PATCH 1/8] clocksource/drivers/arm_global_timer: Prevent ftrace recursion Date: Wed, 28 Oct 2015 14:11:26 +0100 Message-Id: <1446037894-22601-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <5630C947.4020706@linaro.org> References: <5630C947.4020706@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jisheng Zhang Currently arm_global_timer can be used as a scheduler clock. We properly marked gt_sched_clock_read() as notrace but we then call another function gt_counter_read() that _wasn't_ notrace. Having a traceable function in the sched_clock() path leads to a recursion within ftrace and a kernel crash. Fix this by adding an extra notrace function to keep other users of gt_counter_read() traceable. Signed-off-by: Jisheng Zhang Signed-off-by: Daniel Lezcano --- drivers/clocksource/arm_global_timer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index 29ea50a..a2cb6fa 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -60,7 +60,7 @@ static struct clock_event_device __percpu *gt_evt; * different to the 32-bit upper value read previously, go back to step 2. * Otherwise the 64-bit timer counter value is correct. */ -static u64 gt_counter_read(void) +static u64 notrace _gt_counter_read(void) { u64 counter; u32 lower; @@ -79,6 +79,11 @@ static u64 gt_counter_read(void) return counter; } +static u64 gt_counter_read(void) +{ + return _gt_counter_read(); +} + /** * To ensure that updates to comparator value register do not set the * Interrupt Status Register proceed as follows: @@ -201,7 +206,7 @@ static struct clocksource gt_clocksource = { #ifdef CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK static u64 notrace gt_sched_clock_read(void) { - return gt_counter_read(); + return _gt_counter_read(); } #endif