| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200326103230.121447-1-s.chopin@alphalink.fr>
Date: Thu, 26 Mar 2020 11:32:30 +0100
From: Simon Chopin <s.chopin@...halink.fr>
To: netdev@...r.kernel.org
Cc: Michal Ostrowski <mostrows@...thlink.net>,
"David S . Miller" <davem@...emloft.net>,
Arnd Bergmann <arnd@...db.de>,
Guillaume Nault <gnault@...hat.com>,
Simon Chopin <s.chopin@...halink.fr>
Subject: [PATCH net-next] pppoe: new ioctl to extract per-channel stats
The PPP subsystem uses the abstractions of channels and units, the
latter being an aggregate of the former, exported to userspace as a
single network interface. As such, it keeps traffic statistics at the
unit level, but there are no statistics on the individual channels,
partly because most PPP units only have one channel.
However, it is sometimes useful to have statistics at the channel level,
for instance to monitor multilink PPP connections. Such statistics
already exist for PPPoL2TP via the PPPIOCGL2TPSTATS ioctl, this patch
introduces a very similar mechanism for PPPoE via a new
PPPIOCGPPPOESTATS ioctl.
The contents of this patch were greatly inspired by the L2TP
implementation, many thanks to its authors.
Signed-off-by: Simon Chopin <s.chopin@...halink.fr>
---
drivers/net/ppp/pppoe.c | 45 ++++++++++++++++++++++++++++++++++
include/uapi/linux/ppp-ioctl.h | 9 +++++++
2 files changed, 54 insertions(+)
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index d760a36db28c..6a3d98d720d5 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -72,6 +72,7 @@
#include <linux/file.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/atomic.h>
#include <linux/nsproxy.h>
#include <net/net_namespace.h>
@@ -104,6 +105,13 @@ struct pppoe_net {
rwlock_t hash_lock;
};
+struct pppoe_stats {
+ atomic_long_t tx_packets;
+ atomic_long_t tx_bytes;
+ atomic_long_t rx_packets;
+ atomic_long_t rx_bytes;
+};
+
/*
* PPPoE could be in the following stages:
* 1) Discovery stage (to obtain remote MAC and Session ID)
@@ -366,6 +374,8 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb)
{
struct pppox_sock *po = pppox_sk(sk);
struct pppox_sock *relay_po;
+ struct pppoe_stats *stats;
+ size_t len = skb->len;
/* Backlog receive. Semantics of backlog rcv preclude any code from
* executing in lock_sock()/release_sock() bounds; meaning sk->sk_state
@@ -395,6 +405,10 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb)
goto abort_kfree;
}
+ stats = sk_pppox(po)->sk_user_data;
+ atomic_long_inc(&stats->rx_packets);
+ atomic_long_add(len, &stats->rx_bytes);
+
return NET_RX_SUCCESS;
abort_put:
@@ -549,6 +563,8 @@ static int pppoe_create(struct net *net, struct socket *sock, int kern)
sk->sk_family = PF_PPPOX;
sk->sk_protocol = PX_PROTO_OE;
+ sk->sk_user_data = kzalloc(sizeof(struct pppoe_stats), GFP_KERNEL);
+
INIT_WORK(&pppox_sk(sk)->proto.pppoe.padt_work,
pppoe_unbind_sock_work);
@@ -593,6 +609,8 @@ static int pppoe_release(struct socket *sock)
delete_item(pn, po->pppoe_pa.sid, po->pppoe_pa.remote,
po->pppoe_ifindex);
+ kfree(sk->sk_user_data);
+ sk->sk_user_data = NULL;
sock_orphan(sk);
sock->sk = NULL;
@@ -730,11 +748,23 @@ static int pppoe_getname(struct socket *sock, struct sockaddr *uaddr,
return len;
}
+static void pppoe_copy_stats(struct pppoe_ioc_stats *dest,
+ const struct pppoe_stats *stats)
+{
+ memset(dest, 0, sizeof(*dest));
+
+ dest->tx_packets = atomic_long_read(&stats->tx_packets);
+ dest->tx_bytes = atomic_long_read(&stats->tx_bytes);
+ dest->rx_packets = atomic_long_read(&stats->rx_packets);
+ dest->rx_bytes = atomic_long_read(&stats->rx_bytes);
+}
+
static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg)
{
struct sock *sk = sock->sk;
struct pppox_sock *po = pppox_sk(sk);
+ struct pppoe_ioc_stats stats;
int val;
int err;
@@ -823,6 +853,18 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
err = 0;
break;
+ case PPPIOCGPPPOESTATS:
+ err = -EBUSY;
+ /* Check that the stats struct hasn't been freed yet */
+ if (sk->sk_state & PPPOX_DEAD)
+ break;
+
+ pppoe_copy_stats(&stats, sk->sk_user_data);
+ err = 0;
+ if (copy_to_user((void __user *)arg, &stats, sizeof(stats)))
+ err = -EFAULT;
+ break;
+
default:
err = -ENOTTY;
}
@@ -910,6 +952,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
{
struct pppox_sock *po = pppox_sk(sk);
struct net_device *dev = po->pppoe_dev;
+ struct pppoe_stats *stats = sk->sk_user_data;
struct pppoe_hdr *ph;
int data_len = skb->len;
@@ -950,6 +993,8 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
po->pppoe_pa.remote, NULL, data_len);
dev_queue_xmit(skb);
+ atomic_long_inc(&stats->tx_packets);
+ atomic_long_add(data_len, &stats->tx_bytes);
return 1;
abort:
diff --git a/include/uapi/linux/ppp-ioctl.h b/include/uapi/linux/ppp-ioctl.h
index 7bd2a5a75348..a0abc68eceb5 100644
--- a/include/uapi/linux/ppp-ioctl.h
+++ b/include/uapi/linux/ppp-ioctl.h
@@ -79,6 +79,14 @@ struct pppol2tp_ioc_stats {
__aligned_u64 rx_errors;
};
+/* For PPPIOCGPPPOESTATS */
+struct pppoe_ioc_stats {
+ __aligned_u64 tx_packets;
+ __aligned_u64 tx_bytes;
+ __aligned_u64 rx_packets;
+ __aligned_u64 rx_bytes;
+};
+
/*
* Ioctl definitions.
*/
@@ -115,6 +123,7 @@ struct pppol2tp_ioc_stats {
#define PPPIOCATTCHAN _IOW('t', 56, int) /* attach to ppp channel */
#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
+#define PPPIOCGPPPOESTATS _IOR('t', 53, struct pppoe_ioc_stats)
#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */
base-commit: 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
--
2.25.1
Powered by blists - more mailing lists