[IA64-SGI] enforce proper ordering of callouts by XPC (4c2cd966) · Commits · 戴 / test

arch/ia64/sn/kernel/xpc_channel.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -738,7 +738,9 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	/* make sure all activity has settled down first */		/* make sure all activity has settled down first */

	if (atomic_read(&ch->references) > 0) {		if (atomic_read(&ch->references) > 0 \|\|
			((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
			!(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE))) {
	return;		return;
	}		}
	DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0);		DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0);
	@@ -775,7 +777,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	/* both sides are disconnected now */		/* both sides are disconnected now */

	if (ch->flags & XPC_C_CONNECTCALLOUT) {		if (ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE) {
	spin_unlock_irqrestore(&ch->lock, *irq_flags);		spin_unlock_irqrestore(&ch->lock, *irq_flags);
	xpc_disconnect_callout(ch, xpcDisconnected);		xpc_disconnect_callout(ch, xpcDisconnected);
	spin_lock_irqsave(&ch->lock, *irq_flags);		spin_lock_irqsave(&ch->lock, *irq_flags);
	@@ -1300,7 +1302,7 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
	"delivered=%d, partid=%d, channel=%d\n",		"delivered=%d, partid=%d, channel=%d\n",
	nmsgs_sent, ch->partid, ch->number);		nmsgs_sent, ch->partid, ch->number);

	if (ch->flags & XPC_C_CONNECTCALLOUT) {		if (ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) {
	xpc_activate_kthreads(ch, nmsgs_sent);		xpc_activate_kthreads(ch, nmsgs_sent);
	}		}
	}		}

arch/ia64/sn/kernel/xpc_main.c

+13 −7

Original line number	Original line	Diff line number	Diff line
	@@ -750,12 +750,16 @@ xpc_daemonize_kthread(void *args)
	/* let registerer know that connection has been established */		/* let registerer know that connection has been established */

	spin_lock_irqsave(&ch->lock, irq_flags);		spin_lock_irqsave(&ch->lock, irq_flags);
	if (!(ch->flags & XPC_C_CONNECTCALLOUT)) {		if (!(ch->flags & XPC_C_CONNECTEDCALLOUT)) {
	ch->flags \|= XPC_C_CONNECTCALLOUT;		ch->flags \|= XPC_C_CONNECTEDCALLOUT;
	spin_unlock_irqrestore(&ch->lock, irq_flags);		spin_unlock_irqrestore(&ch->lock, irq_flags);

	xpc_connected_callout(ch);		xpc_connected_callout(ch);

			spin_lock_irqsave(&ch->lock, irq_flags);
			ch->flags \|= XPC_C_CONNECTEDCALLOUT_MADE;
			spin_unlock_irqrestore(&ch->lock, irq_flags);

	/*		/*
	* It is possible that while the callout was being		* It is possible that while the callout was being
	* made that the remote partition sent some messages.		* made that the remote partition sent some messages.
	@@ -777,15 +781,17 @@ xpc_daemonize_kthread(void *args)

	if (atomic_dec_return(&ch->kthreads_assigned) == 0) {		if (atomic_dec_return(&ch->kthreads_assigned) == 0) {
	spin_lock_irqsave(&ch->lock, irq_flags);		spin_lock_irqsave(&ch->lock, irq_flags);
	if ((ch->flags & XPC_C_CONNECTCALLOUT) &&		if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
	!(ch->flags & XPC_C_DISCONNECTCALLOUT)) {		!(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
	ch->flags \|= XPC_C_DISCONNECTCALLOUT;		ch->flags \|= XPC_C_DISCONNECTINGCALLOUT;
	spin_unlock_irqrestore(&ch->lock, irq_flags);		spin_unlock_irqrestore(&ch->lock, irq_flags);

	xpc_disconnect_callout(ch, xpcDisconnecting);		xpc_disconnect_callout(ch, xpcDisconnecting);
	} else {
	spin_unlock_irqrestore(&ch->lock, irq_flags);		spin_lock_irqsave(&ch->lock, irq_flags);
			ch->flags \|= XPC_C_DISCONNECTINGCALLOUT_MADE;
	}		}
			spin_unlock_irqrestore(&ch->lock, irq_flags);
	if (atomic_dec_return(&part->nchannels_engaged) == 0) {		if (atomic_dec_return(&part->nchannels_engaged) == 0) {
	xpc_mark_partition_disengaged(part);		xpc_mark_partition_disengaged(part);
	xpc_IPI_send_disengage(part);		xpc_IPI_send_disengage(part);

include/asm-ia64/sn/xpc.h

+18 −13

Original line number	Original line	Diff line number	Diff line
	@@ -508,19 +508,24 @@ struct xpc_channel {
	#define XPC_C_OPENREQUEST 0x00000010 /* local open channel request */		#define XPC_C_OPENREQUEST 0x00000010 /* local open channel request */

	#define XPC_C_SETUP 0x00000020 /* channel's msgqueues are alloc'd */		#define XPC_C_SETUP 0x00000020 /* channel's msgqueues are alloc'd */
	#define XPC_C_CONNECTCALLOUT 0x00000040 /* channel connected callout made */		#define XPC_C_CONNECTEDCALLOUT 0x00000040 /* connected callout initiated */
	#define XPC_C_CONNECTED 0x00000080 /* local channel is connected */		#define XPC_C_CONNECTEDCALLOUT_MADE \
	#define XPC_C_CONNECTING 0x00000100 /* channel is being connected */		0x00000080 /* connected callout completed */
			#define XPC_C_CONNECTED 0x00000100 /* local channel is connected */
	#define XPC_C_RCLOSEREPLY 0x00000200 /* remote close channel reply */		#define XPC_C_CONNECTING 0x00000200 /* channel is being connected */
	#define XPC_C_CLOSEREPLY 0x00000400 /* local close channel reply */
	#define XPC_C_RCLOSEREQUEST 0x00000800 /* remote close channel request */		#define XPC_C_RCLOSEREPLY 0x00000400 /* remote close channel reply */
	#define XPC_C_CLOSEREQUEST 0x00001000 /* local close channel request */		#define XPC_C_CLOSEREPLY 0x00000800 /* local close channel reply */
			#define XPC_C_RCLOSEREQUEST 0x00001000 /* remote close channel request */
	#define XPC_C_DISCONNECTED 0x00002000 /* channel is disconnected */		#define XPC_C_CLOSEREQUEST 0x00002000 /* local close channel request */
	#define XPC_C_DISCONNECTING 0x00004000 /* channel is being disconnected */
	#define XPC_C_DISCONNECTCALLOUT 0x00008000 /* chan disconnected callout made */		#define XPC_C_DISCONNECTED 0x00004000 /* channel is disconnected */
	#define XPC_C_WDISCONNECT 0x00010000 /* waiting for channel disconnect */		#define XPC_C_DISCONNECTING 0x00008000 /* channel is being disconnected */
			#define XPC_C_DISCONNECTINGCALLOUT \
			0x00010000 /* disconnecting callout initiated */
			#define XPC_C_DISCONNECTINGCALLOUT_MADE \
			0x00020000 /* disconnecting callout completed */
			#define XPC_C_WDISCONNECT 0x00040000 /* waiting for channel disconnect */

Admin message