Commit 21f31bc0 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: allow apps to add extra stats to ports 



Allow nfp apps to add extra ethtool stats.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb89cac8

drivers/net/ethernet/netronome/nfp/nfp_app.c

+22 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "nfp_main.h"

#include "nfp_net.h"

#include "nfp_net_repr.h"

#include "nfp_port.h"



static const struct nfp_app_type *apps[] = {

	[NFP_APP_CORE_NIC]	= &app_nic,
@@ -85,6 +86,27 @@ const char *nfp_app_mip_name(struct nfp_app *app) 
	return nfp_mip_name(app->pf->mip);

}



u64 *nfp_app_port_get_stats(struct nfp_port *port, u64 *data)

{

	if (!port || !port->app || !port->app->type->port_get_stats)

		return data;

	return port->app->type->port_get_stats(port->app, port, data);

}



int nfp_app_port_get_stats_count(struct nfp_port *port)

{

	if (!port || !port->app || !port->app->type->port_get_stats_count)

		return 0;

	return port->app->type->port_get_stats_count(port->app, port);

}



u8 *nfp_app_port_get_stats_strings(struct nfp_port *port, u8 *data)

{

	if (!port || !port->app || !port->app->type->port_get_stats_strings)

		return data;

	return port->app->type->port_get_stats_strings(port->app, port, data);

}



struct sk_buff *

nfp_app_ctrl_msg_alloc(struct nfp_app *app, unsigned int size, gfp_t priority)

{

drivers/net/ethernet/netronome/nfp/nfp_app.h

+13 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ extern const struct nfp_app_type app_abm; 
 * @repr_stop:	representor netdev stop callback

 * @check_mtu:	MTU change request on a netdev (verify it is valid)

 * @repr_change_mtu:	MTU change request on repr (make and verify change)

 * @port_get_stats:		get extra ethtool statistics for a port

 * @port_get_stats_count:	get count of extra statistics for a port

 * @port_get_stats_strings:	get strings for extra statistics

 * @start:	start application logic

 * @stop:	stop application logic

 * @ctrl_msg_rx:    control message handler
@@ -132,6 +135,12 @@ struct nfp_app_type { 
	int (*repr_change_mtu)(struct nfp_app *app, struct net_device *netdev,

			       int new_mtu);



	u64 *(*port_get_stats)(struct nfp_app *app,

			       struct nfp_port *port, u64 *data);

	int (*port_get_stats_count)(struct nfp_app *app, struct nfp_port *port);

	u8 *(*port_get_stats_strings)(struct nfp_app *app,

				      struct nfp_port *port, u8 *data);



	int (*start)(struct nfp_app *app);

	void (*stop)(struct nfp_app *app);
@@ -404,6 +413,10 @@ static inline struct net_device *nfp_app_repr_get(struct nfp_app *app, u32 id) 


struct nfp_app *nfp_app_from_netdev(struct net_device *netdev);



u64 *nfp_app_port_get_stats(struct nfp_port *port, u64 *data);

int nfp_app_port_get_stats_count(struct nfp_port *port);

u8 *nfp_app_port_get_stats_strings(struct nfp_port *port, u8 *data);



struct nfp_reprs *

nfp_reprs_get_locked(struct nfp_app *app, enum nfp_repr_type type);

struct nfp_reprs *

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+8 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static int nfp_net_set_ringparam(struct net_device *netdev, 
	return nfp_net_set_ring_size(nn, rxd_cnt, txd_cnt);

}



static __printf(2, 3) u8 *nfp_pr_et(u8 *data, const char *fmt, ...)

__printf(2, 3) u8 *nfp_pr_et(u8 *data, const char *fmt, ...)

{

	va_list args;
@@ -637,6 +637,7 @@ static void nfp_net_get_strings(struct net_device *netdev, 
						     nn->dp.num_tx_rings,

						     false);

		data = nfp_mac_get_stats_strings(netdev, data);

		data = nfp_app_port_get_stats_strings(nn->port, data);

		break;

	}

}
@@ -651,6 +652,7 @@ nfp_net_get_stats(struct net_device *netdev, struct ethtool_stats *stats, 
	data = nfp_vnic_get_hw_stats(data, nn->dp.ctrl_bar,

				     nn->dp.num_rx_rings, nn->dp.num_tx_rings);

	data = nfp_mac_get_stats(netdev, data);

	data = nfp_app_port_get_stats(nn->port, data);

}



static int nfp_net_get_sset_count(struct net_device *netdev, int sset)
@@ -662,7 +664,8 @@ static int nfp_net_get_sset_count(struct net_device *netdev, int sset) 
		return nfp_vnic_get_sw_stats_count(netdev) +

		       nfp_vnic_get_hw_stats_count(nn->dp.num_rx_rings,

						   nn->dp.num_tx_rings) +

		       nfp_mac_get_stats_count(netdev);

		       nfp_mac_get_stats_count(netdev) +

		       nfp_app_port_get_stats_count(nn->port);

	default:

		return -EOPNOTSUPP;

	}
@@ -679,6 +682,7 @@ static void nfp_port_get_strings(struct net_device *netdev, 
			data = nfp_vnic_get_hw_stats_strings(data, 0, 0, true);

		else

			data = nfp_mac_get_stats_strings(netdev, data);

		data = nfp_app_port_get_stats_strings(port, data);

		break;

	}

}
@@ -693,6 +697,7 @@ nfp_port_get_stats(struct net_device *netdev, struct ethtool_stats *stats, 
		data = nfp_vnic_get_hw_stats(data, port->vnic, 0, 0);

	else

		data = nfp_mac_get_stats(netdev, data);

	data = nfp_app_port_get_stats(port, data);

}



static int nfp_port_get_sset_count(struct net_device *netdev, int sset)
@@ -706,6 +711,7 @@ static int nfp_port_get_sset_count(struct net_device *netdev, int sset) 
			count = nfp_vnic_get_hw_stats_count(0, 0);

		else

			count = nfp_mac_get_stats_count(netdev);

		count += nfp_app_port_get_stats_count(port);

		return count;

	default:

		return -EOPNOTSUPP;

drivers/net/ethernet/netronome/nfp/nfp_port.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ struct nfp_port { 
extern const struct ethtool_ops nfp_port_ethtool_ops;

extern const struct switchdev_ops nfp_port_switchdev_ops;



__printf(2, 3) u8 *nfp_pr_et(u8 *data, const char *fmt, ...);



int nfp_port_setup_tc(struct net_device *netdev, enum tc_setup_type type,

		      void *type_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE