forked from mirrors/linux
		
	drivers: net: netdevsim: add devlink trap_drop_counter_get implementation
Whenever query statistics is issued for trap with DROP action, devlink subsystem would also fill-in statistics 'dropped' field. In case if device driver did't register callback for hard drop statistics querying, 'dropped' field will be omitted and not filled. Add trap_drop_counter_get callback implementation to the netdevsim. Add new test cases for netdevsim, to test both the callback functionality, as well as drop statistics alteration check. Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									53f1bd6b28
								
							
						
					
					
						commit
						a7b3527a43
					
				
					 2 changed files with 23 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -269,6 +269,9 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
 | 
			
		|||
		err = PTR_ERR(nsim_dev->nodes_ddir);
 | 
			
		||||
		goto err_out;
 | 
			
		||||
	}
 | 
			
		||||
	debugfs_create_bool("fail_trap_counter_get", 0600,
 | 
			
		||||
			    nsim_dev->ddir,
 | 
			
		||||
			    &nsim_dev->fail_trap_counter_get);
 | 
			
		||||
	nsim_udp_tunnels_debugfs_create(nsim_dev);
 | 
			
		||||
	return 0;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -563,6 +566,7 @@ struct nsim_trap_data {
 | 
			
		|||
	struct delayed_work trap_report_dw;
 | 
			
		||||
	struct nsim_trap_item *trap_items_arr;
 | 
			
		||||
	u64 *trap_policers_cnt_arr;
 | 
			
		||||
	u64 trap_pkt_cnt;
 | 
			
		||||
	struct nsim_dev *nsim_dev;
 | 
			
		||||
	spinlock_t trap_lock;	/* Protects trap_items_arr */
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -1203,6 +1207,23 @@ static int nsim_rate_node_parent_set(struct devlink_rate *child,
 | 
			
		|||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int
 | 
			
		||||
nsim_dev_devlink_trap_hw_counter_get(struct devlink *devlink,
 | 
			
		||||
				     const struct devlink_trap *trap,
 | 
			
		||||
				     u64 *p_drops)
 | 
			
		||||
{
 | 
			
		||||
	struct nsim_dev *nsim_dev = devlink_priv(devlink);
 | 
			
		||||
	u64 *cnt;
 | 
			
		||||
 | 
			
		||||
	if (nsim_dev->fail_trap_counter_get)
 | 
			
		||||
		return -EINVAL;
 | 
			
		||||
 | 
			
		||||
	cnt = &nsim_dev->trap_data->trap_pkt_cnt;
 | 
			
		||||
	*p_drops = (*cnt)++;
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static const struct devlink_ops nsim_dev_devlink_ops = {
 | 
			
		||||
	.eswitch_mode_set = nsim_devlink_eswitch_mode_set,
 | 
			
		||||
	.eswitch_mode_get = nsim_devlink_eswitch_mode_get,
 | 
			
		||||
| 
						 | 
				
			
			@ -1226,6 +1247,7 @@ static const struct devlink_ops nsim_dev_devlink_ops = {
 | 
			
		|||
	.rate_node_del = nsim_rate_node_del,
 | 
			
		||||
	.rate_leaf_parent_set = nsim_rate_leaf_parent_set,
 | 
			
		||||
	.rate_node_parent_set = nsim_rate_node_parent_set,
 | 
			
		||||
	.trap_drop_counter_get = nsim_dev_devlink_trap_hw_counter_get,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#define NSIM_DEV_MAX_MACS_DEFAULT 32
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -249,6 +249,7 @@ struct nsim_dev {
 | 
			
		|||
	bool fail_trap_group_set;
 | 
			
		||||
	bool fail_trap_policer_set;
 | 
			
		||||
	bool fail_trap_policer_counter_get;
 | 
			
		||||
	bool fail_trap_counter_get;
 | 
			
		||||
	struct {
 | 
			
		||||
		struct udp_tunnel_nic_shared utn_shared;
 | 
			
		||||
		u32 __ports[2][NSIM_UDP_TUNNEL_N_PORTS];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue