From patchwork Thu Jul 6 08:47:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 107093 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1825376qge; Thu, 6 Jul 2017 01:48:19 -0700 (PDT) X-Received: by 10.84.215.220 with SMTP id g28mr26601843plj.281.1499330899199; Thu, 06 Jul 2017 01:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499330899; cv=none; d=google.com; s=arc-20160816; b=lUnsfu9eycNvfsO2nBfGdQGGmfLfP80s5EYrRqi6gEowU7Ocblvj9eCDxPrYJLSinB +gNVuIVQ7fqJwAeugCn8qXSOkO6rGm32Ut+DmZE3em7OyOkPtfZzrf/ourCG6zFaGvKW k4172eTLm06I2hhi/1MsoKeheSH9uh8hb6WAhQKsZURkuIfkb/AhOmvUfNgbPwMBkAwB x5gzAQcAfMRyzZW0a+i+k1dG+5hOftMJOzHEkwt78PDg6/7kRURsS+SuDYkBmPcMkmw8 var52eowGyP0KOQYTHm3F8DXaj1wY+SqquccehGvjhy987dzsKGFEvp8Aa0w5Mha1JLd x7Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=gMRUqzm509T/t5lzGA12qNuSITvdYpnL/3H4WWgIHvs=; b=NFOxWfSlrGS/oNy7wdsMJjaPMbulBppEqlVZYIz/3WalpqTupkIyy6fW+0CrYsuqWe 1+dwHzYh6YIXdSzTncPRUUAFgAOp49QGkFkDPe0XqH1zRM+H0ZUE7bqNtrSNKEGFnMjH IntaMjg0mA/OsOufKoqoFFvc1y8uqtpLwnenf4VEWJ3bDZfWvW3ciy4qa12TP5kukNKR tOLgQ6xGus4zk4XFkplcoTzKO28W3hZTIw5MJgR5cL/FTz+z+athipw0H1PVgYIfZZqc gfDjbcWrGFvNyCBrd+3Nu3+NOPBvsn2hfXFvAHIh3w4rwY2johUP1N5dWqpnAbiHKvBT RtfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=hGJNHYqo; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si1237921pld.235.2017.07.06.01.48.18; Thu, 06 Jul 2017 01:48:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=hGJNHYqo; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbdGFIsK (ORCPT + 4 others); Thu, 6 Jul 2017 04:48:10 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:35481 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbdGFIsJ (ORCPT ); Thu, 6 Jul 2017 04:48:09 -0400 Received: by mail-pf0-f177.google.com with SMTP id c73so8098451pfk.2 for ; Thu, 06 Jul 2017 01:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=lP1s5fSAEB3y9SaskyCRC417rn6zMv5SwIGlsjG3eHs=; b=hGJNHYqo2wxDLGCAjMUJ+o04M5l8Txu9uATnT8XNJlFHOJxr3pAl2KNCTUniVT/K8l dZdoiyY+zJqUo0+evEJKRMfUqUgjzzRQmEN9cJoY4qHAx5e0no/0waH52RoB+ywrCwwE V430C2KZPex5xQL9XdL6/jqosWDMIaIeYQcFg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lP1s5fSAEB3y9SaskyCRC417rn6zMv5SwIGlsjG3eHs=; b=r3YEpjG8xnEcdmPLrds0KXna7Hbs8LbZBnwlmrr6q/0WBJcBjt5pVT8+4xes/ehmu2 KOBf4Qa0AKWCjlUXPaV5tKR/iwqQ7CA8mpeMADz8JRyYA+UICruPAWMCUQSjb6cjgb/f TZ5Dt9SxRbNIQCXi1Mxtvz+UTKUE3JuB3HkwSkhgmSzAE0RE819R+rIgbfz8sREz6iRA G0nuDCJMw0fhiIhwUbAFhuvb9FQ9PzUKrmrg7/hbUIOEIAfYAlN0WTpNNGCk5rjLKv0n zCoxUoi475hQiIW8L2dRp258KuJqkorbttqcFutXn8swsqM6H38ojPHPRYGCalkqGP2N SMDA== X-Gm-Message-State: AIVw112NXTLUJpm7RQtEW/eaUZSoUKg8oyHs+VU3mF/n/bWbtSupDPKV VDVrqiHl0QyFK/ou X-Received: by 10.99.146.13 with SMTP id o13mr25155555pgd.54.1499330883627; Thu, 06 Jul 2017 01:48:03 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.194]) by smtp.gmail.com with ESMTPSA id i186sm2871472pgd.55.2017.07.06.01.47.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 01:48:01 -0700 (PDT) From: Alex Shi To: linux-kernel@vger.kernel.org (open list) Cc: Alex Shi , Sebastian Andrzej Siewior , Thomas Gleixner , Anders Roxell , Rik van Riel , Steven Rostedt , "Rafael J . Wysocki" , Daniel Lezcano , linux-rt-users Subject: [PATCH] cpu_pm: replace raw_notifier to atomic_notifier Date: Thu, 6 Jul 2017 16:47:46 +0800 Message-Id: <1499330866-19520-1-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org This patch replace a rwlock and raw notifier by atomic notifier which protected by spin_lock and rcu. The first to reason to have this replace is due to a 'scheduling while atomic' bug of RT kernel on arm/arm64 platform. On arm/arm64, rwlock cpu_pm_notifier_lock in cpu_pm cause a potential schedule after irq disable in idle call chain: cpu_startup_entry cpu_idle_loop local_irq_disable() cpuidle_idle_call call_cpuidle cpuidle_enter cpuidle_enter_state ->enter :arm_enter_idle_state cpu_pm_enter/exit CPU_PM_CPU_IDLE_ENTER read_lock(&cpu_pm_notifier_lock); <-- sleep in idle __rt_spin_lock(); schedule(); The kernel panic is here: [ 4.609601] BUG: scheduling while atomic: swapper/1/0/0x00000002 [ 4.609608] [] arm_enter_idle_state+0x18/0x70 [ 4.609614] Modules linked in: [ 4.609615] [] cpuidle_enter_state+0xf0/0x218 [ 4.609620] [] cpuidle_enter+0x18/0x20 [ 4.609626] Preemption disabled at: [ 4.609627] [] call_cpuidle+0x24/0x40 [ 4.609635] [] schedule_preempt_disabled+0x1c/0x28 [ 4.609639] [] cpu_startup_entry+0x154/0x1f8 [ 4.609645] [] secondary_start_kernel+0x15c/0x1a0 Daniel Lezcano said this notification is needed on arm/arm64 platforms. Sebastian suggested using atomic_notifier instead of rwlock, which is not only removing the sleeping in idle, but also getting better latency improvement. This patch passed Fengguang's 0day testing. Signed-off-by: Alex Shi Cc: Sebastian Andrzej Siewior Cc: Thomas Gleixner Cc: Anders Roxell Cc: Rik van Riel Cc: Steven Rostedt Cc: Rafael J. Wysocki Cc: Daniel Lezcano Cc: linux-rt-users --- kernel/cpu_pm.c | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c index 009cc9a..10f4640 100644 --- a/kernel/cpu_pm.c +++ b/kernel/cpu_pm.c @@ -22,14 +22,13 @@ #include #include -static DEFINE_RWLOCK(cpu_pm_notifier_lock); -static RAW_NOTIFIER_HEAD(cpu_pm_notifier_chain); +static ATOMIC_NOTIFIER_HEAD(cpu_pm_notifier_chain); static int cpu_pm_notify(enum cpu_pm_event event, int nr_to_call, int *nr_calls) { int ret; - ret = __raw_notifier_call_chain(&cpu_pm_notifier_chain, event, NULL, + ret = __atomic_notifier_call_chain(&cpu_pm_notifier_chain, event, NULL, nr_to_call, nr_calls); return notifier_to_errno(ret); @@ -47,14 +46,7 @@ static int cpu_pm_notify(enum cpu_pm_event event, int nr_to_call, int *nr_calls) */ int cpu_pm_register_notifier(struct notifier_block *nb) { - unsigned long flags; - int ret; - - write_lock_irqsave(&cpu_pm_notifier_lock, flags); - ret = raw_notifier_chain_register(&cpu_pm_notifier_chain, nb); - write_unlock_irqrestore(&cpu_pm_notifier_lock, flags); - - return ret; + return atomic_notifier_chain_register(&cpu_pm_notifier_chain, nb); } EXPORT_SYMBOL_GPL(cpu_pm_register_notifier); @@ -69,14 +61,7 @@ EXPORT_SYMBOL_GPL(cpu_pm_register_notifier); */ int cpu_pm_unregister_notifier(struct notifier_block *nb) { - unsigned long flags; - int ret; - - write_lock_irqsave(&cpu_pm_notifier_lock, flags); - ret = raw_notifier_chain_unregister(&cpu_pm_notifier_chain, nb); - write_unlock_irqrestore(&cpu_pm_notifier_lock, flags); - - return ret; + return atomic_notifier_chain_unregister(&cpu_pm_notifier_chain, nb); } EXPORT_SYMBOL_GPL(cpu_pm_unregister_notifier); @@ -100,7 +85,6 @@ int cpu_pm_enter(void) int nr_calls; int ret = 0; - read_lock(&cpu_pm_notifier_lock); ret = cpu_pm_notify(CPU_PM_ENTER, -1, &nr_calls); if (ret) /* @@ -108,7 +92,6 @@ int cpu_pm_enter(void) * PM entry who are notified earlier to prepare for it. */ cpu_pm_notify(CPU_PM_ENTER_FAILED, nr_calls - 1, NULL); - read_unlock(&cpu_pm_notifier_lock); return ret; } @@ -128,13 +111,7 @@ EXPORT_SYMBOL_GPL(cpu_pm_enter); */ int cpu_pm_exit(void) { - int ret; - - read_lock(&cpu_pm_notifier_lock); - ret = cpu_pm_notify(CPU_PM_EXIT, -1, NULL); - read_unlock(&cpu_pm_notifier_lock); - - return ret; + return cpu_pm_notify(CPU_PM_EXIT, -1, NULL); } EXPORT_SYMBOL_GPL(cpu_pm_exit); @@ -159,7 +136,6 @@ int cpu_cluster_pm_enter(void) int nr_calls; int ret = 0; - read_lock(&cpu_pm_notifier_lock); ret = cpu_pm_notify(CPU_CLUSTER_PM_ENTER, -1, &nr_calls); if (ret) /* @@ -167,7 +143,6 @@ int cpu_cluster_pm_enter(void) * PM entry who are notified earlier to prepare for it. */ cpu_pm_notify(CPU_CLUSTER_PM_ENTER_FAILED, nr_calls - 1, NULL); - read_unlock(&cpu_pm_notifier_lock); return ret; } @@ -190,13 +165,7 @@ EXPORT_SYMBOL_GPL(cpu_cluster_pm_enter); */ int cpu_cluster_pm_exit(void) { - int ret; - - read_lock(&cpu_pm_notifier_lock); - ret = cpu_pm_notify(CPU_CLUSTER_PM_EXIT, -1, NULL); - read_unlock(&cpu_pm_notifier_lock); - - return ret; + return cpu_pm_notify(CPU_CLUSTER_PM_EXIT, -1, NULL); } EXPORT_SYMBOL_GPL(cpu_cluster_pm_exit);