Commit cea8768f authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

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: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f15cdbf

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ struct sctp_chunk *sctp_make_cwr(const struct sctp_association *, 
struct sctp_chunk * sctp_make_datafrag_empty(struct sctp_association *,

					const struct sctp_sndrcvinfo *sinfo,

					int len, const __u8 flags,

					__u16 ssn);

					__u16 ssn, gfp_t gfp);

struct sctp_chunk *sctp_make_ecne(const struct sctp_association *,

				  const __u32);

struct sctp_chunk *sctp_make_sack(const struct sctp_association *);

include/net/sctp/structs.h

+5 −5
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ void sctp_chunk_free(struct sctp_chunk *); 
void  *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);

struct sctp_chunk *sctp_chunkify(struct sk_buff *,

				 const struct sctp_association *,

				 struct sock *);

				 struct sock *, gfp_t gfp);

void sctp_init_addrs(struct sctp_chunk *, union sctp_addr *,

		     union sctp_addr *);

const union sctp_addr *sctp_source(const struct sctp_chunk *chunk);
@@ -717,10 +717,10 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *, 
				     __u16 sport, __u16 dport);

struct sctp_packet *sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *,

                                       struct sctp_chunk *, int);

				       struct sctp_chunk *, int, gfp_t);

sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *,

                                     struct sctp_chunk *);

int sctp_packet_transmit(struct sctp_packet *);

int sctp_packet_transmit(struct sctp_packet *, gfp_t);

void sctp_packet_free(struct sctp_packet *);



static inline int sctp_packet_empty(struct sctp_packet *packet)
@@ -1053,7 +1053,7 @@ struct sctp_outq { 
void sctp_outq_init(struct sctp_association *, struct sctp_outq *);

void sctp_outq_teardown(struct sctp_outq *);

void sctp_outq_free(struct sctp_outq*);

int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk);

int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk, gfp_t);

int sctp_outq_sack(struct sctp_outq *, struct sctp_chunk *);

int sctp_outq_is_empty(const struct sctp_outq *);

void sctp_outq_restart(struct sctp_outq *);
@@ -1061,7 +1061,7 @@ void sctp_outq_restart(struct sctp_outq *); 
void sctp_retransmit(struct sctp_outq *, struct sctp_transport *,

		     sctp_retransmit_reason_t);

void sctp_retransmit_mark(struct sctp_outq *, struct sctp_transport *, __u8);

int sctp_outq_uncork(struct sctp_outq *);

int sctp_outq_uncork(struct sctp_outq *, gfp_t gfp);

/* Uncork and flush an outqueue.  */

static inline void sctp_outq_cork(struct sctp_outq *q)

{

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ void sctp_assoc_rwnd_increase(struct sctp_association *asoc, unsigned int len) 


		asoc->peer.sack_needed = 0;



		sctp_outq_tail(&asoc->outqueue, sack);

		sctp_outq_tail(&asoc->outqueue, sack, GFP_ATOMIC);



		/* Stop the SACK timer.  */

		timer = &asoc->timers[SCTP_EVENT_TIMEOUT_SACK];

net/sctp/chunk.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

net/sctp/input.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int sctp_rcv(struct sk_buff *skb) 
		goto discard_release;



	/* Create an SCTP packet structure. */

	chunk = sctp_chunkify(skb, asoc, sk);

	chunk = sctp_chunkify(skb, asoc, sk, GFP_ATOMIC);

	if (!chunk)

		goto discard_release;

	SCTP_INPUT_CB(skb)->chunk = chunk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE