Skip to content

Commit

Permalink
cls_bpf: Convert to use idr_alloc_u32
Browse files Browse the repository at this point in the history
Use the new helper.  This has a modest reduction in both lines of code
and compiled code size.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
  • Loading branch information
Matthew Wilcox committed Feb 6, 2018
1 parent 05af0eb commit 0b4ce8d
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions net/sched/cls_bpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 0b4ce8d

Please sign in to comment.