linux-toradex.git/net/ipv4/ip_vti.c, branch v4.1.5

ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call

2015-05-28T04:23:32+00:00

The vti6_rcv_cb and vti_rcv_cb calls were leaving the skb->mark modified
after completing the function.  This resulted in the original skb->mark
value being lost.  Since we only need skb->mark to be set for
xfrm_policy_check we can pull the assignment into the rcv_cb calls and then
just restore the original mark after xfrm_policy_check has been completed.

Signed-off-by: Alexander Duyck 
Signed-off-by: Steffen Klassert

ip_vti/ip6_vti: Do not touch skb->mark on xmit

2015-05-28T04:23:31+00:00

Instead of modifying skb->mark we can simply modify the flowi_mark that is
generated as a result of the xfrm_decode_session.  By doing this we don't
need to actually touch the skb->mark and it can be preserved as it passes
out through the tunnel.

Signed-off-by: Alexander Duyck 
Signed-off-by: Steffen Klassert

ipv4: coding style: comparison for inequality with NULL

2015-04-03T16:11:15+00:00

The ipv4 code uses a mixture of coding styles. In some instances check
for non-NULL pointer is done as x != NULL and sometimes as x. x is
preferred according to checkpatch and this patch makes the code
consistent by adopting the latter form.

No changes detected by objdiff.

Signed-off-by: Ian Morris 
Signed-off-by: David S. Miller

ipip,gre,vti,sit: implement ndo_get_iflink

2015-04-02T18:05:00+00:00

Don't use dev->iflink anymore.

CC: Steffen Klassert 
Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

netlink: implement nla_get_in_addr and nla_get_in6_addr

2015-03-31T17:58:35+00:00

Those are counterparts to nla_put_in_addr and nla_put_in6_addr.

Signed-off-by: Jiri Benc 
Signed-off-by: David S. Miller

netlink: implement nla_put_in_addr and nla_put_in6_addr

2015-03-31T17:58:35+00:00

IP addresses are often stored in netlink attributes. Add generic functions
to do that.

For nla_put_in_addr, it would be nicer to pass struct in_addr but this is
not used universally throughout the kernel, in way too many places __be32 is
used to store IPv4 address.

Signed-off-by: Jiri Benc 
Signed-off-by: David S. Miller

tunnels: advertise link netns via netlink

2015-01-19T19:32:03+00:00

Implement rtnl_link_ops->get_link_net() callback so that IFLA_LINK_NETNSID is
added to rtnetlink messages.

Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

ip_tunnel: the lack of vti_link_ops' dellink() cause kernel panic

2014-11-24T02:11:17+00:00

Now the vti_link_ops do not point the .dellink, for fb tunnel device
(ip_vti0), the net_device will be removed as the default .dellink is
unregister_netdevice_queue,but the tunnel still in the tunnel list,
then if we add a new vti tunnel, in ip_tunnel_find():

        hlist_for_each_entry_rcu(t, head, hash_node) {
                if (local == t->parms.iph.saddr &&
                    remote == t->parms.iph.daddr &&
                    link == t->parms.link &&
==>                 type == t->dev->type &&
                    ip_tunnel_key_match(&t->parms, flags, key))
                        break;
        }

the panic will happen, cause dev of ip_tunnel *t is null:
[ 3835.072977] IP: [] ip_tunnel_find+0x9d/0xc0 [ip_tunnel]
[ 3835.073008] PGD b2c21067 PUD b7277067 PMD 0
[ 3835.073008] Oops: 0000 [#1] SMP
.....
[ 3835.073008] Stack:
[ 3835.073008]  ffff8800b72d77f0 ffffffffa0411924 ffff8800bb956000 ffff8800b72d78e0
[ 3835.073008]  ffff8800b72d78a0 0000000000000000 ffffffffa040d100 ffff8800b72d7858
[ 3835.073008]  ffffffffa040b2e3 0000000000000000 0000000000000000 0000000000000000
[ 3835.073008] Call Trace:
[ 3835.073008]  [] ip_tunnel_newlink+0x64/0x160 [ip_tunnel]
[ 3835.073008]  [] vti_newlink+0x43/0x70 [ip_vti]
[ 3835.073008]  [] rtnl_newlink+0x4fa/0x5f0
[ 3835.073008]  [] ? nla_strlcpy+0x5b/0x70
[ 3835.073008]  [] ? rtnl_link_ops_get+0x40/0x60
[ 3835.073008]  [] ? rtnl_newlink+0x13f/0x5f0
[ 3835.073008]  [] rtnetlink_rcv_msg+0xa4/0x270
[ 3835.073008]  [] ? sock_has_perm+0x75/0x90
[ 3835.073008]  [] ? rtnetlink_rcv+0x30/0x30
[ 3835.073008]  [] netlink_rcv_skb+0xa9/0xc0
[ 3835.073008]  [] rtnetlink_rcv+0x28/0x30
....

modprobe ip_vti
ip link del ip_vti0 type vti
ip link add ip_vti0 type vti
rmmod ip_vti

do that one or more times, kernel will panic.

fix it by assigning ip_tunnel_dellink to vti_link_ops' dellink, in
which we skip the unregister of fb tunnel device. do the same on ip6_vti.

Signed-off-by: Xin Long 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

net: better IFF_XMIT_DST_RELEASE support

2014-10-07T17:22:11+00:00

Testing xmit_more support with netperf and connected UDP sockets,
I found strange dst refcount false sharing.

Current handling of IFF_XMIT_DST_RELEASE is not optimal.

Dropping dst in validate_xmit_skb() is certainly too late in case
packet was queued by cpu X but dequeued by cpu Y

The logical point to take care of drop/force is in __dev_queue_xmit()
before even taking qdisc lock.

As Julian Anastasov pointed out, need for skb_dst() might come from some
packet schedulers or classifiers.

This patch adds new helper to cleanly express needs of various drivers
or qdiscs/classifiers.

Drivers that need skb_dst() in their ndo_start_xmit() should call
following helper in their setup instead of the prior :

	dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
->
	netif_keep_dst(dev);

Instead of using a single bit, we use two bits, one being
eventually rebuilt in bonding/team drivers.

The other one, is permanent and blocks IFF_XMIT_DST_RELEASE being
rebuilt in bonding/team. Eventually, we could add something
smarter later.

Signed-off-by: Eric Dumazet 
Cc: Julian Anastasov 
Signed-off-by: David S. Miller

vti: Simplify error handling in module init and exit

2014-06-26T06:21:57+00:00

The error handling in the module init and exit functions can be
shortened to safe us some code.

1/ Remove the code duplications in the init function, jump straight to
the existing cleanup code by adding some labels. Also give the error
message some more value by telling the reason why loading the module has
failed. Furthermore fix the "IPSec" typo -- it should be "IPsec" instead.

2/ Remove the error handling in the exit function as the only legitimate
reason xfrm4_protocol_deregister() might fail is inet_del_protocol()
returning -1. That, in turn, means some other protocol handler had been
registered for this very protocol in the meantime. But that essentially
means we haven't been handling that protocol any more, anyway. What it
definitely means not is that we "can't deregister tunnel". Therefore
just get rid of that bogus warning. It's plain wrong.

Signed-off-by: Mathias Krause 
Signed-off-by: Steffen Klassert