Commit 160cb957 authored by David Howells's avatar David Howells
Browse files

afs: Better tracing of protocol errors 



Include the site of detection of AFS protocol errors in trace lines to
better be able to determine what went wrong.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 9ea9ce04

fs/afs/cmservice.c

+4 −2
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ static int afs_deliver_cb_callback(struct afs_call *call) 
		call->count = ntohl(call->tmp);

		_debug("FID count: %u", call->count);

		if (call->count > AFSCBMAX)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_cb_fid_count);



		call->buffer = kmalloc(array3_size(call->count, 3, 4),

				       GFP_KERNEL);
@@ -234,7 +235,8 @@ static int afs_deliver_cb_callback(struct afs_call *call) 
		call->count2 = ntohl(call->tmp);

		_debug("CB count: %u", call->count2);

		if (call->count2 != call->count && call->count2 != 0)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_cb_count);

		call->offset = 0;

		call->unmarshall++;

fs/afs/fsclient.c

+71 −46
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int xdr_decode_AFSFetchStatus(struct afs_call *call, 


bad:

	xdr_dump_bad(*_bp);

	return afs_protocol_error(call, -EBADMSG);

	return afs_protocol_error(call, -EBADMSG, afs_eproto_bad_status);

}



/*
@@ -399,9 +399,10 @@ static int afs_deliver_fs_fetch_status_vnode(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	xdr_decode_AFSCallBack(call, vnode, &bp);

	if (call->reply[1])

		xdr_decode_AFSVolSync(&bp, call->reply[1]);
@@ -580,9 +581,10 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call) 
			return ret;



		bp = call->buffer;

		if (afs_decode_status(call, &bp, &vnode->status, vnode,

				      &vnode->status.data_version, req) < 0)

			return afs_protocol_error(call, -EBADMSG);

		ret = afs_decode_status(call, &bp, &vnode->status, vnode,

					&vnode->status.data_version, req);

		if (ret < 0)

			return ret;

		xdr_decode_AFSCallBack(call, vnode, &bp);

		if (call->reply[1])

			xdr_decode_AFSVolSync(&bp, call->reply[1]);
@@ -733,10 +735,13 @@ static int afs_deliver_fs_create_vnode(struct afs_call *call) 
	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	xdr_decode_AFSFid(&bp, call->reply[1]);

	if (afs_decode_status(call, &bp, call->reply[2], NULL, NULL, NULL) < 0 ||

	    afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, call->reply[2], NULL, NULL, NULL);

	if (ret < 0)

		return ret;

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	xdr_decode_AFSCallBack_raw(&bp, call->reply[3]);

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */
@@ -839,9 +844,10 @@ static int afs_deliver_fs_remove(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	_leave(" = 0 [done]");
@@ -929,10 +935,13 @@ static int afs_deliver_fs_link(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &vnode->status, vnode, NULL, NULL) < 0 ||

	    afs_decode_status(call, &bp, &dvnode->status, dvnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &vnode->status, vnode, NULL, NULL);

	if (ret < 0)

		return ret;

	ret = afs_decode_status(call, &bp, &dvnode->status, dvnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	_leave(" = 0 [done]");
@@ -1016,10 +1025,13 @@ static int afs_deliver_fs_symlink(struct afs_call *call) 
	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	xdr_decode_AFSFid(&bp, call->reply[1]);

	if (afs_decode_status(call, &bp, call->reply[2], NULL, NULL, NULL) ||

	    afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, call->reply[2], NULL, NULL, NULL);

	if (ret < 0)

		return ret;

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	_leave(" = 0 [done]");
@@ -1122,13 +1134,16 @@ static int afs_deliver_fs_rename(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &orig_dvnode->status, orig_dvnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	if (new_dvnode != orig_dvnode &&

	    afs_decode_status(call, &bp, &new_dvnode->status, new_dvnode,

			      &call->expected_version_2, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &orig_dvnode->status, orig_dvnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	if (new_dvnode != orig_dvnode) {

		ret = afs_decode_status(call, &bp, &new_dvnode->status, new_dvnode,

					&call->expected_version_2, NULL);

		if (ret < 0)

			return ret;

	}

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	_leave(" = 0 [done]");
@@ -1231,9 +1246,10 @@ static int afs_deliver_fs_store_data(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	afs_pages_written_back(vnode, call);
@@ -1407,9 +1423,10 @@ static int afs_deliver_fs_store_status(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	if (afs_decode_status(call, &bp, &vnode->status, vnode,

			      &call->expected_version, NULL) < 0)

		return afs_protocol_error(call, -EBADMSG);

	ret = afs_decode_status(call, &bp, &vnode->status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */



	_leave(" = 0 [done]");
@@ -1612,7 +1629,8 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call) 
		call->count = ntohl(call->tmp);

		_debug("volname length: %u", call->count);

		if (call->count >= AFSNAMEMAX)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_volname_len);

		call->offset = 0;

		call->unmarshall++;
@@ -1659,7 +1677,8 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call) 
		call->count = ntohl(call->tmp);

		_debug("offline msg length: %u", call->count);

		if (call->count >= AFSNAMEMAX)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_offline_msg_len);

		call->offset = 0;

		call->unmarshall++;
@@ -1706,7 +1725,8 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call) 
		call->count = ntohl(call->tmp);

		_debug("motd length: %u", call->count);

		if (call->count >= AFSNAMEMAX)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_motd_len);

		call->offset = 0;

		call->unmarshall++;
@@ -2109,8 +2129,10 @@ static int afs_deliver_fs_fetch_status(struct afs_call *call) 


	/* unmarshall the reply once we've received all of it */

	bp = call->buffer;

	afs_decode_status(call, &bp, status, vnode,

	ret = afs_decode_status(call, &bp, status, vnode,

				&call->expected_version, NULL);

	if (ret < 0)

		return ret;

	callback[call->count].version	= ntohl(bp[0]);

	callback[call->count].expiry	= ntohl(bp[1]);

	callback[call->count].type	= ntohl(bp[2]);
@@ -2206,7 +2228,8 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call) 
		tmp = ntohl(call->tmp);

		_debug("status count: %u/%u", tmp, call->count2);

		if (tmp != call->count2)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_ibulkst_count);



		call->count = 0;

		call->unmarshall++;
@@ -2221,10 +2244,11 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call) 


		bp = call->buffer;

		statuses = call->reply[1];

		if (afs_decode_status(call, &bp, &statuses[call->count],

		ret = afs_decode_status(call, &bp, &statuses[call->count],

					call->count == 0 ? vnode : NULL,

				      NULL, NULL) < 0)

			return afs_protocol_error(call, -EBADMSG);

					NULL, NULL);

		if (ret < 0)

			return ret;



		call->count++;

		if (call->count < call->count2)
@@ -2244,7 +2268,8 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call) 
		tmp = ntohl(call->tmp);

		_debug("CB count: %u", tmp);

		if (tmp != call->count2)

			return afs_protocol_error(call, -EBADMSG);

			return afs_protocol_error(call, -EBADMSG,

						  afs_eproto_ibulkst_cb_count);

		call->count = 0;

		call->unmarshall++;

	more_cbs:

fs/afs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int afs_inode_init_from_status(struct afs_vnode *vnode, struct key *key) 
	default:

		printk("kAFS: AFS vnode with undefined type\n");

		read_sequnlock_excl(&vnode->cb_lock);

		return afs_protocol_error(NULL, -EBADMSG);

		return afs_protocol_error(NULL, -EBADMSG, afs_eproto_file_type);

	}



	inode->i_blocks		= 0;

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ extern void afs_flat_call_destructor(struct afs_call *); 
extern void afs_send_empty_reply(struct afs_call *);

extern void afs_send_simple_reply(struct afs_call *, const void *, size_t);

extern int afs_extract_data(struct afs_call *, void *, size_t, bool);

extern int afs_protocol_error(struct afs_call *, int);

extern int afs_protocol_error(struct afs_call *, int, enum afs_eproto_cause);



static inline int afs_transfer_reply(struct afs_call *call)

{

fs/afs/rxrpc.c

+3 −2
Original line number Diff line number Diff line
@@ -939,8 +939,9 @@ int afs_extract_data(struct afs_call *call, void *buf, size_t count, 
/*

 * Log protocol error production.

 */

noinline int afs_protocol_error(struct afs_call *call, int error)

noinline int afs_protocol_error(struct afs_call *call, int error,

				enum afs_eproto_cause cause)

{

	trace_afs_protocol_error(call, error, __builtin_return_address(0));

	trace_afs_protocol_error(call, error, cause);

	return error;

}