From patchwork Thu Oct 1 16:37:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 54378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id D45EF23010 for ; Thu, 1 Oct 2015 16:54:28 +0000 (UTC) Received: by labjk1 with SMTP id jk1sf39701307lab.0 for ; Thu, 01 Oct 2015 09:54:27 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=nbin1tJ/BNMkGYhpMH7oYyk7Ui34NsbzBKScEhkxZlw=; b=SE69xvBw5r/BbTdlwNGw1VsrgP5GFQliMmjlsd8bgmfaudW5dd1IG9xZI/SLycFpvp j0JSw0Uh6o8xgWp5z6pT1F4//CVlJTTEq/oWY0TG6uzQouJkxXfU+itMEACaS/1mTICd CW9SSCxPfUQKXStZ84E4LgUQMMpzn2gwIhw+0EQHUO2WRAMnSgKbG6MQvhbjOOd9SpoP eu9m9ZLkesKHY42TA9rtuQ/g7TUIJKUXu7V8M5n16uaRZWKQxn523ogubLZFHDeejiUX JJwyOPMfLWj+am6a/BCYb+iOtlpLRfHF7NwOTWvj+XAuxJkUJAYJgOrJyDLUvHJvqQLY cqrg== X-Gm-Message-State: ALoCoQlQMq1cP9oJqYTxhQy+wYgxEtXVtSGxcdRlEnwGTrom7CbwDH1OIv/FJ5PkH+i1MMuJbMiU X-Received: by 10.180.208.7 with SMTP id ma7mr682662wic.5.1443718467295; Thu, 01 Oct 2015 09:54:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.150.207 with SMTP id y198ls142327lfd.107.gmail; Thu, 01 Oct 2015 09:54:27 -0700 (PDT) X-Received: by 10.25.22.146 with SMTP id 18mr2167514lfw.8.1443718467115; Thu, 01 Oct 2015 09:54:27 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id az8si3288704lbc.148.2015.10.01.09.54.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 09:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbwr8 with SMTP id r8so12844552lbw.2 for ; Thu, 01 Oct 2015 09:54:26 -0700 (PDT) X-Received: by 10.112.180.230 with SMTP id dr6mr3285886lbc.72.1443718466662; Thu, 01 Oct 2015 09:54:26 -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.112.59.35 with SMTP id w3csp723360lbq; Thu, 1 Oct 2015 09:54:25 -0700 (PDT) X-Received: by 10.68.94.165 with SMTP id dd5mr4659128pbb.59.1443718465409; Thu, 01 Oct 2015 09:54:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k3si10138453pbq.107.2015.10.01.09.54.25; Thu, 01 Oct 2015 09:54:25 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753472AbbJAQyX (ORCPT + 30 others); Thu, 1 Oct 2015 12:54:23 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35639 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752698AbbJAQyV (ORCPT ); Thu, 1 Oct 2015 12:54:21 -0400 Received: by pacfv12 with SMTP id fv12so81220904pac.2 for ; Thu, 01 Oct 2015 09:54:21 -0700 (PDT) X-Received: by 10.68.98.99 with SMTP id eh3mr13426888pbb.126.1443718460878; Thu, 01 Oct 2015 09:54:20 -0700 (PDT) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id zn9sm7671749pac.48.2015.10.01.09.54.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 09:54:19 -0700 (PDT) From: Yang Shi To: rostedt@goodmis.org, catalin.marinas@arm.com, will.deacon@arm.com, dave.long@linaro.org, panand@redhat.com Cc: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [v2 PATCH] arm64: replace read_lock to rcu lock in call_break_hook Date: Thu, 1 Oct 2015 09:37:37 -0700 Message-Id: <1443717457-31461-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 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: yang.shi@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.171 as permitted sender) smtp.mailfrom=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: , BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:917 in_atomic(): 0, irqs_disabled(): 128, pid: 342, name: perf 1 lock held by perf/342: #0: (break_hook_lock){+.+...}, at: [] call_break_hook+0x34/0xd0 irq event stamp: 62224 hardirqs last enabled at (62223): [] __call_rcu.constprop.59+0x104/0x270 hardirqs last disabled at (62224): [] vprintk_emit+0x68/0x640 softirqs last enabled at (0): [] copy_process.part.8+0x428/0x17f8 softirqs last disabled at (0): [< (null)>] (null) CPU: 0 PID: 342 Comm: perf Not tainted 4.1.6-rt5 #4 Hardware name: linux,dummy-virt (DT) Call trace: [] dump_backtrace+0x0/0x128 [] show_stack+0x20/0x30 [] dump_stack+0x7c/0xa0 [] ___might_sleep+0x174/0x260 [] __rt_spin_lock+0x28/0x40 [] rt_read_lock+0x60/0x80 [] call_break_hook+0x30/0xd0 [] brk_handler+0x30/0x98 [] do_debug_exception+0x50/0xb8 Exception stack(0xffffffc00514fe30 to 0xffffffc00514ff50) fe20: 00000000 00000000 c1594680 0000007f fe40: ffffffff ffffffff 92063940 0000007f 0550dcd8 ffffffc0 00000000 00000000 fe60: 0514fe70 ffffffc0 000be1f8 ffffffc0 0514feb0 ffffffc0 0008948c ffffffc0 fe80: 00000004 00000000 0514fed0 ffffffc0 ffffffff ffffffff 9282a948 0000007f fea0: 00000000 00000000 9282b708 0000007f c1592820 0000007f 00083914 ffffffc0 fec0: 00000000 00000000 00000010 00000000 00000064 00000000 00000001 00000000 fee0: 005101e0 00000000 c1594680 0000007f c1594740 0000007f ffffffd8 ffffff80 ff00: 00000000 00000000 00000000 00000000 c1594770 0000007f c1594770 0000007f ff20: 00665e10 00000000 7f7f7f7f 7f7f7f7f 01010101 01010101 00000000 00000000 ff40: 928e4cc0 0000007f 91ff11e8 0000007f call_break_hook is called in atomic context (hard irq disabled), so replace the sleepable lock to rcu lock and replace relevant list operations to rcu version. Signed-off-by: Yang Shi --- v1-> v2 Replace list operations to rcu version. arch/arm64/kernel/debug-monitors.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index cebf786..cf0e4fc 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -276,14 +276,14 @@ static DEFINE_RWLOCK(break_hook_lock); void register_break_hook(struct break_hook *hook) { write_lock(&break_hook_lock); - list_add(&hook->node, &break_hook); + list_add_rcu(&hook->node, &break_hook); write_unlock(&break_hook_lock); } void unregister_break_hook(struct break_hook *hook) { write_lock(&break_hook_lock); - list_del(&hook->node); + list_del_rcu(&hook->node); write_unlock(&break_hook_lock); } @@ -292,11 +292,11 @@ static int call_break_hook(struct pt_regs *regs, unsigned int esr) struct break_hook *hook; int (*fn)(struct pt_regs *regs, unsigned int esr) = NULL; - read_lock(&break_hook_lock); - list_for_each_entry(hook, &break_hook, node) + rcu_read_lock(); + list_for_each_entry_rcu(hook, &break_hook, node) if ((esr & hook->esr_mask) == hook->esr_val) fn = hook->fn; - read_unlock(&break_hook_lock); + rcu_read_unlock(); return fn ? fn(regs, esr) : DBG_HOOK_ERROR; }