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

nfp: flower-ct: add nft_merge table 



Add table and struct to save the result of the three-way merge
between pre_ct,post_ct, and nft flows. Merging code is to be
added in follow-up patches.

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 4772ad3f

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

+14 −0
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ const struct rhashtable_params nfp_tc_ct_merge_params = { 
	.automatic_shrinking	= true,

};



const struct rhashtable_params nfp_nft_ct_merge_params = {

	.head_offset		= offsetof(struct nfp_fl_nft_tc_merge,

					   hash_node),

	.key_len		= sizeof(unsigned long) * 3,

	.key_offset		= offsetof(struct nfp_fl_nft_tc_merge, cookie),

	.automatic_shrinking	= true,

};



/**

 * get_hashentry() - Wrapper around hashtable lookup.

 * @ht:		hashtable where entry could be found
@@ -171,6 +179,10 @@ nfp_fl_ct_zone_entry *get_nfp_zone_entry(struct nfp_flower_priv *priv, 
	if (err)

		goto err_tc_merge_tb_init;



	err = rhashtable_init(&zt->nft_merge_tb, &nfp_nft_ct_merge_params);

	if (err)

		goto err_nft_merge_tb_init;



	if (wildcarded) {

		priv->ct_zone_wc = zt;

	} else {
@@ -184,6 +196,8 @@ nfp_fl_ct_zone_entry *get_nfp_zone_entry(struct nfp_flower_priv *priv, 
	return zt;



err_zone_insert:

	rhashtable_destroy(&zt->nft_merge_tb);

err_nft_merge_tb_init:

	rhashtable_destroy(&zt->tc_merge_tb);

err_tc_merge_tb_init:

	kfree(zt);

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

+33 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
extern const struct rhashtable_params nfp_zone_table_params;

extern const struct rhashtable_params nfp_ct_map_params;

extern const struct rhashtable_params nfp_tc_ct_merge_params;

extern const struct rhashtable_params nfp_nft_ct_merge_params;



/**

 * struct nfp_fl_ct_zone_entry - Zone entry containing conntrack flow information
@@ -31,6 +32,9 @@ extern const struct rhashtable_params nfp_tc_ct_merge_params; 
 *

 * @nft_flows_list:	The list of nft relatednfp_fl_ct_flow_entry entries

 * @nft_flows_count:	Keep count of the number of nft_flow entries

 *

 * @nft_merge_tb:	The table of merged tc+nft flows

 * @nft_merge_count:	Keep count of the number of merged tc+nft entries

 */

struct nfp_fl_ct_zone_entry {

	u16 zone;
@@ -50,6 +54,9 @@ struct nfp_fl_ct_zone_entry { 


	struct list_head nft_flows_list;

	unsigned int nft_flows_count;



	struct rhashtable nft_merge_tb;

	unsigned int nft_merge_count;

};



enum ct_entry_type {
@@ -106,6 +113,32 @@ struct nfp_fl_ct_tc_merge { 
	struct list_head children;

};



/**

 * struct nfp_fl_nft_tc_merge - Merge of tc_merge flows with nft flow

 * @netdev:		Ingress netdev name

 * @cookie:		Flow cookie, combination of tc_merge and nft cookies

 * @hash_node:		Used by the hashtable

 * @zt:	Reference to the zone table this belongs to

 * @nft_flow_list:	This entry is part of a nft_flows_list

 * @tc_merge_list:	This entry is part of a ct_merge_list

 * @tc_m_parent:	The tc_merge parent

 * @nft_parent:	The nft_entry parent

 * @tc_flower_cookie:	The cookie of the flow offloaded to the nfp

 * @flow_pay:	Reference to the offloaded flow struct

 */

struct nfp_fl_nft_tc_merge {

	struct net_device *netdev;

	unsigned long cookie[3];

	struct rhash_head hash_node;

	struct nfp_fl_ct_zone_entry *zt;

	struct list_head nft_flow_list;

	struct list_head tc_merge_list;

	struct nfp_fl_ct_tc_merge *tc_m_parent;

	struct nfp_fl_ct_flow_entry *nft_parent;

	unsigned long tc_flower_cookie;

	struct nfp_fl_payload *flow_pay;

};



/**

 * struct nfp_fl_ct_map_entry - Map between flow cookie and specific ct_flow

 * @cookie:	Flow cookie, same as original TC flow, used as key

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

+2 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ static void nfp_zone_table_entry_destroy(struct nfp_fl_ct_zone_entry *zt) 


	rhashtable_free_and_destroy(&zt->tc_merge_tb,

				    nfp_check_rhashtable_empty, NULL);

	rhashtable_free_and_destroy(&zt->nft_merge_tb,

				    nfp_check_rhashtable_empty, NULL);



	kfree(zt);

}