mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'idr-2018-02-06' of git://git.infradead.org/users/willy/linux-dax
Pull idr updates from Matthew Wilcox: - test-suite improvements - replace the extended API by improving the normal API - performance improvement for IDRs which are 1-based rather than 0-based - add documentation * 'idr-2018-02-06' of git://git.infradead.org/users/willy/linux-dax: idr: Add documentation idr: Make 1-based IDRs more efficient idr: Warn if old iterators see large IDs idr: Rename idr_for_each_entry_ext idr: Remove idr_alloc_ext cls_u32: Convert to idr_alloc_u32 cls_u32: Reinstate cyclic allocation cls_flower: Convert to idr_alloc_u32 cls_bpf: Convert to use idr_alloc_u32 cls_basic: Convert to use idr_alloc_u32 cls_api: Convert to idr_alloc_u32 net sched actions: Convert to use idr_alloc_u32 idr: Add idr_alloc_u32 helper idr: Delete idr_find_ext function idr: Delete idr_replace_ext function idr: Delete idr_remove_ext function IDR test suite: Check handling negative end correctly idr test suite: Fix ida_test_random() radix tree test suite: Remove ARRAY_SIZE
This commit is contained in:
Linus Torvalds
commit
9d21874da8
15 changed files with 471 additions and 325 deletions
|
|
@ -78,7 +78,7 @@ static void free_tcf(struct tc_action *p)
|
|||
static void tcf_idr_remove(struct tcf_idrinfo *idrinfo, struct tc_action *p)
|
||||
{
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
idr_remove_ext(&idrinfo->action_idr, p->tcfa_index);
|
||||
idr_remove(&idrinfo->action_idr, p->tcfa_index);
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
gen_kill_estimator(&p->tcfa_rate_est);
|
||||
free_tcf(p);
|
||||
|
|
@ -124,7 +124,7 @@ static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
|
|||
|
||||
s_i = cb->args[0];
|
||||
|
||||
idr_for_each_entry_ext(idr, p, id) {
|
||||
idr_for_each_entry_ul(idr, p, id) {
|
||||
index++;
|
||||
if (index < s_i)
|
||||
continue;
|
||||
|
|
@ -181,7 +181,7 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
|
|||
if (nla_put_string(skb, TCA_KIND, ops->kind))
|
||||
goto nla_put_failure;
|
||||
|
||||
idr_for_each_entry_ext(idr, p, id) {
|
||||
idr_for_each_entry_ul(idr, p, id) {
|
||||
ret = __tcf_idr_release(p, false, true);
|
||||
if (ret == ACT_P_DELETED) {
|
||||
module_put(ops->owner);
|
||||
|
|
@ -222,7 +222,7 @@ static struct tc_action *tcf_idr_lookup(u32 index, struct tcf_idrinfo *idrinfo)
|
|||
struct tc_action *p = NULL;
|
||||
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
p = idr_find_ext(&idrinfo->action_idr, index);
|
||||
p = idr_find(&idrinfo->action_idr, index);
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
|
||||
return p;
|
||||
|
|
@ -274,7 +274,6 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
|
|||
struct tcf_idrinfo *idrinfo = tn->idrinfo;
|
||||
struct idr *idr = &idrinfo->action_idr;
|
||||
int err = -ENOMEM;
|
||||
unsigned long idr_index;
|
||||
|
||||
if (unlikely(!p))
|
||||
return -ENOMEM;
|
||||
|
|
@ -284,45 +283,28 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
|
|||
|
||||
if (cpustats) {
|
||||
p->cpu_bstats = netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
|
||||
if (!p->cpu_bstats) {
|
||||
err1:
|
||||
kfree(p);
|
||||
return err;
|
||||
}
|
||||
p->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
|
||||
if (!p->cpu_qstats) {
|
||||
err2:
|
||||
free_percpu(p->cpu_bstats);
|
||||
if (!p->cpu_bstats)
|
||||
goto err1;
|
||||
}
|
||||
p->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
|
||||
if (!p->cpu_qstats)
|
||||
goto err2;
|
||||
}
|
||||
spin_lock_init(&p->tcfa_lock);
|
||||
idr_preload(GFP_KERNEL);
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
/* user doesn't specify an index */
|
||||
if (!index) {
|
||||
idr_preload(GFP_KERNEL);
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
err = idr_alloc_ext(idr, NULL, &idr_index, 1, 0,
|
||||
GFP_ATOMIC);
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
idr_preload_end();
|
||||
if (err) {
|
||||
err3:
|
||||
free_percpu(p->cpu_qstats);
|
||||
goto err2;
|
||||
}
|
||||
p->tcfa_index = idr_index;
|
||||
index = 1;
|
||||
err = idr_alloc_u32(idr, NULL, &index, UINT_MAX, GFP_ATOMIC);
|
||||
} else {
|
||||
idr_preload(GFP_KERNEL);
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
err = idr_alloc_ext(idr, NULL, NULL, index, index + 1,
|
||||
GFP_ATOMIC);
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
idr_preload_end();
|
||||
if (err)
|
||||
goto err3;
|
||||
p->tcfa_index = index;
|
||||
err = idr_alloc_u32(idr, NULL, &index, index, GFP_ATOMIC);
|
||||
}
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
idr_preload_end();
|
||||
if (err)
|
||||
goto err3;
|
||||
|
||||
p->tcfa_index = index;
|
||||
p->tcfa_tm.install = jiffies;
|
||||
p->tcfa_tm.lastuse = jiffies;
|
||||
p->tcfa_tm.firstuse = 0;
|
||||
|
|
@ -330,9 +312,8 @@ err3:
|
|||
err = gen_new_estimator(&p->tcfa_bstats, p->cpu_bstats,
|
||||
&p->tcfa_rate_est,
|
||||
&p->tcfa_lock, NULL, est);
|
||||
if (err) {
|
||||
goto err3;
|
||||
}
|
||||
if (err)
|
||||
goto err4;
|
||||
}
|
||||
|
||||
p->idrinfo = idrinfo;
|
||||
|
|
@ -340,6 +321,15 @@ err3:
|
|||
INIT_LIST_HEAD(&p->list);
|
||||
*a = p;
|
||||
return 0;
|
||||
err4:
|
||||
idr_remove(idr, index);
|
||||
err3:
|
||||
free_percpu(p->cpu_qstats);
|
||||
err2:
|
||||
free_percpu(p->cpu_bstats);
|
||||
err1:
|
||||
kfree(p);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(tcf_idr_create);
|
||||
|
||||
|
|
@ -348,7 +338,7 @@ void tcf_idr_insert(struct tc_action_net *tn, struct tc_action *a)
|
|||
struct tcf_idrinfo *idrinfo = tn->idrinfo;
|
||||
|
||||
spin_lock_bh(&idrinfo->lock);
|
||||
idr_replace_ext(&idrinfo->action_idr, a, a->tcfa_index);
|
||||
idr_replace(&idrinfo->action_idr, a, a->tcfa_index);
|
||||
spin_unlock_bh(&idrinfo->lock);
|
||||
}
|
||||
EXPORT_SYMBOL(tcf_idr_insert);
|
||||
|
|
@ -361,7 +351,7 @@ void tcf_idrinfo_destroy(const struct tc_action_ops *ops,
|
|||
int ret;
|
||||
unsigned long id = 1;
|
||||
|
||||
idr_for_each_entry_ext(idr, p, id) {
|
||||
idr_for_each_entry_ul(idr, p, id) {
|
||||
ret = __tcf_idr_release(p, false, true);
|
||||
if (ret == ACT_P_DELETED)
|
||||
module_put(ops->owner);
|
||||
|
|
|
|||
|
|
@ -381,8 +381,8 @@ static int tcf_block_insert(struct tcf_block *block, struct net *net,
|
|||
struct tcf_net *tn = net_generic(net, tcf_net_id);
|
||||
int err;
|
||||
|
||||
err = idr_alloc_ext(&tn->idr, block, NULL, block_index,
|
||||
block_index + 1, GFP_KERNEL);
|
||||
err = idr_alloc_u32(&tn->idr, block, &block_index, block_index,
|
||||
GFP_KERNEL);
|
||||
if (err)
|
||||
return err;
|
||||
block->index = block_index;
|
||||
|
|
@ -393,7 +393,7 @@ static void tcf_block_remove(struct tcf_block *block, struct net *net)
|
|||
{
|
||||
struct tcf_net *tn = net_generic(net, tcf_net_id);
|
||||
|
||||
idr_remove_ext(&tn->idr, block->index);
|
||||
idr_remove(&tn->idr, block->index);
|
||||
}
|
||||
|
||||
static struct tcf_block *tcf_block_create(struct net *net, struct Qdisc *q,
|
||||
|
|
@ -434,7 +434,7 @@ static struct tcf_block *tcf_block_lookup(struct net *net, u32 block_index)
|
|||
{
|
||||
struct tcf_net *tn = net_generic(net, tcf_net_id);
|
||||
|
||||
return idr_find_ext(&tn->idr, block_index);
|
||||
return idr_find(&tn->idr, block_index);
|
||||
}
|
||||
|
||||
static struct tcf_chain *tcf_block_chain_zero(struct tcf_block *block)
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
|
|||
list_for_each_entry_safe(f, n, &head->flist, link) {
|
||||
list_del_rcu(&f->link);
|
||||
tcf_unbind_filter(tp, &f->res);
|
||||
idr_remove_ext(&head->handle_idr, f->handle);
|
||||
idr_remove(&head->handle_idr, f->handle);
|
||||
if (tcf_exts_get_net(&f->exts))
|
||||
call_rcu(&f->rcu, basic_delete_filter);
|
||||
else
|
||||
|
|
@ -138,7 +138,7 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
|
|||
|
||||
list_del_rcu(&f->link);
|
||||
tcf_unbind_filter(tp, &f->res);
|
||||
idr_remove_ext(&head->handle_idr, f->handle);
|
||||
idr_remove(&head->handle_idr, f->handle);
|
||||
tcf_exts_get_net(&f->exts);
|
||||
call_rcu(&f->rcu, basic_delete_filter);
|
||||
*last = list_empty(&head->flist);
|
||||
|
|
@ -185,7 +185,6 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
|
|||
struct nlattr *tb[TCA_BASIC_MAX + 1];
|
||||
struct basic_filter *fold = (struct basic_filter *) *arg;
|
||||
struct basic_filter *fnew;
|
||||
unsigned long idr_index;
|
||||
|
||||
if (tca[TCA_OPTIONS] == NULL)
|
||||
return -EINVAL;
|
||||
|
|
@ -208,34 +207,30 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
|
|||
if (err < 0)
|
||||
goto errout;
|
||||
|
||||
if (handle) {
|
||||
fnew->handle = handle;
|
||||
if (!fold) {
|
||||
err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
|
||||
handle, handle + 1, GFP_KERNEL);
|
||||
if (err)
|
||||
goto errout;
|
||||
}
|
||||
} else {
|
||||
err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
|
||||
1, 0x7FFFFFFF, GFP_KERNEL);
|
||||
if (err)
|
||||
goto errout;
|
||||
fnew->handle = idr_index;
|
||||
if (!handle) {
|
||||
handle = 1;
|
||||
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
||||
INT_MAX, GFP_KERNEL);
|
||||
} else if (!fold) {
|
||||
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
||||
handle, GFP_KERNEL);
|
||||
}
|
||||
if (err)
|
||||
goto errout;
|
||||
fnew->handle = handle;
|
||||
|
||||
err = basic_set_parms(net, tp, fnew, base, tb, tca[TCA_RATE], ovr,
|
||||
extack);
|
||||
if (err < 0) {
|
||||
if (!fold)
|
||||
idr_remove_ext(&head->handle_idr, fnew->handle);
|
||||
idr_remove(&head->handle_idr, fnew->handle);
|
||||
goto errout;
|
||||
}
|
||||
|
||||
*arg = fnew;
|
||||
|
||||
if (fold) {
|
||||
idr_replace_ext(&head->handle_idr, fnew, fnew->handle);
|
||||
idr_replace(&head->handle_idr, fnew, fnew->handle);
|
||||
list_replace_rcu(&fold->link, &fnew->link);
|
||||
tcf_unbind_filter(tp, &fold->res);
|
||||
tcf_exts_get_net(&fold->exts);
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog,
|
|||
{
|
||||
struct cls_bpf_head *head = rtnl_dereference(tp->root);
|
||||
|
||||
idr_remove_ext(&head->handle_idr, prog->handle);
|
||||
idr_remove(&head->handle_idr, prog->handle);
|
||||
cls_bpf_stop_offload(tp, prog, extack);
|
||||
list_del_rcu(&prog->link);
|
||||
tcf_unbind_filter(tp, &prog->res);
|
||||
|
|
@ -471,7 +471,6 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
|
|||
struct cls_bpf_prog *oldprog = *arg;
|
||||
struct nlattr *tb[TCA_BPF_MAX + 1];
|
||||
struct cls_bpf_prog *prog;
|
||||
unsigned long idr_index;
|
||||
int ret;
|
||||
|
||||
if (tca[TCA_OPTIONS] == NULL)
|
||||
|
|
@ -498,21 +497,18 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
|
|||
}
|
||||
|
||||
if (handle == 0) {
|
||||
ret = idr_alloc_ext(&head->handle_idr, prog, &idr_index,
|
||||
1, 0x7FFFFFFF, GFP_KERNEL);
|
||||
if (ret)
|
||||
goto errout;
|
||||
prog->handle = idr_index;
|
||||
} else {
|
||||
if (!oldprog) {
|
||||
ret = idr_alloc_ext(&head->handle_idr, prog, &idr_index,
|
||||
handle, handle + 1, GFP_KERNEL);
|
||||
if (ret)
|
||||
goto errout;
|
||||
}
|
||||
prog->handle = handle;
|
||||
handle = 1;
|
||||
ret = idr_alloc_u32(&head->handle_idr, prog, &handle,
|
||||
INT_MAX, GFP_KERNEL);
|
||||
} else if (!oldprog) {
|
||||
ret = idr_alloc_u32(&head->handle_idr, prog, &handle,
|
||||
handle, GFP_KERNEL);
|
||||
}
|
||||
|
||||
if (ret)
|
||||
goto errout;
|
||||
prog->handle = handle;
|
||||
|
||||
ret = cls_bpf_set_parms(net, tp, prog, base, tb, tca[TCA_RATE], ovr,
|
||||
extack);
|
||||
if (ret < 0)
|
||||
|
|
@ -526,7 +522,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
|
|||
prog->gen_flags |= TCA_CLS_FLAGS_NOT_IN_HW;
|
||||
|
||||
if (oldprog) {
|
||||
idr_replace_ext(&head->handle_idr, prog, handle);
|
||||
idr_replace(&head->handle_idr, prog, handle);
|
||||
list_replace_rcu(&oldprog->link, &prog->link);
|
||||
tcf_unbind_filter(tp, &oldprog->res);
|
||||
tcf_exts_get_net(&oldprog->exts);
|
||||
|
|
@ -542,7 +538,7 @@ errout_parms:
|
|||
cls_bpf_free_parms(prog);
|
||||
errout_idr:
|
||||
if (!oldprog)
|
||||
idr_remove_ext(&head->handle_idr, prog->handle);
|
||||
idr_remove(&head->handle_idr, prog->handle);
|
||||
errout:
|
||||
tcf_exts_destroy(&prog->exts);
|
||||
kfree(prog);
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ static void __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
|
|||
{
|
||||
struct cls_fl_head *head = rtnl_dereference(tp->root);
|
||||
|
||||
idr_remove_ext(&head->handle_idr, f->handle);
|
||||
idr_remove(&head->handle_idr, f->handle);
|
||||
list_del_rcu(&f->list);
|
||||
if (!tc_skip_hw(f->flags))
|
||||
fl_hw_destroy_filter(tp, f, extack);
|
||||
|
|
@ -334,7 +334,7 @@ static void *fl_get(struct tcf_proto *tp, u32 handle)
|
|||
{
|
||||
struct cls_fl_head *head = rtnl_dereference(tp->root);
|
||||
|
||||
return idr_find_ext(&head->handle_idr, handle);
|
||||
return idr_find(&head->handle_idr, handle);
|
||||
}
|
||||
|
||||
static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {
|
||||
|
|
@ -865,7 +865,6 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
|
|||
struct cls_fl_filter *fnew;
|
||||
struct nlattr **tb;
|
||||
struct fl_flow_mask mask = {};
|
||||
unsigned long idr_index;
|
||||
int err;
|
||||
|
||||
if (!tca[TCA_OPTIONS])
|
||||
|
|
@ -896,21 +895,17 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
|
|||
goto errout;
|
||||
|
||||
if (!handle) {
|
||||
err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
|
||||
1, 0x80000000, GFP_KERNEL);
|
||||
if (err)
|
||||
goto errout;
|
||||
fnew->handle = idr_index;
|
||||
}
|
||||
|
||||
/* user specifies a handle and it doesn't exist */
|
||||
if (handle && !fold) {
|
||||
err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
|
||||
handle, handle + 1, GFP_KERNEL);
|
||||
if (err)
|
||||
goto errout;
|
||||
fnew->handle = idr_index;
|
||||
handle = 1;
|
||||
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
||||
INT_MAX, GFP_KERNEL);
|
||||
} else if (!fold) {
|
||||
/* user specifies a handle and it doesn't exist */
|
||||
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
||||
handle, GFP_KERNEL);
|
||||
}
|
||||
if (err)
|
||||
goto errout;
|
||||
fnew->handle = handle;
|
||||
|
||||
if (tb[TCA_FLOWER_FLAGS]) {
|
||||
fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]);
|
||||
|
|
@ -966,8 +961,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
|
|||
*arg = fnew;
|
||||
|
||||
if (fold) {
|
||||
fnew->handle = handle;
|
||||
idr_replace_ext(&head->handle_idr, fnew, fnew->handle);
|
||||
idr_replace(&head->handle_idr, fnew, fnew->handle);
|
||||
list_replace_rcu(&fold->list, &fnew->list);
|
||||
tcf_unbind_filter(tp, &fold->res);
|
||||
tcf_exts_get_net(&fold->exts);
|
||||
|
|
@ -981,7 +975,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
|
|||
|
||||
errout_idr:
|
||||
if (fnew->handle)
|
||||
idr_remove_ext(&head->handle_idr, fnew->handle);
|
||||
idr_remove(&head->handle_idr, fnew->handle);
|
||||
errout:
|
||||
tcf_exts_destroy(&fnew->exts);
|
||||
kfree(fnew);
|
||||
|
|
|
|||
|
|
@ -316,19 +316,13 @@ static void *u32_get(struct tcf_proto *tp, u32 handle)
|
|||
return u32_lookup_key(ht, handle);
|
||||
}
|
||||
|
||||
/* Protected by rtnl lock */
|
||||
static u32 gen_new_htid(struct tc_u_common *tp_c, struct tc_u_hnode *ptr)
|
||||
{
|
||||
unsigned long idr_index;
|
||||
int err;
|
||||
|
||||
/* This is only used inside rtnl lock it is safe to increment
|
||||
* without read _copy_ update semantics
|
||||
*/
|
||||
err = idr_alloc_ext(&tp_c->handle_idr, ptr, &idr_index,
|
||||
1, 0x7FF, GFP_KERNEL);
|
||||
if (err)
|
||||
int id = idr_alloc_cyclic(&tp_c->handle_idr, ptr, 1, 0x7FF, GFP_KERNEL);
|
||||
if (id < 0)
|
||||
return 0;
|
||||
return (u32)(idr_index | 0x800) << 20;
|
||||
return (id | 0x800U) << 20;
|
||||
}
|
||||
|
||||
static struct hlist_head *tc_u_common_hash;
|
||||
|
|
@ -598,7 +592,7 @@ static void u32_clear_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht,
|
|||
rtnl_dereference(n->next));
|
||||
tcf_unbind_filter(tp, &n->res);
|
||||
u32_remove_hw_knode(tp, n, extack);
|
||||
idr_remove_ext(&ht->handle_idr, n->handle);
|
||||
idr_remove(&ht->handle_idr, n->handle);
|
||||
if (tcf_exts_get_net(&n->exts))
|
||||
call_rcu(&n->rcu, u32_delete_key_freepf_rcu);
|
||||
else
|
||||
|
|
@ -625,7 +619,7 @@ static int u32_destroy_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht,
|
|||
if (phn == ht) {
|
||||
u32_clear_hw_hnode(tp, ht, extack);
|
||||
idr_destroy(&ht->handle_idr);
|
||||
idr_remove_ext(&tp_c->handle_idr, ht->handle);
|
||||
idr_remove(&tp_c->handle_idr, ht->handle);
|
||||
RCU_INIT_POINTER(*hn, ht->next);
|
||||
kfree_rcu(ht, rcu);
|
||||
return 0;
|
||||
|
|
@ -747,19 +741,17 @@ ret:
|
|||
|
||||
static u32 gen_new_kid(struct tc_u_hnode *ht, u32 htid)
|
||||
{
|
||||
unsigned long idr_index;
|
||||
u32 start = htid | 0x800;
|
||||
u32 index = htid | 0x800;
|
||||
u32 max = htid | 0xFFF;
|
||||
u32 min = htid;
|
||||
|
||||
if (idr_alloc_ext(&ht->handle_idr, NULL, &idr_index,
|
||||
start, max + 1, GFP_KERNEL)) {
|
||||
if (idr_alloc_ext(&ht->handle_idr, NULL, &idr_index,
|
||||
min + 1, max + 1, GFP_KERNEL))
|
||||
return max;
|
||||
if (idr_alloc_u32(&ht->handle_idr, NULL, &index, max, GFP_KERNEL)) {
|
||||
index = htid + 1;
|
||||
if (idr_alloc_u32(&ht->handle_idr, NULL, &index, max,
|
||||
GFP_KERNEL))
|
||||
index = max;
|
||||
}
|
||||
|
||||
return (u32)idr_index;
|
||||
return index;
|
||||
}
|
||||
|
||||
static const struct nla_policy u32_policy[TCA_U32_MAX + 1] = {
|
||||
|
|
@ -849,7 +841,7 @@ static void u32_replace_knode(struct tcf_proto *tp, struct tc_u_common *tp_c,
|
|||
if (pins->handle == n->handle)
|
||||
break;
|
||||
|
||||
idr_replace_ext(&ht->handle_idr, n, n->handle);
|
||||
idr_replace(&ht->handle_idr, n, n->handle);
|
||||
RCU_INIT_POINTER(n->next, pins->next);
|
||||
rcu_assign_pointer(*ins, n);
|
||||
}
|
||||
|
|
@ -1010,8 +1002,8 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
|
|||
return -ENOMEM;
|
||||
}
|
||||
} else {
|
||||
err = idr_alloc_ext(&tp_c->handle_idr, ht, NULL,
|
||||
handle, handle + 1, GFP_KERNEL);
|
||||
err = idr_alloc_u32(&tp_c->handle_idr, ht, &handle,
|
||||
handle, GFP_KERNEL);
|
||||
if (err) {
|
||||
kfree(ht);
|
||||
return err;
|
||||
|
|
@ -1027,7 +1019,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
|
|||
|
||||
err = u32_replace_hw_hnode(tp, ht, flags, extack);
|
||||
if (err) {
|
||||
idr_remove_ext(&tp_c->handle_idr, handle);
|
||||
idr_remove(&tp_c->handle_idr, handle);
|
||||
kfree(ht);
|
||||
return err;
|
||||
}
|
||||
|
|
@ -1067,8 +1059,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
|
|||
return -EINVAL;
|
||||
}
|
||||
handle = htid | TC_U32_NODE(handle);
|
||||
err = idr_alloc_ext(&ht->handle_idr, NULL, NULL,
|
||||
handle, handle + 1,
|
||||
err = idr_alloc_u32(&ht->handle_idr, NULL, &handle, handle,
|
||||
GFP_KERNEL);
|
||||
if (err)
|
||||
return err;
|
||||
|
|
@ -1163,7 +1154,7 @@ errfree:
|
|||
#endif
|
||||
kfree(n);
|
||||
erridr:
|
||||
idr_remove_ext(&ht->handle_idr, handle);
|
||||
idr_remove(&ht->handle_idr, handle);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue