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

Commit e51f6ff3 authored by Kevin Groeneveld's avatar Kevin Groeneveld Committed by David S. Miller
Browse files

ppp: add 64 bit stats 



Add 64 bit stats to ppp driver.  The 64 bit stats include tx_bytes,
rx_bytes, tx_packets and rx_packets.  Other stats are still 32 bit.
The 64 bit stats can be retrieved via the ndo_get_stats operation.  The
SIOCGPPPSTATS ioctl is still 32 bit stats only.

Signed-off-by: default avatarKevin Groeneveld <kgroeneveld@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ff5105a

drivers/net/ppp/ppp_generic.c

+48 −10
Original line number Original line Diff line number Diff line
@@ -93,6 +93,18 @@ struct ppp_file { 
#define PF_TO_PPP(pf)		PF_TO_X(pf, struct ppp)

#define PF_TO_PPP(pf)		PF_TO_X(pf, struct ppp)

#define PF_TO_CHANNEL(pf)	PF_TO_X(pf, struct channel)

#define PF_TO_CHANNEL(pf)	PF_TO_X(pf, struct channel)





/*

 * Data structure to hold primary network stats for which

 * we want to use 64 bit storage.  Other network stats

 * are stored in dev->stats of the ppp strucute.

 */

struct ppp_link_stats {

	u64 rx_packets;

	u64 tx_packets;

	u64 rx_bytes;

	u64 tx_bytes;

};



/*

/*

 * Data structure describing one ppp unit.

 * Data structure describing one ppp unit.

 * A ppp unit corresponds to a ppp network interface device

 * A ppp unit corresponds to a ppp network interface device
@@ -136,6 +148,7 @@ struct ppp { 
	unsigned pass_len, active_len;

	unsigned pass_len, active_len;

#endif /* CONFIG_PPP_FILTER */

#endif /* CONFIG_PPP_FILTER */

	struct net	*ppp_net;	/* the net we belong to */

	struct net	*ppp_net;	/* the net we belong to */

	struct ppp_link_stats stats64;	/* 64 bit network stats */

};

};





/*

/*
@@ -1021,9 +1034,34 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	return err;

	return err;

}

}





struct rtnl_link_stats64*

ppp_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats64)

{

	struct ppp *ppp = netdev_priv(dev);



	ppp_recv_lock(ppp);

	stats64->rx_packets = ppp->stats64.rx_packets;

	stats64->rx_bytes   = ppp->stats64.rx_bytes;

	ppp_recv_unlock(ppp);



	ppp_xmit_lock(ppp);

	stats64->tx_packets = ppp->stats64.tx_packets;

	stats64->tx_bytes   = ppp->stats64.tx_bytes;

	ppp_xmit_unlock(ppp);



	stats64->rx_errors        = dev->stats.rx_errors;

	stats64->tx_errors        = dev->stats.tx_errors;

	stats64->rx_dropped       = dev->stats.rx_dropped;

	stats64->tx_dropped       = dev->stats.tx_dropped;

	stats64->rx_length_errors = dev->stats.rx_length_errors;



	return stats64;

}



static const struct net_device_ops ppp_netdev_ops = {

static const struct net_device_ops ppp_netdev_ops = {

	.ndo_start_xmit  = ppp_start_xmit,

	.ndo_start_xmit  = ppp_start_xmit,

	.ndo_do_ioctl    = ppp_net_ioctl,

	.ndo_do_ioctl    = ppp_net_ioctl,

	.ndo_get_stats64 = ppp_get_stats64,

};

};





static void ppp_setup(struct net_device *dev)

static void ppp_setup(struct net_device *dev)
@@ -1157,8 +1195,8 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) 
#endif /* CONFIG_PPP_FILTER */

#endif /* CONFIG_PPP_FILTER */

	}

	}





	++ppp->dev->stats.tx_packets;

	++ppp->stats64.tx_packets;

	ppp->dev->stats.tx_bytes += skb->len - 2;

	ppp->stats64.tx_bytes += skb->len - 2;





	switch (proto) {

	switch (proto) {

	case PPP_IP:

	case PPP_IP:
@@ -1745,8 +1783,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) 
		break;

		break;

	}

	}





	++ppp->dev->stats.rx_packets;

	++ppp->stats64.rx_packets;

	ppp->dev->stats.rx_bytes += skb->len - 2;

	ppp->stats64.rx_bytes += skb->len - 2;





	npi = proto_to_npindex(proto);

	npi = proto_to_npindex(proto);

	if (npi < 0) {

	if (npi < 0) {
@@ -2570,12 +2608,12 @@ ppp_get_stats(struct ppp *ppp, struct ppp_stats *st) 
	struct slcompress *vj = ppp->vj;

	struct slcompress *vj = ppp->vj;





	memset(st, 0, sizeof(*st));

	memset(st, 0, sizeof(*st));

	st->p.ppp_ipackets = ppp->dev->stats.rx_packets;

	st->p.ppp_ipackets = ppp->stats64.rx_packets;

	st->p.ppp_ierrors = ppp->dev->stats.rx_errors;

	st->p.ppp_ierrors = ppp->dev->stats.rx_errors;

	st->p.ppp_ibytes = ppp->dev->stats.rx_bytes;

	st->p.ppp_ibytes = ppp->stats64.rx_bytes;

	st->p.ppp_opackets = ppp->dev->stats.tx_packets;

	st->p.ppp_opackets = ppp->stats64.tx_packets;

	st->p.ppp_oerrors = ppp->dev->stats.tx_errors;

	st->p.ppp_oerrors = ppp->dev->stats.tx_errors;

	st->p.ppp_obytes = ppp->dev->stats.tx_bytes;

	st->p.ppp_obytes = ppp->stats64.tx_bytes;

	if (!vj)

	if (!vj)

		return;

		return;

	st->vj.vjs_packets = vj->sls_o_compressed + vj->sls_o_uncompressed;

	st->vj.vjs_packets = vj->sls_o_compressed + vj->sls_o_uncompressed;