From: Rusty Russell <rusty@rustcorp.com.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Jeff Garzik <jeff@garzik.org>,
Tejun Heo <htejun@gmail.com>
Subject: [PATCH 1/6] typesafe: Convert stop_machine and callers
Date: Sun, 20 Jan 2008 20:47:22 +1100 [thread overview]
Message-ID: <200801202047.22943.rusty@rustcorp.com.au> (raw)
In-Reply-To: <200801202046.14746.rusty@rustcorp.com.au>
Simple statement expression with a temporary variable does the
typechecking for us: that the stop_machine callback matches the data
type.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
drivers/char/hw_random/intel-rng.c | 3 +--
include/linux/stop_machine.h | 13 +++++++++----
kernel/module.c | 10 +++-------
kernel/stop_machine.c | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff -r fa243a61ba85 drivers/char/hw_random/intel-rng.c
--- a/drivers/char/hw_random/intel-rng.c Thu Jan 17 13:06:16 2008 +1100
+++ b/drivers/char/hw_random/intel-rng.c Thu Jan 17 14:47:11 2008 +1100
@@ -227,9 +227,8 @@ struct intel_rng_hw {
u8 fwh_dec_en1_val;
};
-static int __init intel_rng_hw_init(void *_intel_rng_hw)
+static int __init intel_rng_hw_init(struct intel_rng_hw *intel_rng_hw)
{
- struct intel_rng_hw *intel_rng_hw = _intel_rng_hw;
u8 mfc, dvc;
/* interrupts disabled in stop_machine_run call */
diff -r fa243a61ba85 include/linux/stop_machine.h
--- a/include/linux/stop_machine.h Thu Jan 17 13:06:16 2008 +1100
+++ b/include/linux/stop_machine.h Thu Jan 17 14:47:11 2008 +1100
@@ -7,7 +7,6 @@
#include <linux/cpu.h>
#include <asm/system.h>
-#if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)
/**
* stop_machine_run: freeze the machine on all CPUs and run this function
* @fn: the function to run
@@ -21,7 +20,13 @@
*
* This can be thought of as a very heavy write lock, equivalent to
* grabbing every spinlock in the kernel. */
-int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu);
+#define stop_machine_run(fn, data, cpu) ({ \
+ int (*_fn)(typeof(data)) = (fn); \
+ stop_machine_run_notype((void *)_fn, (data), (cpu)); \
+})
+
+#if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)
+int stop_machine_run_notype(int (*fn)(void *), void *data, unsigned int cpu);
/**
* __stop_machine_run: freeze the machine on all CPUs and run this function
@@ -38,8 +43,8 @@ struct task_struct *__stop_machine_run(i
#else
-static inline int stop_machine_run(int (*fn)(void *), void *data,
- unsigned int cpu)
+static inline int stop_machine_run_notype(int (*fn)(void *), void *data,
+ unsigned int cpu)
{
int ret;
local_irq_disable();
diff -r fa243a61ba85 kernel/module.c
--- a/kernel/module.c Thu Jan 17 13:06:16 2008 +1100
+++ b/kernel/module.c Thu Jan 17 14:47:11 2008 +1100
@@ -623,10 +623,8 @@ struct stopref
};
/* Whole machine is stopped with interrupts off when this runs. */
-static int __try_stop_module(void *_sref)
+static int __try_stop_module(struct stopref *sref)
{
- struct stopref *sref = _sref;
-
/* If it's not unused, quit unless we are told to block. */
if ((sref->flags & O_NONBLOCK) && module_refcount(sref->mod) != 0) {
if (!(*sref->forced = try_force_unload(sref->flags)))
@@ -1305,9 +1303,8 @@ static void mod_kobject_remove(struct mo
* link the module with the whole machine is stopped with interrupts off
* - this defends against kallsyms not taking locks
*/
-static int __link_module(void *_mod)
+static int __link_module(struct module *mod)
{
- struct module *mod = _mod;
list_add(&mod->list, &modules);
return 0;
}
@@ -1316,9 +1313,8 @@ static int __link_module(void *_mod)
* unlink the module with the whole machine is stopped with interrupts off
* - this defends against kallsyms not taking locks
*/
-static int __unlink_module(void *_mod)
+static int __unlink_module(struct module *mod)
{
- struct module *mod = _mod;
list_del(&mod->list);
return 0;
}
diff -r fa243a61ba85 kernel/stop_machine.c
--- a/kernel/stop_machine.c Thu Jan 17 13:06:16 2008 +1100
+++ b/kernel/stop_machine.c Thu Jan 17 14:47:11 2008 +1100
@@ -197,7 +197,7 @@ struct task_struct *__stop_machine_run(i
return p;
}
-int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
+int stop_machine_run_notype(int (*fn)(void *), void *data, unsigned int cpu)
{
struct task_struct *p;
int ret;
@@ -213,4 +213,4 @@ int stop_machine_run(int (*fn)(void *),
return ret;
}
-EXPORT_SYMBOL_GPL(stop_machine_run);
+EXPORT_SYMBOL_GPL(stop_machine_run_notype);
next prev parent reply other threads:[~2008-01-20 9:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-20 9:46 [PATCH 0/6] RFC: Typesafe callbacks Rusty Russell
2008-01-20 9:47 ` Rusty Russell [this message]
2008-01-20 9:48 ` [PATCH 2/6] typesafe: kthread_create and kthread_run Rusty Russell
2008-01-20 9:50 ` [PATCH 3/6] typesafe: convert kthread users Rusty Russell
2008-01-20 9:51 ` [PATCH 4/6] typesafe: cast_if_type to allow macros functions which take more than one type Rusty Russell
2008-01-20 9:54 ` [PATCH 5/6] typesafe: request_irq and devm_request_irq Rusty Russell
2008-01-20 9:57 ` [PATCH 6/6] typesafe: timers Rusty Russell
2008-01-20 11:25 ` [PATCH 2/6] typesafe: kthread_create and kthread_run Jan Engelhardt
2008-01-20 12:07 ` Bert Wesarg
2008-01-20 16:24 ` Johannes Weiner
2008-01-20 16:43 ` Bert Wesarg
2008-01-20 22:04 ` Rusty Russell
2008-01-21 7:56 ` Bert Wesarg
2008-01-20 12:56 ` [PATCH 0/6] RFC: Typesafe callbacks Tejun Heo
2008-01-20 13:00 ` Tejun Heo
2008-01-20 22:17 ` Rusty Russell
2008-01-21 11:33 ` Rusty Russell
2008-01-21 12:38 ` Tejun Heo
2008-01-21 23:27 ` Rusty Russell
2008-01-21 23:57 ` Linus Torvalds
2008-01-22 7:16 ` Rusty Russell
2008-01-22 15:53 ` Linus Torvalds
2008-01-22 4:20 ` Andi Kleen
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=200801202047.22943.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=akpm@linux-foundation.org \
--cc=htejun@gmail.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).