Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0b0462 authored by Sridhar Samudrala's avatar Sridhar Samudrala Committed by David S. Miller
Browse files

[SCTP]: Extend /proc/net/sctp/snmp to provide more statistics. 



This patch adds more statistics info under /proc/net/sctp/snmp
that should be useful for debugging. The additional events that
are counted now include timer expirations, retransmits, packet
and data chunk discards.

The Data chunk discards include all the cases where a data chunk
is discarded including high tsn, bad stream, dup tsn and the most
useful one(out of receive buffer/rwnd).

Also moved the SCTP MIB data structures from the generic include
directories to include/sctp/sctp.h.

Signed-off-by: default avatarSridhar Samudrala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72d3b2c9

include/linux/snmp.h

+0 −33
Original line number Diff line number Diff line
@@ -160,39 +160,6 @@ enum 
	__UDP_MIB_MAX

};



/* sctp mib definitions */

/*

 * draft-ietf-sigtran-sctp-mib-07.txt

 */

enum

{

	SCTP_MIB_NUM = 0,

	SCTP_MIB_CURRESTAB,			/* CurrEstab */

	SCTP_MIB_ACTIVEESTABS,			/* ActiveEstabs */

	SCTP_MIB_PASSIVEESTABS,			/* PassiveEstabs */

	SCTP_MIB_ABORTEDS,			/* Aborteds */

	SCTP_MIB_SHUTDOWNS,			/* Shutdowns */

	SCTP_MIB_OUTOFBLUES,			/* OutOfBlues */

	SCTP_MIB_CHECKSUMERRORS,		/* ChecksumErrors */

	SCTP_MIB_OUTCTRLCHUNKS,			/* OutCtrlChunks */

	SCTP_MIB_OUTORDERCHUNKS,		/* OutOrderChunks */

	SCTP_MIB_OUTUNORDERCHUNKS,		/* OutUnorderChunks */

	SCTP_MIB_INCTRLCHUNKS,			/* InCtrlChunks */

	SCTP_MIB_INORDERCHUNKS,			/* InOrderChunks */

	SCTP_MIB_INUNORDERCHUNKS,		/* InUnorderChunks */

	SCTP_MIB_FRAGUSRMSGS,			/* FragUsrMsgs */

	SCTP_MIB_REASMUSRMSGS,			/* ReasmUsrMsgs */

	SCTP_MIB_OUTSCTPPACKS,			/* OutSCTPPacks */

	SCTP_MIB_INSCTPPACKS,			/* InSCTPPacks */

	SCTP_MIB_RTOALGORITHM,			/* RtoAlgorithm */

	SCTP_MIB_RTOMIN,			/* RtoMin */

	SCTP_MIB_RTOMAX,			/* RtoMax */

	SCTP_MIB_RTOINITIAL,			/* RtoInitial */

	SCTP_MIB_VALCOOKIELIFE,			/* ValCookieLife */

	SCTP_MIB_MAXINITRETR,			/* MaxInitRetr */

	__SCTP_MIB_MAX

};



/* linux mib definitions */

enum

{

include/net/sctp/sctp.h

+44 −0
Original line number Diff line number Diff line
@@ -216,6 +216,50 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics); 


#endif /* !TEST_FRAME */



/* sctp mib definitions */

enum

{

	SCTP_MIB_NUM = 0,

	SCTP_MIB_CURRESTAB,			/* CurrEstab */

	SCTP_MIB_ACTIVEESTABS,			/* ActiveEstabs */

	SCTP_MIB_PASSIVEESTABS,			/* PassiveEstabs */

	SCTP_MIB_ABORTEDS,			/* Aborteds */

	SCTP_MIB_SHUTDOWNS,			/* Shutdowns */

	SCTP_MIB_OUTOFBLUES,			/* OutOfBlues */

	SCTP_MIB_CHECKSUMERRORS,		/* ChecksumErrors */

	SCTP_MIB_OUTCTRLCHUNKS,			/* OutCtrlChunks */

	SCTP_MIB_OUTORDERCHUNKS,		/* OutOrderChunks */

	SCTP_MIB_OUTUNORDERCHUNKS,		/* OutUnorderChunks */

	SCTP_MIB_INCTRLCHUNKS,			/* InCtrlChunks */

	SCTP_MIB_INORDERCHUNKS,			/* InOrderChunks */

	SCTP_MIB_INUNORDERCHUNKS,		/* InUnorderChunks */

	SCTP_MIB_FRAGUSRMSGS,			/* FragUsrMsgs */

	SCTP_MIB_REASMUSRMSGS,			/* ReasmUsrMsgs */

	SCTP_MIB_OUTSCTPPACKS,			/* OutSCTPPacks */

	SCTP_MIB_INSCTPPACKS,			/* InSCTPPacks */

	SCTP_MIB_T1_INIT_EXPIREDS,

	SCTP_MIB_T1_COOKIE_EXPIREDS,

	SCTP_MIB_T2_SHUTDOWN_EXPIREDS,

	SCTP_MIB_T3_RTX_EXPIREDS,

	SCTP_MIB_T4_RTO_EXPIREDS,

	SCTP_MIB_T5_SHUTDOWN_GUARD_EXPIREDS,

	SCTP_MIB_DELAY_SACK_EXPIREDS,

	SCTP_MIB_AUTOCLOSE_EXPIREDS,

	SCTP_MIB_T3_RETRANSMITS,

	SCTP_MIB_PMTUD_RETRANSMITS,

	SCTP_MIB_FAST_RETRANSMITS,

	SCTP_MIB_IN_PKT_SOFTIRQ,

	SCTP_MIB_IN_PKT_BACKLOG,

	SCTP_MIB_IN_PKT_DISCARDS,

	SCTP_MIB_IN_DATA_CHUNK_DISCARDS,

	__SCTP_MIB_MAX

};



#define SCTP_MIB_MAX    __SCTP_MIB_MAX

struct sctp_mib {

        unsigned long   mibs[SCTP_MIB_MAX];

} __SNMP_MIB_ALIGN__;





/* Print debugging messages.  */

#if SCTP_DEBUG

include/net/snmp.h

+0 −6
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ struct udp_mib { 
	unsigned long	mibs[UDP_MIB_MAX];

} __SNMP_MIB_ALIGN__;



/* SCTP */

#define SCTP_MIB_MAX	__SCTP_MIB_MAX

struct sctp_mib {

	unsigned long	mibs[SCTP_MIB_MAX];

} __SNMP_MIB_ALIGN__;



/* Linux */

#define LINUX_MIB_MAX	__LINUX_MIB_MAX

struct linux_mib {

net/sctp/input.c

+6 −2
Original line number Diff line number Diff line
@@ -255,10 +255,13 @@ int sctp_rcv(struct sk_buff *skb) 
	 */

	sctp_bh_lock_sock(sk);



	if (sock_owned_by_user(sk))

	if (sock_owned_by_user(sk)) {

		SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_BACKLOG);

		sctp_add_backlog(sk, skb);

	else

	} else {

		SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_SOFTIRQ);

		sctp_inq_push(&chunk->rcvr->inqueue, chunk);

	}



	sctp_bh_unlock_sock(sk);
@@ -271,6 +274,7 @@ int sctp_rcv(struct sk_buff *skb) 
	return 0;



discard_it:

	SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_DISCARDS);

	kfree_skb(skb);

	return 0;

net/sctp/inqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void sctp_inq_free(struct sctp_inq *queue) 
/* Put a new packet in an SCTP inqueue.

 * We assume that packet->sctp_hdr is set and in host byte order.

 */

void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *packet)

void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *chunk)

{

	/* Directly call the packet handling routine. */
@@ -96,7 +96,7 @@ void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *packet) 
	 * Eventually, we should clean up inqueue to not rely

	 * on the BH related data structures.

	 */

	list_add_tail(&packet->list, &q->in_chunk_list);

	list_add_tail(&chunk->list, &q->in_chunk_list);

	q->immediate.func(q->immediate.data);

}