Patch "geneve: fix fill_info when link down" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
geneve: fix fill_info when link down
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
geneve-fix-fill_info-when-link-down.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Dec 12 10:32:42 CET 2017
From: Hangbin Liu <[email protected]>
Date: Wed, 15 Nov 2017 09:43:09 +0800
Subject: geneve: fix fill_info when link down
From: Hangbin Liu <[email protected]>
[ Upstream commit fd7eafd02121d6ef501ef1a4a891e6061366c952 ]
geneve->sock4/6 were added with geneve_open and released with geneve_stop. So when geneve link down, we will not able to show remote address and checksum info after commit 11387fe4a98 ("geneve: fix fill_info when using collect_metadata").
Fix this by avoid passing *_REMOTE{,6} for COLLECT_METADATA since they are mutually exclusive, and always show UDP_ZERO_CSUM6_RX info.
--- drivers/net/geneve.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/net/geneve.c +10 -14
@@ -1503,6 +1503,7 @@ static int geneve_fill_info(struct sk_bu {struct geneve_dev *geneve =netdev_priv (dev);struct ip_tunnel_info *info = &geneve->info; +bool metadata = geneve->collect_md;__u8 tmp_vni[3 ];__u32 vni;
@@ -1511,32 +1512,24 @@ static int geneve_fill_info(struct sk_buif (nla_put_u32 (skb,IFLA_GENEVE_ID , vni)) goto nla_put_failure; -if (rtnl_dereference (geneve->sock4)) { +if (!metadata &&ip_tunnel_info_af (info) ==AF_INET ) {if (nla_put_in_addr (skb,IFLA_GENEVE_REMOTE , info->key.u.ipv4.dst)) goto nla_put_failure; -if (nla_put_u8 (skb,IFLA_GENEVE_UDP_CSUM , !!(info->key.tun_flags &TUNNEL_CSUM ))) goto nla_put_failure; - } -#if IS_ENABLED (CONFIG_IPV6 ) -if (rtnl_dereference (geneve->sock6)) { + } else if (!metadata) {if (nla_put_in6_addr (skb,IFLA_GENEVE_REMOTE6 , &info->key.u.ipv6.dst)) goto nla_put_failure; -if (nla_put_u8 (skb,IFLA_GENEVE_UDP_ZERO_CSUM6_TX , !(info->key.tun_flags &TUNNEL_CSUM ))) goto nla_put_failure; - -if (nla_put_u8 (skb,IFLA_GENEVE_UDP_ZERO_CSUM6_RX , - !geneve->use_udp6_rx_checksums)) - goto nla_put_failure; - }#endif + } if (nla_put_u8(skb, IFLA_GENEVE_TTL, info->key.ttl) || nla_put_u8(skb, IFLA_GENEVE_TOS, info->key.tos) ||
@@ -1546,10 +1539,13 @@ static int geneve_fill_info(struct sk_buif (nla_put_be16 (skb,IFLA_GENEVE_PORT , info->key.tp_dst)) goto nla_put_failure; -if (geneve->collect_md) { -if (nla_put_flag (skb,IFLA_GENEVE_COLLECT_METADATA )) +if (metadata &&nla_put_flag (skb,IFLA_GENEVE_COLLECT_METADATA )) goto nla_put_failure; - } + +if (nla_put_u8 (skb,IFLA_GENEVE_UDP_ZERO_CSUM6_RX , + !geneve->use_udp6_rx_checksums)) + goto nla_put_failure; +return 0 ; nla_put_failure:
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/geneve-fix-fill_info-when-link-down.patch