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

Commit a3b1c1eb authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: deinline ip_set_put_extensions() 



On x86 allyesconfig build:
The function compiles to 489 bytes of machine code.
It has 25 callsites.

    text    data       bss       dec     hex filename
82441375 22255384 20627456 125324215 7784bb7 vmlinux.before
82434909 22255384 20627456 125317749 7783275 vmlinux

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
CC: Eric W. Biederman <ebiederm@xmission.com>
CC: David S. Miller <davem@davemloft.net>
CC: Jan Engelhardt <jengelh@medozas.de>
CC: Jiri Pirko <jpirko@redhat.com>
CC: linux-kernel@vger.kernel.org
CC: netdev@vger.kernel.org
CC: netfilter-devel@vger.kernel.org
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a9fcc6a4

include/linux/netfilter/ipset/ip_set.h

+2 −22
Original line number Diff line number Diff line
@@ -533,29 +533,9 @@ bitmap_bytes(u32 a, u32 b) 
#include <linux/netfilter/ipset/ip_set_timeout.h>

#include <linux/netfilter/ipset/ip_set_comment.h>



static inline int

int

ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,

		      const void *e, bool active)

{

	if (SET_WITH_TIMEOUT(set)) {

		unsigned long *timeout = ext_timeout(e, set);



		if (nla_put_net32(skb, IPSET_ATTR_TIMEOUT,

			htonl(active ? ip_set_timeout_get(timeout)

				: *timeout)))

			return -EMSGSIZE;

	}

	if (SET_WITH_COUNTER(set) &&

	    ip_set_put_counter(skb, ext_counter(e, set)))

		return -EMSGSIZE;

	if (SET_WITH_COMMENT(set) &&

	    ip_set_put_comment(skb, ext_comment(e, set)))

		return -EMSGSIZE;

	if (SET_WITH_SKBINFO(set) &&

	    ip_set_put_skbinfo(skb, ext_skbinfo(e, set)))

		return -EMSGSIZE;

	return 0;

}

		      const void *e, bool active);



#define IP_SET_INIT_KEXT(skb, opt, set)			\

	{ .bytes = (skb)->len, .packets = 1,		\

net/netfilter/ipset/ip_set_core.c

+25 −0
Original line number Diff line number Diff line
@@ -432,6 +432,31 @@ ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[], 
}

EXPORT_SYMBOL_GPL(ip_set_get_extensions);



int

ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,

		      const void *e, bool active)

{

	if (SET_WITH_TIMEOUT(set)) {

		unsigned long *timeout = ext_timeout(e, set);



		if (nla_put_net32(skb, IPSET_ATTR_TIMEOUT,

			htonl(active ? ip_set_timeout_get(timeout)

				: *timeout)))

			return -EMSGSIZE;

	}

	if (SET_WITH_COUNTER(set) &&

	    ip_set_put_counter(skb, ext_counter(e, set)))

		return -EMSGSIZE;

	if (SET_WITH_COMMENT(set) &&

	    ip_set_put_comment(skb, ext_comment(e, set)))

		return -EMSGSIZE;

	if (SET_WITH_SKBINFO(set) &&

	    ip_set_put_skbinfo(skb, ext_skbinfo(e, set)))

		return -EMSGSIZE;

	return 0;

}

EXPORT_SYMBOL_GPL(ip_set_put_extensions);



/*

 * Creating/destroying/renaming/swapping affect the existence and

 * the properties of a set. All of these can be executed from userspace