[dpdk-dev] [PATCH v5 0/4] introduce new tunnel types

[Iremonger, Bernard]

Hi Li

<snip>

> > > -----Original Message-----
> > > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Xueming Li
> > > Sent: Tuesday, April 17, 2018 4:04 PM
> > > To: Lu, Wenzhuo <wenzhuo.lu at intel.com>; Wu, Jingjing
> > > <jingjing.wu at intel.com>; Thomas Monjalon <thomas at monjalon.net>;
> > > Adrien Mazarguil <adrien.mazarguil at 6wind.com>
> > > Cc: Xueming Li <xuemingl at mellanox.com>; Nelio Laranjeiro
> > > <nelio.laranjeiro at 6wind.com>; Shahaf Shuler <shahafs at mellanox.com>;
> > > dev at dpdk.org; Olivier Matz <olivier.matz at 6wind.com>
> > > Subject: [dpdk-dev] [PATCH v5 0/4] introduce new tunnel types
> > >
> > > v5:
> > > - Fixed VXLAN-GPE comment alignment
> > > v4:
> > > - Update testpmd doc for flow VXLAN-GPE paramter.
> > > v3:
> > > - Change VXLAN-GPE definition order to avoid ABI compatibility issue.
> > > v2:
> > > - Split patch set into public and mlx5 two series, this one is the first.
> > > v1:
> > > - Support new tunnel type MPLS-in-GRE and MPLS-in-UDP
> > > - Remove deprecation notes of rss level
> > >
> > > This patchset introduced new tunnel type and related testpmd code:
> > > - New tunnel type VXLAN-GPE
> > >
> > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fd
> > > at
> > > atracker.ietf.org%2Fdoc%2Fdraft-ietf-nvo3-vxlan-gpe%2F&data=02%7C01%
> > > 7C
> > >
> xuemingl%40mellanox.com%7C2dffef40890b4cf8ff9d08d5a47d0420%7Ca65297
> 1
> > > c7
> > >
> d2e4d9ba6a4d149256f461b%7C0%7C0%7C636595779231620631&sdata=%2Bv
> x%2Fg
> > > VB
> > > 3e3BHI%2BYxPxOIpqK6CuKvQQ8qej4B1Faxihc%3D&reserved=0
> > > - New tunnel type MPLS-in-GRE
> > >
> > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ft
> > > oo
> > >
> ls.ietf.org%2Fhtml%2Frfc4023&data=02%7C01%7Cxuemingl%40mellanox.com%
> > > 7C
> > >
> 2dffef40890b4cf8ff9d08d5a47d0420%7Ca652971c7d2e4d9ba6a4d149256f461b
> %
> > > 7C
> > >
> 0%7C0%7C636595779231620631&sdata=wk2wvoB9LSbI2LfHZVvWzmtgS0XQbG
> NMFL4
> > > G1
> > > kyr77E%3D&reserved=0
> > > - New tunnel type MPLS-in-UDP
> > >
> > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ft
> > > oo
> > >
> ls.ietf.org%2Fhtml%2Frfc7510&data=02%7C01%7Cxuemingl%40mellanox.com%
> > > 7C
> > >
> 2dffef40890b4cf8ff9d08d5a47d0420%7Ca652971c7d2e4d9ba6a4d149256f461b
> %
> > > 7C
> > >
> 0%7C0%7C636595779231620631&sdata=4RXbPD9tV7ArcnKsK8IJy%2B9XbKlzKc
> NBS
> > > v1
> > > LXVwwuPs%3D&reserved=0
> > > - Support GRE extension in testpmd csum forwarding engine
> > >
> > > Xueming Li (4):
> > >   doc: remove RSS configuration change announcement
> > >   ethdev: introduce new tunnel VXLAN-GPE
> > >   app/testpmd: introduce new tunnel VXLAN-GPE
> > >   app/testpmd: add more GRE extension support to csum engine
> > >
> > >  app/test-pmd/cmdline_flow.c                 |  24 +++++++
> > >  app/test-pmd/config.c                       |   2 +
> > >  app/test-pmd/csumonly.c                     | 103 +++++++++++++++++++++++++--
> -
> > >  app/test-pmd/parameters.c                   |  12 +++-
> > >  app/test-pmd/testpmd.h                      |   2 +
> > >  doc/guides/prog_guide/rte_flow.rst          |  12 ++++
> > >  doc/guides/rel_notes/deprecation.rst        |   4 --
> > >  doc/guides/testpmd_app_ug/run_app.rst       |   5 ++
> > >  doc/guides/testpmd_app_ug/testpmd_funcs.rst |   4 ++
> > >  lib/librte_ether/rte_eth_ctrl.h             |   3 +-
> > >  lib/librte_ether/rte_flow.c                 |   1 +
> > >  lib/librte_ether/rte_flow.h                 |  27 ++++++++
> > >  lib/librte_mbuf/rte_mbuf.c                  |   3 +
> > >  lib/librte_mbuf/rte_mbuf.h                  |   1 +
> > >  lib/librte_mbuf/rte_mbuf_ptype.c            |   1 +
> > >  lib/librte_mbuf/rte_mbuf_ptype.h            |  13 ++++
> > >  lib/librte_net/rte_ether.h                  |  25 +++++++
> > >  17 files changed, 225 insertions(+), 17 deletions(-)
> > >
> > > --
> > > 2.13.3
> >
> > Patch 3 of this patch set fails to apply to the latest master, the other three
> patches apply ok.
> >
> > Regards,
> >
> > Bernard.
> >
> I tried it with orgin/master branch and it worked for me.
> Could you please share more information?
> 
> Best Regards,
> Xueming Li

I have just cloned the current dpdk master, patch 3 still fails to apply, dpdk-dev-v5-3-4-app-testpmd-introduce-new-tunnel-VXLAN-GPE.patch

git am ./dpdk-dev-v5-3-4-app-testpmd-introduce-new-tunnel-VXLAN-GPE.patch 
Applying: app/testpmd: introduce new tunnel VXLAN-GPE
error: patch failed: app/test-pmd/config.c:997
error: app/test-pmd/config.c: patch does not apply
Patch failed at 0001 app/testpmd: introduce new tunnel VXLAN-GPE
The copy of the patch that failed is found in:
   /root/dpdk_temp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort

Regards,

Bernard.