[PATCH net-2.6.25 0/8] [NET]: More uninlining & related

[PATCH net-2.6.25 0/8] [NET]: More uninlining & related

[Ilpo Järvinen]

Hi Dave,

First of all, I changed output encoding of git to utf-8, so I
guess the encoding should not cause the same trouble for you.

Here are couple of more to uninline things. Pretty
straightforward except the EXPORT_SYMBOLs, I've no idea which
is the right variant (feel free to fix them while applying :-)).
Also pktgen uninlining is somewhat questionable because it's
just a testing tool so feel free to drop it if it feels
unnecessary (I could have asked first but it's just as easy to
do it this way if not easier)...

There were more dead static inlines found after inlines removed
(gcc didn't report them otherwise) than in pktgen now included,
but I'm not sure if I should send "by default" patches removing
or #if 0'ing them?


--
 i.

[PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat

[Ilpo Järvinen]

net/netfilter/xt_policy.c:
  policy_mt | -906
 1 function changed, 906 bytes removed, diff: -906

net/netfilter/xt_policy.c:
  match_xfrm_state | +427
 1 function changed, 427 bytes added, diff: +427

net/netfilter/xt_policy.o:
 2 functions changed, 427 bytes added, 906 bytes removed, diff: -479

Alternatively, this could be done by combining identical
parts of the match_policy_in/out()

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 net/netfilter/xt_policy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 46ee7e8..45731ca 100644
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -33,7 +33,7 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
 	return false;
 }
 
-static inline bool
+static bool
 match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
 		 unsigned short family)
 {
-- 
1.5.0.6

Re: [PATCH net-2.6.25 0/8] [NET]: More uninlining & related

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:21 +0200

> First of all, I changed output encoding of git to utf-8, so I
> guess the encoding should not cause the same trouble for you.

I worked on a rebase of net-2.6.25 today and was able to
use emacs to fixup the encoding for all existing net-2.6.25
commits.

I've also put some things in place to avoid this problem in
the future.

Thanks.

> Here are couple of more to uninline things. Pretty
> straightforward except the EXPORT_SYMBOLs, I've no idea which
> is the right variant (feel free to fix them while applying :-)).
> Also pktgen uninlining is somewhat questionable because it's
> just a testing tool so feel free to drop it if it feels
> unnecessary (I could have asked first but it's just as easy to
> do it this way if not easier)...
> 
> There were more dead static inlines found after inlines removed
> (gcc didn't report them otherwise) than in pktgen now included,
> but I'm not sure if I should send "by default" patches removing
> or #if 0'ing them?

Unless there is some pressing reason to keep the code around
it should be removed.

Anyways, I'll take a look.

Re: [PATCH 1/8] [TCP]: Uninline tcp_set_state

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:22 +0200

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied, thanks.

> +#endif	
> +}
> +EXPORT_SYMBOL_GPL(tcp_set_state);

I fixed up the trailing whitespace on the "#endif" line.

Re: [PATCH 2/8] [TCP]: Uninline tcp_is_cwnd_limited

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:23 +0200

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied.

Re: [PATCH 3/8] [XFRM] xfrm_policy: kill some bloat

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:24 +0200

> net/xfrm/xfrm_policy.c:
>   xfrm_audit_policy_delete | -692
>   xfrm_audit_policy_add    | -692
>  2 functions changed, 1384 bytes removed, diff: -1384
> 
> net/xfrm/xfrm_policy.c:
>   xfrm_audit_common_policyinfo | +704
>  1 function changed, 704 bytes added, diff: +704
> 
> net/xfrm/xfrm_policy.o:
>  3 functions changed, 704 bytes added, 1384 bytes removed, diff: -680
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied.

Re: [PATCH 4/8] [IPV6] route: kill some bloat

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:25 +0200

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied.

Re: [PATCH 5/8] [NETLINK] af_netlink: kill some bloat

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:26 +0200

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied.

Re: [PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:27 +0200

Ilpo, please post netfilter patches to netfilter-devel,
CC:'ing Patrick McHardy.

Patrick, please review, thanks.

> net/netfilter/xt_policy.c:
>   policy_mt | -906
>  1 function changed, 906 bytes removed, diff: -906
> 
> net/netfilter/xt_policy.c:
>   match_xfrm_state | +427
>  1 function changed, 427 bytes added, diff: +427
> 
> net/netfilter/xt_policy.o:
>  2 functions changed, 427 bytes added, 906 bytes removed, diff: -479
> 
> Alternatively, this could be done by combining identical
> parts of the match_policy_in/out()
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> ---
>  net/netfilter/xt_policy.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
> index 46ee7e8..45731ca 100644
> --- a/net/netfilter/xt_policy.c
> +++ b/net/netfilter/xt_policy.c
> @@ -33,7 +33,7 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
>  	return false;
>  }
>  
> -static inline bool
> +static bool
>  match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
>  		 unsigned short family)
>  {
> -- 
> 1.5.0.6
> 

Re: [PATCH 7/8] [PKTGEN]: Kill dead static inlines

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:28 +0200

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

These were leftovers from the ktime_t conversion of pktgen.

Applied, th anks!

Re: [RFC PATCH 8/8] [PKTGEN]: uninline getCurUs

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:29 +0200

> net/core/pktgen.c:
>   pktgen_stop_device   |  -50
>   pktgen_run           | -105
>   pktgen_if_show       |  -37
>   pktgen_thread_worker | -702
>  4 functions changed, 894 bytes removed, diff: -894
> 
> net/core/pktgen.c:
>   getCurUs |  +36
>  1 function changed, 36 bytes added, diff: +36
> 
> net/core/pktgen.o:
>  5 functions changed, 36 bytes added, 894 bytes removed, diff: -858
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

I think this is the right thing to do, applied.

Re: [PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat

[Patrick McHardy]

David Miller wrote:
> From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
> Date: Sat, 12 Jan 2008 11:34:27 +0200
> 
> Ilpo, please post netfilter patches to netfilter-devel,
> CC:'ing Patrick McHardy.
> 
> Patrick, please review, thanks.

This looks fine to me, thanks Ilpo.

>> net/netfilter/xt_policy.c:
>>   policy_mt | -906
>>  1 function changed, 906 bytes removed, diff: -906
>>
>> net/netfilter/xt_policy.c:
>>   match_xfrm_state | +427
>>  1 function changed, 427 bytes added, diff: +427
>>
>> net/netfilter/xt_policy.o:
>>  2 functions changed, 427 bytes added, 906 bytes removed, diff: -479
>>
>> Alternatively, this could be done by combining identical
>> parts of the match_policy_in/out()

That would probably end up rather ugly because they walk
over different structures and have some minor differences.

-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Sat, 12 Jan 2008 20:03:31 +0100

> David Miller wrote:
> > From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
> > Date: Sat, 12 Jan 2008 11:34:27 +0200
> > 
> > Ilpo, please post netfilter patches to netfilter-devel,
> > CC:'ing Patrick McHardy.
> > 
> > Patrick, please review, thanks.
> 
> This looks fine to me, thanks Ilpo.

Applied, thanks.