Thanks YiHung for reviewing. I've sent out a new version. Best, Yifeng
On Wed, Aug 7, 2019 at 10:24 AM Yi-Hung Wei <yihung....@gmail.com> wrote: > > On Tue, Aug 6, 2019 at 5:06 PM Yifeng Sun <pkusunyif...@gmail.com> wrote: > > > > This patch backports several critical bug fixes related to > > locking and data consistency in nf_conncount code. > > > > This backport is based on the following upstream net-next upstream commits. > > 4cd273b ("netfilter: nf_conncount: don't skip eviction when age is > > negative") > > d4e7df1 ("netfilter: nf_conncount: use rb_link_node_rcu() instead of > > rb_link_node()") > > 53ca0f2 ("netfilter: nf_conncount: remove wrong condition check routine") > > 3c5cdb1 ("netfilter: nf_conncount: fix unexpected permanent node of list.") > > 31568ec ("netfilter: nf_conncount: fix list_del corruption in conn_free") > > fd3e71a ("netfilter: nf_conncount: use spin_lock_bh instead of spin_lock") > > > > This patch also added additional compat code so that it can build on > > all supported kernel versions. > > > > Travis tests are at > > https://travis-ci.org/yifsun/ovs-travis/builds/568603796 > > > > VMware-BZ: #2396471 > > > > CC: Taehee Yoo <ap420...@gmail.com> > > Signed-off-by: Yifeng Sun <pkusunyif...@gmail.com> > > --- > > Hi Yifeng, > > Thanks for the patch. This backport looks good in general. > > I found that there are couple of fixes on nf_conncount in upstream > kernel. Since we would like to use df4a90250976 ("netfilter: > nf_conncount: merge lookup and add functions") to determine if the > kernel has all the fixes. It would be good to bring other commits on > the same date to our datapath compat code base as well. That is to > squash all the following commits. > > One more suggestion is to squash the other patch that you sent > ("datapath: Apply bug fixes of nf_conncount for different kernel > versions") into this one, since updating "HAVE_UPSTREAM_NF_CONNCOUNT" > is only useful with this patch. > > > a007232066f6 ("netfilter: nf_conncount: fix argument order to find_next_bit") > c80f10bc973a ("netfilter: nf_conncount: speculative garbage collection > on empty lists") > 2f971a8f4255 ("netfilter: nf_conncount: move all list iterations under > spinlock") > df4a90250976 ("netfilter: nf_conncount: merge lookup and add functions") > e8cfb372b38a ("netfilter: nf_conncount: restart search when nodes have > been erased") > f7fcc98dfc2d ("netfilter: nf_conncount: split gc in two phases") > 4cd273bb91b3 ("netfilter: nf_conncount: don't skip eviction when age > is negative") > c78e7818f16f ("netfilter: nf_conncount: replace CONNCOUNT_LOCK_SLOTS > with CONNCOUNT_SLOTS") > d4e7df16567b ("netfilter: nf_conncount: use rb_link_node_rcu() instead > of rb_link_node()") > 53ca0f2fec39 ("netfilter: nf_conncount: remove wrong condition check routine") > 3c5cdb17c3be ("netfilter: nf_conncount: fix unexpected permanent node of > list.") > 31568ec09ea0 ("netfilter: nf_conncount: fix list_del corruption in conn_free") > fd3e71a9f71e ("netfilter: nf_conncount: use spin_lock_bh instead of > spin_lock") > > Thanks, > > -Yi-Hung _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev