mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
[SCTP]: Remove sctp_add_cmd_sf wrapper bloat
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
419ae74ecc
commit
bc09dff198
4 changed files with 5 additions and 24 deletions
|
@ -205,12 +205,11 @@ typedef struct {
|
||||||
int sctp_init_cmd_seq(sctp_cmd_seq_t *seq);
|
int sctp_init_cmd_seq(sctp_cmd_seq_t *seq);
|
||||||
|
|
||||||
/* Add a command to an sctp_cmd_seq_t.
|
/* 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
|
* Use the SCTP_* constructors defined by SCTP_ARG_CONSTRUCTOR() above
|
||||||
* to wrap data which goes in the obj argument.
|
* 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 the next command structure in an sctp_cmd_seq.
|
||||||
* Return NULL at the end of the sequence.
|
* Return NULL at the end of the sequence.
|
||||||
|
|
|
@ -385,14 +385,6 @@ static inline int ADDIP_SERIAL_gte(__u16 s, __u16 t)
|
||||||
return (((s) == (t)) || (((t) - (s)) & ADDIP_SERIAL_SIGN_BIT));
|
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_t obj)
|
|
||||||
{
|
|
||||||
if (unlikely(!sctp_add_cmd(seq, verb, obj)))
|
|
||||||
BUG();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check VTAG of the packet matches the sender's own tag. */
|
/* Check VTAG of the packet matches the sender's own tag. */
|
||||||
static inline int
|
static inline int
|
||||||
sctp_vtag_verify(const struct sctp_chunk *chunk,
|
sctp_vtag_verify(const struct sctp_chunk *chunk,
|
||||||
|
|
|
@ -52,18 +52,12 @@ int sctp_init_cmd_seq(sctp_cmd_seq_t *seq)
|
||||||
/* Add a command to a sctp_cmd_seq_t.
|
/* Add a command to a sctp_cmd_seq_t.
|
||||||
* Return 0 if the command sequence is full.
|
* Return 0 if the command sequence is full.
|
||||||
*/
|
*/
|
||||||
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)
|
||||||
{
|
{
|
||||||
if (seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS)
|
BUG_ON(seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS);
|
||||||
goto fail;
|
|
||||||
|
|
||||||
seq->cmds[seq->next_free_slot].verb = verb;
|
seq->cmds[seq->next_free_slot].verb = verb;
|
||||||
seq->cmds[seq->next_free_slot++].obj = obj;
|
seq->cmds[seq->next_free_slot++].obj = obj;
|
||||||
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return the next command structure in a sctp_cmd_seq.
|
/* Return the next command structure in a sctp_cmd_seq.
|
||||||
|
|
|
@ -3135,12 +3135,8 @@ sctp_disposition_t sctp_sf_operr_notify(const struct sctp_endpoint *ep,
|
||||||
if (!ev)
|
if (!ev)
|
||||||
goto nomem;
|
goto nomem;
|
||||||
|
|
||||||
if (!sctp_add_cmd(commands, SCTP_CMD_EVENT_ULP,
|
sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
|
||||||
SCTP_ULPEVENT(ev))) {
|
SCTP_ULPEVENT(ev));
|
||||||
sctp_ulpevent_free(ev);
|
|
||||||
goto nomem;
|
|
||||||
}
|
|
||||||
|
|
||||||
sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_OPERR,
|
sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_OPERR,
|
||||||
SCTP_CHUNK(chunk));
|
SCTP_CHUNK(chunk));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue