mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-25 21:34:16 -04:00
0c0dddc07d
ovpn updates dev->dstats from both process and softirq contexts. In
particular, TCP paths may run from socket callbacks, workqueues or
strparser work, while UDP receive and ovpn's ndo_start_xmit path may
update the same per-device dstats from BH context.
Add ovpn device drop-stat helpers that disable BHs around
dev_dstats_rx_dropped() and dev_dstats_tx_dropped(), and use them for
drop accounting.
The successful RX dev_dstats_rx_add() update is already covered by the
BH-disabled section around gro_cells_receive(). For the successful TCP
TX dev_dstats_tx_add() update, replace the existing preempt-disabled
section with a BH-disabled one.
Fixes: 11851cbd60 ("ovpn: implement TCP transport")
Signed-off-by: Ralf Lici <ralf@mandelbit.com>
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
64 lines
1.4 KiB
C
64 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/* OpenVPN data channel offload
|
|
*
|
|
* Copyright (C) 2020-2025 OpenVPN, Inc.
|
|
*
|
|
* Author: James Yonan <james@openvpn.net>
|
|
* Antonio Quartulli <antonio@openvpn.net>
|
|
* Lev Stipakov <lev@openvpn.net>
|
|
*/
|
|
|
|
#ifndef _NET_OVPN_OVPNSTATS_H_
|
|
#define _NET_OVPN_OVPNSTATS_H_
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
/* one stat */
|
|
struct ovpn_peer_stat {
|
|
atomic64_t bytes;
|
|
atomic64_t packets;
|
|
};
|
|
|
|
/* rx and tx stats combined */
|
|
struct ovpn_peer_stats {
|
|
struct ovpn_peer_stat rx;
|
|
struct ovpn_peer_stat tx;
|
|
};
|
|
|
|
void ovpn_peer_stats_init(struct ovpn_peer_stats *ps);
|
|
|
|
static inline void ovpn_peer_stats_increment(struct ovpn_peer_stat *stat,
|
|
const unsigned int n)
|
|
{
|
|
atomic64_add(n, &stat->bytes);
|
|
atomic64_inc(&stat->packets);
|
|
}
|
|
|
|
static inline void ovpn_peer_stats_increment_rx(struct ovpn_peer_stats *stats,
|
|
const unsigned int n)
|
|
{
|
|
ovpn_peer_stats_increment(&stats->rx, n);
|
|
}
|
|
|
|
static inline void ovpn_peer_stats_increment_tx(struct ovpn_peer_stats *stats,
|
|
const unsigned int n)
|
|
{
|
|
ovpn_peer_stats_increment(&stats->tx, n);
|
|
}
|
|
|
|
static inline void ovpn_dev_dstats_tx_dropped(struct net_device *dev)
|
|
{
|
|
local_bh_disable();
|
|
dev_dstats_tx_dropped(dev);
|
|
local_bh_enable();
|
|
}
|
|
|
|
static inline void ovpn_dev_dstats_rx_dropped(struct net_device *dev)
|
|
{
|
|
local_bh_disable();
|
|
dev_dstats_rx_dropped(dev);
|
|
local_bh_enable();
|
|
}
|
|
|
|
#endif /* _NET_OVPN_OVPNSTATS_H_ */
|