aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/ulpqueue.c
diff options
context:
space:
mode:
authorXin Long <lucien.xin@gmail.com>2019-04-15 05:15:07 -0400
committerDavid S. Miller <davem@davemloft.net>2019-04-15 16:36:51 -0400
commit9dde27de3e5efa0d032f3c891a0ca833a0d31911 (patch)
treebaba7e7942d6e6a3162db024a2995f306d0afad4 /net/sctp/ulpqueue.c
parent1033990ac5b2ab6cee93734cb6d301aa3a35bcaa (diff)
sctp: implement memory accounting on rx path
sk_forward_alloc's updating is also done on rx path, but to be consistent we change to use sk_mem_charge() in sctp_skb_set_owner_r(). In sctp_eat_data(), it's not enough to check sctp_memory_pressure only, which doesn't work for mem_cgroup_sockets_enabled, so we change to use sk_under_memory_pressure(). When it's under memory pressure, sk_mem_reclaim() and sk_rmem_schedule() should be called on both RENEGE or CHUNK DELIVERY path exit the memory pressure status as soon as possible. Note that sk_rmem_schedule() is using datalen to make things easy there. Reported-by: Matteo Croce <mcroce@redhat.com> Tested-by: Matteo Croce <mcroce@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ulpqueue.c')
-rw-r--r--net/sctp/ulpqueue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 7cdc3623fa35..a212fe079c07 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -1104,7 +1104,8 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
1104 freed += sctp_ulpq_renege_frags(ulpq, needed - freed); 1104 freed += sctp_ulpq_renege_frags(ulpq, needed - freed);
1105 } 1105 }
1106 /* If able to free enough room, accept this chunk. */ 1106 /* If able to free enough room, accept this chunk. */
1107 if (freed >= needed) { 1107 if (sk_rmem_schedule(asoc->base.sk, chunk->skb, needed) &&
1108 freed >= needed) {
1108 int retval = sctp_ulpq_tail_data(ulpq, chunk, gfp); 1109 int retval = sctp_ulpq_tail_data(ulpq, chunk, gfp);
1109 /* 1110 /*
1110 * Enter partial delivery if chunk has not been 1111 * Enter partial delivery if chunk has not been