linux-stable.git/net/ipv4/ip_gre.c, branch linux-4.3.y

openvswitch: Fix egress tunnel info.

2015-10-23T02:39:25+00:00

While transitioning to netdev based vport we broke OVS
feature which allows user to retrieve tunnel packet egress
information for lwtunnel devices.  Following patch fixes it
by introducing ndo operation to get the tunnel egress info.
Same ndo operation can be used for lwtunnel devices and compat
ovs-tnl-vport devices. So after adding such device operation
we can remove similar operation from ovs-vport.

Fixes: 614732eaa12d ("openvswitch: Use regular VXLAN net_device device").
Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

ip_tunnels: record IP version in tunnel info

2015-08-29T20:07:54+00:00

There's currently nothing preventing directing packets with IPv6
encapsulation data to IPv4 tunnels (and vice versa). If this happens,
IPv6 addresses are incorrectly interpreted as IPv4 ones.

Track whether the given ip_tunnel_key contains IPv4 or IPv6 data. Store this
in ip_tunnel_info. Reject packets at appropriate places if they are supposed
to be encapsulated into an incompatible protocol.

Signed-off-by: Jiri Benc 
Acked-by: Alexei Starovoitov 
Acked-by: Thomas Graf 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

ip_tunnels: convert the mode field of ip_tunnel_info to flags

2015-08-29T20:07:54+00:00

The mode field holds a single bit of information only (whether the
ip_tunnel_info struct is for rx or tx). Change the mode field to bit flags.
This allows more mode flags to be added.

Signed-off-by: Jiri Benc 
Acked-by: Alexei Starovoitov 
Acked-by: Thomas Graf 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

tunnel: introduce udp_tun_rx_dst()

2015-08-27T22:42:47+00:00

Introduce function udp_tun_rx_dst() to initialize tunnel dst on
receive path.

Signed-off-by: Pravin B Shelar 
Reviewed-by: Jesse Gross 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

route: move lwtunnel state to dst_entry

2015-08-20T22:42:36+00:00

Currently, the lwtunnel state resides in per-protocol data. This is
a problem if we encapsulate ipv6 traffic in an ipv4 tunnel (or vice versa).
The xmit function of the tunnel does not know whether the packet has been
routed to it by ipv4 or ipv6, yet it needs the lwtstate data. Moving the
lwtstate data to dst_entry makes such inter-protocol tunneling possible.

As a bonus, this brings a nice diffstat.

Signed-off-by: Jiri Benc 
Acked-by: Roopa Prabhu 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

ip_tunnels: use tos and ttl fields also for IPv6

2015-08-20T22:42:36+00:00

Rename the ipv4_tos and ipv4_ttl fields to just 'tos' and 'ttl', as they'll
be used with IPv6 tunnels, too.

Signed-off-by: Jiri Benc 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

ip_tunnels: add IPv6 addresses to ip_tunnel_key

2015-08-20T22:42:36+00:00

Add the IPv6 addresses as an union with IPv4 ones. When using IPv4, the
newly introduced padding after the IPv4 addresses needs to be zeroed out.

Signed-off-by: Jiri Benc 
Acked-by: Thomas Graf 
Acked-by: Alexei Starovoitov 
Signed-off-by: David S. Miller

gre: Remove support for sharing GRE protocol hook.

2015-08-10T21:03:54+00:00

Support for sharing GREPROTO_CISCO port was added so that
OVS gre port and kernel GRE devices can co-exist. After
flow-based tunneling patches OVS GRE protocol processing
is completely moved to ip_gre module. so there is no need
for GRE protocol hook. Following patch consolidates
GRE protocol related functions into ip_gre module.

Signed-off-by: Pravin B Shelar 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

openvswitch: Use regular GRE net_device instead of vport

2015-08-10T21:03:54+00:00

Using GRE tunnel meta data collection feature, we can implement
OVS GRE vport. This patch removes all of the OVS
specific GRE code and make OVS use a ip_gre net_device.
Minimal GRE vport is kept to handle compatibility with
current userspace application.

Signed-off-by: Pravin B Shelar 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

ip_gre: Add support to collect tunnel metadata.

2015-08-10T21:03:54+00:00

Following patch create new tunnel flag which enable
tunnel metadata collection on given device.

Signed-off-by: Pravin B Shelar 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller