|
@@ -374,10 +374,8 @@ static void l2tp_recv_queue_skb(struct l2tp_session *session, struct sk_buff *sk
|
|
|
struct sk_buff *skbp;
|
|
|
struct sk_buff *tmp;
|
|
|
u32 ns = L2TP_SKB_CB(skb)->ns;
|
|
|
- struct l2tp_stats *sstats;
|
|
|
|
|
|
spin_lock_bh(&session->reorder_q.lock);
|
|
|
- sstats = &session->stats;
|
|
|
skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {
|
|
|
if (L2TP_SKB_CB(skbp)->ns > ns) {
|
|
|
__skb_queue_before(&session->reorder_q, skbp, skb);
|
|
@@ -385,9 +383,7 @@ static void l2tp_recv_queue_skb(struct l2tp_session *session, struct sk_buff *sk
|
|
|
"%s: pkt %hu, inserted before %hu, reorder_q len=%d\n",
|
|
|
session->name, ns, L2TP_SKB_CB(skbp)->ns,
|
|
|
skb_queue_len(&session->reorder_q));
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_oos_packets++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_oos_packets);
|
|
|
goto out;
|
|
|
}
|
|
|
}
|
|
@@ -404,23 +400,16 @@ static void l2tp_recv_dequeue_skb(struct l2tp_session *session, struct sk_buff *
|
|
|
{
|
|
|
struct l2tp_tunnel *tunnel = session->tunnel;
|
|
|
int length = L2TP_SKB_CB(skb)->length;
|
|
|
- struct l2tp_stats *tstats, *sstats;
|
|
|
|
|
|
/* We're about to requeue the skb, so return resources
|
|
|
* to its current owner (a socket receive buffer).
|
|
|
*/
|
|
|
skb_orphan(skb);
|
|
|
|
|
|
- tstats = &tunnel->stats;
|
|
|
- u64_stats_update_begin(&tstats->syncp);
|
|
|
- sstats = &session->stats;
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- tstats->rx_packets++;
|
|
|
- tstats->rx_bytes += length;
|
|
|
- sstats->rx_packets++;
|
|
|
- sstats->rx_bytes += length;
|
|
|
- u64_stats_update_end(&tstats->syncp);
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&tunnel->stats.rx_packets);
|
|
|
+ atomic_long_add(length, &tunnel->stats.rx_bytes);
|
|
|
+ atomic_long_inc(&session->stats.rx_packets);
|
|
|
+ atomic_long_add(length, &session->stats.rx_bytes);
|
|
|
|
|
|
if (L2TP_SKB_CB(skb)->has_seq) {
|
|
|
/* Bump our Nr */
|
|
@@ -451,7 +440,6 @@ static void l2tp_recv_dequeue(struct l2tp_session *session)
|
|
|
{
|
|
|
struct sk_buff *skb;
|
|
|
struct sk_buff *tmp;
|
|
|
- struct l2tp_stats *sstats;
|
|
|
|
|
|
/* If the pkt at the head of the queue has the nr that we
|
|
|
* expect to send up next, dequeue it and any other
|
|
@@ -459,13 +447,10 @@ static void l2tp_recv_dequeue(struct l2tp_session *session)
|
|
|
*/
|
|
|
start:
|
|
|
spin_lock_bh(&session->reorder_q.lock);
|
|
|
- sstats = &session->stats;
|
|
|
skb_queue_walk_safe(&session->reorder_q, skb, tmp) {
|
|
|
if (time_after(jiffies, L2TP_SKB_CB(skb)->expires)) {
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_seq_discards++;
|
|
|
- sstats->rx_errors++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_seq_discards);
|
|
|
+ atomic_long_inc(&session->stats.rx_errors);
|
|
|
l2tp_dbg(session, L2TP_MSG_SEQ,
|
|
|
"%s: oos pkt %u len %d discarded (too old), waiting for %u, reorder_q_len=%d\n",
|
|
|
session->name, L2TP_SKB_CB(skb)->ns,
|
|
@@ -624,7 +609,6 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
struct l2tp_tunnel *tunnel = session->tunnel;
|
|
|
int offset;
|
|
|
u32 ns, nr;
|
|
|
- struct l2tp_stats *sstats = &session->stats;
|
|
|
|
|
|
/* The ref count is increased since we now hold a pointer to
|
|
|
* the session. Take care to decrement the refcnt when exiting
|
|
@@ -641,9 +625,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
"%s: cookie mismatch (%u/%u). Discarding.\n",
|
|
|
tunnel->name, tunnel->tunnel_id,
|
|
|
session->session_id);
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_cookie_discards++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_cookie_discards);
|
|
|
goto discard;
|
|
|
}
|
|
|
ptr += session->peer_cookie_len;
|
|
@@ -712,9 +694,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
l2tp_warn(session, L2TP_MSG_SEQ,
|
|
|
"%s: recv data has no seq numbers when required. Discarding.\n",
|
|
|
session->name);
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_seq_discards++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_seq_discards);
|
|
|
goto discard;
|
|
|
}
|
|
|
|
|
@@ -733,9 +713,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
l2tp_warn(session, L2TP_MSG_SEQ,
|
|
|
"%s: recv data has no seq numbers when required. Discarding.\n",
|
|
|
session->name);
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_seq_discards++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_seq_discards);
|
|
|
goto discard;
|
|
|
}
|
|
|
}
|
|
@@ -789,9 +767,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
* packets
|
|
|
*/
|
|
|
if (L2TP_SKB_CB(skb)->ns != session->nr) {
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_seq_discards++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_seq_discards);
|
|
|
l2tp_dbg(session, L2TP_MSG_SEQ,
|
|
|
"%s: oos pkt %u len %d discarded, waiting for %u, reorder_q_len=%d\n",
|
|
|
session->name, L2TP_SKB_CB(skb)->ns,
|
|
@@ -817,9 +793,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
return;
|
|
|
|
|
|
discard:
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
- sstats->rx_errors++;
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
+ atomic_long_inc(&session->stats.rx_errors);
|
|
|
kfree_skb(skb);
|
|
|
|
|
|
if (session->deref)
|
|
@@ -861,7 +835,6 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb,
|
|
|
u32 tunnel_id, session_id;
|
|
|
u16 version;
|
|
|
int length;
|
|
|
- struct l2tp_stats *tstats;
|
|
|
|
|
|
if (tunnel->sock && l2tp_verify_udp_checksum(tunnel->sock, skb))
|
|
|
goto discard_bad_csum;
|
|
@@ -950,10 +923,7 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb,
|
|
|
discard_bad_csum:
|
|
|
LIMIT_NETDEBUG("%s: UDP: bad checksum\n", tunnel->name);
|
|
|
UDP_INC_STATS_USER(tunnel->l2tp_net, UDP_MIB_INERRORS, 0);
|
|
|
- tstats = &tunnel->stats;
|
|
|
- u64_stats_update_begin(&tstats->syncp);
|
|
|
- tstats->rx_errors++;
|
|
|
- u64_stats_update_end(&tstats->syncp);
|
|
|
+ atomic_long_inc(&tunnel->stats.rx_errors);
|
|
|
kfree_skb(skb);
|
|
|
|
|
|
return 0;
|
|
@@ -1080,7 +1050,6 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
struct l2tp_tunnel *tunnel = session->tunnel;
|
|
|
unsigned int len = skb->len;
|
|
|
int error;
|
|
|
- struct l2tp_stats *tstats, *sstats;
|
|
|
|
|
|
/* Debug */
|
|
|
if (session->send_seq)
|
|
@@ -1109,21 +1078,15 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
|
|
|
error = ip_queue_xmit(skb, fl);
|
|
|
|
|
|
/* Update stats */
|
|
|
- tstats = &tunnel->stats;
|
|
|
- u64_stats_update_begin(&tstats->syncp);
|
|
|
- sstats = &session->stats;
|
|
|
- u64_stats_update_begin(&sstats->syncp);
|
|
|
if (error >= 0) {
|
|
|
- tstats->tx_packets++;
|
|
|
- tstats->tx_bytes += len;
|
|
|
- sstats->tx_packets++;
|
|
|
- sstats->tx_bytes += len;
|
|
|
+ atomic_long_inc(&tunnel->stats.tx_packets);
|
|
|
+ atomic_long_add(len, &tunnel->stats.tx_bytes);
|
|
|
+ atomic_long_inc(&session->stats.tx_packets);
|
|
|
+ atomic_long_add(len, &session->stats.tx_bytes);
|
|
|
} else {
|
|
|
- tstats->tx_errors++;
|
|
|
- sstats->tx_errors++;
|
|
|
+ atomic_long_inc(&tunnel->stats.tx_errors);
|
|
|
+ atomic_long_inc(&session->stats.tx_errors);
|
|
|
}
|
|
|
- u64_stats_update_end(&tstats->syncp);
|
|
|
- u64_stats_update_end(&sstats->syncp);
|
|
|
|
|
|
return 0;
|
|
|
}
|