瀏覽代碼

nfp: bring back support for offloading shared blocks

Now that we have offload replay infrastructure added by
commit 326367427cc0 ("net: sched: call reoffload op on block callback reg")
and flows are guaranteed to be removed correctly, we can revert
commit 951a8ee6def3 ("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>
Jakub Kicinski 7 年之前
父節點
當前提交
042f882556

+ 0 - 3
drivers/net/ethernet/netronome/nfp/bpf/main.c

@@ -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)
 	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
 		return -EOPNOTSUPP;
 		return -EOPNOTSUPP;
 
 
-	if (tcf_block_shared(f->block))
-		return -EOPNOTSUPP;
-
 	switch (f->command) {
 	switch (f->command) {
 	case TC_BLOCK_BIND:
 	case TC_BLOCK_BIND:
 		return tcf_block_cb_register(f->block,
 		return tcf_block_cb_register(f->block,

+ 0 - 3
drivers/net/ethernet/netronome/nfp/flower/offload.c

@@ -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)
 	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
 		return -EOPNOTSUPP;
 		return -EOPNOTSUPP;
 
 
-	if (tcf_block_shared(f->block))
-		return -EOPNOTSUPP;
-
 	switch (f->command) {
 	switch (f->command) {
 	case TC_BLOCK_BIND:
 	case TC_BLOCK_BIND:
 		return tcf_block_cb_register(f->block,
 		return tcf_block_cb_register(f->block,

+ 0 - 5
include/net/pkt_cls.h

@@ -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)
 static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
 {
 {
 	return NULL;
 	return NULL;