The patch titled
IPMI: Fix some RCU problems (update)
has been removed from the -mm tree. Its filename was
ipmi-fix-some-rcu-problems-update.patch
This patch was dropped because it was folded into ipmi-fix-some-rcu-problems.patch
------------------------------------------------------
Subject: IPMI: Fix some RCU problems (update)
From: Corey Minyard <minyard@xxxxxxx>
Andrew asked that the open-coded barriers be commented, so here it
is. I also realized that one of the read barriers was in an area
where the protecting mutex was held, so no read barrier was needed.
Signed-off-by: Corey Minyard <minyard@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/ipmi/ipmi_msghandler.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff -puN drivers/char/ipmi/ipmi_msghandler.c~ipmi-fix-some-rcu-problems-update drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/ipmi/ipmi_msghandler.c~ipmi-fix-some-rcu-problems-update
+++ a/drivers/char/ipmi/ipmi_msghandler.c
@@ -839,7 +839,6 @@ int ipmi_create_user(unsigned int
goto out_kfree;
found:
- smp_rmb();
/* Note that each existing user holds a refcount to the interface. */
kref_get(&intf->refcount);
@@ -2762,10 +2761,15 @@ int ipmi_register_smi(struct ipmi_smi_ha
synchronize_rcu();
kref_put(&intf->refcount, intf_free);
} else {
- /* After this point the interface is legal to use. */
- smp_wmb(); /* Keep memory order straight for RCU readers. */
+ /*
+ * Keep memory order straight for RCU readers. Make
+ * sure everything else is committed to memory before
+ * setting intf_num to mark the interface valid.
+ */
+ smp_wmb();
intf->intf_num = i;
mutex_unlock(&ipmi_interfaces_mutex);
+ /* After this point the interface is legal to use. */
call_smi_watchers(i, intf->si_dev);
mutex_unlock(&smi_watchers_mutex);
}
@@ -3926,6 +3930,12 @@ static void send_panic_events(char *str)
/* Interface was not ready yet. */
continue;
+ /*
+ * intf_num is used as an marker to tell if the
+ * interface is valid. Thus we need a read barrier to
+ * make sure data fetched before checking intf_num
+ * won't be used.
+ */
smp_rmb();
/* First job here is to figure out where to send the
_
Patches currently in -mm which might be from minyard@xxxxxxx are
add-an-rcu-version-of-list-splicing.patch
ipmi-fix-some-rcu-problems.patch
ipmi-fix-some-rcu-problems-update.patch
proc-remove-useless-and-buggy-nlink-settings.patch
sysctl-ipmi-remove-unnecessary-insert_at_head-flag.patch
sysctl-remove-insert_at_head-from-register_sysctl.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
