net_sched: actions - Add default lookup
Subsystems (3)
Jamal Hadi Salim
maintainerPATCH 1/1 net_sched: actions - Add default lookup
Attached. Tested with simple action.
cheers,
jamal
commit 80f80120ba4b85daf00c53eceebe7f0ad0b58a57
Author: Jamal Hadi Salim <[email protected]> Date: Wed Oct 30 07:03:55 2013 -0400
Provide default lookup function for actions that dont provide one
net/sched/act_api.c +4 -0
@@ -279,6 +279,10 @@ int tcf_register_action(struct tc_action_ops *act) } act->next =NULL ; *ap = act; + +if (!act->lookup) + act->lookup = tcf_hash_search; +write_unlock (&act_mod_lock);return 0 ; }
Quoted 4 lines · Jamal Hadi Salim
Attached. Tested with simple action.
cheers,
jamal
Why not setting .lookup to tcf_hash_search
in the few actions not already doing that ?
This would be more consistent.
# git grep -n tcf_hash_search include/net/act_api.h:92:int tcf_hash_search(struct tc_action *a, u32 index); net/sched/act_api.c:198:int tcf_hash_search(struct tc_action *a, u32 index) net/sched/act_api.c:209:EXPORT_SYMBOL(tcf_hash_search); net/sched/act_csum.c:588: .lookup = tcf_hash_search, net/sched/act_gact.c:209: .lookup = tcf_hash_search, net/sched/act_ipt.c:301: .lookup = tcf_hash_search, net/sched/act_ipt.c:315: .lookup = tcf_hash_search, net/sched/act_mirred.c:274: .lookup = tcf_hash_search, net/sched/act_nat.c:311: .lookup = tcf_hash_search, net/sched/act_pedit.c:246: .lookup = tcf_hash_search, net/sched/act_police.c:410: .lookup = tcf_hash_search,
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Wed, 30 Oct 2013 07:00:05 -0700
Quoted 10 lines · Jamal Hadi Salim
Quoted 4 lines
Attached. Tested with simple action.
cheers,
jamalWhy not setting .lookup to
tcf_hash_search
in the few actions not already doing that ?This would be more consistent.
Quoted 12 lines
# git grep -n tcf_hash_search include/net/act_api.h:92:int tcf_hash_search(struct tc_action *a, u32 index); net/sched/act_api.c:198:int tcf_hash_search(struct tc_action *a, u32 index) net/sched/act_api.c:209:EXPORT_SYMBOL(tcf_hash_search); net/sched/act_csum.c:588: .lookup = tcf_hash_search, net/sched/act_gact.c:209: .lookup = tcf_hash_search, net/sched/act_ipt.c:301: .lookup = tcf_hash_search, net/sched/act_ipt.c:315: .lookup = tcf_hash_search, net/sched/act_mirred.c:274: .lookup = tcf_hash_search, net/sched/act_nat.c:311: .lookup = tcf_hash_search, net/sched/act_pedit.c:246: .lookup = tcf_hash_search, net/sched/act_police.c:410: .lookup = tcf_hash_search,
Right, and BUG() if we try to register and action with a NULL .lookup member.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Sun, 03 Nov 2013 23:12:32 -0500 (EST)
Quoted 2 lines
Right, and
BUG()if we try to register and action with a NULL .lookup member.
I return an error, BUG() is too harsh.
Jamal Hadi Salim
maintainerQuoted 8 lines · David Miller
From: David Miller <[email protected]>
Date: Sun, 03 Nov 2013 23:12:32 -0500 (EST)Quoted 2 lines
Right, and
BUG()if we try to register and action with a NULL .lookup member.I return an error,
BUG()is too harsh.
Sorry - I was distracted, but have time now.
I wanted to fix this then send the other patches - but confused. We are setting the default if someone registers an action with a NULL .lookup. Why do we want to return an error?
cheers,
jamal
Jamal Hadi Salim
maintainerFollow up to that patch would be this one.
I also want to do the same for the walker, but will wait response.
cheers,
jamal
Quoted 10 lines · Jamal Hadi Salim
Quoted 8 lines · David Miller
From: David Miller <[email protected]>
Date: Sun, 03 Nov 2013 23:12:32 -0500 (EST)Quoted 2 lines
Right, and
BUG()if we try to register and action with a NULL .lookup member.I return an error,
BUG()is too harsh.
Quoted 8 lines
Sorry - I was distracted, but have time now.
I wanted to fix this then send the other patches - but confused. We are setting the default if someone registers an action with a NULL .lookup. Why do we want to return an error?cheers,
jamal
commit 926db1197d055ee933265ad4d5f5ae2392bcc654
Author: Jamal Hadi Salim <[email protected]> Date: Sun Nov 17 11:20:16 2013 -0500
Use default lookup functions. Users are free to override when needed.
net/sched/act_csum.c +0 -1
@@ -585,7 +585,6 @@ static struct tc_action_ops act_csum_ops = { .act = tcf_csum, .dump = tcf_csum_dump, .cleanup = tcf_csum_cleanup, - .lookup = tcf_hash_search, .init = tcf_csum_init, .walk = tcf_generic_walker };
net/sched/act_gact.c +0 -1
@@ -206,7 +206,6 @@ static struct tc_action_ops act_gact_ops = { .act = tcf_gact, .dump = tcf_gact_dump, .cleanup = tcf_gact_cleanup, - .lookup = tcf_hash_search, .init = tcf_gact_init, .walk = tcf_generic_walker };
net/sched/act_ipt.c +0 -2
@@ -298,7 +298,6 @@ static struct tc_action_ops act_ipt_ops = { .act = tcf_ipt, .dump = tcf_ipt_dump, .cleanup = tcf_ipt_cleanup, - .lookup = tcf_hash_search, .init = tcf_ipt_init, .walk = tcf_generic_walker };
@@ -312,7 +311,6 @@ static struct tc_action_ops act_xt_ops = { .act = tcf_ipt, .dump = tcf_ipt_dump, .cleanup = tcf_ipt_cleanup, - .lookup = tcf_hash_search, .init = tcf_ipt_init, .walk = tcf_generic_walker };
net/sched/act_mirred.c +0 -1
@@ -271,7 +271,6 @@ static struct tc_action_ops act_mirred_ops = { .act = tcf_mirred, .dump = tcf_mirred_dump, .cleanup = tcf_mirred_cleanup, - .lookup = tcf_hash_search, .init = tcf_mirred_init, .walk = tcf_generic_walker };
net/sched/act_nat.c +0 -1
@@ -308,7 +308,6 @@ static struct tc_action_ops act_nat_ops = { .act = tcf_nat, .dump = tcf_nat_dump, .cleanup = tcf_nat_cleanup, - .lookup = tcf_hash_search, .init = tcf_nat_init, .walk = tcf_generic_walker };
net/sched/act_pedit.c +0 -1
@@ -243,7 +243,6 @@ static struct tc_action_ops act_pedit_ops = { .act = tcf_pedit, .dump = tcf_pedit_dump, .cleanup = tcf_pedit_cleanup, - .lookup = tcf_hash_search, .init = tcf_pedit_init, .walk = tcf_generic_walker };
net/sched/act_police.c +0 -1
@@ -407,7 +407,6 @@ static struct tc_action_ops act_police_ops = { .act = tcf_act_police, .dump = tcf_act_police_dump, .cleanup = tcf_act_police_cleanup, - .lookup = tcf_hash_search, .init = tcf_act_police_locate, .walk = tcf_act_police_walker };
Jamal Hadi Salim
maintainerApologies for the latency
My intention was to eventually remove it everywhere since this is needed by all actions. An action could override it, otherwise they get the default.
cheers,
jamal
Quoted 29 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 30 Oct 2013 07:00:05 -0700Quoted 10 lines · Jamal Hadi Salim
Quoted 4 lines
Attached. Tested with simple action.
cheers,
jamalWhy not setting .lookup to
tcf_hash_search
in the few actions not already doing that ?This would be more consistent.
Quoted 12 lines
# git grep -n tcf_hash_search include/net/act_api.h:92:int tcf_hash_search(struct tc_action *a, u32 index); net/sched/act_api.c:198:int tcf_hash_search(struct tc_action *a, u32 index) net/sched/act_api.c:209:EXPORT_SYMBOL(tcf_hash_search); net/sched/act_csum.c:588: .lookup = tcf_hash_search, net/sched/act_gact.c:209: .lookup = tcf_hash_search, net/sched/act_ipt.c:301: .lookup = tcf_hash_search, net/sched/act_ipt.c:315: .lookup = tcf_hash_search, net/sched/act_mirred.c:274: .lookup = tcf_hash_search, net/sched/act_nat.c:311: .lookup = tcf_hash_search, net/sched/act_pedit.c:246: .lookup = tcf_hash_search, net/sched/act_police.c:410: .lookup = tcf_hash_search,Right, and
BUG()if we try to register and action with a NULL .lookup member.