Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c06849 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: ipv6: icmp6: avoid indirect call for icmpv6_send() 



commit cc7a21b6fbd945f8d8f61422ccd27203c1fafeb7 upstream.

If IPv6 is builtin, we do not need an expensive indirect call
to reach icmp6_send().

v2: put inline keyword before the type to avoid sparse warnings.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit e528edf1)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I0d19f581c6360b4317e6934972845f6a39203de5
parent 0682eb72

include/linux/icmpv6.h

+21 −1
Original line number Diff line number Diff line
@@ -13,12 +13,32 @@ static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) 
#include <linux/netdevice.h>



#if IS_ENABLED(CONFIG_IPV6)

extern void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info);



typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info,

			     const struct in6_addr *force_saddr);

#if IS_BUILTIN(CONFIG_IPV6)

void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

		const struct in6_addr *force_saddr);

static inline void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)

{

	icmp6_send(skb, type, code, info, NULL);

}

static inline int inet6_register_icmp_sender(ip6_icmp_send_t *fn)

{

	BUILD_BUG_ON(fn != icmp6_send);

	return 0;

}

static inline int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn)

{

	BUILD_BUG_ON(fn != icmp6_send);

	return 0;

}

#else

extern void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info);

extern int inet6_register_icmp_sender(ip6_icmp_send_t *fn);

extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn);

#endif



int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,

			       unsigned int data_len);

net/ipv6/icmp.c

+3 −2
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int icmp6_iif(const struct sk_buff *skb) 
/*

 *	Send an ICMP message in response to a packet in error

 */

static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

		const struct in6_addr *force_saddr)

{

	struct inet6_dev *idev = NULL;
@@ -594,6 +594,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, 
out_bh_enable:

	local_bh_enable();

}

EXPORT_SYMBOL(icmp6_send);



/* Slightly more convenient version of icmp6_send.

 */

net/ipv6/ip6_icmp.c

+5 −5
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


#if IS_ENABLED(CONFIG_IPV6)



#if !IS_BUILTIN(CONFIG_IPV6)



static ip6_icmp_send_t __rcu *ip6_icmp_send;



int inet6_register_icmp_sender(ip6_icmp_send_t *fn)
@@ -37,14 +39,12 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 


	rcu_read_lock();

	send = rcu_dereference(ip6_icmp_send);



	if (!send)

		goto out;

	if (send)

		send(skb, type, code, info, NULL);

out:

	rcu_read_unlock();

}

EXPORT_SYMBOL(icmpv6_send);

#endif



#if IS_ENABLED(CONFIG_NF_NAT)

#include <net/netfilter/nf_conntrack.h>