[PATCH 7/7] [SCTP]: Remove sctp_add_cmd_sf wrapper bloat

Previous thread: [PATCH 3/7] [NET]: uninline dev_alloc_skb, de-bloats a lot by Ilpo Järvinen on Thursday, March 27, 2008 - 8:38 am. (27 messages)

Next thread: none
To: Andrew Morton <akpm@...>, David Miller <davem@...>, <netdev@...>, <linux-kernel@...>
Cc: Arnaldo Carvalho de Melo <acme@...>, Ilpo J <ilpo.jarvinen@...>, Vlad Yasevich <vladislav.yasevich@...>
Date: Thursday, March 27, 2008 - 8:38 am

With a was number of callsites sctp_add_cmd_sf wrapper bloats
kernel by some amount. Due to unlikely tracking allyesconfig,
with the initial result were around ~7kB (thus caught my
attention) while a non-debug config produced only ~2.3kB effect.

I (ij) proposed first a patch to uninline it but Vlad responded
with a patch that removed the only sctp_add_cmd call which is
wrapped by sctp_add_cmd_sf (I wasn't sure if I could do that).
I did minor cleanup to Vlad's patch.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
---
include/net/sctp/command.h | 3 +--
include/net/sctp/sm.h | 8 --------
net/sctp/command.c | 10 ++--------
net/sctp/sm_statefuns.c | 8 ++------
4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 10ae2da..4263af8 100644
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -205,12 +205,11 @@ typedef struct {
int sctp_init_cmd_seq(sctp_cmd_seq_t *seq);

/* Add a command to an sctp_cmd_seq_t.
- * Return 0 if the command sequence is full.
*
* Use the SCTP_* constructors defined by SCTP_ARG_CONSTRUCTOR() above
* to wrap data which goes in the obj argument.
*/
-int sctp_add_cmd(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj);
+void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj);

/* Return the next command structure in an sctp_cmd_seq.
* Return NULL at the end of the sequence.
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index ef9e7ed..2481173 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -385,14 +385,6 @@ static inline int ADDIP_SERIAL_gte(__u16 s, __u16 t)
return (((s) == (t)) || (((t) - (s)) & ADDIP_SERIAL_SIGN_BIT));
}

-
-/* Run sctp_add_cmd() generating a BUG() if there is a failure. */
-static inline void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg...

To: <ilpo.jarvinen@...>
Cc: <akpm@...>, <netdev@...>, <linux-kernel@...>, <acme@...>, <vladislav.yasevich@...>
Date: Thursday, March 27, 2008 - 8:54 pm

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>

Applied, thanks.
--

Previous thread: [PATCH 3/7] [NET]: uninline dev_alloc_skb, de-bloats a lot by Ilpo Järvinen on Thursday, March 27, 2008 - 8:38 am. (27 messages)

Next thread: none