Create a new socket level option to report number of queue overflows
Recently I augmented the AF_PACKET protocol to report the number of frames lost
on the socket receive queue between any two enqueued frames.  This value was
exported via a SOL_PACKET level cmsg.  AFter I completed that work it was
requested that this feature be generalized so that any datagram oriented socket
could make use of this option.  As such I've created this patch, It creates a
new SOL_SOCKET level option called SO_RXQ_OVFL, which when enabled exports a
SOL_SOCKET level cmsg that reports the nubmer of times the sk_receive_queue
overflowed between any two given frames.  It also augments the AF_PACKET
protocol to take advantage of this new feature (as it previously did not touch
sk->sk_drops, which this patch uses to record the overflow count).  Tested
successfully by me.
Notes:
1) Unlike my previous patch, this patch simply records the sk_drops value, which
is not a number of drops between packets, but rather a total number of drops.
Deltas must be computed in user space.
2) While this patch currently works with datagram oriented protocols, it will
also be accepted by non-datagram oriented protocols. I'm not sure if thats
agreeable to everyone, but my argument in favor of doing so is that, for those
protocols which aren't applicable to this option, sk_drops will always be zero,
and reporting no drops on a receive queue that isn't used for those
non-participating protocols seems reasonable to me.  This also saves us having
to code in a per-protocol opt in mechanism.
3) This applies cleanly to net-next assuming that commit
977750076d (my af packet cmsg patch) is reverted
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
		
	
			
		
			
				
	
	
		
			124 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			124 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * This file is subject to the terms and conditions of the GNU General Public
 | 
						|
 * License.  See the file "COPYING" in the main directory of this archive
 | 
						|
 * for more details.
 | 
						|
 *
 | 
						|
 * Copyright (C) 1997, 1999, 2000, 2001 Ralf Baechle
 | 
						|
 * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
 | 
						|
 */
 | 
						|
#ifndef _ASM_SOCKET_H
 | 
						|
#define _ASM_SOCKET_H
 | 
						|
 | 
						|
#include <asm/sockios.h>
 | 
						|
 | 
						|
/*
 | 
						|
 * For setsockopt(2)
 | 
						|
 *
 | 
						|
 * This defines are ABI conformant as far as Linux supports these ...
 | 
						|
 */
 | 
						|
#define SOL_SOCKET	0xffff
 | 
						|
 | 
						|
#define SO_DEBUG	0x0001	/* Record debugging information.  */
 | 
						|
#define SO_REUSEADDR	0x0004	/* Allow reuse of local addresses.  */
 | 
						|
#define SO_KEEPALIVE	0x0008	/* Keep connections alive and send
 | 
						|
				   SIGPIPE when they die.  */
 | 
						|
#define SO_DONTROUTE	0x0010	/* Don't do local routing.  */
 | 
						|
#define SO_BROADCAST	0x0020	/* Allow transmission of
 | 
						|
				   broadcast messages.  */
 | 
						|
#define SO_LINGER	0x0080	/* Block on close of a reliable
 | 
						|
				   socket to transmit pending data.  */
 | 
						|
#define SO_OOBINLINE 0x0100	/* Receive out-of-band data in-band.  */
 | 
						|
#if 0
 | 
						|
To add: #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */
 | 
						|
#endif
 | 
						|
 | 
						|
#define SO_TYPE		0x1008	/* Compatible name for SO_STYLE.  */
 | 
						|
#define SO_STYLE	SO_TYPE	/* Synonym */
 | 
						|
#define SO_ERROR	0x1007	/* get error status and clear */
 | 
						|
#define SO_SNDBUF	0x1001	/* Send buffer size. */
 | 
						|
#define SO_RCVBUF	0x1002	/* Receive buffer. */
 | 
						|
#define SO_SNDLOWAT	0x1003	/* send low-water mark */
 | 
						|
#define SO_RCVLOWAT	0x1004	/* receive low-water mark */
 | 
						|
#define SO_SNDTIMEO	0x1005	/* send timeout */
 | 
						|
#define SO_RCVTIMEO 	0x1006	/* receive timeout */
 | 
						|
#define SO_ACCEPTCONN	0x1009
 | 
						|
#define SO_PROTOCOL	0x1028	/* protocol type */
 | 
						|
#define SO_DOMAIN	0x1029	/* domain/socket family */
 | 
						|
 | 
						|
/* linux-specific, might as well be the same as on i386 */
 | 
						|
#define SO_NO_CHECK	11
 | 
						|
#define SO_PRIORITY	12
 | 
						|
#define SO_BSDCOMPAT	14
 | 
						|
 | 
						|
#define SO_PASSCRED	17
 | 
						|
#define SO_PEERCRED	18
 | 
						|
 | 
						|
/* Security levels - as per NRL IPv6 - don't actually do anything */
 | 
						|
#define SO_SECURITY_AUTHENTICATION		22
 | 
						|
#define SO_SECURITY_ENCRYPTION_TRANSPORT	23
 | 
						|
#define SO_SECURITY_ENCRYPTION_NETWORK		24
 | 
						|
 | 
						|
#define SO_BINDTODEVICE		25
 | 
						|
 | 
						|
/* Socket filtering */
 | 
						|
#define SO_ATTACH_FILTER        26
 | 
						|
#define SO_DETACH_FILTER        27
 | 
						|
 | 
						|
#define SO_PEERNAME             28
 | 
						|
#define SO_TIMESTAMP		29
 | 
						|
#define SCM_TIMESTAMP		SO_TIMESTAMP
 | 
						|
 | 
						|
#define SO_PEERSEC		30
 | 
						|
#define SO_SNDBUFFORCE		31
 | 
						|
#define SO_RCVBUFFORCE		33
 | 
						|
#define SO_PASSSEC		34
 | 
						|
#define SO_TIMESTAMPNS		35
 | 
						|
#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
 | 
						|
 | 
						|
#define SO_MARK			36
 | 
						|
 | 
						|
#define SO_TIMESTAMPING		37
 | 
						|
#define SCM_TIMESTAMPING	SO_TIMESTAMPING
 | 
						|
 | 
						|
#define SO_RXQ_OVFL             40
 | 
						|
 | 
						|
#ifdef __KERNEL__
 | 
						|
 | 
						|
/** sock_type - Socket types
 | 
						|
 *
 | 
						|
 * Please notice that for binary compat reasons MIPS has to
 | 
						|
 * override the enum sock_type in include/linux/net.h, so
 | 
						|
 * we define ARCH_HAS_SOCKET_TYPES here.
 | 
						|
 *
 | 
						|
 * @SOCK_DGRAM - datagram (conn.less) socket
 | 
						|
 * @SOCK_STREAM - stream (connection) socket
 | 
						|
 * @SOCK_RAW - raw socket
 | 
						|
 * @SOCK_RDM - reliably-delivered message
 | 
						|
 * @SOCK_SEQPACKET - sequential packet socket
 | 
						|
 * @SOCK_PACKET - linux specific way of getting packets at the dev level.
 | 
						|
 *		  For writing rarp and other similar things on the user level.
 | 
						|
 */
 | 
						|
enum sock_type {
 | 
						|
	SOCK_DGRAM	= 1,
 | 
						|
	SOCK_STREAM	= 2,
 | 
						|
	SOCK_RAW	= 3,
 | 
						|
	SOCK_RDM	= 4,
 | 
						|
	SOCK_SEQPACKET	= 5,
 | 
						|
	SOCK_DCCP	= 6,
 | 
						|
	SOCK_PACKET	= 10,
 | 
						|
};
 | 
						|
 | 
						|
#define SOCK_MAX (SOCK_PACKET + 1)
 | 
						|
/* Mask which covers at least up to SOCK_MASK-1.  The
 | 
						|
 *  * remaining bits are used as flags. */
 | 
						|
#define SOCK_TYPE_MASK 0xf
 | 
						|
 | 
						|
/* Flags for socket, socketpair, paccept */
 | 
						|
#define SOCK_CLOEXEC	O_CLOEXEC
 | 
						|
#define SOCK_NONBLOCK	O_NONBLOCK
 | 
						|
 | 
						|
#define ARCH_HAS_SOCKET_TYPES 1
 | 
						|
 | 
						|
#endif /* __KERNEL__ */
 | 
						|
 | 
						|
#endif /* _ASM_SOCKET_H */
 |