Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkt_sched: gen_estimator: Optimize gen_estimator_active()

Browse source 
Since all other gen_estimator functions use bstats and rate_est params
together, and searching for them is optimized now, let's use this also
in gen_estimator_active(). The return type of gen_estimator_active()
is changed to bool, and gen_find_node() parameters to const, btw.

In tcf_act_police_locate() a check for ACT_P_CREATED is added before
calling gen_estimator_active().

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski 2008-11-26 15:24:32 -08:00 committed by David S. Miller
parent 3d4cd60ed0
commit 244e6c2d07
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/gen_stats.h
View file

@ -45,6 +45,6 @@ extern void gen_kill_estimator(struct gnet_stats_basic *bstats,
extern int gen_replace_estimator(struct gnet_stats_basic *bstats,
struct gnet_stats_rate_est *rate_est,
spinlock_t *stats_lock, struct nlattr *opt);
extern int gen_estimator_active(const struct gnet_stats_rate_est *rate_est);
extern bool gen_estimator_active(const struct gnet_stats_basic *bstats,
const struct gnet_stats_rate_est *rate_est);
#endif

25
net/core/gen_estimator.c
View file

@ -163,8 +163,9 @@ static void gen_add_node(struct gen_estimator *est)
rb_insert_color(&est->node, &est_root);
}
static struct gen_estimator *gen_find_node(struct gnet_stats_basic *bstats,
struct gnet_stats_rate_est *rate_est)
static
struct gen_estimator *gen_find_node(const struct gnet_stats_basic *bstats,
const struct gnet_stats_rate_est *rate_est)
{
struct rb_node *p = est_root.rb_node;
@ -301,26 +302,16 @@ EXPORT_SYMBOL(gen_replace_estimator);
/**
* gen_estimator_active - test if estimator is currently in use
* @bstats: basic statistics
* @rate_est: rate estimator statistics
*
* Returns 1 if estimator is active, and 0 if not.
* Returns true if estimator is active, and false if not.
*/
int gen_estimator_active(const struct gnet_stats_rate_est *rate_est)
bool gen_estimator_active(const struct gnet_stats_basic *bstats,
const struct gnet_stats_rate_est *rate_est)
{
int idx;
struct gen_estimator *e;
ASSERT_RTNL();
for (idx=0; idx <= EST_MAX_INTERVAL; idx++) {
if (!elist[idx].timer.function)
continue;
list_for_each_entry(e, &elist[idx].list, list) {
if (e->rate_est == rate_est)
return 1;
}
}
return 0;
return gen_find_node(bstats, rate_est) != NULL;
}
EXPORT_SYMBOL(gen_estimator_active);

4
net/sched/act_police.c
View file

@ -183,7 +183,9 @@ static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est,
if (R_tab == NULL)
goto failure;
if (!est && !gen_estimator_active(&police->tcf_rate_est)) {
if (!est && (ret == ACT_P_CREATED ||
!gen_estimator_active(&police->tcf_bstats,
&police->tcf_rate_est))) {
err = -EINVAL;
goto failure;
}