Re: [PATCH net v2 1/4] udp: do not accept non-tunnel GSO skbs landing in a tunnel

[Antoine Tenart <atenart@kernel.org>]

Quoting Jakub Kicinski (2024-03-20 03:41:24)
> On Tue, 19 Mar 2024 10:31:36 +0100 Antoine Tenart wrote:
> > +DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key);
> 
> nit: our build bot says you need to export this as well for v6=m.

Thanks for the heads up, missed that. And udpv6_encap_needed_key needs
to be defined outside ipv6.ko and exported as well. The following should
fix the remaining build issues,

  diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
  index 661d0e0d273f..c02bf011d4a6 100644
  --- a/net/ipv4/udp.c
  +++ b/net/ipv4/udp.c
  @@ -582,6 +582,13 @@ static inline bool __udp_is_mcast_sock(struct net *net, const struct sock *sk,
   }

   DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key);
  +EXPORT_SYMBOL(udp_encap_needed_key);
  +
  +#if IS_ENABLED(CONFIG_IPV6)
  +DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
  +EXPORT_SYMBOL(udpv6_encap_needed_key);
  +#endif
  +
   void udp_encap_enable(void)
   {
          static_branch_inc(&udp_encap_needed_key);
  diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
  index 7c1e6469d091..8b1dd7f51249 100644
  --- a/net/ipv6/udp.c
  +++ b/net/ipv6/udp.c
  @@ -447,7 +447,7 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
          goto try_again;
   }

  -DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
  +DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
   void udpv6_encap_enable(void)
   {
          static_branch_inc(&udpv6_encap_needed_key);

Thanks!
Antoine