leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfp: flower-ct: add nft_merge table

Browse Source 
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: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Louis Peens 2021-06-16 12:02:03 +02:00 committed by David S. Miller
parent 4772ad3f58
commit b5e30c61d8
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/netronome/nfp/flower/conntrack.c
View File

@ -11,6 +11,14 @@ const struct rhashtable_params nfp_tc_ct_merge_params = {
.automatic_shrinking = true, .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. * get_hashentry() - Wrapper around hashtable lookup.
* @ht: hashtable where entry could be found * @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) if (err)
goto err_tc_merge_tb_init; 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) { if (wildcarded) {
priv->ct_zone_wc = zt; priv->ct_zone_wc = zt;
} else { } else {
@ -184,6 +196,8 @@ nfp_fl_ct_zone_entry *get_nfp_zone_entry(struct nfp_flower_priv *priv,
return zt; return zt;
err_zone_insert: err_zone_insert:
rhashtable_destroy(&zt->nft_merge_tb);
err_nft_merge_tb_init:
rhashtable_destroy(&zt->tc_merge_tb); rhashtable_destroy(&zt->tc_merge_tb);
err_tc_merge_tb_init: err_tc_merge_tb_init:
kfree(zt); kfree(zt);

33
drivers/net/ethernet/netronome/nfp/flower/conntrack.h
View File

@ -12,6 +12,7 @@
extern const struct rhashtable_params nfp_zone_table_params; extern const struct rhashtable_params nfp_zone_table_params;
extern const struct rhashtable_params nfp_ct_map_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_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 * 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_list: The list of nft relatednfp_fl_ct_flow_entry entries
* @nft_flows_count: Keep count of the number of nft_flow 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 { struct nfp_fl_ct_zone_entry {
u16 zone; u16 zone;
@ -50,6 +54,9 @@ struct nfp_fl_ct_zone_entry {
struct list_head nft_flows_list; struct list_head nft_flows_list;
unsigned int nft_flows_count; unsigned int nft_flows_count;
struct rhashtable nft_merge_tb;
unsigned int nft_merge_count;
}; };
enum ct_entry_type { enum ct_entry_type {
@ -106,6 +113,32 @@ struct nfp_fl_ct_tc_merge {
struct list_head children; 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 * 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 * @cookie: Flow cookie, same as original TC flow, used as key

2
drivers/net/ethernet/netronome/nfp/flower/metadata.c
View File

@ -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, rhashtable_free_and_destroy(&zt->tc_merge_tb,
nfp_check_rhashtable_empty, NULL); nfp_check_rhashtable_empty, NULL);
rhashtable_free_and_destroy(&zt->nft_merge_tb,
nfp_check_rhashtable_empty, NULL);
kfree(zt); kfree(zt);
} }