From patchwork Wed Apr 30 12:01:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 29414 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9D452203F3 for ; Wed, 30 Apr 2014 12:01:52 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id c41sf5091289yho.1 for ; Wed, 30 Apr 2014 05:01:52 -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=DVz1CQqZfkZf6RXHLkKMAGPkEvZM4AVqN4GqLIgOX4k=; b=Tvot6TrEvtRCHnUjhVeIwsfAktmbEanUj1mA0N+xA1/ZypDa/RPwEH69E+/LjMsAC6 ugvl4QQTZJYqpk6ZEdrkovfOj4zDPCksj7smEthbqdXaWAIv94pGZanFA0msh0k+wqei AAWzo0Y+PyqQjX1Gsfe4+6u58y/bAo83EiOWXA6+k9s4uLc8Tg8G7nGwPX4BUk3y3CQp +hFum/yn6J8MEHBPMd2ZkAfjOJSAXENuafzqF+WATrSQBLRrx2OVz7rPzb6Bbf7Cajoe CMZ/XgU7sKBsZssEcVACm22gTFEH0Ms61ahridcIgfyDvn1jbprYJM1hIgCVKyGfCBNA dVtw== X-Gm-Message-State: ALoCoQmW88ge1jd96kcFG5FBE2awtLtpYfMwg6z1etbkUKHhCCawoaYjlLlp+IbcTTy4swZeZvbu X-Received: by 10.58.30.78 with SMTP id q14mr2088454veh.10.1398859312332; Wed, 30 Apr 2014 05:01:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.164 with SMTP id r33ls641996qgr.2.gmail; Wed, 30 Apr 2014 05:01:52 -0700 (PDT) X-Received: by 10.52.253.75 with SMTP id zy11mr3129459vdc.10.1398859312225; Wed, 30 Apr 2014 05:01:52 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id sl10si2426654vdc.21.2014.04.30.05.01.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 05:01:52 -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.182; Received: by mail-ve0-f182.google.com with SMTP id jw12so1994030veb.13 for ; Wed, 30 Apr 2014 05:01:52 -0700 (PDT) X-Received: by 10.52.99.168 with SMTP id er8mr3137263vdb.26.1398859312082; Wed, 30 Apr 2014 05:01:52 -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 ib8csp272941vcb; Wed, 30 Apr 2014 05:01:51 -0700 (PDT) X-Received: by 10.66.163.164 with SMTP id yj4mr7684078pab.91.1398859311074; Wed, 30 Apr 2014 05:01:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci3si16765686pad.209.2014.04.30.05.01.44 for ; Wed, 30 Apr 2014 05:01:44 -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 S1758870AbaD3MBZ (ORCPT + 28 others); Wed, 30 Apr 2014 08:01:25 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:48646 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758818AbaD3MBG (ORCPT ); Wed, 30 Apr 2014 08:01:06 -0400 Received: by mail-we0-f179.google.com with SMTP id x48so1581642wes.10 for ; Wed, 30 Apr 2014 05:01:04 -0700 (PDT) X-Received: by 10.194.77.50 with SMTP id p18mr1559995wjw.68.1398859264235; Wed, 30 Apr 2014 05:01:04 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-317-131.w86-199.abo.wanadoo.fr. [86.199.204.131]) by mx.google.com with ESMTPSA id k19sm3201198wic.10.2014.04.30.05.01.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 05:01:03 -0700 (PDT) From: Daniel Lezcano To: peterz@infradead.org, mingo@elte.hu Cc: rjw@rjwysocki.net, amit.kucheria@linaro.org, linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 2/2] sched: idle: Store the idle state the cpu is Date: Wed, 30 Apr 2014 14:01:03 +0200 Message-Id: <1398859263-7632-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398859263-7632-1-git-send-email-daniel.lezcano@linaro.org> References: <1398859263-7632-1-git-send-email-daniel.lezcano@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: daniel.lezcano@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: , When the cpu enters idle it stores the cpuidle state pointer in the struct rq which in turn could be used to take a right decision when balancing a task. As soon as the cpu exits the idle state, the structure is filled back with the NULL pointer. There are a couple of situations where the idle state pointer could be changed while looking at it: 1. For x86/acpi with dynamic c-states, when a laptop switches from battery to AC that could result on removing the deeper idle state. The acpi driver triggers: 'acpi_processor_cst_has_changed' 'cpuidle_pause_and_lock' 'cpuidle_uninstall_idle_handler' 'kick_all_cpus_sync'. All cpus will exit their idle state and the pointed object will be set to NULL. 2. The cpuidle driver is unloaded. Logically that could happen but not in practice because the drivers are always compiled in and 95% of the drivers are not coded to unregister the driver. In any case, the unloading code must call 'cpuidle_unregister_device', that calls 'cpuidle_pause_and_lock' leading to 'kick_all_cpus_sync' as mentioned above. The race can happen if we use the pointer and then one of these two situations occurs at the same moment. In order to be safe, the idle state pointer stored in the rq must be used inside a rcu_read_lock section where we are protected with the 'rcu_barrier' in the 'cpuidle_uninstall_idle_handler' function. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/cpuidle.c | 6 ++++++ kernel/sched/idle.c | 7 +++++++ kernel/sched/sched.h | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 8236746..6a13f40 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -190,6 +190,12 @@ void cpuidle_install_idle_handler(void) */ void cpuidle_uninstall_idle_handler(void) { + /* + * Wait for the scheduler to finish to use the idle state he + * may pointing to when looking for the cpu idle states + */ + rcu_barrier(); + if (enabled_devices) { initialized = 0; kick_all_cpus_sync(); diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index f2f4bc9..09029f6 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -12,6 +12,8 @@ #include +#include "sched.h" + static int __read_mostly cpu_idle_force_poll; void cpu_idle_poll_ctrl(bool enable) @@ -66,6 +68,7 @@ void __weak arch_cpu_idle(void) #ifdef CONFIG_CPU_IDLE static int __cpuidle_idle_call(void) { + struct rq *rq = this_rq(); struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices); struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); int next_state, entered_state, ret; @@ -114,6 +117,8 @@ static int __cpuidle_idle_call(void) if (!ret) { trace_cpu_idle_rcuidle(next_state, dev->cpu); + rq->idle_state = &drv->states[next_state]; + /* * Enter the idle state previously returned by * the governor decision. This function will @@ -123,6 +128,8 @@ static int __cpuidle_idle_call(void) */ entered_state = cpuidle_enter(drv, dev, next_state); + rq->idle_state = NULL; + trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); if (broadcast) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 456e492..bace64a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -14,6 +14,7 @@ #include "cpuacct.h" struct rq; +struct cpuidle_state; extern __read_mostly int scheduler_running; @@ -643,6 +644,10 @@ struct rq { #ifdef CONFIG_SMP struct llist_head wake_list; #endif + +#ifdef CONFIG_CPU_IDLE + struct cpuidle_state *idle_state; +#endif }; static inline int cpu_of(struct rq *rq)