Skip to content

Commit

Permalink
nfp: bring back support for offloading shared blocks
Browse files Browse the repository at this point in the history
Now that we have offload replay infrastructure added by
commit 3263674 ("net: sched: call reoffload op on block callback reg")
and flows are guaranteed to be removed correctly, we can revert
commit 951a8ee ("nfp: reject binding to shared blocks").

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jakub Kicinski authored and David S. Miller committed Jul 22, 2018
1 parent 2d408c0 commit 042f882
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
3 changes: 0 additions & 3 deletions drivers/net/ethernet/netronome/nfp/bpf/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ static int nfp_bpf_setup_tc_block(struct net_device *netdev,
if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
return -EOPNOTSUPP;

if (tcf_block_shared(f->block))
return -EOPNOTSUPP;

switch (f->command) {
case TC_BLOCK_BIND:
return tcf_block_cb_register(f->block,
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/ethernet/netronome/nfp/flower/offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,9 +631,6 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,
if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
return -EOPNOTSUPP;

if (tcf_block_shared(f->block))
return -EOPNOTSUPP;

switch (f->command) {
case TC_BLOCK_BIND:
return tcf_block_cb_register(f->block,
Expand Down
5 changes: 0 additions & 5 deletions include/net/pkt_cls.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,
{
}

static inline bool tcf_block_shared(struct tcf_block *block)
{
return false;
}

static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
{
return NULL;
Expand Down

0 comments on commit 042f882

Please sign in to comment.