Skip to content

Commit

Permalink
[NETFILTER]: {ip,ip6}_tables: remove some inlines
Browse files Browse the repository at this point in the history 
This patch removes inlines except those which are used
by packet matching code and thus are performance-critical.

Before:

$ size */*/*/ip*tables*.o
   text    data     bss     dec     hex filename
   6402     500      16    6918    1b06 net/ipv4/netfilter/ip_tables.o
   7130     500      16    7646    1dde net/ipv6/netfilter/ip6_tables.o

After:

$ size */*/*/ip*tables*.o
   text    data     bss     dec     hex filename
   6307     500      16    6823    1aa7 net/ipv4/netfilter/ip_tables.o
   7010     500      16    7526    1d66 net/ipv6/netfilter/ip6_tables.o

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denys Vlasenko authored and David S. Miller committed Jan 28, 2008
1 parent f9ef8a2 commit 022748a
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 39 deletions.
47 changes: 27 additions & 20 deletions net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ do { \
Hence the start of any table is given by get_table() below. */

/* Returns whether matches rule or not. */
/* Performance critical - called for every packet */
static inline bool
ip_packet_match(const struct iphdr *ip,
const char *indev,
Expand Down Expand Up @@ -153,7 +154,7 @@ ip_packet_match(const struct iphdr *ip,
return true;
}

static inline bool
static bool
ip_checkentry(const struct ipt_ip *ip)
{
if (ip->flags & ~IPT_F_MASK) {
Expand Down Expand Up @@ -183,8 +184,9 @@ ipt_error(struct sk_buff *skb,
return NF_DROP;
}

static inline
bool do_match(struct ipt_entry_match *m,
/* Performance critical - called for every packet */
static inline bool
do_match(struct ipt_entry_match *m,
const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
Expand All @@ -199,13 +201,15 @@ bool do_match(struct ipt_entry_match *m,
return false;
}

/* Performance critical */
static inline struct ipt_entry *
get_entry(void *base, unsigned int offset)
{
return (struct ipt_entry *)(base + offset);
}

/* All zeroes == unconditional rule. */
/* Mildly perf critical (only if packet tracing is on) */
static inline int
unconditional(const struct ipt_ip *ip)
{
Expand All @@ -221,7 +225,7 @@ unconditional(const struct ipt_ip *ip)

#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
static const char *hooknames[] = {
static const char *const hooknames[] = {
[NF_INET_PRE_ROUTING] = "PREROUTING",
[NF_INET_LOCAL_IN] = "INPUT",
[NF_INET_FORWARD] = "FORWARD",
Expand All @@ -235,7 +239,7 @@ enum nf_ip_trace_comments {
NF_IP_TRACE_COMMENT_POLICY,
};

static const char *comments[] = {
static const char *const comments[] = {
[NF_IP_TRACE_COMMENT_RULE] = "rule",
[NF_IP_TRACE_COMMENT_RETURN] = "return",
[NF_IP_TRACE_COMMENT_POLICY] = "policy",
Expand All @@ -251,6 +255,7 @@ static struct nf_loginfo trace_loginfo = {
},
};

/* Mildly perf critical (only if packet tracing is on) */
static inline int
get_chainname_rulenum(struct ipt_entry *s, struct ipt_entry *e,
char *hookname, char **chainname,
Expand Down Expand Up @@ -567,7 +572,7 @@ mark_source_chains(struct xt_table_info *newinfo,
return 1;
}

static inline int
static int
cleanup_match(struct ipt_entry_match *m, unsigned int *i)
{
if (i && (*i)-- == 0)
Expand All @@ -579,7 +584,7 @@ cleanup_match(struct ipt_entry_match *m, unsigned int *i)
return 0;
}

static inline int
static int
check_entry(struct ipt_entry *e, const char *name)
{
struct ipt_entry_target *t;
Expand All @@ -600,7 +605,8 @@ check_entry(struct ipt_entry *e, const char *name)
return 0;
}

static inline int check_match(struct ipt_entry_match *m, const char *name,
static int
check_match(struct ipt_entry_match *m, const char *name,
const struct ipt_ip *ip,
unsigned int hookmask, unsigned int *i)
{
Expand All @@ -623,7 +629,7 @@ static inline int check_match(struct ipt_entry_match *m, const char *name,
return ret;
}

static inline int
static int
find_check_match(struct ipt_entry_match *m,
const char *name,
const struct ipt_ip *ip,
Expand Down Expand Up @@ -652,7 +658,7 @@ find_check_match(struct ipt_entry_match *m,
return ret;
}

static inline int check_target(struct ipt_entry *e, const char *name)
static int check_target(struct ipt_entry *e, const char *name)
{
struct ipt_entry_target *t;
struct xt_target *target;
Expand All @@ -673,7 +679,7 @@ static inline int check_target(struct ipt_entry *e, const char *name)
return ret;
}

static inline int
static int
find_check_entry(struct ipt_entry *e, const char *name, unsigned int size,
unsigned int *i)
{
Expand Down Expand Up @@ -717,7 +723,7 @@ find_check_entry(struct ipt_entry *e, const char *name, unsigned int size,
return ret;
}

static inline int
static int
check_entry_size_and_hooks(struct ipt_entry *e,
struct xt_table_info *newinfo,
unsigned char *base,
Expand Down Expand Up @@ -760,7 +766,7 @@ check_entry_size_and_hooks(struct ipt_entry *e,
return 0;
}

static inline int
static int
cleanup_entry(struct ipt_entry *e, unsigned int *i)
{
struct ipt_entry_target *t;
Expand Down Expand Up @@ -916,7 +922,7 @@ get_counters(const struct xt_table_info *t,
}
}

static inline struct xt_counters * alloc_counters(struct xt_table *table)
static struct xt_counters * alloc_counters(struct xt_table *table)
{
unsigned int countersize;
struct xt_counters *counters;
Expand Down Expand Up @@ -1304,7 +1310,7 @@ do_replace(void __user *user, unsigned int len)

/* We're lazy, and add to the first CPU; overflow works its fey magic
* and everything is OK. */
static inline int
static int
add_counter_to_entry(struct ipt_entry *e,
const struct xt_counters addme[],
unsigned int *i)
Expand Down Expand Up @@ -1465,7 +1471,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
return ret;
}

static inline int
static int
compat_find_calc_match(struct ipt_entry_match *m,
const char *name,
const struct ipt_ip *ip,
Expand All @@ -1489,7 +1495,7 @@ compat_find_calc_match(struct ipt_entry_match *m,
return 0;
}

static inline int
static int
compat_release_match(struct ipt_entry_match *m, unsigned int *i)
{
if (i && (*i)-- == 0)
Expand All @@ -1499,7 +1505,7 @@ compat_release_match(struct ipt_entry_match *m, unsigned int *i)
return 0;
}

static inline int
static int
compat_release_entry(struct compat_ipt_entry *e, unsigned int *i)
{
struct ipt_entry_target *t;
Expand All @@ -1514,7 +1520,7 @@ compat_release_entry(struct compat_ipt_entry *e, unsigned int *i)
return 0;
}

static inline int
static int
check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
struct xt_table_info *newinfo,
unsigned int *size,
Expand Down Expand Up @@ -1637,7 +1643,8 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
return ret;
}

static inline int compat_check_entry(struct ipt_entry *e, const char *name,
static int
compat_check_entry(struct ipt_entry *e, const char *name,
unsigned int *i)
{
int j, ret;
Expand Down
42 changes: 23 additions & 19 deletions net/ipv6/netfilter/ip6_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ ip6t_ext_hdr(u8 nexthdr)
}

/* Returns whether matches rule or not. */
/* Performance critical - called for every packet */
static inline bool
ip6_packet_match(const struct sk_buff *skb,
const char *indev,
Expand Down Expand Up @@ -182,7 +183,7 @@ ip6_packet_match(const struct sk_buff *skb,
}

/* should be ip6 safe */
static inline bool
static bool
ip6_checkentry(const struct ip6t_ip6 *ipv6)
{
if (ipv6->flags & ~IP6T_F_MASK) {
Expand Down Expand Up @@ -212,8 +213,9 @@ ip6t_error(struct sk_buff *skb,
return NF_DROP;
}

static inline
bool do_match(struct ip6t_entry_match *m,
/* Performance critical - called for every packet */
static inline bool
do_match(struct ip6t_entry_match *m,
const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
Expand All @@ -236,6 +238,7 @@ get_entry(void *base, unsigned int offset)
}

/* All zeroes == unconditional rule. */
/* Mildly perf critical (only if packet tracing is on) */
static inline int
unconditional(const struct ip6t_ip6 *ipv6)
{
Expand All @@ -251,7 +254,7 @@ unconditional(const struct ip6t_ip6 *ipv6)
#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
/* This cries for unification! */
static const char *hooknames[] = {
static const char *const hooknames[] = {
[NF_INET_PRE_ROUTING] = "PREROUTING",
[NF_INET_LOCAL_IN] = "INPUT",
[NF_INET_FORWARD] = "FORWARD",
Expand All @@ -265,7 +268,7 @@ enum nf_ip_trace_comments {
NF_IP6_TRACE_COMMENT_POLICY,
};

static const char *comments[] = {
static const char *const comments[] = {
[NF_IP6_TRACE_COMMENT_RULE] = "rule",
[NF_IP6_TRACE_COMMENT_RETURN] = "return",
[NF_IP6_TRACE_COMMENT_POLICY] = "policy",
Expand All @@ -281,6 +284,7 @@ static struct nf_loginfo trace_loginfo = {
},
};

/* Mildly perf critical (only if packet tracing is on) */
static inline int
get_chainname_rulenum(struct ip6t_entry *s, struct ip6t_entry *e,
char *hookname, char **chainname,
Expand Down Expand Up @@ -595,7 +599,7 @@ mark_source_chains(struct xt_table_info *newinfo,
return 1;
}

static inline int
static int
cleanup_match(struct ip6t_entry_match *m, unsigned int *i)
{
if (i && (*i)-- == 0)
Expand All @@ -607,7 +611,7 @@ cleanup_match(struct ip6t_entry_match *m, unsigned int *i)
return 0;
}

static inline int
static int
check_entry(struct ip6t_entry *e, const char *name)
{
struct ip6t_entry_target *t;
Expand All @@ -628,7 +632,7 @@ check_entry(struct ip6t_entry *e, const char *name)
return 0;
}

static inline int check_match(struct ip6t_entry_match *m, const char *name,
static int check_match(struct ip6t_entry_match *m, const char *name,
const struct ip6t_ip6 *ipv6,
unsigned int hookmask, unsigned int *i)
{
Expand All @@ -651,7 +655,7 @@ static inline int check_match(struct ip6t_entry_match *m, const char *name,
return ret;
}

static inline int
static int
find_check_match(struct ip6t_entry_match *m,
const char *name,
const struct ip6t_ip6 *ipv6,
Expand Down Expand Up @@ -680,7 +684,7 @@ find_check_match(struct ip6t_entry_match *m,
return ret;
}

static inline int check_target(struct ip6t_entry *e, const char *name)
static int check_target(struct ip6t_entry *e, const char *name)
{
struct ip6t_entry_target *t;
struct xt_target *target;
Expand All @@ -701,7 +705,7 @@ static inline int check_target(struct ip6t_entry *e, const char *name)
return ret;
}

static inline int
static int
find_check_entry(struct ip6t_entry *e, const char *name, unsigned int size,
unsigned int *i)
{
Expand Down Expand Up @@ -745,7 +749,7 @@ find_check_entry(struct ip6t_entry *e, const char *name, unsigned int size,
return ret;
}

static inline int
static int
check_entry_size_and_hooks(struct ip6t_entry *e,
struct xt_table_info *newinfo,
unsigned char *base,
Expand Down Expand Up @@ -788,7 +792,7 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
return 0;
}

static inline int
static int
cleanup_entry(struct ip6t_entry *e, unsigned int *i)
{
struct ip6t_entry_target *t;
Expand Down Expand Up @@ -944,7 +948,7 @@ get_counters(const struct xt_table_info *t,
}
}

static inline struct xt_counters *alloc_counters(struct xt_table *table)
static struct xt_counters *alloc_counters(struct xt_table *table)
{
unsigned int countersize;
struct xt_counters *counters;
Expand Down Expand Up @@ -1494,7 +1498,7 @@ compat_copy_entry_to_user(struct ip6t_entry *e, void __user **dstptr,
return ret;
}

static inline int
static int
compat_find_calc_match(struct ip6t_entry_match *m,
const char *name,
const struct ip6t_ip6 *ipv6,
Expand All @@ -1518,7 +1522,7 @@ compat_find_calc_match(struct ip6t_entry_match *m,
return 0;
}

static inline int
static int
compat_release_match(struct ip6t_entry_match *m, unsigned int *i)
{
if (i && (*i)-- == 0)
Expand All @@ -1528,7 +1532,7 @@ compat_release_match(struct ip6t_entry_match *m, unsigned int *i)
return 0;
}

static inline int
static int
compat_release_entry(struct compat_ip6t_entry *e, unsigned int *i)
{
struct ip6t_entry_target *t;
Expand All @@ -1543,7 +1547,7 @@ compat_release_entry(struct compat_ip6t_entry *e, unsigned int *i)
return 0;
}

static inline int
static int
check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
struct xt_table_info *newinfo,
unsigned int *size,
Expand Down Expand Up @@ -1666,7 +1670,7 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
return ret;
}

static inline int compat_check_entry(struct ip6t_entry *e, const char *name,
static int compat_check_entry(struct ip6t_entry *e, const char *name,
unsigned int *i)
{
int j, ret;
Expand Down

0 comments on commit 022748a

Please sign in to comment.