| Message ID | 1513029033-9087-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| Headers | show |
| Series | Backport upstream Linux OVS patches | expand |
Enough time has passed that this doesn't apply cleanly to master either. Would you mind rebasing these, too? Thanks, --Justin > On Dec 11, 2017, at 1:50 PM, Greg Rose <gvrose8192@gmail.com> wrote: > > The following patches are available in the current Linux upstream > git repository: > > 183dea5 openvswitch: do not propagate headroom updates to internal port > 311af51 openvswitch: use ktime_get_ts64() instead of ktime_get_ts() > 67c8d22 openvswitch: fix the incorrect flow action alloc size > 2734166 net: openvswitch: datapath: fix data type in queue_gso_packets > 0c19f846 net: accept UFO datagrams from tuntap and packet > b74912a openvswitch: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start > 6dc14dc openvswitch: Using kfree_rcu() to simplify the code > 06c2351 openvswitch: Make local function ovs_nsh_key_attr_size() static > 8a860c2 openvswitch: Fix return value check in ovs_meter_cmd_features() > cd8a6c3 openvswitch: Add meter action support > 96fbc13 openvswitch: Add meter infrastructure > 9602c01 openvswitch: export get_dp() API. > b2d0f5d openvswitch: enable NSH support > 9354d45 openvswitch: reliable interface indentification in port dumps > 2a17178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net > b244131 License cleanup: add SPDX GPL-2.0 license identifier to files with no license > 279badc openvswitch: conntrack: mark expected switch fall-through > b822696 openvswitch: add ct_clear action > ceaa001 openvswitch: Add erspan tunnel support. > 42ab19e net: Add extack to upper device linking > 5829e62 openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()' > > This patch series backports all of those patches except these four: > 279badc openvswitch: conntrack: mark expected switch fall-through > b822696 openvswitch: add ct_clear action > ceaa001 openvswitch: Add erspan tunnel support. > b2d0f5d openvswitch: enable NSH support > > Upstream patch 279badc isn't necessary since a patch for it was recently > independently added. > > Upstream patches b2d0f5d, b822696 and ceaa001 require user space > changes to allow OVS to build. I will work with the authors of > those patches to get backports and required user space changes > posted separately. > > Andy Zhou has sent me additional patches for the user space side of > the meter patches. In this case the kernel datapath meter patches > do not require the user space code to compile correctly so we can > separate the application of the kernel datapath patches and the > user space patches. I will update and post Andy's user space side > meter patches in the near future. > > The remaining patches are addressed in this patch series as indicated > below. > > Andy Zhou (3): > datapath: export get_dp() API > datapath: Add meter netlink definitions > datapath: Add meter infrastructure > > Arnd Bergmann (1): > datapath: use ktime_get_ts64() instead of ktime_get_ts() > > Christophe JAILLET (1): > datapath: Fix an error handling path in > 'ovs_nla_init_match_and_action() > > Gustavo A. R. Silva (2): > datapath: meter: fix NULL pointer dereference in > ovs_meter_cmd_reply_start > datapath: fix data type in queue_gso_packets > > Jiri Benc (1): > datapath: reliable interface indentification in port dumps > > Paolo Abeni (1): > datapath: do not propagate headroom updates to internal port > > Wei Yongjun (2): > datapath: Fix return value check in ovs_meter_cmd_features() > datapath: Using kfree_rcu() to simplify the code > > zhangliping (1): > datapath: fix the incorrect flow action alloc size > > acinclude.m4 | 4 +- > datapath/Modules.mk | 6 +- > datapath/datapath.c | 97 ++-- > datapath/datapath.h | 38 +- > datapath/dp_notify.c | 3 +- > datapath/flow.c | 6 +- > datapath/flow_netlink.c | 16 +- > datapath/linux/compat/include/linux/netdevice.h | 19 - > datapath/linux/compat/include/linux/openvswitch.h | 53 ++ > datapath/linux/compat/include/net/netlink.h | 9 + > datapath/meter.c | 597 ++++++++++++++++++++++ > datapath/meter.h | 54 ++ > datapath/vport-internal_dev.c | 19 +- > 13 files changed, 821 insertions(+), 100 deletions(-) > create mode 100644 datapath/meter.c > create mode 100644 datapath/meter.h > > -- > 1.8.3.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
On 1/23/2018 11:35 AM, Justin Pettit wrote: > Enough time has passed that this doesn't apply cleanly to master either. Would you mind rebasing these, too? > > Thanks, > > --Justin Yep, I can do that. thanks, - Greg > > >> On Dec 11, 2017, at 1:50 PM, Greg Rose <gvrose8192@gmail.com> wrote: >> >> The following patches are available in the current Linux upstream >> git repository: >> >> 183dea5 openvswitch: do not propagate headroom updates to internal port >> 311af51 openvswitch: use ktime_get_ts64() instead of ktime_get_ts() >> 67c8d22 openvswitch: fix the incorrect flow action alloc size >> 2734166 net: openvswitch: datapath: fix data type in queue_gso_packets >> 0c19f846 net: accept UFO datagrams from tuntap and packet >> b74912a openvswitch: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start >> 6dc14dc openvswitch: Using kfree_rcu() to simplify the code >> 06c2351 openvswitch: Make local function ovs_nsh_key_attr_size() static >> 8a860c2 openvswitch: Fix return value check in ovs_meter_cmd_features() >> cd8a6c3 openvswitch: Add meter action support >> 96fbc13 openvswitch: Add meter infrastructure >> 9602c01 openvswitch: export get_dp() API. >> b2d0f5d openvswitch: enable NSH support >> 9354d45 openvswitch: reliable interface indentification in port dumps >> 2a17178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net >> b244131 License cleanup: add SPDX GPL-2.0 license identifier to files with no license >> 279badc openvswitch: conntrack: mark expected switch fall-through >> b822696 openvswitch: add ct_clear action >> ceaa001 openvswitch: Add erspan tunnel support. >> 42ab19e net: Add extack to upper device linking >> 5829e62 openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()' >> >> This patch series backports all of those patches except these four: >> 279badc openvswitch: conntrack: mark expected switch fall-through >> b822696 openvswitch: add ct_clear action >> ceaa001 openvswitch: Add erspan tunnel support. >> b2d0f5d openvswitch: enable NSH support >> >> Upstream patch 279badc isn't necessary since a patch for it was recently >> independently added. >> >> Upstream patches b2d0f5d, b822696 and ceaa001 require user space >> changes to allow OVS to build. I will work with the authors of >> those patches to get backports and required user space changes >> posted separately. >> >> Andy Zhou has sent me additional patches for the user space side of >> the meter patches. In this case the kernel datapath meter patches >> do not require the user space code to compile correctly so we can >> separate the application of the kernel datapath patches and the >> user space patches. I will update and post Andy's user space side >> meter patches in the near future. >> >> The remaining patches are addressed in this patch series as indicated >> below. >> >> Andy Zhou (3): >> datapath: export get_dp() API >> datapath: Add meter netlink definitions >> datapath: Add meter infrastructure >> >> Arnd Bergmann (1): >> datapath: use ktime_get_ts64() instead of ktime_get_ts() >> >> Christophe JAILLET (1): >> datapath: Fix an error handling path in >> 'ovs_nla_init_match_and_action() >> >> Gustavo A. R. Silva (2): >> datapath: meter: fix NULL pointer dereference in >> ovs_meter_cmd_reply_start >> datapath: fix data type in queue_gso_packets >> >> Jiri Benc (1): >> datapath: reliable interface indentification in port dumps >> >> Paolo Abeni (1): >> datapath: do not propagate headroom updates to internal port >> >> Wei Yongjun (2): >> datapath: Fix return value check in ovs_meter_cmd_features() >> datapath: Using kfree_rcu() to simplify the code >> >> zhangliping (1): >> datapath: fix the incorrect flow action alloc size >> >> acinclude.m4 | 4 +- >> datapath/Modules.mk | 6 +- >> datapath/datapath.c | 97 ++-- >> datapath/datapath.h | 38 +- >> datapath/dp_notify.c | 3 +- >> datapath/flow.c | 6 +- >> datapath/flow_netlink.c | 16 +- >> datapath/linux/compat/include/linux/netdevice.h | 19 - >> datapath/linux/compat/include/linux/openvswitch.h | 53 ++ >> datapath/linux/compat/include/net/netlink.h | 9 + >> datapath/meter.c | 597 ++++++++++++++++++++++ >> datapath/meter.h | 54 ++ >> datapath/vport-internal_dev.c | 19 +- >> 13 files changed, 821 insertions(+), 100 deletions(-) >> create mode 100644 datapath/meter.c >> create mode 100644 datapath/meter.h >> >> -- >> 1.8.3.1 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
The following patches are available in the current Linux upstream git repository: 183dea5 openvswitch: do not propagate headroom updates to internal port 311af51 openvswitch: use ktime_get_ts64() instead of ktime_get_ts() 67c8d22 openvswitch: fix the incorrect flow action alloc size 2734166 net: openvswitch: datapath: fix data type in queue_gso_packets 0c19f846 net: accept UFO datagrams from tuntap and packet b74912a openvswitch: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start 6dc14dc openvswitch: Using kfree_rcu() to simplify the code 06c2351 openvswitch: Make local function ovs_nsh_key_attr_size() static 8a860c2 openvswitch: Fix return value check in ovs_meter_cmd_features() cd8a6c3 openvswitch: Add meter action support 96fbc13 openvswitch: Add meter infrastructure 9602c01 openvswitch: export get_dp() API. b2d0f5d openvswitch: enable NSH support 9354d45 openvswitch: reliable interface indentification in port dumps 2a17178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net b244131 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 279badc openvswitch: conntrack: mark expected switch fall-through b822696 openvswitch: add ct_clear action ceaa001 openvswitch: Add erspan tunnel support. 42ab19e net: Add extack to upper device linking 5829e62 openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()' This patch series backports all of those patches except these four: 279badc openvswitch: conntrack: mark expected switch fall-through b822696 openvswitch: add ct_clear action ceaa001 openvswitch: Add erspan tunnel support. b2d0f5d openvswitch: enable NSH support Upstream patch 279badc isn't necessary since a patch for it was recently independently added. Upstream patches b2d0f5d, b822696 and ceaa001 require user space changes to allow OVS to build. I will work with the authors of those patches to get backports and required user space changes posted separately. Andy Zhou has sent me additional patches for the user space side of the meter patches. In this case the kernel datapath meter patches do not require the user space code to compile correctly so we can separate the application of the kernel datapath patches and the user space patches. I will update and post Andy's user space side meter patches in the near future. The remaining patches are addressed in this patch series as indicated below. Andy Zhou (3): datapath: export get_dp() API datapath: Add meter netlink definitions datapath: Add meter infrastructure Arnd Bergmann (1): datapath: use ktime_get_ts64() instead of ktime_get_ts() Christophe JAILLET (1): datapath: Fix an error handling path in 'ovs_nla_init_match_and_action() Gustavo A. R. Silva (2): datapath: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start datapath: fix data type in queue_gso_packets Jiri Benc (1): datapath: reliable interface indentification in port dumps Paolo Abeni (1): datapath: do not propagate headroom updates to internal port Wei Yongjun (2): datapath: Fix return value check in ovs_meter_cmd_features() datapath: Using kfree_rcu() to simplify the code zhangliping (1): datapath: fix the incorrect flow action alloc size acinclude.m4 | 4 +- datapath/Modules.mk | 6 +- datapath/datapath.c | 97 ++-- datapath/datapath.h | 38 +- datapath/dp_notify.c | 3 +- datapath/flow.c | 6 +- datapath/flow_netlink.c | 16 +- datapath/linux/compat/include/linux/netdevice.h | 19 - datapath/linux/compat/include/linux/openvswitch.h | 53 ++ datapath/linux/compat/include/net/netlink.h | 9 + datapath/meter.c | 597 ++++++++++++++++++++++ datapath/meter.h | 54 ++ datapath/vport-internal_dev.c | 19 +- 13 files changed, 821 insertions(+), 100 deletions(-) create mode 100644 datapath/meter.c create mode 100644 datapath/meter.h