Commit 04ca1495 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Paolo Abeni
Browse files

ovpn: store tunnel and transport statistics 



Byte/packet counters for in-tunnel and transport streams
are now initialized and updated as needed.

To be exported via netlink.

Signed-off-by: default avatarAntonio Quartulli <antonio@openvpn.net>
Link: https://patch.msgid.link/20250415-b4-ovpn-v26-10-577f6097b964@openvpn.net


Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 8534731d

drivers/net/ovpn/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ ovpn-y += netlink-gen.o 
ovpn-y += peer.o

ovpn-y += pktid.o

ovpn-y += socket.o

ovpn-y += stats.o

ovpn-y += udp.o

drivers/net/ovpn/io.c

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/skbuff.h>

#include <net/gro_cells.h>

#include <net/gso.h>

#include <net/ip.h>



#include "ovpnpriv.h"

#include "peer.h"
@@ -55,10 +56,12 @@ static void ovpn_netdev_write(struct ovpn_peer *peer, struct sk_buff *skb) 
	/* cause packet to be "received" by the interface */

	pkt_len = skb->len;

	ret = gro_cells_receive(&peer->ovpn->gro_cells, skb);

	if (likely(ret == NET_RX_SUCCESS))

	if (likely(ret == NET_RX_SUCCESS)) {

		/* update RX stats with the size of decrypted packet */

		ovpn_peer_stats_increment_rx(&peer->vpn_stats, pkt_len);

		dev_dstats_rx_add(peer->ovpn->dev, pkt_len);

	}

}



void ovpn_decrypt_post(void *data, int ret)

{
@@ -152,6 +155,8 @@ void ovpn_recv(struct ovpn_peer *peer, struct sk_buff *skb) 
	struct ovpn_crypto_key_slot *ks;

	u8 key_id;



	ovpn_peer_stats_increment_rx(&peer->link_stats, skb->len);



	/* get the key slot matching the key ID in the received packet */

	key_id = ovpn_key_id_from_skb(skb);

	ks = ovpn_crypto_key_id_to_slot(&peer->crypto, key_id);
@@ -175,6 +180,7 @@ void ovpn_encrypt_post(void *data, int ret) 
	struct sk_buff *skb = data;

	struct ovpn_socket *sock;

	struct ovpn_peer *peer;

	unsigned int orig_len;



	/* encryption is happening asynchronously. This function will be

	 * called later by the crypto callback with a proper return value
@@ -194,6 +200,7 @@ void ovpn_encrypt_post(void *data, int ret) 
		goto err;



	skb_mark_not_on_list(skb);

	orig_len = skb->len;



	rcu_read_lock();

	sock = rcu_dereference(peer->sock);
@@ -208,6 +215,8 @@ void ovpn_encrypt_post(void *data, int ret) 
		/* no transport configured yet */

		goto err_unlock;

	}



	ovpn_peer_stats_increment_tx(&peer->link_stats, orig_len);

	/* skb passed down the stack - don't free it */

	skb = NULL;

err_unlock:
@@ -322,6 +331,7 @@ netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto drop;

	}



	ovpn_peer_stats_increment_tx(&peer->vpn_stats, skb->len);

	ovpn_send(ovpn, skb_list.next, peer);



	return NETDEV_TX_OK;

drivers/net/ovpn/peer.c

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ struct ovpn_peer *ovpn_peer_new(struct ovpn_priv *ovpn, u32 id) 
	ovpn_crypto_state_init(&peer->crypto);

	spin_lock_init(&peer->lock);

	kref_init(&peer->refcount);

	ovpn_peer_stats_init(&peer->vpn_stats);

	ovpn_peer_stats_init(&peer->link_stats);



	ret = dst_cache_init(&peer->dst_cache, GFP_KERNEL);

	if (ret < 0) {

drivers/net/ovpn/peer.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "crypto.h"

#include "socket.h"

#include "stats.h"



/**

 * struct ovpn_peer - the main remote peer object
@@ -27,6 +28,8 @@ 
 * @crypto: the crypto configuration (ciphers, keys, etc..)

 * @dst_cache: cache for dst_entry used to send to peer

 * @bind: remote peer binding

 * @vpn_stats: per-peer in-VPN TX/RX stats

 * @link_stats: per-peer link/transport TX/RX stats

 * @delete_reason: why peer was deleted (i.e. timeout, transport error, ..)

 * @lock: protects binding to peer (bind)

 * @refcount: reference counter
@@ -45,6 +48,8 @@ struct ovpn_peer { 
	struct ovpn_crypto_state crypto;

	struct dst_cache dst_cache;

	struct ovpn_bind __rcu *bind;

	struct ovpn_peer_stats vpn_stats;

	struct ovpn_peer_stats link_stats;

	enum ovpn_del_peer_reason delete_reason;

	spinlock_t lock; /* protects bind */

	struct kref refcount;

drivers/net/ovpn/stats.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*  OpenVPN data channel offload

 *

 *  Copyright (C) 2020-2025 OpenVPN, Inc.

 *

 *  Author:	James Yonan <james@openvpn.net>

 *		Antonio Quartulli <antonio@openvpn.net>

 */



#include <linux/atomic.h>



#include "stats.h"



void ovpn_peer_stats_init(struct ovpn_peer_stats *ps)

{

	atomic64_set(&ps->rx.bytes, 0);

	atomic64_set(&ps->rx.packets, 0);



	atomic64_set(&ps->tx.bytes, 0);

	atomic64_set(&ps->tx.packets, 0);

}