Commit f9f221c9 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Saeed Mahameed
Browse files

xfrm: get global statistics from the offloaded device 



Iterate over all SAs in order to fill global IPsec statistics.

Acked-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent fd2bc419

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c

+2 −1
Original line number Diff line number Diff line
@@ -991,7 +991,8 @@ static void mlx5e_xfrm_update_stats(struct xfrm_state *x) 
	u64 packets, bytes, lastuse;



	lockdep_assert(lockdep_is_held(&x->lock) ||

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_cfg_mutex));

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_cfg_mutex) ||

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_state_lock));



	if (x->xso.flags & XFRM_DEV_OFFLOAD_FLAG_ACQ ||

	    x->xso.type != XFRM_DEV_OFFLOAD_PACKET)

include/net/xfrm.h

+3 −0
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ 


#ifdef CONFIG_XFRM_STATISTICS

#define XFRM_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.xfrm_statistics, field)

#define XFRM_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.xfrm_statistics, field, val)

#else

#define XFRM_INC_STATS(net, field)	((void)(net))

#define XFRM_ADD_STATS(net, field, val) ((void)(net))

#endif
@@ -1577,6 +1579,7 @@ struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark, u32 if_id, 
struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi,

					      unsigned short family);

int xfrm_state_check_expire(struct xfrm_state *x);

void xfrm_state_update_stats(struct net *net);

#ifdef CONFIG_XFRM_OFFLOAD

static inline void xfrm_dev_state_update_stats(struct xfrm_state *x)

{

net/xfrm/xfrm_proc.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static int xfrm_statistics_seq_show(struct seq_file *seq, void *v) 


	memset(buff, 0, sizeof(unsigned long) * LINUX_MIB_XFRMMAX);



	xfrm_state_update_stats(net);

	snmp_get_cpu_field_batch(buff, xfrm_mib_list,

				 net->mib.xfrm_statistics);

	for (i = 0; xfrm_mib_list[i].name; i++)

net/xfrm/xfrm_state.c

+13 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,19 @@ int xfrm_state_check_expire(struct xfrm_state *x) 
}

EXPORT_SYMBOL(xfrm_state_check_expire);



void xfrm_state_update_stats(struct net *net)

{

	struct xfrm_state *x;

	int i;



	spin_lock_bh(&net->xfrm.xfrm_state_lock);

	for (i = 0; i <= net->xfrm.state_hmask; i++) {

		hlist_for_each_entry(x, net->xfrm.state_bydst + i, bydst)

			xfrm_dev_state_update_stats(x);

	}

	spin_unlock_bh(&net->xfrm.xfrm_state_lock);

}



struct xfrm_state *

xfrm_state_lookup(struct net *net, u32 mark, const xfrm_address_t *daddr, __be32 spi,

		  u8 proto, unsigned short family)