Commit e138aa7d authored by David Howells's avatar David Howells
Browse files

rxrpc: Fix call interruptibility handling 



Fix the interruptibility of kernel-initiated client calls so that they're
either only interruptible when they're waiting for a call slot to come
available or they're not interruptible at all.  Either way, they're not
interruptible during transmission.

This should help prevent StoreData calls from being interrupted when
writeback is in progress.  It doesn't, however, handle interruption during
the receive phase.

Userspace-initiated calls are still interruptable.  After the signal has
been handled, sendmsg() will return the amount of data copied out of the
buffer and userspace can perform another sendmsg() call to continue
transmission.

Fixes: bc5e3a54 ("rxrpc: Use MSG_WAITALL to tell sendmsg() to temporarily ignore signals")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 158fe666

fs/afs/rxrpc.c

+2 −1
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp) 
					  afs_wake_up_async_call :

					  afs_wake_up_call_waiter),

					 call->upgrade,

					 call->intr,

					 (call->intr ? RXRPC_PREINTERRUPTIBLE :

					  RXRPC_UNINTERRUPTIBLE),

					 call->debug_id);

	if (IS_ERR(rxcall)) {

		ret = PTR_ERR(rxcall);

include/net/af_rxrpc.h

+7 −1
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ struct sock; 
struct socket;

struct rxrpc_call;



enum rxrpc_interruptibility {

	RXRPC_INTERRUPTIBLE,	/* Call is interruptible */

	RXRPC_PREINTERRUPTIBLE,	/* Call can be cancelled whilst waiting for a slot */

	RXRPC_UNINTERRUPTIBLE,	/* Call should not be interruptible at all */

};



/*

 * Debug ID counter for tracing.

 */
@@ -41,7 +47,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *, 
					   gfp_t,

					   rxrpc_notify_rx_t,

					   bool,

					   bool,

					   enum rxrpc_interruptibility,

					   unsigned int);

int rxrpc_kernel_send_data(struct socket *, struct rxrpc_call *,

			   struct msghdr *, size_t,

net/rxrpc/af_rxrpc.c

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, 
					   gfp_t gfp,

					   rxrpc_notify_rx_t notify_rx,

					   bool upgrade,

					   bool intr,

					   enum rxrpc_interruptibility interruptibility,

					   unsigned int debug_id)

{

	struct rxrpc_conn_parameters cp;
@@ -310,7 +310,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, 
	memset(&p, 0, sizeof(p));

	p.user_call_ID = user_call_ID;

	p.tx_total_len = tx_total_len;

	p.intr = intr;

	p.interruptibility = interruptibility;



	memset(&cp, 0, sizeof(cp));

	cp.local		= rx->local;

net/rxrpc/ar-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ enum rxrpc_call_flag { 
	RXRPC_CALL_BEGAN_RX_TIMER,	/* We began the expect_rx_by timer */

	RXRPC_CALL_RX_HEARD,		/* The peer responded at least once to this call */

	RXRPC_CALL_RX_UNDERRUN,		/* Got data underrun */

	RXRPC_CALL_IS_INTR,		/* The call is interruptible */

	RXRPC_CALL_DISCONNECTED,	/* The call has been disconnected */

};
@@ -598,6 +597,7 @@ struct rxrpc_call { 
	atomic_t		usage;

	u16			service_id;	/* service ID */

	u8			security_ix;	/* Security type */

	enum rxrpc_interruptibility interruptibility; /* At what point call may be interrupted */

	u32			call_id;	/* call ID on connection  */

	u32			cid;		/* connection ID plus channel index */

	int			debug_id;	/* debug ID for printks */
@@ -721,7 +721,7 @@ struct rxrpc_call_params { 
		u32		normal;		/* Max time since last call packet (msec) */

	} timeouts;

	u8			nr_timeouts;	/* Number of timeouts specified */

	bool			intr;		/* The call is interruptible */

	enum rxrpc_interruptibility interruptibility; /* How is interruptible is the call? */

};



struct rxrpc_send_params {

net/rxrpc/call_object.c

+1 −2
Original line number Diff line number Diff line
@@ -237,8 +237,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, 
		return call;

	}



	if (p->intr)

		__set_bit(RXRPC_CALL_IS_INTR, &call->flags);

	call->interruptibility = p->interruptibility;

	call->tx_total_len = p->tx_total_len;

	trace_rxrpc_call(call->debug_id, rxrpc_call_new_client,

			 atomic_read(&call->usage),

CRA Git | Maintained and supported by SUSTech CRA and CCSE