Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfp: flower: ignore duplicate cb requests for same rule

Browse Source 
If a flower rule has a repr both as ingress and egress port then 2
callbacks may be generated for the same rule request.

Add an indicator to each flow as to whether or not it was added from an
ingress registered cb. If so then ignore add/del/stat requests to it from
an egress cb.

Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
John Hurley 2018-04-24 21:17:04 -07:00 committed by David S. Miller
parent 54a4a03439
commit c50647d3e8
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/netronome/nfp/flower/main.h
View File

@ -194,6 +194,7 @@ struct nfp_fl_payload {
char *unmasked_data; char *unmasked_data;
char *mask_data; char *mask_data;
char *action_data; char *action_data;
bool ingress_offload;
}; };
struct nfp_fl_stats_frame { struct nfp_fl_stats_frame {

23
drivers/net/ethernet/netronome/nfp/flower/offload.c
View File

@ -345,7 +345,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
} }
static struct nfp_fl_payload * static struct nfp_fl_payload *
nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer) nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer, bool egress)
{ {
struct nfp_fl_payload *flow_pay; struct nfp_fl_payload *flow_pay;
@ -371,6 +371,8 @@ nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer)
flow_pay->meta.flags = 0; flow_pay->meta.flags = 0;
spin_lock_init(&flow_pay->lock); spin_lock_init(&flow_pay->lock);
flow_pay->ingress_offload = !egress;
return flow_pay; return flow_pay;
err_free_mask: err_free_mask:
@ -402,8 +404,20 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
struct nfp_flower_priv *priv = app->priv; struct nfp_flower_priv *priv = app->priv;
struct nfp_fl_payload *flow_pay; struct nfp_fl_payload *flow_pay;
struct nfp_fl_key_ls *key_layer; struct nfp_fl_key_ls *key_layer;
struct net_device *ingr_dev;
int err; int err;
ingr_dev = egress ? NULL : netdev;
flow_pay = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev,
NFP_FL_STATS_CTX_DONT_CARE);
if (flow_pay) {
/* Ignore as duplicate if it has been added by different cb. */
if (flow_pay->ingress_offload && egress)
return 0;
else
return -EOPNOTSUPP;
}
key_layer = kmalloc(sizeof(*key_layer), GFP_KERNEL); key_layer = kmalloc(sizeof(*key_layer), GFP_KERNEL);
if (!key_layer) if (!key_layer)
return -ENOMEM; return -ENOMEM;
@ -413,7 +427,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
if (err) if (err)
goto err_free_key_ls; goto err_free_key_ls;
flow_pay = nfp_flower_allocate_new(key_layer); flow_pay = nfp_flower_allocate_new(key_layer, egress);
if (!flow_pay) { if (!flow_pay) {
err = -ENOMEM; err = -ENOMEM;
goto err_free_key_ls; goto err_free_key_ls;
@ -485,7 +499,7 @@ nfp_flower_del_offload(struct nfp_app *app, struct net_device *netdev,
nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev, nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev,
NFP_FL_STATS_CTX_DONT_CARE); NFP_FL_STATS_CTX_DONT_CARE);
if (!nfp_flow) if (!nfp_flow)
return -ENOENT; return egress ? 0 : -ENOENT;
err = nfp_modify_flow_metadata(app, nfp_flow); err = nfp_modify_flow_metadata(app, nfp_flow);
if (err) if (err)
@ -534,6 +548,9 @@ nfp_flower_get_stats(struct nfp_app *app, struct net_device *netdev,
if (!nfp_flow) if (!nfp_flow)
return -EINVAL; return -EINVAL;
if (nfp_flow->ingress_offload && egress)
return 0;
spin_lock_bh(&nfp_flow->lock); spin_lock_bh(&nfp_flow->lock);
tcf_exts_stats_update(flow->exts, nfp_flow->stats.bytes, tcf_exts_stats_update(flow->exts, nfp_flow->stats.bytes,
nfp_flow->stats.pkts, nfp_flow->stats.used); nfp_flow->stats.pkts, nfp_flow->stats.used);