From patchwork Thu Jul 6 12:49:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ding Tianhong X-Patchwork-Id: 107142 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2065383qge; Thu, 6 Jul 2017 05:50:59 -0700 (PDT) X-Received: by 10.99.49.20 with SMTP id x20mr25847692pgx.181.1499345459585; Thu, 06 Jul 2017 05:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499345459; cv=none; d=google.com; s=arc-20160816; b=O8c80P/e0nUISqX9tR9mdFuWMDgBT3m3uEYAlHP1McCsQmziRi9ZWrHdsQyjkIfUp1 oY1j2uSPY7uigyuBhZz6oh0Dn6Y/57FBBau1fkOFDuArA4PTqbWVVoZvYMPGnSsfAH/N UYViJYAJHSMTEtc8Ezx9JK36CJxbw5h44Yerdy7HGu+MNKAwY7O5tCo+yqa9MmhOuAj3 ssYg+ujYJAY15ePt+egYkuHXqeznOzFwd1+2hKX9YPC90sYQx7QMVvLvwohfxgi5pTyt s3HyBPZ5q3WIv6l/Dxc5Ze1NEsQbTTumCbuenoMZIpbNChwXufvZXjdcDKybwJmSA3nD /4oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:date:message-id:subject:from:to :arc-authentication-results; bh=BW2trdsJy+/8H0i51CEzXnzn/7v/+UQNyZAgTqwA9bQ=; b=K1+2zzM1JObphZEpj6787/KXzY1l3XV4Poa1vBnzBWpJMjSxHjzdJLBs3R7y+8olB4 SEXacTf6vrOLBINoEHFRUYc/Rxlw1fjCKGd1/VOBpsAUZGo1gEVWajixvBxj5g6svIyF 8kmXEZn/qvgBq08NtYe8sVrhFbjBLK1i8nxJppB1lhKAQ3RoV2K+biX2xURspGbp+uCT K9d2Ygc3yjTOYpBwTKfpYOJGMUhE3JSdsQSgsmbGwJK8X0nAMTqCmkZ12Bh/BVzmQbjz UA9lrDJ1NDKhADAXcHZZJUVY2zrIXIyx0LyTXQbbGCu6PmHbHKIDPMZ5O4B7NXtF9knF tRHA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 190si5117pfy.271.2017.07.06.05.50.59; Thu, 06 Jul 2017 05:50:59 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbdGFMug (ORCPT + 25 others); Thu, 6 Jul 2017 08:50:36 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:9802 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbdGFMug (ORCPT ); Thu, 6 Jul 2017 08:50:36 -0400 Received: from 172.30.72.53 (EHLO DGGEML401-HUB.china.huawei.com) ([172.30.72.53]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AQP66841; Thu, 06 Jul 2017 20:49:44 +0800 (CST) Received: from [127.0.0.1] (10.177.23.32) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server id 14.3.301.0; Thu, 6 Jul 2017 20:49:35 +0800 To: Mark Rutland , Marc Zyngier , Catalin Marinas , Will Deacon , LinuxArm , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" From: Ding Tianhong Subject: [PATCH] arm64: arch_timer: fix the infinite recursion when enable ftrace and erratum workaround Message-ID: <43ec809d-b8f2-eb73-8ad6-9966cf67625f@huawei.com> Date: Thu, 6 Jul 2017 20:49:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 X-Originating-IP: [10.177.23.32] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.595E31EA.0056, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 9f2e7ae7b4ecd2ce895e24230727116b Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When enable preempt and ftrace, and perform the following steps, the system will hang: mount -t debugfs nodev /sys/kernel/debug/ cd /sys/kernel/debug/tracing/ echo function_graph > current_tracer This is because the preempt_disable and preempt_enable calls would cause infinite recursion for some chips which needs the timer erratum workaround and the system will hang, so use the preempt_disable/enable_notrace calls to prevent recursion. Fixes: 6acc71ccac71 ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs") Signed-off-by: Ding Tianhong --- arch/arm64/include/asm/arch_timer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.0 diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 74d08e4..67bb7a4 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -65,13 +65,13 @@ struct arch_timer_erratum_workaround { u64 _val; \ if (needs_unstable_timer_counter_workaround()) { \ const struct arch_timer_erratum_workaround *wa; \ - preempt_disable(); \ + preempt_disable_notrace(); \ wa = __this_cpu_read(timer_unstable_counter_workaround); \ if (wa && wa->read_##reg) \ _val = wa->read_##reg(); \ else \ _val = read_sysreg(reg); \ - preempt_enable(); \ + preempt_enable_notrace(); \ } else { \ _val = read_sysreg(reg); \ } \