[MERGE HELP] cls_tcindex.c

[MERGE HELP] cls_tcindex.c

[David Miller]

I've merged net into net-next.

The worst conflict was cls_tcindex.c as Cong's fixes collided heavily
with Vlad's work.

The interim solution I used for this merge was to revert back to RCU.

Please take a look at what I did and send me followups because I am
absolutely certain that some are necessary :-)))

Thanks!

Re: [MERGE HELP] cls_tcindex.c

[Cong Wang]

On Fri, Feb 15, 2019 at 12:41 PM David Miller <davem@davemloft.net> wrote:
>
>
> I've merged net into net-next.
>
> The worst conflict was cls_tcindex.c as Cong's fixes collided heavily
> with Vlad's work.
>
> The interim solution I used for this merge was to revert back to RCU.
>
> Please take a look at what I did and send me followups because I am
> absolutely certain that some are necessary :-)))

Well, there is nothing fundamentally changed w.r.t. the race I have fixed.

In tcindex_delete(), after all Vlad's patches, it still calls tcf_queue_work()
therefore still races with call_rcu(). This has nothing to do with whether
it is RTNL or another mutex.

For the first memory leak, it is same, nothing changes, tcindex_delete()
still skips r->res.class==0 therefore we still need to fix it.

For the rest two memory leaks, it looks like you already merged the fix
(patch 3/3) correctly.

I will cherry-pick the first two patches for net-next and send them to you.

Thanks.

Re: [MERGE HELP] cls_tcindex.c

[David Miller]

From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Fri, 15 Feb 2019 17:31:41 -0800

> I will cherry-pick the first two patches for net-next and send them to you.

Ok, thanks Cong.