Commit 400a5e5f authored by Louis Peens's avatar Louis Peens Committed by David S. Miller
Browse files

nfp: flower-ct: add offload calls to the nfp 



Add the offload parts (ADD_FLOW/DEL_FLOW) calls to add and delete
the flows from the nfp.

Signed-off-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarYinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 453cdc30

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

+12 −0
Original line number Diff line number Diff line
@@ -813,6 +813,11 @@ static int nfp_fl_ct_add_offload(struct nfp_fl_nft_tc_merge *m_entry) 
	if (err)

		goto ct_release_offload_meta_err;



	err = nfp_flower_xmit_flow(priv->app, flow_pay,

				   NFP_FLOWER_CMSG_TYPE_FLOW_ADD);

	if (err)

		goto ct_remove_rhash_err;



	m_entry->tc_flower_cookie = flow_pay->tc_flower_cookie;

	m_entry->flow_pay = flow_pay;
@@ -821,6 +826,10 @@ static int nfp_fl_ct_add_offload(struct nfp_fl_nft_tc_merge *m_entry) 


	return err;



ct_remove_rhash_err:

	WARN_ON_ONCE(rhashtable_remove_fast(&priv->flow_table,

					    &flow_pay->fl_node,

					    nfp_flower_table_params));

ct_release_offload_meta_err:

	nfp_modify_flow_metadata(priv->app, flow_pay);

ct_offload_err:
@@ -865,6 +874,9 @@ static int nfp_fl_ct_del_offload(struct nfp_app *app, unsigned long cookie, 
		goto err_free_merge_flow;

	}



	err = nfp_flower_xmit_flow(app, flow_pay,

				   NFP_FLOWER_CMSG_TYPE_FLOW_DEL);



err_free_merge_flow:

	nfp_flower_del_linked_merge_flows(app, flow_pay);

	if (port)

drivers/net/ethernet/netronome/nfp/flower/main.h

+3 −0
Original line number Diff line number Diff line
@@ -563,4 +563,7 @@ int nfp_flower_calculate_key_layers(struct nfp_app *app, 
void

nfp_flower_del_linked_merge_flows(struct nfp_app *app,

				  struct nfp_fl_payload *sub_flow);

int

nfp_flower_xmit_flow(struct nfp_app *app, struct nfp_fl_payload *nfp_flow,

		     u8 mtype);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct nfp_flower_merge_check { 
	};

};



static int

int

nfp_flower_xmit_flow(struct nfp_app *app, struct nfp_fl_payload *nfp_flow,

		     u8 mtype)

{