On Fri, Sep 27, 2019 at 11:09 AM Kevin Traynor <ktray...@redhat.com> wrote: > > On 27/09/2019 09:04, Ilya Maximets wrote: > > On 27.09.2019 10:43, David Marchand wrote: > >> On Thu, Sep 26, 2019 at 9:45 PM Stokes, Ian <ian.sto...@intel.com> wrote: > >>> On 9/26/2019 1:09 PM, David Marchand wrote: > >>>> On Thu, Sep 26, 2019 at 11:41 AM Ilya Maximets <i.maxim...@ovn.org> > >>>> wrote: > >>>>> > >>>>> On 26.09.2019 12:08, Stokes, Ian wrote: > >>>>>> Hi all, > >>>>>> > >>>>>> the dpdk-latest branch has been lagging behind ovs master for a bit. > >>>>>> Now that the OVS 2.12 release is out it seems timely to rebase it on> > >>>>>> top of OVS master and push, note as before this will be a force push> > >>>>>> on the dpdk-latest branch as the rebase on master will change the > >>>>>> commit history. > >>>>>> > >>>>>> I intend to do this today, are there any objections to this? > >>>>> > >>>>> Sounds good to me. Thanks! > >>>>> > >>>>> BTW, last time I tried to build the dpdk-latest branch there was > >>>>> issues with sparse, i.e. some DPDK headers didn't want to build. > >>>>> So, there is a probability that some additional fixes required. > >>>> > >>>> ovs rte_flow.h (sparse header) is out of sync with dpdk master. > >>>> Either we resync it or we remove it :-). > >>>> > >>>> > >>> > >>> I've just pushed the rebase. I can take a look at fixing at the sparse > >>> header for rte_flow.h in the coming days to help fix travis. > >> > >> Just tested it, got bitten by some build issue related to ovn removal, > >> but I suppose this is because my workdir was already configured. > >> From scratch, it works fine. > >> Thanks. > >> > >> > >> About sparse and rte_flow.h, just removing include/sparse/rte_flow.h > >> header does the trick. > >> I inserted issues in the rte_flow.h from my compiled dpdk and sparse > >> properly reported them when building ovs. > >> > >> What is the reason for keeping this copy of the file in ovs? > > > > I think that you fixed the reason recently on DPDK master by the following > > patch: > > fbb25a3878cc ("ethdev: fix endian annotation for SPI item") > > > > OVS master branch will not build with DPDK 18.11 and sparse enabled. > > > > I can pull this fix into 18.11.3, so it will remove any workarounds for > sparse.
I sure don't mind :-). We have other duplicates (rte_{icmp,ip,sctp,tcp,udp}.h) that could be dropped, but it needs dpdk headers to make use of the rte_beXX_t types. I will send patches on dpdk first. -- David Marchand _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev