V2 sgi-xpc: Fixups for two bugs and some cleanup.
cover V2 sgi-xpc: Fixups for two bugs and some cleanup.
The following set of patches fix two difficult to detect bugs in SGI's XPC.
Changes from V1:
- Prefixed barrier operations with smp_
PATCH 1/3 V2 sgi-xpc: ensure flags are updated before bte_copy
From: Robin Holt <[email protected]>
The clearing of the msg->flags needs a barrier between it and the notify of the channel threads that the messages are cleaned and ready for use.
I also modified all the *mb() operations to be prefixed with smp_ as they all are really only needed when running with multiple cpus.
---
drivers/misc/sgi-xp/xpc_sn2.c | 9 +++++---- drivers/misc/sgi-xp/xpc_uv.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/misc/sgi-xp/xpc_sn2.c +5 -4
@@ -1836,6 +1836,7 @@ xpc_process_msg_chctl_flags_sn2(struct x*/ xpc_clear_remote_msgqueue_flags_sn2 (ch); +smp_wmb ();/* ensure flags have been cleared before bte_copy */ ch_sn2->w_remote_GP.put = ch_sn2->remote_GP.put; dev_dbg(xpc_chan, "w_remote_GP.put changed to %ld, partid=%d, "
@@ -1934,7 +1935,7 @@ xpc_get_deliverable_payload_sn2(struct xbreak ; get = ch_sn2->w_local_GP.get; -rmb ();/* guarantee that .get loads before .put */ +smp_rmb ();/* guarantee that .get loads before .put */ if (get == ch_sn2->w_remote_GP.put)break ;
@@ -2053,7 +2054,7 @@ xpc_allocate_msg_sn2(struct xpc_channelwhile (1 ) { put = ch_sn2->w_local_GP.put; -rmb ();/* guarantee that .put loads before .get */ +smp_rmb ();/* guarantee that .put loads before .get */ if (put - ch_sn2->w_remote_GP.get < ch->local_nentries) {/* There are available message entries. We need to try
@@ -2186,7 +2187,7 @@ xpc_send_payload_sn2(struct xpc_channel* The preceding store of msg->flags must occur before the following * load of local_GP->put. */ -mb (); +smp_mb ();/* see if the message is next in line to be sent, if so send it */
@@ -2287,7 +2288,7 @@ xpc_received_payload_sn2(struct xpc_chan* The preceding store of msg->flags must occur before the following * load of local_GP->get. */ -mb (); +smp_mb ();/* * See if this message is next in line to be acknowledged as having
drivers/misc/sgi-xp/xpc_uv.c +1 -1
@@ -1423,7 +1423,7 @@ xpc_send_payload_uv(struct xpc_channel *atomic_inc (&ch->n_to_notify); msg_slot->key = key; -wmb ();/* a non-NULL func must hit memory after the key */ +smp_wmb ();/* a non-NULL func must hit memory after the key */ msg_slot->func = func;if (ch->flags &XPC_C_DISCONNECTING ) {
PATCH 2/3 V2 sgi-xpc: Remove NULL pointer dereference.
In reply to Robin HoltFrom: Robin Holt <[email protected]>
If the bte copy fails, the attempt to retrieve payloads merely returns a null pointer deref and not NULL as was expected.
---
drivers/misc/sgi-xp/xpc_sn2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/misc/sgi-xp/xpc_sn2.c +6 -4
@@ -1957,11 +1957,13 @@ xpc_get_deliverable_payload_sn2(struct x msg =xpc_pull_remote_msg_sn2 (ch, get); -DBUG_ON (msg !=NULL && msg->number != get); -DBUG_ON (msg !=NULL && (msg->flags &XPC_M_SN2_DONE )); -DBUG_ON (msg !=NULL && !(msg->flags &XPC_M_SN2_READY )); +if (msg !=NULL ) { +DBUG_ON (msg->number != get); +DBUG_ON (msg->flags &XPC_M_SN2_DONE ); +DBUG_ON (!(msg->flags &XPC_M_SN2_READY )); - payload = &msg->payload; + payload = &msg->payload; + }break ; }
PATCH 3/3 V2 sgi-xpc: Fixup stale DBUG_ON statements.
In reply to Robin HoltFrom: Robin Holt <[email protected]>
Clean up the stale DBUG_ON checks and add a couple new ones.
---
drivers/misc/sgi-xp/xpc_channel.c | 3 --- drivers/misc/sgi-xp/xpc_sn2.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-)
drivers/misc/sgi-xp/xpc_sn2.c +11 -4
@@ -1106,8 +1106,6 @@ xpc_process_activate_IRQ_rcvd_sn2(void)int n_IRQs_expected;int n_IRQs_detected; -DBUG_ON (xpc_activate_IRQ_rcvd ==0 ); -spin_lock_irqsave (&xpc_activate_IRQ_rcvd_lock, irq_flags); n_IRQs_expected = xpc_activate_IRQ_rcvd; xpc_activate_IRQ_rcvd =0 ;
@@ -1726,6 +1724,7 @@ xpc_clear_local_msgqueue_flags_sn2(struc msg = (struct xpc_msg_sn2 *)((u64 )ch_sn2->local_msgqueue + (get % ch->local_nentries) * ch->entry_size); +DBUG_ON (!(msg->flags &XPC_M_SN2_READY )); msg->flags =0 ; }while (++get < ch_sn2->remote_GP.get); }
@@ -1740,11 +1739,18 @@ xpc_clear_remote_msgqueue_flags_sn2(strustruct xpc_msg_sn2 *msg;s64 put; - put = ch_sn2->w_remote_GP.put; +/* flags are zeroed when the buffer is allocated */ +if (ch_sn2->remote_GP.put < ch->remote_nentries) +return ; + + put =max (ch_sn2->w_remote_GP.put, ch->remote_nentries);do { msg = (struct xpc_msg_sn2 *)((u64 )ch_sn2->remote_msgqueue + (put % ch->remote_nentries) * ch->entry_size); +DBUG_ON (!(msg->flags &XPC_M_SN2_READY )); +DBUG_ON (!(msg->flags &XPC_M_SN2_DONE )); +DBUG_ON (msg->number != put - ch->remote_nentries); msg->flags =0 ; }while (++put < ch_sn2->remote_GP.put); }
@@ -2280,8 +2286,9 @@ xpc_received_payload_sn2(struct xpc_chandev_dbg (xpc_chan,"msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n" , (void *)msg, msg_number, ch->partid, ch->number); -DBUG_ON ((((u64 )msg - (u64 )ch->remote_msgqueue) / ch->entry_size) != +DBUG_ON ((((u64 )msg - (u64 )ch->sn.sn2.remote_msgqueue) / ch->entry_size) != msg_number % ch->remote_nentries); +DBUG_ON (!(msg->flags &XPC_M_SN2_READY ));DBUG_ON (msg->flags &XPC_M_SN2_DONE ); msg->flags |=XPC_M_SN2_DONE ;
drivers/misc/sgi-xp/xpc_channel.c +0 -3
@@ -49,9 +49,6 @@ xpc_process_connect(struct xpc_channel *if (ch->flags & (XPC_C_CONNECTED |XPC_C_DISCONNECTING ))return ; - -DBUG_ON (ch->local_msgqueue ==NULL ); -DBUG_ON (ch->remote_msgqueue ==NULL ); }if (!(ch->flags &XPC_C_OPENREPLY )) {