diff options
| author |   Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2016-03-10 18:33:07 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-13 22:29:07 -0400 |
| commit | cea8768f333e3f0bc231d8b815aa4a9e63fa990c (patch) | |
| tree | 60bf6ef493bdc7f9816f4c62f65b7aa106a9a0ce /net/sctp/chunk.c | |
| parent | ovs: allow nl 'flow set' to use ufid without flow key (diff) | |
| download | linux-dev-cea8768f333e3f0bc231d8b815aa4a9e63fa990c.tar.xz linux-dev-cea8768f333e3f0bc231d8b815aa4a9e63fa990c.zip | |
sctp: allow sctp_transmit_packet and others to use gfp
Currently sctp_sendmsg() triggers some calls that will allocate memory
with GFP_ATOMIC even when not necessary. In the case of
sctp_packet_transmit it will allocate a linear skb that will be used to
construct the packet and this may cause sends to fail due to ENOMEM more
often than anticipated specially with big MTUs.
This patch thus allows it to inherit gfp flags from upper calls so that
it can use GFP_KERNEL if it was triggered by a sctp_sendmsg call or
similar. All others, like retransmits or flushes started from BH, are
still allocated using GFP_ATOMIC.
In netperf tests this didn't result in any performance drawbacks when
memory is not too fragmented and made it trigger ENOMEM way less often.
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/chunk.c')
| -rw-r--r-- | net/sctp/chunk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 3aa43073e0b9..958ef5f33f4b 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c @@ -260,7 +260,8 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, frag |= SCTP_DATA_SACK_IMM; } - chunk = sctp_make_datafrag_empty(asoc, sinfo, len, frag, 0); + chunk = sctp_make_datafrag_empty(asoc, sinfo, len, frag, + 0, GFP_KERNEL); if (!chunk) { err = -ENOMEM; @@ -296,7 +297,8 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, (sinfo->sinfo_flags & SCTP_SACK_IMMEDIATELY)) frag |= SCTP_DATA_SACK_IMM; - chunk = sctp_make_datafrag_empty(asoc, sinfo, over, frag, 0); + chunk = sctp_make_datafrag_empty(asoc, sinfo, over, frag, + 0, GFP_KERNEL); if (!chunk) { err = -ENOMEM; |