[ovs-git] [openvswitch/ovs] 8b7cc7: datapath: Check extack argument of rtnl_create_link()

yifsun noreply at github.com
Thu Jun 13 17:05:52 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 8b7cc752614fb6b49d694e42417439b11e077528
      https://github.com/openvswitch/ovs/commit/8b7cc752614fb6b49d694e42417439b11e077528
  Author: Yifeng Sun <pkusunyifeng at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/include/net/rtnetlink.h

  Log Message:
  -----------
  datapath: Check extack argument of rtnl_create_link()

Upstream commit d0522f1cd25edb796548f91e04766fa3cbc3b6df ("net:
Add extack argument to rtnl_create_link") added new argument
to rtnl_create_link(). This introduced compiling errors in
the code of kernel datapath.

This patch fixes this issue.

Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 9feb5bda27bef6fde7f80d0727261efc361a90a3
      https://github.com/openvswitch/ovs/commit/9feb5bda27bef6fde7f80d0727261efc361a90a3
  Author: Michał Mirosław <mirq-linux at rere.qmqm.pl>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M acinclude.m4
    M datapath/actions.c
    M datapath/flow.c
    M datapath/flow.h
    M datapath/flow_netlink.c
    M datapath/linux/compat/include/linux/if_vlan.h

  Log Message:
  -----------
  OVS: remove use of VLAN_TAG_PRESENT

Upstream commits:
    (1) commit 9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3
    Author: Michał Mirosław <mirq-linux at rere.qmqm.pl>
    Date:   Thu Nov 8 18:44:50 2018 +0100

    OVS: remove use of VLAN_TAG_PRESENT

    This is a minimal change to allow removing of VLAN_TAG_PRESENT.
    It leaves OVS unable to use CFI bit, as fixing this would need
    a deeper surgery involving userspace interface.

    Signed-off-by: Michał Mirosław <mirq-linux at rere.qmqm.pl>
    Signed-off-by: David S. Miller <davem at davemloft.net>

    (2) commit 6083e28aa02d7c9e6b87f8b944e92793094ae047
    Author: Michał Mirosław <mirq-linux at rere.qmqm.pl>
    Date:   Sat Nov 10 19:55:34 2018 +0100

    OVS: remove VLAN_TAG_PRESENT - fixup

    It turns out I missed one VLAN_TAG_PRESENT in OVS code while rebasing.
    This fixes it.

    Fixes: 9df46aefafa6 ("OVS: remove use of VLAN_TAG_PRESENT")
    Signed-off-by: Michał Mirosław <mirq-linux at rere.qmqm.pl>
    Signed-off-by: David S. Miller <davem at davemloft.net>

This patch backports the above upstream patch to OVS and adds
extra checking in kernel module's compat code.

Cc: Michał Mirosław <mirq-linux at rere.qmqm.pl>
Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: abcf1c0deb8f1197161577996de993ff3662a243
      https://github.com/openvswitch/ovs/commit/abcf1c0deb8f1197161577996de993ff3662a243
  Author: Yifeng Sun <pkusunyifeng at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M datapath/linux/compat/stt.c

  Log Message:
  -----------
  datapath: Backport the removal of __tcp_checksum_complete()

Upstream commit 6ab6dfa6bb500f5cbb9b7a0f23a1613417ca2d12 ("net: get
rid of __tcp_checksum_complete())" deleted __tcp_checksum_complete()
and caused compilation failure for OVS on newer kernels.

This patch fixes it by using __skb_checksum_complete(), which is
100% the same with __tcp_checksum_complete().

Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 140c8971c31c82cb7c38753a5cd974a193b29c5b
      https://github.com/openvswitch/ovs/commit/140c8971c31c82cb7c38753a5cd974a193b29c5b
  Author: Petr Machata <petrm at mellanox.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/include/linux/netdevice.h
    M datapath/linux/compat/ip6_gre.c
    M datapath/linux/compat/ip_gre.c
    M datapath/vport-geneve.c
    M datapath/vport-gre.c
    M datapath/vport-lisp.c
    M datapath/vport-stt.c
    M datapath/vport-vxlan.c

  Log Message:
  -----------
  net: core: dev: Add extack argument to dev_change_flags()

Upstream commit:
    commit 567c5e13be5cc74d24f5eb54cf353c2e2277189b
    Author: Petr Machata <petrm at mellanox.com>
    Date:   Thu Dec 6 17:05:42 2018 +0000

    net: core: dev: Add extack argument to dev_change_flags()

    In order to pass extack together with NETDEV_PRE_UP notifications, it's
    necessary to route the extack to __dev_open() from diverse (possibly
    indirect) callers. One prominent API through which the notification is
    invoked is dev_change_flags().

    Therefore extend dev_change_flags() with and extra extack argument and
    update all users. Most of the calls end up just encoding NULL, but
    several sites (VLAN, ipvlan, VRF, rtnetlink) do have extack available.

    Since the function declaration line is changed anyway, name the other
    function arguments to placate checkpatch.

    Signed-off-by: Petr Machata <petrm at mellanox.com>
    Acked-by: Jiri Pirko <jiri at mellanox.com>
    Reviewed-by: Ido Schimmel <idosch at mellanox.com>
    Reviewed-by: David Ahern <dsahern at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

This patch backports the above upstream patch and also adds fixes
in compat code.

Cc: Petr Machata <petrm at mellanox.com>
Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 2adada0e3db2279c8386cc9ca7e19fd3003f04d6
      https://github.com/openvswitch/ovs/commit/2adada0e3db2279c8386cc9ca7e19fd3003f04d6
  Author: Yifeng Sun <pkusunyifeng at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M .travis.yml
    M .travis/linux-build.sh
    M Documentation/faq/releases.rst
    M NEWS
    M acinclude.m4

  Log Message:
  -----------
  datapath: Support kernel version 5.0.x

This patch updated acinclude.m4 so that OVS can be compiled on
5.0.x kernels.
This patch also updated travis files so that 5.0.x kernel versions
are used during travis test builds.
Besides, NEWS and releases.rst are also updated to reflect this
new support.

Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/9e74acbe4fb3...2adada0e3db2


More information about the git mailing list