Commit fb7cba61 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rxrpc-timeout-fixes' 



David Howells says:

====================
rxrpc: Timeout handling fixes

Here are three patches to fix timeouts handling in AF_RXRPC:

 (1) The hard call timeout should be interpreted in seconds, not
     milliseconds.

 (2) Allow a waiting call to be aborted (thereby cancelling the call) in
     the case a signal interrupts sendmsg() and leaves it hanging until it
     is granted a channel on a connection.

 (3) Kernel-generated calls get the timer started on them even if they're
     still waiting to be attached to a connection.  If the timer expires
     before the wait is complete and a conn is attached, an oops will
     occur.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4f163bf8 db099c62

fs/afs/afs.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#define AFSPATHMAX		1024	/* Maximum length of a pathname plus NUL */

#define AFSOPAQUEMAX		1024	/* Maximum length of an opaque field */



#define AFS_VL_MAX_LIFESPAN	(120 * HZ)

#define AFS_PROBE_MAX_LIFESPAN	(30 * HZ)

#define AFS_VL_MAX_LIFESPAN	120

#define AFS_PROBE_MAX_LIFESPAN	30



typedef u64			afs_volid_t;

typedef u64			afs_vnodeid_t;

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct afs_call { 
	spinlock_t		state_lock;

	int			error;		/* error code */

	u32			abort_code;	/* Remote abort ID or 0 */

	unsigned int		max_lifespan;	/* Maximum lifespan to set if not 0 */

	unsigned int		max_lifespan;	/* Maximum lifespan in secs to set if not 0 */

	unsigned		request_size;	/* size of request data */

	unsigned		reply_max;	/* maximum size of reply */

	unsigned		count2;		/* count used in unmarshalling */

fs/afs/rxrpc.c

+3 −5
Original line number Diff line number Diff line
@@ -335,7 +335,9 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp) 
	/* create a call */

	rxcall = rxrpc_kernel_begin_call(call->net->socket, srx, call->key,

					 (unsigned long)call,

					 tx_total_len, gfp,

					 tx_total_len,

					 call->max_lifespan,

					 gfp,

					 (call->async ?

					  afs_wake_up_async_call :

					  afs_wake_up_call_waiter),
@@ -350,10 +352,6 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp) 
	}



	call->rxcall = rxcall;



	if (call->max_lifespan)

		rxrpc_kernel_set_max_life(call->net->socket, rxcall,

					  call->max_lifespan);

	call->issue_time = ktime_get_real();



	/* send the request */

include/net/af_rxrpc.h

+11 −10
Original line number Diff line number Diff line
@@ -40,16 +40,17 @@ typedef void (*rxrpc_user_attach_call_t)(struct rxrpc_call *, unsigned long); 
void rxrpc_kernel_new_call_notification(struct socket *,

					rxrpc_notify_new_call_t,

					rxrpc_discard_new_call_t);

struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *,

					   struct sockaddr_rxrpc *,

					   struct key *,

					   unsigned long,

					   s64,

					   gfp_t,

					   rxrpc_notify_rx_t,

					   bool,

					   enum rxrpc_interruptibility,

					   unsigned int);

struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,

					   struct sockaddr_rxrpc *srx,

					   struct key *key,

					   unsigned long user_call_ID,

					   s64 tx_total_len,

					   u32 hard_timeout,

					   gfp_t gfp,

					   rxrpc_notify_rx_t notify_rx,

					   bool upgrade,

					   enum rxrpc_interruptibility interruptibility,

					   unsigned int debug_id);

int rxrpc_kernel_send_data(struct socket *, struct rxrpc_call *,

			   struct msghdr *, size_t,

			   rxrpc_notify_end_tx_t);

net/rxrpc/af_rxrpc.c

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static int rxrpc_listen(struct socket *sock, int backlog) 
 * @key: The security context to use (defaults to socket setting)

 * @user_call_ID: The ID to use

 * @tx_total_len: Total length of data to transmit during the call (or -1)

 * @hard_timeout: The maximum lifespan of the call in sec

 * @gfp: The allocation constraints

 * @notify_rx: Where to send notifications instead of socket queue

 * @upgrade: Request service upgrade for call
@@ -283,6 +284,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, 
					   struct key *key,

					   unsigned long user_call_ID,

					   s64 tx_total_len,

					   u32 hard_timeout,

					   gfp_t gfp,

					   rxrpc_notify_rx_t notify_rx,

					   bool upgrade,
@@ -313,6 +315,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, 
	p.tx_total_len		= tx_total_len;

	p.interruptibility	= interruptibility;

	p.kernel		= true;

	p.timeouts.hard		= hard_timeout;



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

	cp.local		= rx->local;