mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-10 00:46:40 +07:00
Merge branch 'net-sctp-Avoid-allocating-high-order-memory-with-kmalloc'
Konstantin Khorenko says: ==================== net/sctp: Avoid allocating high order memory with kmalloc() Each SCTP association can have up to 65535 input and output streams. For each stream type an array of sctp_stream_in or sctp_stream_out structures is allocated using kmalloc_array() function. This function allocates physically contiguous memory regions, so this can lead to allocation of memory regions of very high order, i.e.: sizeof(struct sctp_stream_out) == 24, ((65535 * 24) / 4096) == 383 memory pages (4096 byte per page), which means 9th memory order. This can lead to a memory allocation failures on the systems under a memory stress. We actually do not need these arrays of memory to be physically contiguous. Possible simple solution would be to use kvmalloc() instread of kmalloc() as kvmalloc() can allocate physically scattered pages if contiguous pages are not available. But the problem is that the allocation can happed in a softirq context with GFP_ATOMIC flag set, and kvmalloc() cannot be used in this scenario. So the other possible solution is to use flexible arrays instead of contiguios arrays of memory so that the memory would be allocated on a per-page basis. This patchset replaces kvmalloc() with flex_array usage. It consists of two parts: * First patch is preparatory - it mechanically wraps all direct access to assoc->stream.out[] and assoc->stream.in[] arrays with SCTP_SO() and SCTP_SI() wrappers so that later a direct array access could be easily changed to an access to a flex_array (or any other possible alternative). * Second patch replaces kmalloc_array() with flex_array usage. v2 changes: sctp_stream_in() users are updated to provide stream as an argument, sctp_stream_{in,out}_ptr() are now just sctp_stream_{in,out}(). v3 changes: Move type chages struct sctp_stream_out -> flex_array to next patch. Make sctp_stream_{in,out}() static incline and move them to a header. Performance results (single stream): ==================================== * Kernel: v4.18-rc6 - stock and with 2 patches from Oleg (earlier in this thread) * Node: CPU (8 cores): Intel(R) Xeon(R) CPU E31230 @ 3.20GHz RAM: 32 Gb * netperf: taken from https://github.com/HewlettPackard/netperf.git, compiled from sources with sctp support * netperf server and client are run on the same node * ip link set lo mtu 1500 The script used to run tests: # cat run_tests.sh #!/bin/bash for test in SCTP_STREAM SCTP_STREAM_MANY SCTP_RR SCTP_RR_MANY; do echo "TEST: $test"; for i in `seq 1 3`; do echo "Iteration: $i"; set -x netperf -t $test -H localhost -p 22222 -S 200000,200000 -s 200000,200000 \ -l 60 -- -m 1452; set +x done done ================================================ Results (a bit reformatted to be more readable): Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec v4.18-rc7 v4.18-rc7 + fixes TEST: SCTP_STREAM 212992 212992 1452 60.21 1125.52 1247.04 212992 212992 1452 60.20 1376.38 1149.95 212992 212992 1452 60.20 1131.40 1163.85 TEST: SCTP_STREAM_MANY 212992 212992 1452 60.00 1111.00 1310.05 212992 212992 1452 60.00 1188.55 1130.50 212992 212992 1452 60.00 1108.06 1162.50 =========== Local /Remote Socket Size Request Resp. Elapsed Trans. Send Recv Size Size Time Rate bytes Bytes bytes bytes secs. per sec v4.18-rc7 v4.18-rc7 + fixes TEST: SCTP_RR 212992 212992 1 1 60.00 45486.98 46089.43 212992 212992 1 1 60.00 45584.18 45994.21 212992 212992 1 1 60.00 45703.86 45720.84 TEST: SCTP_RR_MANY 212992 212992 1 1 60.00 40.75 40.77 212992 212992 1 1 60.00 40.58 40.08 212992 212992 1 1 60.00 39.98 39.97 Performance results for many streams: ===================================== * Kernel: v4.18-rc8 - stock and with 2 patches v3 * Node: CPU (8 cores): Intel(R) Xeon(R) CPU E31230 @ 3.20GHz RAM: 32 Gb * sctp_test: https://github.com/sctp/lksctp-tools * both server and client are run on the same node * ip link set lo mtu 1500 * sysctl -w vm.max_map_count=65530000 (need it to make memory fragmented) The script used to run tests: ============================= # cat run_sctp_test.sh #!/bin/bash set -x uname -r ip link set lo mtu 1500 swapoff -a free cat /proc/buddyinfo ./src/apps/sctp_test -H 127.0.0.1 -P 22222 -l -d 0 & sleep 3 time ./src/apps/sctp_test -H 127.0.0.1 -P 22221 -h 127.0.0.1 -p 22222 \ -s -c 1 -M 65535 -T -t 1 -x 100000 -d 0 1>/dev/null killall -9 lt-sctp_test =============================== Results (a bit reformatted to be more readable): 1) ms stock kernel v4.18-rc8, no memory fragmentation test 1 test 2 test 3 real 0m14.715s 0m14.593s 0m15.954s user 0m0.954s 0m0.955s 0m0.854s sys 0m13.388s 0m12.537s 0m13.749s 2) kernel with fixes, no memory fragmentation test 1 test 2 test 3 real 0m14.959s 0m14.693s 0m14.762s user 0m0.948s 0m0.921s 0m0.929s sys 0m13.538s 0m13.225s 0m13.217s 3) kernel with fixes, memory fragmented 'free': total used free shared buff/cache available Mem: 32906008 30555200 302740 764 2048068 266452 Mem: 32906008 30379948 541436 764 1984624 442376 Mem: 32906008 30717312 262380 764 1926316 109908 /proc/buddyinfo: Node 0, zone Normal 40773 37 34 29 0 0 0 0 0 0 0 Node 0, zone Normal 100332 68 8 4 2 1 1 0 0 0 0 Node 0, zone Normal 31113 7 2 1 0 0 0 0 0 0 0 test 1 test 2 test 3 real 0m14.159s 0m15.252s 0m15.826s user 0m0.839s 0m1.004s 0m1.048s sys 0m11.827s 0m14.240s 0m14.778s ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
2b14e1ea21
@ -57,6 +57,7 @@
|
||||
#include <linux/atomic.h> /* This gets us atomic counters. */
|
||||
#include <linux/skbuff.h> /* We need sk_buff_head. */
|
||||
#include <linux/workqueue.h> /* We need tq_struct. */
|
||||
#include <linux/flex_array.h> /* We need flex_array. */
|
||||
#include <linux/sctp.h> /* We need sctp* header structs. */
|
||||
#include <net/sctp/auth.h> /* We need auth specific structs */
|
||||
#include <net/ip.h> /* For inet_skb_parm */
|
||||
@ -398,37 +399,35 @@ void sctp_stream_update(struct sctp_stream *stream, struct sctp_stream *new);
|
||||
|
||||
/* What is the current SSN number for this stream? */
|
||||
#define sctp_ssn_peek(stream, type, sid) \
|
||||
((stream)->type[sid].ssn)
|
||||
(sctp_stream_##type((stream), (sid))->ssn)
|
||||
|
||||
/* Return the next SSN number for this stream. */
|
||||
#define sctp_ssn_next(stream, type, sid) \
|
||||
((stream)->type[sid].ssn++)
|
||||
(sctp_stream_##type((stream), (sid))->ssn++)
|
||||
|
||||
/* Skip over this ssn and all below. */
|
||||
#define sctp_ssn_skip(stream, type, sid, ssn) \
|
||||
((stream)->type[sid].ssn = ssn + 1)
|
||||
(sctp_stream_##type((stream), (sid))->ssn = ssn + 1)
|
||||
|
||||
/* What is the current MID number for this stream? */
|
||||
#define sctp_mid_peek(stream, type, sid) \
|
||||
((stream)->type[sid].mid)
|
||||
(sctp_stream_##type((stream), (sid))->mid)
|
||||
|
||||
/* Return the next MID number for this stream. */
|
||||
#define sctp_mid_next(stream, type, sid) \
|
||||
((stream)->type[sid].mid++)
|
||||
(sctp_stream_##type((stream), (sid))->mid++)
|
||||
|
||||
/* Skip over this mid and all below. */
|
||||
#define sctp_mid_skip(stream, type, sid, mid) \
|
||||
((stream)->type[sid].mid = mid + 1)
|
||||
|
||||
#define sctp_stream_in(asoc, sid) (&(asoc)->stream.in[sid])
|
||||
(sctp_stream_##type((stream), (sid))->mid = mid + 1)
|
||||
|
||||
/* What is the current MID_uo number for this stream? */
|
||||
#define sctp_mid_uo_peek(stream, type, sid) \
|
||||
((stream)->type[sid].mid_uo)
|
||||
(sctp_stream_##type((stream), (sid))->mid_uo)
|
||||
|
||||
/* Return the next MID_uo number for this stream. */
|
||||
#define sctp_mid_uo_next(stream, type, sid) \
|
||||
((stream)->type[sid].mid_uo++)
|
||||
(sctp_stream_##type((stream), (sid))->mid_uo++)
|
||||
|
||||
/*
|
||||
* Pointers to address related SCTP functions.
|
||||
@ -1440,8 +1439,8 @@ struct sctp_stream_in {
|
||||
};
|
||||
|
||||
struct sctp_stream {
|
||||
struct sctp_stream_out *out;
|
||||
struct sctp_stream_in *in;
|
||||
struct flex_array *out;
|
||||
struct flex_array *in;
|
||||
__u16 outcnt;
|
||||
__u16 incnt;
|
||||
/* Current stream being sent, if any */
|
||||
@ -1463,6 +1462,23 @@ struct sctp_stream {
|
||||
struct sctp_stream_interleave *si;
|
||||
};
|
||||
|
||||
static inline struct sctp_stream_out *sctp_stream_out(
|
||||
const struct sctp_stream *stream,
|
||||
__u16 sid)
|
||||
{
|
||||
return flex_array_get(stream->out, sid);
|
||||
}
|
||||
|
||||
static inline struct sctp_stream_in *sctp_stream_in(
|
||||
const struct sctp_stream *stream,
|
||||
__u16 sid)
|
||||
{
|
||||
return flex_array_get(stream->in, sid);
|
||||
}
|
||||
|
||||
#define SCTP_SO(s, i) sctp_stream_out((s), (i))
|
||||
#define SCTP_SI(s, i) sctp_stream_in((s), (i))
|
||||
|
||||
#define SCTP_STREAM_CLOSED 0x00
|
||||
#define SCTP_STREAM_OPEN 0x01
|
||||
|
||||
|
@ -325,7 +325,8 @@ int sctp_chunk_abandoned(struct sctp_chunk *chunk)
|
||||
if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) &&
|
||||
time_after(jiffies, chunk->msg->expires_at)) {
|
||||
struct sctp_stream_out *streamout =
|
||||
&chunk->asoc->stream.out[chunk->sinfo.sinfo_stream];
|
||||
SCTP_SO(&chunk->asoc->stream,
|
||||
chunk->sinfo.sinfo_stream);
|
||||
|
||||
if (chunk->sent_count) {
|
||||
chunk->asoc->abandoned_sent[SCTP_PR_INDEX(TTL)]++;
|
||||
@ -339,7 +340,8 @@ int sctp_chunk_abandoned(struct sctp_chunk *chunk)
|
||||
} else if (SCTP_PR_RTX_ENABLED(chunk->sinfo.sinfo_flags) &&
|
||||
chunk->sent_count > chunk->sinfo.sinfo_timetolive) {
|
||||
struct sctp_stream_out *streamout =
|
||||
&chunk->asoc->stream.out[chunk->sinfo.sinfo_stream];
|
||||
SCTP_SO(&chunk->asoc->stream,
|
||||
chunk->sinfo.sinfo_stream);
|
||||
|
||||
chunk->asoc->abandoned_sent[SCTP_PR_INDEX(RTX)]++;
|
||||
streamout->ext->abandoned_sent[SCTP_PR_INDEX(RTX)]++;
|
||||
|
@ -80,7 +80,7 @@ static inline void sctp_outq_head_data(struct sctp_outq *q,
|
||||
q->out_qlen += ch->skb->len;
|
||||
|
||||
stream = sctp_chunk_stream_no(ch);
|
||||
oute = q->asoc->stream.out[stream].ext;
|
||||
oute = SCTP_SO(&q->asoc->stream, stream)->ext;
|
||||
list_add(&ch->stream_list, &oute->outq);
|
||||
}
|
||||
|
||||
@ -101,7 +101,7 @@ static inline void sctp_outq_tail_data(struct sctp_outq *q,
|
||||
q->out_qlen += ch->skb->len;
|
||||
|
||||
stream = sctp_chunk_stream_no(ch);
|
||||
oute = q->asoc->stream.out[stream].ext;
|
||||
oute = SCTP_SO(&q->asoc->stream, stream)->ext;
|
||||
list_add_tail(&ch->stream_list, &oute->outq);
|
||||
}
|
||||
|
||||
@ -372,7 +372,7 @@ static int sctp_prsctp_prune_sent(struct sctp_association *asoc,
|
||||
sctp_insert_list(&asoc->outqueue.abandoned,
|
||||
&chk->transmitted_list);
|
||||
|
||||
streamout = &asoc->stream.out[chk->sinfo.sinfo_stream];
|
||||
streamout = SCTP_SO(&asoc->stream, chk->sinfo.sinfo_stream);
|
||||
asoc->sent_cnt_removable--;
|
||||
asoc->abandoned_sent[SCTP_PR_INDEX(PRIO)]++;
|
||||
streamout->ext->abandoned_sent[SCTP_PR_INDEX(PRIO)]++;
|
||||
@ -416,7 +416,7 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc,
|
||||
asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;
|
||||
if (chk->sinfo.sinfo_stream < asoc->stream.outcnt) {
|
||||
struct sctp_stream_out *streamout =
|
||||
&asoc->stream.out[chk->sinfo.sinfo_stream];
|
||||
SCTP_SO(&asoc->stream, chk->sinfo.sinfo_stream);
|
||||
|
||||
streamout->ext->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;
|
||||
}
|
||||
@ -1082,6 +1082,7 @@ static void sctp_outq_flush_data(struct sctp_flush_ctx *ctx,
|
||||
/* Finally, transmit new packets. */
|
||||
while ((chunk = sctp_outq_dequeue_data(ctx->q)) != NULL) {
|
||||
__u32 sid = ntohs(chunk->subh.data_hdr->stream);
|
||||
__u8 stream_state = SCTP_SO(&ctx->asoc->stream, sid)->state;
|
||||
|
||||
/* Has this chunk expired? */
|
||||
if (sctp_chunk_abandoned(chunk)) {
|
||||
@ -1091,7 +1092,7 @@ static void sctp_outq_flush_data(struct sctp_flush_ctx *ctx,
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ctx->asoc->stream.out[sid].state == SCTP_STREAM_CLOSED) {
|
||||
if (stream_state == SCTP_STREAM_CLOSED) {
|
||||
sctp_outq_head_data(ctx->q, chunk);
|
||||
break;
|
||||
}
|
||||
|
@ -1911,7 +1911,7 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc,
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (unlikely(!asoc->stream.out[sinfo->sinfo_stream].ext)) {
|
||||
if (unlikely(!SCTP_SO(&asoc->stream, sinfo->sinfo_stream)->ext)) {
|
||||
err = sctp_stream_init_ext(&asoc->stream, sinfo->sinfo_stream);
|
||||
if (err)
|
||||
goto err;
|
||||
@ -7154,7 +7154,7 @@ static int sctp_getsockopt_pr_streamstatus(struct sock *sk, int len,
|
||||
if (!asoc || params.sprstat_sid >= asoc->stream.outcnt)
|
||||
goto out;
|
||||
|
||||
streamoute = asoc->stream.out[params.sprstat_sid].ext;
|
||||
streamoute = SCTP_SO(&asoc->stream, params.sprstat_sid)->ext;
|
||||
if (!streamoute) {
|
||||
/* Not allocated yet, means all stats are 0 */
|
||||
params.sprstat_abandoned_unsent = 0;
|
||||
|
@ -37,6 +37,53 @@
|
||||
#include <net/sctp/sm.h>
|
||||
#include <net/sctp/stream_sched.h>
|
||||
|
||||
static struct flex_array *fa_alloc(size_t elem_size, size_t elem_count,
|
||||
gfp_t gfp)
|
||||
{
|
||||
struct flex_array *result;
|
||||
int err;
|
||||
|
||||
result = flex_array_alloc(elem_size, elem_count, gfp);
|
||||
if (result) {
|
||||
err = flex_array_prealloc(result, 0, elem_count, gfp);
|
||||
if (err) {
|
||||
flex_array_free(result);
|
||||
result = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static void fa_free(struct flex_array *fa)
|
||||
{
|
||||
if (fa)
|
||||
flex_array_free(fa);
|
||||
}
|
||||
|
||||
static void fa_copy(struct flex_array *fa, struct flex_array *from,
|
||||
size_t index, size_t count)
|
||||
{
|
||||
void *elem;
|
||||
|
||||
while (count--) {
|
||||
elem = flex_array_get(from, index);
|
||||
flex_array_put(fa, index, elem, 0);
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
static void fa_zero(struct flex_array *fa, size_t index, size_t count)
|
||||
{
|
||||
void *elem;
|
||||
|
||||
while (count--) {
|
||||
elem = flex_array_get(fa, index);
|
||||
memset(elem, 0, fa->element_size);
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
/* Migrates chunks from stream queues to new stream queues if needed,
|
||||
* but not across associations. Also, removes those chunks to streams
|
||||
* higher than the new max.
|
||||
@ -78,34 +125,33 @@ static void sctp_stream_outq_migrate(struct sctp_stream *stream,
|
||||
* sctp_stream_update will swap ->out pointers.
|
||||
*/
|
||||
for (i = 0; i < outcnt; i++) {
|
||||
kfree(new->out[i].ext);
|
||||
new->out[i].ext = stream->out[i].ext;
|
||||
stream->out[i].ext = NULL;
|
||||
kfree(SCTP_SO(new, i)->ext);
|
||||
SCTP_SO(new, i)->ext = SCTP_SO(stream, i)->ext;
|
||||
SCTP_SO(stream, i)->ext = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = outcnt; i < stream->outcnt; i++)
|
||||
kfree(stream->out[i].ext);
|
||||
kfree(SCTP_SO(stream, i)->ext);
|
||||
}
|
||||
|
||||
static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt,
|
||||
gfp_t gfp)
|
||||
{
|
||||
struct sctp_stream_out *out;
|
||||
struct flex_array *out;
|
||||
size_t elem_size = sizeof(struct sctp_stream_out);
|
||||
|
||||
out = kmalloc_array(outcnt, sizeof(*out), gfp);
|
||||
out = fa_alloc(elem_size, outcnt, gfp);
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
if (stream->out) {
|
||||
memcpy(out, stream->out, min(outcnt, stream->outcnt) *
|
||||
sizeof(*out));
|
||||
kfree(stream->out);
|
||||
fa_copy(out, stream->out, 0, min(outcnt, stream->outcnt));
|
||||
fa_free(stream->out);
|
||||
}
|
||||
|
||||
if (outcnt > stream->outcnt)
|
||||
memset(out + stream->outcnt, 0,
|
||||
(outcnt - stream->outcnt) * sizeof(*out));
|
||||
fa_zero(out, stream->outcnt, (outcnt - stream->outcnt));
|
||||
|
||||
stream->out = out;
|
||||
|
||||
@ -115,22 +161,20 @@ static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt,
|
||||
static int sctp_stream_alloc_in(struct sctp_stream *stream, __u16 incnt,
|
||||
gfp_t gfp)
|
||||
{
|
||||
struct sctp_stream_in *in;
|
||||
|
||||
in = kmalloc_array(incnt, sizeof(*stream->in), gfp);
|
||||
struct flex_array *in;
|
||||
size_t elem_size = sizeof(struct sctp_stream_in);
|
||||
|
||||
in = fa_alloc(elem_size, incnt, gfp);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
if (stream->in) {
|
||||
memcpy(in, stream->in, min(incnt, stream->incnt) *
|
||||
sizeof(*in));
|
||||
kfree(stream->in);
|
||||
fa_copy(in, stream->in, 0, min(incnt, stream->incnt));
|
||||
fa_free(stream->in);
|
||||
}
|
||||
|
||||
if (incnt > stream->incnt)
|
||||
memset(in + stream->incnt, 0,
|
||||
(incnt - stream->incnt) * sizeof(*in));
|
||||
fa_zero(in, stream->incnt, (incnt - stream->incnt));
|
||||
|
||||
stream->in = in;
|
||||
|
||||
@ -162,7 +206,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
|
||||
|
||||
stream->outcnt = outcnt;
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
|
||||
sched->init(stream);
|
||||
|
||||
@ -174,7 +218,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
|
||||
ret = sctp_stream_alloc_in(stream, incnt, gfp);
|
||||
if (ret) {
|
||||
sched->free(stream);
|
||||
kfree(stream->out);
|
||||
fa_free(stream->out);
|
||||
stream->out = NULL;
|
||||
stream->outcnt = 0;
|
||||
goto out;
|
||||
@ -193,7 +237,7 @@ int sctp_stream_init_ext(struct sctp_stream *stream, __u16 sid)
|
||||
soute = kzalloc(sizeof(*soute), GFP_KERNEL);
|
||||
if (!soute)
|
||||
return -ENOMEM;
|
||||
stream->out[sid].ext = soute;
|
||||
SCTP_SO(stream, sid)->ext = soute;
|
||||
|
||||
return sctp_sched_init_sid(stream, sid, GFP_KERNEL);
|
||||
}
|
||||
@ -205,9 +249,9 @@ void sctp_stream_free(struct sctp_stream *stream)
|
||||
|
||||
sched->free(stream);
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
kfree(stream->out[i].ext);
|
||||
kfree(stream->out);
|
||||
kfree(stream->in);
|
||||
kfree(SCTP_SO(stream, i)->ext);
|
||||
fa_free(stream->out);
|
||||
fa_free(stream->in);
|
||||
}
|
||||
|
||||
void sctp_stream_clear(struct sctp_stream *stream)
|
||||
@ -215,12 +259,12 @@ void sctp_stream_clear(struct sctp_stream *stream)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
stream->out[i].mid = 0;
|
||||
stream->out[i].mid_uo = 0;
|
||||
SCTP_SO(stream, i)->mid = 0;
|
||||
SCTP_SO(stream, i)->mid_uo = 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < stream->incnt; i++)
|
||||
stream->in[i].mid = 0;
|
||||
SCTP_SI(stream, i)->mid = 0;
|
||||
}
|
||||
|
||||
void sctp_stream_update(struct sctp_stream *stream, struct sctp_stream *new)
|
||||
@ -273,8 +317,8 @@ static bool sctp_stream_outq_is_empty(struct sctp_stream *stream,
|
||||
for (i = 0; i < str_nums; i++) {
|
||||
__u16 sid = ntohs(str_list[i]);
|
||||
|
||||
if (stream->out[sid].ext &&
|
||||
!list_empty(&stream->out[sid].ext->outq))
|
||||
if (SCTP_SO(stream, sid)->ext &&
|
||||
!list_empty(&SCTP_SO(stream, sid)->ext->outq))
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -361,11 +405,11 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
|
||||
if (out) {
|
||||
if (str_nums)
|
||||
for (i = 0; i < str_nums; i++)
|
||||
stream->out[str_list[i]].state =
|
||||
SCTP_SO(stream, str_list[i])->state =
|
||||
SCTP_STREAM_CLOSED;
|
||||
else
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_CLOSED;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_CLOSED;
|
||||
}
|
||||
|
||||
asoc->strreset_chunk = chunk;
|
||||
@ -380,11 +424,11 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
|
||||
|
||||
if (str_nums)
|
||||
for (i = 0; i < str_nums; i++)
|
||||
stream->out[str_list[i]].state =
|
||||
SCTP_SO(stream, str_list[i])->state =
|
||||
SCTP_STREAM_OPEN;
|
||||
else
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
|
||||
goto out;
|
||||
}
|
||||
@ -418,7 +462,7 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
|
||||
|
||||
/* Block further xmit of data until this request is completed */
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_CLOSED;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_CLOSED;
|
||||
|
||||
asoc->strreset_chunk = chunk;
|
||||
sctp_chunk_hold(asoc->strreset_chunk);
|
||||
@ -429,7 +473,7 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
|
||||
asoc->strreset_chunk = NULL;
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
|
||||
return retval;
|
||||
}
|
||||
@ -609,10 +653,10 @@ struct sctp_chunk *sctp_process_strreset_outreq(
|
||||
}
|
||||
|
||||
for (i = 0; i < nums; i++)
|
||||
stream->in[ntohs(str_p[i])].mid = 0;
|
||||
SCTP_SI(stream, ntohs(str_p[i]))->mid = 0;
|
||||
} else {
|
||||
for (i = 0; i < stream->incnt; i++)
|
||||
stream->in[i].mid = 0;
|
||||
SCTP_SI(stream, i)->mid = 0;
|
||||
}
|
||||
|
||||
result = SCTP_STRRESET_PERFORMED;
|
||||
@ -683,11 +727,11 @@ struct sctp_chunk *sctp_process_strreset_inreq(
|
||||
|
||||
if (nums)
|
||||
for (i = 0; i < nums; i++)
|
||||
stream->out[ntohs(str_p[i])].state =
|
||||
SCTP_SO(stream, ntohs(str_p[i]))->state =
|
||||
SCTP_STREAM_CLOSED;
|
||||
else
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_CLOSED;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_CLOSED;
|
||||
|
||||
asoc->strreset_chunk = chunk;
|
||||
asoc->strreset_outstanding = 1;
|
||||
@ -786,11 +830,11 @@ struct sctp_chunk *sctp_process_strreset_tsnreq(
|
||||
* incoming and outgoing streams.
|
||||
*/
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
stream->out[i].mid = 0;
|
||||
stream->out[i].mid_uo = 0;
|
||||
SCTP_SO(stream, i)->mid = 0;
|
||||
SCTP_SO(stream, i)->mid_uo = 0;
|
||||
}
|
||||
for (i = 0; i < stream->incnt; i++)
|
||||
stream->in[i].mid = 0;
|
||||
SCTP_SI(stream, i)->mid = 0;
|
||||
|
||||
result = SCTP_STRRESET_PERFORMED;
|
||||
|
||||
@ -979,15 +1023,18 @@ struct sctp_chunk *sctp_process_strreset_resp(
|
||||
sizeof(__u16);
|
||||
|
||||
if (result == SCTP_STRRESET_PERFORMED) {
|
||||
struct sctp_stream_out *sout;
|
||||
if (nums) {
|
||||
for (i = 0; i < nums; i++) {
|
||||
stream->out[ntohs(str_p[i])].mid = 0;
|
||||
stream->out[ntohs(str_p[i])].mid_uo = 0;
|
||||
sout = SCTP_SO(stream, ntohs(str_p[i]));
|
||||
sout->mid = 0;
|
||||
sout->mid_uo = 0;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
stream->out[i].mid = 0;
|
||||
stream->out[i].mid_uo = 0;
|
||||
sout = SCTP_SO(stream, i);
|
||||
sout->mid = 0;
|
||||
sout->mid_uo = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -995,7 +1042,7 @@ struct sctp_chunk *sctp_process_strreset_resp(
|
||||
}
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
|
||||
*evp = sctp_ulpevent_make_stream_reset_event(asoc, flags,
|
||||
nums, str_p, GFP_ATOMIC);
|
||||
@ -1050,15 +1097,15 @@ struct sctp_chunk *sctp_process_strreset_resp(
|
||||
asoc->adv_peer_ack_point = asoc->ctsn_ack_point;
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
stream->out[i].mid = 0;
|
||||
stream->out[i].mid_uo = 0;
|
||||
SCTP_SO(stream, i)->mid = 0;
|
||||
SCTP_SO(stream, i)->mid_uo = 0;
|
||||
}
|
||||
for (i = 0; i < stream->incnt; i++)
|
||||
stream->in[i].mid = 0;
|
||||
SCTP_SI(stream, i)->mid = 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
|
||||
*evp = sctp_ulpevent_make_assoc_reset_event(asoc, flags,
|
||||
stsn, rtsn, GFP_ATOMIC);
|
||||
@ -1072,7 +1119,7 @@ struct sctp_chunk *sctp_process_strreset_resp(
|
||||
|
||||
if (result == SCTP_STRRESET_PERFORMED)
|
||||
for (i = number; i < stream->outcnt; i++)
|
||||
stream->out[i].state = SCTP_STREAM_OPEN;
|
||||
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
|
||||
else
|
||||
stream->outcnt = number;
|
||||
|
||||
|
@ -197,7 +197,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_partial(
|
||||
__u32 next_fsn = 0;
|
||||
int is_last = 0;
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
|
||||
skb_queue_walk(&ulpq->reasm, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
@ -278,7 +278,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_reassembled(
|
||||
__u32 pd_len = 0;
|
||||
__u32 mid = 0;
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
|
||||
skb_queue_walk(&ulpq->reasm, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
@ -368,7 +368,7 @@ static struct sctp_ulpevent *sctp_intl_reasm(struct sctp_ulpq *ulpq,
|
||||
|
||||
sctp_intl_store_reasm(ulpq, event);
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
if (sin->pd_mode && event->mid == sin->mid &&
|
||||
event->fsn == sin->fsn)
|
||||
retval = sctp_intl_retrieve_partial(ulpq, event);
|
||||
@ -575,7 +575,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_partial_uo(
|
||||
__u32 next_fsn = 0;
|
||||
int is_last = 0;
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
|
||||
skb_queue_walk(&ulpq->reasm_uo, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
@ -659,7 +659,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_reassembled_uo(
|
||||
__u32 pd_len = 0;
|
||||
__u32 mid = 0;
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
|
||||
skb_queue_walk(&ulpq->reasm_uo, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
@ -750,7 +750,7 @@ static struct sctp_ulpevent *sctp_intl_reasm_uo(struct sctp_ulpq *ulpq,
|
||||
|
||||
sctp_intl_store_reasm_uo(ulpq, event);
|
||||
|
||||
sin = sctp_stream_in(ulpq->asoc, event->stream);
|
||||
sin = sctp_stream_in(&ulpq->asoc->stream, event->stream);
|
||||
if (sin->pd_mode_uo && event->mid == sin->mid_uo &&
|
||||
event->fsn == sin->fsn_uo)
|
||||
retval = sctp_intl_retrieve_partial_uo(ulpq, event);
|
||||
@ -774,7 +774,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_first_uo(struct sctp_ulpq *ulpq)
|
||||
skb_queue_walk(&ulpq->reasm_uo, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
|
||||
csin = sctp_stream_in(ulpq->asoc, cevent->stream);
|
||||
csin = sctp_stream_in(&ulpq->asoc->stream, cevent->stream);
|
||||
if (csin->pd_mode_uo)
|
||||
continue;
|
||||
|
||||
@ -875,7 +875,7 @@ static struct sctp_ulpevent *sctp_intl_retrieve_first(struct sctp_ulpq *ulpq)
|
||||
skb_queue_walk(&ulpq->reasm, pos) {
|
||||
struct sctp_ulpevent *cevent = sctp_skb2event(pos);
|
||||
|
||||
csin = sctp_stream_in(ulpq->asoc, cevent->stream);
|
||||
csin = sctp_stream_in(&ulpq->asoc->stream, cevent->stream);
|
||||
if (csin->pd_mode)
|
||||
continue;
|
||||
|
||||
@ -1053,7 +1053,7 @@ static void sctp_intl_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)
|
||||
__u16 sid;
|
||||
|
||||
for (sid = 0; sid < stream->incnt; sid++) {
|
||||
struct sctp_stream_in *sin = &stream->in[sid];
|
||||
struct sctp_stream_in *sin = SCTP_SI(stream, sid);
|
||||
__u32 mid;
|
||||
|
||||
if (sin->pd_mode_uo) {
|
||||
@ -1247,7 +1247,7 @@ static void sctp_handle_fwdtsn(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk)
|
||||
static void sctp_intl_skip(struct sctp_ulpq *ulpq, __u16 sid, __u32 mid,
|
||||
__u8 flags)
|
||||
{
|
||||
struct sctp_stream_in *sin = sctp_stream_in(ulpq->asoc, sid);
|
||||
struct sctp_stream_in *sin = sctp_stream_in(&ulpq->asoc->stream, sid);
|
||||
struct sctp_stream *stream = &ulpq->asoc->stream;
|
||||
|
||||
if (flags & SCTP_FTSN_U_BIT) {
|
||||
|
@ -161,7 +161,7 @@ int sctp_sched_set_sched(struct sctp_association *asoc,
|
||||
|
||||
/* Give the next scheduler a clean slate. */
|
||||
for (i = 0; i < asoc->stream.outcnt; i++) {
|
||||
void *p = asoc->stream.out[i].ext;
|
||||
void *p = SCTP_SO(&asoc->stream, i)->ext;
|
||||
|
||||
if (!p)
|
||||
continue;
|
||||
@ -175,7 +175,7 @@ int sctp_sched_set_sched(struct sctp_association *asoc,
|
||||
asoc->outqueue.sched = n;
|
||||
n->init(&asoc->stream);
|
||||
for (i = 0; i < asoc->stream.outcnt; i++) {
|
||||
if (!asoc->stream.out[i].ext)
|
||||
if (!SCTP_SO(&asoc->stream, i)->ext)
|
||||
continue;
|
||||
|
||||
ret = n->init_sid(&asoc->stream, i, GFP_KERNEL);
|
||||
@ -217,7 +217,7 @@ int sctp_sched_set_value(struct sctp_association *asoc, __u16 sid,
|
||||
if (sid >= asoc->stream.outcnt)
|
||||
return -EINVAL;
|
||||
|
||||
if (!asoc->stream.out[sid].ext) {
|
||||
if (!SCTP_SO(&asoc->stream, sid)->ext) {
|
||||
int ret;
|
||||
|
||||
ret = sctp_stream_init_ext(&asoc->stream, sid);
|
||||
@ -234,7 +234,7 @@ int sctp_sched_get_value(struct sctp_association *asoc, __u16 sid,
|
||||
if (sid >= asoc->stream.outcnt)
|
||||
return -EINVAL;
|
||||
|
||||
if (!asoc->stream.out[sid].ext)
|
||||
if (!SCTP_SO(&asoc->stream, sid)->ext)
|
||||
return 0;
|
||||
|
||||
return asoc->outqueue.sched->get(&asoc->stream, sid, value);
|
||||
@ -252,7 +252,7 @@ void sctp_sched_dequeue_done(struct sctp_outq *q, struct sctp_chunk *ch)
|
||||
* priority stream comes in.
|
||||
*/
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
sout = &q->asoc->stream.out[sid];
|
||||
sout = SCTP_SO(&q->asoc->stream, sid);
|
||||
q->asoc->stream.out_curr = sout;
|
||||
return;
|
||||
}
|
||||
@ -272,8 +272,9 @@ void sctp_sched_dequeue_common(struct sctp_outq *q, struct sctp_chunk *ch)
|
||||
int sctp_sched_init_sid(struct sctp_stream *stream, __u16 sid, gfp_t gfp)
|
||||
{
|
||||
struct sctp_sched_ops *sched = sctp_sched_ops_from_stream(stream);
|
||||
struct sctp_stream_out_ext *ext = SCTP_SO(stream, sid)->ext;
|
||||
|
||||
INIT_LIST_HEAD(&stream->out[sid].ext->outq);
|
||||
INIT_LIST_HEAD(&ext->outq);
|
||||
return sched->init_sid(stream, sid, gfp);
|
||||
}
|
||||
|
||||
|
@ -75,10 +75,10 @@ static struct sctp_stream_priorities *sctp_sched_prio_get_head(
|
||||
|
||||
/* No luck. So we search on all streams now. */
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
if (!stream->out[i].ext)
|
||||
if (!SCTP_SO(stream, i)->ext)
|
||||
continue;
|
||||
|
||||
p = stream->out[i].ext->prio_head;
|
||||
p = SCTP_SO(stream, i)->ext->prio_head;
|
||||
if (!p)
|
||||
/* Means all other streams won't be initialized
|
||||
* as well.
|
||||
@ -165,7 +165,7 @@ static void sctp_sched_prio_sched(struct sctp_stream *stream,
|
||||
static int sctp_sched_prio_set(struct sctp_stream *stream, __u16 sid,
|
||||
__u16 prio, gfp_t gfp)
|
||||
{
|
||||
struct sctp_stream_out *sout = &stream->out[sid];
|
||||
struct sctp_stream_out *sout = SCTP_SO(stream, sid);
|
||||
struct sctp_stream_out_ext *soute = sout->ext;
|
||||
struct sctp_stream_priorities *prio_head, *old;
|
||||
bool reschedule = false;
|
||||
@ -186,7 +186,7 @@ static int sctp_sched_prio_set(struct sctp_stream *stream, __u16 sid,
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
soute = stream->out[i].ext;
|
||||
soute = SCTP_SO(stream, i)->ext;
|
||||
if (soute && soute->prio_head == old)
|
||||
/* It's still in use, nothing else to do here. */
|
||||
return 0;
|
||||
@ -201,7 +201,7 @@ static int sctp_sched_prio_set(struct sctp_stream *stream, __u16 sid,
|
||||
static int sctp_sched_prio_get(struct sctp_stream *stream, __u16 sid,
|
||||
__u16 *value)
|
||||
{
|
||||
*value = stream->out[sid].ext->prio_head->prio;
|
||||
*value = SCTP_SO(stream, sid)->ext->prio_head->prio;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -215,7 +215,7 @@ static int sctp_sched_prio_init(struct sctp_stream *stream)
|
||||
static int sctp_sched_prio_init_sid(struct sctp_stream *stream, __u16 sid,
|
||||
gfp_t gfp)
|
||||
{
|
||||
INIT_LIST_HEAD(&stream->out[sid].ext->prio_list);
|
||||
INIT_LIST_HEAD(&SCTP_SO(stream, sid)->ext->prio_list);
|
||||
return sctp_sched_prio_set(stream, sid, 0, gfp);
|
||||
}
|
||||
|
||||
@ -233,9 +233,9 @@ static void sctp_sched_prio_free(struct sctp_stream *stream)
|
||||
*/
|
||||
sctp_sched_prio_unsched_all(stream);
|
||||
for (i = 0; i < stream->outcnt; i++) {
|
||||
if (!stream->out[i].ext)
|
||||
if (!SCTP_SO(stream, i)->ext)
|
||||
continue;
|
||||
prio = stream->out[i].ext->prio_head;
|
||||
prio = SCTP_SO(stream, i)->ext->prio_head;
|
||||
if (prio && list_empty(&prio->prio_sched))
|
||||
list_add(&prio->prio_sched, &list);
|
||||
}
|
||||
@ -255,7 +255,7 @@ static void sctp_sched_prio_enqueue(struct sctp_outq *q,
|
||||
ch = list_first_entry(&msg->chunks, struct sctp_chunk, frag_list);
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
stream = &q->asoc->stream;
|
||||
sctp_sched_prio_sched(stream, stream->out[sid].ext);
|
||||
sctp_sched_prio_sched(stream, SCTP_SO(stream, sid)->ext);
|
||||
}
|
||||
|
||||
static struct sctp_chunk *sctp_sched_prio_dequeue(struct sctp_outq *q)
|
||||
@ -297,7 +297,7 @@ static void sctp_sched_prio_dequeue_done(struct sctp_outq *q,
|
||||
* this priority.
|
||||
*/
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
soute = q->asoc->stream.out[sid].ext;
|
||||
soute = SCTP_SO(&q->asoc->stream, sid)->ext;
|
||||
prio = soute->prio_head;
|
||||
|
||||
sctp_sched_prio_next_stream(prio);
|
||||
@ -317,7 +317,7 @@ static void sctp_sched_prio_sched_all(struct sctp_stream *stream)
|
||||
__u16 sid;
|
||||
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
sout = &stream->out[sid];
|
||||
sout = SCTP_SO(stream, sid);
|
||||
if (sout->ext)
|
||||
sctp_sched_prio_sched(stream, sout->ext);
|
||||
}
|
||||
|
@ -100,7 +100,7 @@ static int sctp_sched_rr_init(struct sctp_stream *stream)
|
||||
static int sctp_sched_rr_init_sid(struct sctp_stream *stream, __u16 sid,
|
||||
gfp_t gfp)
|
||||
{
|
||||
INIT_LIST_HEAD(&stream->out[sid].ext->rr_list);
|
||||
INIT_LIST_HEAD(&SCTP_SO(stream, sid)->ext->rr_list);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -120,7 +120,7 @@ static void sctp_sched_rr_enqueue(struct sctp_outq *q,
|
||||
ch = list_first_entry(&msg->chunks, struct sctp_chunk, frag_list);
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
stream = &q->asoc->stream;
|
||||
sctp_sched_rr_sched(stream, stream->out[sid].ext);
|
||||
sctp_sched_rr_sched(stream, SCTP_SO(stream, sid)->ext);
|
||||
}
|
||||
|
||||
static struct sctp_chunk *sctp_sched_rr_dequeue(struct sctp_outq *q)
|
||||
@ -154,7 +154,7 @@ static void sctp_sched_rr_dequeue_done(struct sctp_outq *q,
|
||||
|
||||
/* Last chunk on that msg, move to the next stream */
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
soute = q->asoc->stream.out[sid].ext;
|
||||
soute = SCTP_SO(&q->asoc->stream, sid)->ext;
|
||||
|
||||
sctp_sched_rr_next_stream(&q->asoc->stream);
|
||||
|
||||
@ -173,7 +173,7 @@ static void sctp_sched_rr_sched_all(struct sctp_stream *stream)
|
||||
__u16 sid;
|
||||
|
||||
sid = sctp_chunk_stream_no(ch);
|
||||
soute = stream->out[sid].ext;
|
||||
soute = SCTP_SO(stream, sid)->ext;
|
||||
if (soute)
|
||||
sctp_sched_rr_sched(stream, soute);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user