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

Merge tag 'rxrpc-rewrite-20160823-1' of... 

Merge tag 'rxrpc-rewrite-20160823-1' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs



David Howells says:

====================
rxrpc: Cleanups

Here are some cleanups for the AF_RXRPC rewrite:

 (1) Remove some unused bits.

 (2) Call releasing on socket closure is now done in the order in which
     calls progress through the phases so that we don't miss a call
     actively moving list.

 (3) The rxrpc_call struct's channel number field is redundant and replaced
     with accesses to the masked off cid field instead.

 (4) Use a tracepoint for socket buffer accounting rather than printks.

     Unfortunately, since this would require currently non-existend
     arch-specific help to divine the current instruction location, the
     accounting functions are moved out of line so that
     __builtin_return_address() can be used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b3dc9350 df844fd4

include/trace/events/rxrpc.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/* AF_RXRPC tracepoints

 *

 * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */

#undef TRACE_SYSTEM

#define TRACE_SYSTEM rxrpc



#if !defined(_TRACE_RXRPC_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_RXRPC_H



#include <linux/tracepoint.h>



TRACE_EVENT(rxrpc_skb,

	    TP_PROTO(struct sk_buff *skb, int op, int usage, int mod_count,

		     const void *where),



	    TP_ARGS(skb, op, usage, mod_count, where),



	    TP_STRUCT__entry(

		    __field(struct sk_buff *,		skb		)

		    __field(int,			op		)

		    __field(int,			usage		)

		    __field(int,			mod_count	)

		    __field(const void *,		where		)

			     ),



	    TP_fast_assign(

		    __entry->skb = skb;

		    __entry->op = op;

		    __entry->usage = usage;

		    __entry->mod_count = mod_count;

		    __entry->where = where;

			   ),



	    TP_printk("s=%p %s u=%d m=%d p=%pSR",

		      __entry->skb,

		      (__entry->op == 0 ? "NEW" :

		       __entry->op == 1 ? "SEE" :

		       __entry->op == 2 ? "GET" :

		       __entry->op == 3 ? "FRE" :

		       "PUR"),

		      __entry->usage,

		      __entry->mod_count,

		      __entry->where)

	    );



#endif /* _TRACE_RXRPC_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

net/rxrpc/af_rxrpc.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <net/net_namespace.h>

#include <net/sock.h>

#include <net/af_rxrpc.h>

#define CREATE_TRACE_POINTS

#include "ar-internal.h"



MODULE_DESCRIPTION("RxRPC network protocol");

net/rxrpc/ar-internal.h

+21 −47
Original line number Diff line number Diff line
@@ -341,10 +341,10 @@ enum rxrpc_call_flag { 
	RXRPC_CALL_RCVD_LAST,		/* all packets received */

	RXRPC_CALL_RUN_RTIMER,		/* Tx resend timer started */

	RXRPC_CALL_TX_SOFT_ACK,		/* sent some soft ACKs */

	RXRPC_CALL_PROC_BUSY,		/* the processor is busy */

	RXRPC_CALL_INIT_ACCEPT,		/* acceptance was initiated */

	RXRPC_CALL_HAS_USERID,		/* has a user ID attached */

	RXRPC_CALL_EXPECT_OOS,		/* expect out of sequence packets */

	RXRPC_CALL_IS_SERVICE,		/* Call is service call */

};



/*
@@ -432,8 +432,10 @@ struct rxrpc_call { 
	int			error_report;	/* Network error (ICMP/local transport) */

	int			error;		/* Local error incurred */

	enum rxrpc_call_state	state : 8;	/* current state of call */

	u16			service_id;	/* service ID */

	u32			call_id;	/* call ID on connection  */

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

	int			debug_id;	/* debug ID for printks */

	u8			channel;	/* connection channel occupied by this call */



	/* transmission-phase ACK management */

	u8			acks_head;	/* offset into window of first entry */
@@ -461,13 +463,6 @@ struct rxrpc_call { 
	/* received packet records, 1 bit per record */

#define RXRPC_ACKR_WINDOW_ASZ DIV_ROUND_UP(RXRPC_MAXACKS, BITS_PER_LONG)

	unsigned long		ackr_window[RXRPC_ACKR_WINDOW_ASZ + 1];



	u8			in_clientflag;	/* Copy of conn->in_clientflag */

	struct rxrpc_local	*local;		/* Local endpoint. */

	u32			call_id;	/* call ID on connection  */

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

	u32			epoch;		/* epoch of this connection */

	u16			service_id;	/* service ID */

};



/*
@@ -484,6 +479,8 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code) 
	write_unlock_bh(&call->state_lock);

}



#include <trace/events/rxrpc.h>



/*

 * af_rxrpc.c

 */
@@ -528,6 +525,16 @@ void rxrpc_release_calls_on_socket(struct rxrpc_sock *); 
void __rxrpc_put_call(struct rxrpc_call *);

void __exit rxrpc_destroy_all_calls(void);



static inline bool rxrpc_is_service_call(const struct rxrpc_call *call)

{

	return test_bit(RXRPC_CALL_IS_SERVICE, &call->flags);

}



static inline bool rxrpc_is_client_call(const struct rxrpc_call *call)

{

	return !rxrpc_is_service_call(call);

}



/*

 * conn_client.c

 */
@@ -747,6 +754,11 @@ int rxrpc_init_server_conn_security(struct rxrpc_connection *); 
 * skbuff.c

 */

void rxrpc_packet_destructor(struct sk_buff *);

void rxrpc_new_skb(struct sk_buff *);

void rxrpc_see_skb(struct sk_buff *);

void rxrpc_get_skb(struct sk_buff *);

void rxrpc_free_skb(struct sk_buff *);

void rxrpc_purge_queue(struct sk_buff_head *);



/*

 * sysctl.c
@@ -894,44 +906,6 @@ do { \ 


#endif /* __KDEBUGALL */



/*

 * socket buffer accounting / leak finding

 */

static inline void __rxrpc_new_skb(struct sk_buff *skb, const char *fn)

{

	//_net("new skb %p %s [%d]", skb, fn, atomic_read(&rxrpc_n_skbs));

	//atomic_inc(&rxrpc_n_skbs);

}



#define rxrpc_new_skb(skb) __rxrpc_new_skb((skb), __func__)



static inline void __rxrpc_kill_skb(struct sk_buff *skb, const char *fn)

{

	//_net("kill skb %p %s [%d]", skb, fn, atomic_read(&rxrpc_n_skbs));

	//atomic_dec(&rxrpc_n_skbs);

}



#define rxrpc_kill_skb(skb) __rxrpc_kill_skb((skb), __func__)



static inline void __rxrpc_free_skb(struct sk_buff *skb, const char *fn)

{

	if (skb) {

		CHECK_SLAB_OKAY(&skb->users);

		//_net("free skb %p %s [%d]",

		//     skb, fn, atomic_read(&rxrpc_n_skbs));

		//atomic_dec(&rxrpc_n_skbs);

		kfree_skb(skb);

	}

}



#define rxrpc_free_skb(skb) __rxrpc_free_skb((skb), __func__)



static inline void rxrpc_purge_queue(struct sk_buff_head *list)

{

	struct sk_buff *skb;

	while ((skb = skb_dequeue((list))) != NULL)

		rxrpc_free_skb(skb);

}



#define rxrpc_get_call(CALL)				\

do {							\

net/rxrpc/call_accept.c

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ void rxrpc_accept_incoming_calls(struct rxrpc_local *local) 


	_net("incoming call skb %p", skb);



	rxrpc_see_skb(skb);

	sp = rxrpc_skb(skb);



	/* Set up a response packet header in case we need it */

net/rxrpc/call_event.c

+3 −6
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ static int rxrpc_drain_rx_oos_queue(struct rxrpc_call *call) 


	skb = skb_dequeue(&call->rx_oos_queue);

	if (skb) {

		rxrpc_see_skb(skb);

		sp = rxrpc_skb(skb);



		_debug("drain OOS packet %d [%d]",
@@ -427,6 +428,7 @@ static int rxrpc_drain_rx_oos_queue(struct rxrpc_call *call) 


			/* find out what the next packet is */

			skb = skb_peek(&call->rx_oos_queue);

			rxrpc_see_skb(skb);

			if (skb)

				call->rx_first_oos = rxrpc_skb(skb)->hdr.seq;

			else
@@ -576,6 +578,7 @@ process_further: 
	if (!skb)

		return -EAGAIN;



	rxrpc_see_skb(skb);

	_net("deferred skb %p", skb);



	sp = rxrpc_skb(skb);
@@ -832,11 +835,6 @@ void rxrpc_process_call(struct work_struct *work) 
	       call->debug_id, rxrpc_call_states[call->state], call->events,

	       (jiffies - call->creation_jif) / (HZ / 10));



	if (test_and_set_bit(RXRPC_CALL_PROC_BUSY, &call->flags)) {

		_debug("XXXXXXXXXXXXX RUNNING ON MULTIPLE CPUS XXXXXXXXXXXXX");

		return;

	}



	if (!call->conn)

		goto skip_msg_init;
@@ -1281,7 +1279,6 @@ maybe_reschedule: 
	}



error:

	clear_bit(RXRPC_CALL_PROC_BUSY, &call->flags);

	kfree(acks);



	/* because we don't want two CPUs both processing the work item for one

CRA Git | Maintained and supported by SUSTech CRA and CCSE