[PATCH] ipv4: tunnel: fix compilation on ARCH=um

[PATCH] ipv4: tunnel: fix compilation on ARCH=um

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

With certain configurations, a 64-bit ARCH=um errors
out here with an unknown csum_ipv6_magic() function.
Include the right header file to always have it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/ipv4/ip_tunnel_core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 9ddee2a0c66d..4ecf0232ba2d 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -37,6 +37,7 @@
 #include <net/geneve.h>
 #include <net/vxlan.h>
 #include <net/erspan.h>
+#include <net/ip6_checksum.h>
 
 const struct ip_tunnel_encap_ops __rcu *
 		iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
-- 
2.26.2

Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um

[Eric Dumazet]

On 8/12/20 12:08 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> With certain configurations, a 64-bit ARCH=um errors
> out here with an unknown csum_ipv6_magic() function.
> Include the right header file to always have it.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>  net/ipv4/ip_tunnel_core.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
> index 9ddee2a0c66d..4ecf0232ba2d 100644
> --- a/net/ipv4/ip_tunnel_core.c
> +++ b/net/ipv4/ip_tunnel_core.c
> @@ -37,6 +37,7 @@
>  #include <net/geneve.h>
>  #include <net/vxlan.h>
>  #include <net/erspan.h>
> +#include <net/ip6_checksum.h>
>  
>  const struct ip_tunnel_encap_ops __rcu *
>  		iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
> 

Already fixed ?

commit 8ed54f167abda44da48498876953f5b7843378df
Author: Stefano Brivio <sbrivio@redhat.com>
Date:   Wed Aug 5 15:39:31 2020 +0200

    ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM
    
    On architectures defining _HAVE_ARCH_IPV6_CSUM, we get
    csum_ipv6_magic() defined by means of arch checksum.h headers. On
    other architectures, we actually need to include net/ip6_checksum.h
    to be able to use it.
    
    Without this include, building with defconfig breaks at least for
    s390.
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Fixes: 4cb47a8644cc ("tunnels: PMTU discovery support for directly bridged IP packets")
    Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um

[David Miller]

From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 12 Aug 2020 21:08:53 +0200

> From: Johannes Berg <johannes.berg@intel.com>
> 
> With certain configurations, a 64-bit ARCH=um errors
> out here with an unknown csum_ipv6_magic() function.
> Include the right header file to always have it.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Applied, thank you.

Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um

[David Miller]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 12 Aug 2020 13:01:16 -0700

> 
> 
> On 8/12/20 12:08 PM, Johannes Berg wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>> 
>> With certain configurations, a 64-bit ARCH=um errors
>> out here with an unknown csum_ipv6_magic() function.
>> Include the right header file to always have it.
>> 
>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> ---
>>  net/ipv4/ip_tunnel_core.c | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
>> index 9ddee2a0c66d..4ecf0232ba2d 100644
>> --- a/net/ipv4/ip_tunnel_core.c
>> +++ b/net/ipv4/ip_tunnel_core.c
>> @@ -37,6 +37,7 @@
>>  #include <net/geneve.h>
>>  #include <net/vxlan.h>
>>  #include <net/erspan.h>
>> +#include <net/ip6_checksum.h>
>>  
>>  const struct ip_tunnel_encap_ops __rcu *
>>  		iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
>> 
> 
> Already fixed ?
> 
> commit 8ed54f167abda44da48498876953f5b7843378df
> Author: Stefano Brivio <sbrivio@redhat.com>
> Date:   Wed Aug 5 15:39:31 2020 +0200
> 
>     ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM

Indeed, this patch added a dup include, I've reverted it.