* More painful merges... @ 2017-10-30 12:15 David Miller 2017-10-30 15:14 ` Alexei Starovoitov 2017-10-30 15:58 ` Cong Wang 0 siblings, 2 replies; 6+ messages in thread From: David Miller @ 2017-10-30 12:15 UTC (permalink / raw) To: netdev; +Cc: john.fastabend, ast, daniel, xiyou.wangcong, jiri BPF and tc action bug fixes in 'net' caused some extremely painful merges with 'net-next'. Could the interested parties please take a look at 'net-next' and send me any necessary fixes, as I did the best that I could. Thank you. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: More painful merges... 2017-10-30 12:15 More painful merges David Miller @ 2017-10-30 15:14 ` Alexei Starovoitov 2017-10-30 15:45 ` John Fastabend 2017-10-30 15:58 ` Cong Wang 1 sibling, 1 reply; 6+ messages in thread From: Alexei Starovoitov @ 2017-10-30 15:14 UTC (permalink / raw) To: David Miller; +Cc: netdev, john.fastabend, ast, daniel, xiyou.wangcong, jiri On Mon, Oct 30, 2017 at 09:15:51PM +0900, David Miller wrote: > > BPF and tc action bug fixes in 'net' caused some extremely > painful merges with 'net-next'. > > Could the interested parties please take a look at 'net-next' > and send me any necessary fixes, as I did the best that I > could. bpf side is good. John, please double check as well. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: More painful merges... 2017-10-30 15:14 ` Alexei Starovoitov @ 2017-10-30 15:45 ` John Fastabend 0 siblings, 0 replies; 6+ messages in thread From: John Fastabend @ 2017-10-30 15:45 UTC (permalink / raw) To: Alexei Starovoitov, David Miller Cc: netdev, ast, daniel, xiyou.wangcong, jiri On 10/30/2017 08:14 AM, Alexei Starovoitov wrote: > On Mon, Oct 30, 2017 at 09:15:51PM +0900, David Miller wrote: >> >> BPF and tc action bug fixes in 'net' caused some extremely >> painful merges with 'net-next'. >> >> Could the interested parties please take a look at 'net-next' >> and send me any necessary fixes, as I did the best that I >> could. > > bpf side is good. John, please double check as well. > Code looks good and all my tests passing successfully. Thanks, John ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: More painful merges... 2017-10-30 12:15 More painful merges David Miller 2017-10-30 15:14 ` Alexei Starovoitov @ 2017-10-30 15:58 ` Cong Wang 2017-10-30 16:40 ` Cong Wang 2017-10-30 16:41 ` Jiri Pirko 1 sibling, 2 replies; 6+ messages in thread From: Cong Wang @ 2017-10-30 15:58 UTC (permalink / raw) To: David Miller Cc: Linux Kernel Network Developers, John Fastabend, Alexei Starovoitov, Daniel Borkmann, Jiri Pirko On Mon, Oct 30, 2017 at 5:15 AM, David Miller <davem@davemloft.net> wrote: > > BPF and tc action bug fixes in 'net' caused some extremely > painful merges with 'net-next'. > > Could the interested parties please take a look at 'net-next' > and send me any necessary fixes, as I did the best that I > could. > The tcf_block_put_ext() part looks good to me. I will run some tests to make sure. Thanks for sorting them! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: More painful merges... 2017-10-30 15:58 ` Cong Wang @ 2017-10-30 16:40 ` Cong Wang 2017-10-30 16:41 ` Jiri Pirko 1 sibling, 0 replies; 6+ messages in thread From: Cong Wang @ 2017-10-30 16:40 UTC (permalink / raw) To: David Miller Cc: Linux Kernel Network Developers, John Fastabend, Alexei Starovoitov, Daniel Borkmann, Jiri Pirko On Mon, Oct 30, 2017 at 8:58 AM, Cong Wang <xiyou.wangcong@gmail.com> wrote: > On Mon, Oct 30, 2017 at 5:15 AM, David Miller <davem@davemloft.net> wrote: >> >> BPF and tc action bug fixes in 'net' caused some extremely >> painful merges with 'net-next'. >> >> Could the interested parties please take a look at 'net-next' >> and send me any necessary fixes, as I did the best that I >> could. >> > > The tcf_block_put_ext() part looks good to me. I will run > some tests to make sure. > Hmm, there is some bug in tcf_unbind_filter() after this merge, but that is not your fault. In net-next, we use tp->chain after it is freed: static inline void tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r) { + struct Qdisc *q = tp->chain->block->q; unsigned long cl; + if (!q) + return; if ((cl = __cls_set_class(&r->class, 0)) != 0) - tp->q->ops->cl_ops->unbind_tcf(tp->q, cl); + q->ops->cl_ops->unbind_tcf(q, cl); } I will provide a fix. Just FYI. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: More painful merges... 2017-10-30 15:58 ` Cong Wang 2017-10-30 16:40 ` Cong Wang @ 2017-10-30 16:41 ` Jiri Pirko 1 sibling, 0 replies; 6+ messages in thread From: Jiri Pirko @ 2017-10-30 16:41 UTC (permalink / raw) To: Cong Wang Cc: David Miller, Linux Kernel Network Developers, John Fastabend, Alexei Starovoitov, Daniel Borkmann, Jiri Pirko Mon, Oct 30, 2017 at 04:58:25PM CET, xiyou.wangcong@gmail.com wrote: >On Mon, Oct 30, 2017 at 5:15 AM, David Miller <davem@davemloft.net> wrote: >> >> BPF and tc action bug fixes in 'net' caused some extremely >> painful merges with 'net-next'. >> >> Could the interested parties please take a look at 'net-next' >> and send me any necessary fixes, as I did the best that I >> could. >> > >The tcf_block_put_ext() part looks good to me. I will run >some tests to make sure. Looks fine to me as well. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-30 16:41 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-10-30 12:15 More painful merges David Miller 2017-10-30 15:14 ` Alexei Starovoitov 2017-10-30 15:45 ` John Fastabend 2017-10-30 15:58 ` Cong Wang 2017-10-30 16:40 ` Cong Wang 2017-10-30 16:41 ` Jiri Pirko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox