nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

packet: rollover statistics

Browse source 
Rollover indicates exceptional conditions. Export a counter to inform
socket owners of this state.

If no socket with sufficient room is found, rollover fails. Also count
these events.

Finally, also count when flows are rolled over early thanks to huge
flow detection, to validate its correctness.

Tested:
  Read counters in bench_rollover on all other tests in the patchset

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2015-05-12 11:56:50 -04:00 committed by David S. Miller
parent 3b3a5b0aab
commit a9b6391814
3 changed files with 28 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
include/uapi/linux/if_packet.h
View file

@ -54,6 +54,7 @@ struct sockaddr_ll {
#define PACKET_FANOUT 18 #define PACKET_FANOUT 18
#define PACKET_TX_HAS_OFF 19 #define PACKET_TX_HAS_OFF 19
#define PACKET_QDISC_BYPASS 20 #define PACKET_QDISC_BYPASS 20
#define PACKET_ROLLOVER_STATS 21
#define PACKET_FANOUT_HASH 0 #define PACKET_FANOUT_HASH 0
#define PACKET_FANOUT_LB 1 #define PACKET_FANOUT_LB 1
@ -75,6 +76,12 @@ struct tpacket_stats_v3 {
unsigned int tp_freeze_q_cnt; unsigned int tp_freeze_q_cnt;
}; };
struct tpacket_rollover_stats {
__aligned_u64 tp_all;
__aligned_u64 tp_huge;
__aligned_u64 tp_failed;
};
union tpacket_stats_u { union tpacket_stats_u {
struct tpacket_stats stats1; struct tpacket_stats stats1;
struct tpacket_stats_v3 stats3; struct tpacket_stats_v3 stats3;

19
net/packet/af_packet.c
View file

@ -1395,7 +1395,7 @@ static unsigned int fanout_demux_rollover(struct packet_fanout *f,
unsigned int num) unsigned int num)
{ {
struct packet_sock *po, *po_next; struct packet_sock *po, *po_next;
unsigned int i, j, room; unsigned int i, j, room = ROOM_NONE;
po = pkt_sk(f->arr[idx]); po = pkt_sk(f->arr[idx]);
@ -1413,6 +1413,9 @@ static unsigned int fanout_demux_rollover(struct packet_fanout *f,
packet_rcv_has_room(po_next, skb) == ROOM_NORMAL) { packet_rcv_has_room(po_next, skb) == ROOM_NORMAL) {
if (i != j) if (i != j)
po->rollover->sock = i; po->rollover->sock = i;
atomic_long_inc(&po->rollover->num);
if (room == ROOM_LOW)
atomic_long_inc(&po->rollover->num_huge);
return i; return i;
} }
@ -1420,6 +1423,7 @@ static unsigned int fanout_demux_rollover(struct packet_fanout *f,
i = 0; i = 0;
} while (i != j); } while (i != j);
atomic_long_inc(&po->rollover->num_failed);
return idx; return idx;
} }
@ -1554,6 +1558,9 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
po->rollover = kzalloc(sizeof(*po->rollover), GFP_KERNEL); po->rollover = kzalloc(sizeof(*po->rollover), GFP_KERNEL);
if (!po->rollover) if (!po->rollover)
return -ENOMEM; return -ENOMEM;
atomic_long_set(&po->rollover->num, 0);
atomic_long_set(&po->rollover->num_huge, 0);
atomic_long_set(&po->rollover->num_failed, 0);
} }
mutex_lock(&fanout_mutex); mutex_lock(&fanout_mutex);
@ -3584,6 +3591,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
struct packet_sock *po = pkt_sk(sk); struct packet_sock *po = pkt_sk(sk);
void *data = &val; void *data = &val;
union tpacket_stats_u st; union tpacket_stats_u st;
struct tpacket_rollover_stats rstats;
if (level != SOL_PACKET) if (level != SOL_PACKET)
return -ENOPROTOOPT; return -ENOPROTOOPT;
@ -3659,6 +3667,15 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
((u32)po->fanout->flags << 24)) : ((u32)po->fanout->flags << 24)) :
0); 0);
break; break;
case PACKET_ROLLOVER_STATS:
if (!po->rollover)
return -EINVAL;
rstats.tp_all = atomic_long_read(&po->rollover->num);
rstats.tp_huge = atomic_long_read(&po->rollover->num_huge);
rstats.tp_failed = atomic_long_read(&po->rollover->num_failed);
data = &rstats;
lv = sizeof(rstats);
break;
case PACKET_TX_HAS_OFF: case PACKET_TX_HAS_OFF:
val = po->tp_tx_has_off; val = po->tp_tx_has_off;
break; break;

3
net/packet/internal.h
View file

@ -89,6 +89,9 @@ struct packet_fanout {
struct packet_rollover { struct packet_rollover {
int sock; int sock;
atomic_long_t num;
atomic_long_t num_huge;
atomic_long_t num_failed;
#define ROLLOVER_HLEN (L1_CACHE_BYTES / sizeof(u32)) #define ROLLOVER_HLEN (L1_CACHE_BYTES / sizeof(u32))
u32 history[ROLLOVER_HLEN] ____cacheline_aligned; u32 history[ROLLOVER_HLEN] ____cacheline_aligned;
} ____cacheline_aligned_in_smp; } ____cacheline_aligned_in_smp;