Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

nfp: forbid disabling hw-tc-offload on representors while offload active 



All netdevs which can accept TC offloads must implement
.ndo_set_features().  nfp_reprs currently do not do that, which
means hw-tc-offload can be turned on and off even when offloads
are active.

Whether the offloads are active is really a question to nfp_ports,
so remove the per-app tc_busy callback indirection thing, and
simply count the number of offloaded items in nfp_port structure.

Fixes: 8a276873 ("nfp: provide infrastructure for offloading flower based TC filters")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Tested-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b9de4ca

drivers/net/ethernet/netronome/nfp/bpf/main.c

+1 −8
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, 
		return err;



	bv->tc_prog = cls_bpf->prog;

	nn->port->tc_offload_cnt = !!bv->tc_prog;

	return 0;

}
@@ -219,13 +220,6 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev, 
	}

}



static bool nfp_bpf_tc_busy(struct nfp_app *app, struct nfp_net *nn)

{

	struct nfp_bpf_vnic *bv = nn->app_priv;



	return !!bv->tc_prog;

}



static int

nfp_bpf_change_mtu(struct nfp_app *app, struct net_device *netdev, int new_mtu)

{
@@ -429,7 +423,6 @@ const struct nfp_app_type app_bpf = { 
	.ctrl_msg_rx	= nfp_bpf_ctrl_msg_rx,



	.setup_tc	= nfp_bpf_setup_tc,

	.tc_busy	= nfp_bpf_tc_busy,

	.bpf		= nfp_ndo_bpf,

	.xdp_offload	= nfp_bpf_xdp_offload,

};

drivers/net/ethernet/netronome/nfp/flower/offload.c

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev, 
		       struct tc_cls_flower_offload *flow, bool egress)

{

	enum nfp_flower_tun_type tun_type = NFP_FL_TUNNEL_NONE;

	struct nfp_port *port = nfp_port_from_netdev(netdev);

	struct nfp_flower_priv *priv = app->priv;

	struct nfp_fl_payload *flow_pay;

	struct nfp_fl_key_ls *key_layer;
@@ -390,6 +391,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev, 
	INIT_HLIST_NODE(&flow_pay->link);

	flow_pay->tc_flower_cookie = flow->cookie;

	hash_add_rcu(priv->flow_table, &flow_pay->link, flow->cookie);

	port->tc_offload_cnt++;



	/* Deallocate flow payload when flower rule has been destroyed. */

	kfree(key_layer);
@@ -421,6 +423,7 @@ static int 
nfp_flower_del_offload(struct nfp_app *app, struct net_device *netdev,

		       struct tc_cls_flower_offload *flow)

{

	struct nfp_port *port = nfp_port_from_netdev(netdev);

	struct nfp_fl_payload *nfp_flow;

	int err;
@@ -442,6 +445,7 @@ nfp_flower_del_offload(struct nfp_app *app, struct net_device *netdev, 


err_free_flow:

	hash_del_rcu(&nfp_flow->link);

	port->tc_offload_cnt--;

	kfree(nfp_flow->action_data);

	kfree(nfp_flow->mask_data);

	kfree(nfp_flow->unmasked_data);

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

+0 −9
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ extern const struct nfp_app_type app_flower; 
 * @stop:	stop application logic

 * @ctrl_msg_rx:    control message handler

 * @setup_tc:	setup TC ndo

 * @tc_busy:	TC HW offload busy (rules loaded)

 * @bpf:	BPF ndo offload-related calls

 * @xdp_offload:    offload an XDP program

 * @eswitch_mode_get:    get SR-IOV eswitch mode
@@ -135,7 +134,6 @@ struct nfp_app_type { 


	int (*setup_tc)(struct nfp_app *app, struct net_device *netdev,

			enum tc_setup_type type, void *type_data);

	bool (*tc_busy)(struct nfp_app *app, struct nfp_net *nn);

	int (*bpf)(struct nfp_app *app, struct nfp_net *nn,

		   struct netdev_bpf *xdp);

	int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn,
@@ -301,13 +299,6 @@ static inline bool nfp_app_has_tc(struct nfp_app *app) 
	return app && app->type->setup_tc;

}



static inline bool nfp_app_tc_busy(struct nfp_app *app, struct nfp_net *nn)

{

	if (!app || !app->type->tc_busy)

		return false;

	return app->type->tc_busy(app, nn);

}



static inline int nfp_app_setup_tc(struct nfp_app *app,

				   struct net_device *netdev,

				   enum tc_setup_type type, void *type_data)

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

+3 −4
Original line number Diff line number Diff line
@@ -3210,10 +3210,9 @@ static int nfp_net_set_features(struct net_device *netdev, 
			new_ctrl &= ~NFP_NET_CFG_CTRL_GATHER;

	}



	if (changed & NETIF_F_HW_TC && nfp_app_tc_busy(nn->app, nn)) {

		nn_err(nn, "Cannot disable HW TC offload while in use\n");

		return -EBUSY;

	}

	err = nfp_port_set_features(netdev, features);

	if (err)

		return err;



	nn_dbg(nn, "Feature change 0x%llx -> 0x%llx (changed=0x%llx)\n",

	       netdev->features, features, changed);

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

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ const struct net_device_ops nfp_repr_netdev_ops = { 
	.ndo_set_vf_spoofchk	= nfp_app_set_vf_spoofchk,

	.ndo_get_vf_config	= nfp_app_get_vf_config,

	.ndo_set_vf_link_state	= nfp_app_set_vf_link_state,

	.ndo_set_features	= nfp_port_set_features,

};



static void nfp_repr_clean(struct nfp_repr *repr)