Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 042f8825 authored Jul 20, 2018 by Jakub Kicinski Committed by David S. Miller Jul 22, 2018

nfp: bring back support for offloading shared blocks



Now that we have offload replay infrastructure added by
commit 32636742 ("net: sched: call reoffload op on block callback reg")
and flows are guaranteed to be removed correctly, we can revert
commit 951a8ee6 ("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>

parent 2d408c0d

drivers/net/ethernet/netronome/nfp/bpf/main.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,

include/net/pkt_cls.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -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;