Commit 277e4ab7 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Simplify TCP receive code by switching to using iterators 



Most of this code should also be reusable with other socket types.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 9d96acbc

include/linux/sunrpc/xprtsock.h

+4 −15
Original line number Diff line number Diff line
@@ -30,16 +30,17 @@ struct sock_xprt { 
	/*

	 * State of TCP reply receive

	 */

	struct {

		struct {

			__be32	fraghdr,

				xid,

				calldir;

		} __attribute__((packed));



		u32		offset,

				len;



		unsigned long	copied,

				flags;

		unsigned long	copied;

	} recv;



	/*
@@ -76,21 +77,9 @@ struct sock_xprt { 
	void			(*old_error_report)(struct sock *);

};



/*

 * TCP receive state flags

 */

#define TCP_RCV_LAST_FRAG	(1UL << 0)

#define TCP_RCV_COPY_FRAGHDR	(1UL << 1)

#define TCP_RCV_COPY_XID	(1UL << 2)

#define TCP_RCV_COPY_DATA	(1UL << 3)

#define TCP_RCV_READ_CALLDIR	(1UL << 4)

#define TCP_RCV_COPY_CALLDIR	(1UL << 5)



/*

 * TCP RPC flags

 */

#define TCP_RPC_REPLY		(1UL << 6)



#define XPRT_SOCK_CONNECTING	1U

#define XPRT_SOCK_DATA_READY	(2)

#define XPRT_SOCK_UPD_TIMEOUT	(3)

include/trace/events/sunrpc.h

+1 −14
Original line number Diff line number Diff line
@@ -497,16 +497,6 @@ TRACE_EVENT(xs_tcp_data_ready, 
			__get_str(port), __entry->err, __entry->total)

);



#define rpc_show_sock_xprt_flags(flags) \

	__print_flags(flags, "|", \

		{ TCP_RCV_LAST_FRAG, "TCP_RCV_LAST_FRAG" }, \

		{ TCP_RCV_COPY_FRAGHDR, "TCP_RCV_COPY_FRAGHDR" }, \

		{ TCP_RCV_COPY_XID, "TCP_RCV_COPY_XID" }, \

		{ TCP_RCV_COPY_DATA, "TCP_RCV_COPY_DATA" }, \

		{ TCP_RCV_READ_CALLDIR, "TCP_RCV_READ_CALLDIR" }, \

		{ TCP_RCV_COPY_CALLDIR, "TCP_RCV_COPY_CALLDIR" }, \

		{ TCP_RPC_REPLY, "TCP_RPC_REPLY" })



TRACE_EVENT(xs_tcp_data_recv,

	TP_PROTO(struct sock_xprt *xs),
@@ -516,7 +506,6 @@ TRACE_EVENT(xs_tcp_data_recv, 
		__string(addr, xs->xprt.address_strings[RPC_DISPLAY_ADDR])

		__string(port, xs->xprt.address_strings[RPC_DISPLAY_PORT])

		__field(u32, xid)

		__field(unsigned long, flags)

		__field(unsigned long, copied)

		__field(unsigned int, reclen)

		__field(unsigned long, offset)
@@ -526,15 +515,13 @@ TRACE_EVENT(xs_tcp_data_recv, 
		__assign_str(addr, xs->xprt.address_strings[RPC_DISPLAY_ADDR]);

		__assign_str(port, xs->xprt.address_strings[RPC_DISPLAY_PORT]);

		__entry->xid = be32_to_cpu(xs->recv.xid);

		__entry->flags = xs->recv.flags;

		__entry->copied = xs->recv.copied;

		__entry->reclen = xs->recv.len;

		__entry->offset = xs->recv.offset;

	),



	TP_printk("peer=[%s]:%s xid=0x%08x flags=%s copied=%lu reclen=%u offset=%lu",

	TP_printk("peer=[%s]:%s xid=0x%08x copied=%lu reclen=%u offset=%lu",

			__get_str(addr), __get_str(port), __entry->xid,

			rpc_show_sock_xprt_flags(__entry->flags),

			__entry->copied, __entry->reclen, __entry->offset)

);

net/sunrpc/xprtsock.c

+333 −364

File changed.

Preview size limit exceeded, changes collapsed.