public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: florian@mickler.org
To: pm list <linux-pm@lists.linux-foundation.org>
Cc: Florian Mickler <florian@mickler.org>,
	james.bottomley@suse.de, markgross@thegnar.org
Subject: [PATCH] pm_qos: make update_request non blocking
Date: Sat,  5 Jun 2010 22:46:23 +0200	[thread overview]
Message-ID: <1275770783-4183-1-git-send-email-florian@mickler.org> (raw)

First we use atomic_notifier to get the spinlocked variant.
Secondly we call the notifiers via schedule_work.

Signed-off-by: Florian Mickler <florian@mickler.org>
---

Please advise.

 kernel/pm_qos_params.c |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index f42d3f7..7335c27 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -40,6 +40,7 @@
 #include <linux/string.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/workqueue.h>
 
 #include <linux/uaccess.h>
 
@@ -63,7 +64,7 @@ static s32 min_compare(s32 v1, s32 v2);
 
 struct pm_qos_object {
 	struct pm_qos_request_list requests;
-	struct blocking_notifier_head *notifiers;
+	struct atomic_notifier_head *notifiers;
 	struct miscdevice pm_qos_power_miscdev;
 	char *name;
 	s32 default_value;
@@ -72,7 +73,7 @@ struct pm_qos_object {
 };
 
 static struct pm_qos_object null_pm_qos;
-static BLOCKING_NOTIFIER_HEAD(cpu_dma_lat_notifier);
+static ATOMIC_NOTIFIER_HEAD(cpu_dma_lat_notifier);
 static struct pm_qos_object cpu_dma_pm_qos = {
 	.requests = {LIST_HEAD_INIT(cpu_dma_pm_qos.requests.list)},
 	.notifiers = &cpu_dma_lat_notifier,
@@ -82,7 +83,7 @@ static struct pm_qos_object cpu_dma_pm_qos = {
 	.comparitor = min_compare
 };
 
-static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);
+static ATOMIC_NOTIFIER_HEAD(network_lat_notifier);
 static struct pm_qos_object network_lat_pm_qos = {
 	.requests = {LIST_HEAD_INIT(network_lat_pm_qos.requests.list)},
 	.notifiers = &network_lat_notifier,
@@ -93,7 +94,7 @@ static struct pm_qos_object network_lat_pm_qos = {
 };
 
 
-static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier);
+static ATOMIC_NOTIFIER_HEAD(network_throughput_notifier);
 static struct pm_qos_object network_throughput_pm_qos = {
 	.requests = {LIST_HEAD_INIT(network_throughput_pm_qos.requests.list)},
 	.notifiers = &network_throughput_notifier,
@@ -103,7 +104,6 @@ static struct pm_qos_object network_throughput_pm_qos = {
 	.comparitor = max_compare
 };
 
-
 static struct pm_qos_object *pm_qos_array[] = {
 	&null_pm_qos,
 	&cpu_dma_pm_qos,
@@ -135,6 +135,15 @@ static s32 min_compare(s32 v1, s32 v2)
 	return min(v1, v2);
 }
 
+static void update_notify(struct work_struct* work){
+	int pm_qos_class = atomic_long_read(&work->data);
+	
+	s32 extreme_value = atomic_read(&pm_qos_array[pm_qos_class]->target_value);
+	atomic_notifier_call_chain(
+		pm_qos_array[pm_qos_class]->notifiers,
+			(unsigned long) extreme_value, NULL);
+}
+struct work_struct pm_qos_update_notify_work;
 
 static void update_target(int pm_qos_class)
 {
@@ -160,10 +169,10 @@ static void update_target(int pm_qos_class)
 	}
 	spin_unlock_irqrestore(&pm_qos_lock, flags);
 
-	if (call_notifier)
-		blocking_notifier_call_chain(
-				pm_qos_array[pm_qos_class]->notifiers,
-					(unsigned long) extreme_value, NULL);
+	if (call_notifier){
+		atomic_long_set(&pm_qos_update_notify_work.data, pm_qos_class);
+		schedule_work(&pm_qos_update_notify_work);
+	}
 }
 
 static int register_pm_qos_misc(struct pm_qos_object *qos)
@@ -308,7 +317,7 @@ int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier)
 {
 	int retval;
 
-	retval = blocking_notifier_chain_register(
+	retval = atomic_notifier_chain_register(
 			pm_qos_array[pm_qos_class]->notifiers, notifier);
 
 	return retval;
@@ -327,7 +336,7 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier)
 {
 	int retval;
 
-	retval = blocking_notifier_chain_unregister(
+	retval = atomic_notifier_chain_unregister(
 			pm_qos_array[pm_qos_class]->notifiers, notifier);
 
 	return retval;
@@ -380,6 +389,8 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
 		pr_debug(KERN_ERR "%s, %d, 0x%x\n", ascii_value, x, value);
 	} else
 		return -EINVAL;
+	
+	INIT_WORK(&pm_qos_update_notify_work,update_notify);
 
 	pm_qos_req = (struct pm_qos_request_list *)filp->private_data;
 	pm_qos_update_request(pm_qos_req, value);
-- 
1.7.1

             reply	other threads:[~2010-06-05 20:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-05 20:46 florian [this message]
2010-06-05 20:57 ` [PATCH] pm_qos: make update_request non blocking James Bottomley
2010-06-05 21:21   ` Florian Mickler
2010-06-05 22:44     ` James Bottomley
2010-06-06 21:50       ` mark gross
2010-06-07  2:49         ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275770783-4183-1-git-send-email-florian@mickler.org \
    --to=florian@mickler.org \
    --cc=james.bottomley@suse.de \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=markgross@thegnar.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox