Commit c7c17e6a authored Nov 28, 2019 by Florian Westphal Committed by Pablo Neira Ayuso Nov 30, 2019

netfilter: conntrack: tell compiler to not inline nf_ct_resolve_clash



At this time compiler inlines it, but this code will not be executed
under normal conditions.

Also, no inlining allows to use "nf_ct_resolve_clash%return" perf probe.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent dc4d3f2e

net/netfilter/nf_conntrack_core.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -895,7 +895,8 @@ static void nf_ct_acct_merge(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
		}

		/* Resolve race on insertion if this protocol allows this. */
		static int nf_ct_resolve_clash(struct net net, struct sk_buff skb,
		static __cold noinline int
		nf_ct_resolve_clash(struct net net, struct sk_buff skb,
		enum ip_conntrack_info ctinfo,
		struct nf_conntrack_tuple_hash *h)
		{

Admin message