public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Mandeep Singh Baines <msb@chromium.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-acpi@vger.kernel.org, ibm-acpi@hmh.eng.br,
	ibm-acpi-devel@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	Aaron Lu <aaron.lu@intel.com>, Tejun Heo <tj@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Artem Savkov <artem.savkov@gmail.com>
Subject: [PATCH 1/1] thinkpad-acpi: kill hotkey_thread_mutex
Date: Thu, 7 Mar 2013 18:53:59 +0100	[thread overview]
Message-ID: <20130307175359.GB15631@redhat.com> (raw)
In-Reply-To: <20130307175305.GA15631@redhat.com>

hotkey_kthread() does try_to_freeze() under hotkey_thread_mutex.

We can simply kill this mutex, hotkey_poll_stop_sync() does not need
to serialize with hotkey_kthread(). When kthread_stop() returns the
thread is already dead, it called do_exit()->complete_vfork_done().

Reported-by: Artem Savkov <artem.savkov@gmail.com>
Reported-by: Maciej Rutecki <maciej.rutecki@gmail.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>

--- x/drivers/platform/x86/thinkpad_acpi.c
+++ x/drivers/platform/x86/thinkpad_acpi.c
@@ -1965,9 +1965,6 @@ struct tp_nvram_state {
 /* kthread for the hotkey poller */
 static struct task_struct *tpacpi_hotkey_task;
 
-/* Acquired while the poller kthread is running, use to sync start/stop */
-static struct mutex hotkey_thread_mutex;
-
 /*
  * Acquire mutex to write poller control variables as an
  * atomic block.
@@ -2463,8 +2460,6 @@ static int hotkey_kthread(void *data)
 	unsigned int poll_freq;
 	bool was_frozen;
 
-	mutex_lock(&hotkey_thread_mutex);
-
 	if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
 		goto exit;
 
@@ -2524,7 +2519,6 @@ static int hotkey_kthread(void *data)
 	}
 
 exit:
-	mutex_unlock(&hotkey_thread_mutex);
 	return 0;
 }
 
@@ -2534,9 +2528,6 @@ static void hotkey_poll_stop_sync(void)
 	if (tpacpi_hotkey_task) {
 		kthread_stop(tpacpi_hotkey_task);
 		tpacpi_hotkey_task = NULL;
-		mutex_lock(&hotkey_thread_mutex);
-		/* at this point, the thread did exit */
-		mutex_unlock(&hotkey_thread_mutex);
 	}
 }
 
@@ -3235,7 +3226,6 @@ static int __init hotkey_init(struct ibm
 	mutex_init(&hotkey_mutex);
 
 #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
-	mutex_init(&hotkey_thread_mutex);
 	mutex_init(&hotkey_thread_data_mutex);
 #endif
 


  reply	other threads:[~2013-03-07 17:55 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-04 19:55 [REGRESSION] [3.9-rc1] BUG: ktpacpi_nvramd/446 still has locks held! Maciej Rutecki
2013-03-05  7:28 ` Aaron Lu
2013-03-05 16:04   ` Mandeep Singh Baines
2013-03-05 17:34 ` [PATCH] thinkpad-acpi: fix potential suspend blocking issue Mandeep Singh Baines
2013-03-05 17:48   ` Oleg Nesterov
2013-03-05 17:59     ` Mandeep Singh Baines
2013-03-05 18:05       ` Oleg Nesterov
2013-03-05 20:55         ` Mandeep Singh Baines
2013-03-05 23:26           ` Henrique de Moraes Holschuh
2013-03-06 15:44             ` Oleg Nesterov
2013-03-06 23:32               ` Henrique de Moraes Holschuh
     [not found]                 ` <20130306233232.GA12645-ZGHd14iZgfaRjzvQDGKj+xxZW9W5cXbT@public.gmane.org>
2013-03-07 17:53                   ` [PATCH 0/1] thinkpad-acpi: kill hotkey_thread_mutex Oleg Nesterov
2013-03-07 17:53                     ` Oleg Nesterov [this message]
2013-03-07 18:42                       ` [PATCH 1/1] " Mandeep Singh Baines
     [not found]                         ` <CACBanvqP0jx_d-LtV5+fRD7M698M_b6j0Sv=v0uoTBpjEusQCw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-03-09 21:34                           ` Henrique de Moraes Holschuh
2013-03-26 13:14                       ` Rafael J. Wysocki
2013-03-26 13:09                         ` Oleg Nesterov
2013-03-26 13:50                           ` Rafael J. Wysocki
2013-03-05 19:18   ` [PATCH] thinkpad-acpi: fix potential suspend blocking issue Maciej Rutecki
2013-03-05 22:18   ` Andrew Morton
2013-03-06 15:50     ` Oleg Nesterov
2013-03-06 20:18       ` Artem Savkov

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=20130307175359.GB15631@redhat.com \
    --to=oleg@redhat.com \
    --cc=aaron.lu@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=artem.savkov@gmail.com \
    --cc=hmh@hmh.eng.br \
    --cc=ibm-acpi-devel@lists.sourceforge.net \
    --cc=ibm-acpi@hmh.eng.br \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=msb@chromium.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=tj@kernel.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