diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:25:14 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:25:14 -0400 |
| commit | bd9ef39b60fd1727f40c84721da81bda186f4639 (patch) | |
| tree | b0d7c1a8a5e6eee2e586c6ce4796fe7a26f0731e | |
| parent | 1853f15d39ee934acb3fc5b5e55d822ddc6822f6 (diff) | |
| download | longterm-queue-4.12-bd9ef39b60fd1727f40c84721da81bda186f4639.tar.gz | |
net: drop sctp patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/sctp-silence-warns-on-sctp_stream_init-allocations.patch | 51 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 52 deletions
diff --git a/queue/sctp-silence-warns-on-sctp_stream_init-allocations.patch b/queue/sctp-silence-warns-on-sctp_stream_init-allocations.patch deleted file mode 100644 index f9374b0..0000000 --- a/queue/sctp-silence-warns-on-sctp_stream_init-allocations.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1ae2eaaa229bc350b6f38fbf4ab9c873532aecfb Mon Sep 17 00:00:00 2001 -From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Date: Tue, 3 Oct 2017 19:20:08 -0300 -Subject: [PATCH] sctp: silence warns on sctp_stream_init allocations - -commit 1ae2eaaa229bc350b6f38fbf4ab9c873532aecfb upstream. - -As SCTP supports up to 65535 streams, that can lead to very large -allocations in sctp_stream_init(). As Xin Long noticed, systems with -small amounts of memory are more prone to not have enough memory and -dump warnings on dmesg initiated by user actions. Thus, silence them. - -Also, if the reallocation of stream->out is not necessary, skip it and -keep the memory we already have. - -Reported-by: Xin Long <lucien.xin@gmail.com> -Tested-by: Xin Long <lucien.xin@gmail.com> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> - -diff --git a/net/sctp/stream.c b/net/sctp/stream.c -index 63ea15503714..1afa95558083 100644 ---- a/net/sctp/stream.c -+++ b/net/sctp/stream.c -@@ -40,9 +40,14 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, - { - int i; - -+ gfp |= __GFP_NOWARN; -+ - /* Initial stream->out size may be very big, so free it and alloc -- * a new one with new outcnt to save memory. -+ * a new one with new outcnt to save memory if needed. - */ -+ if (outcnt == stream->outcnt) -+ goto in; -+ - kfree(stream->out); - - stream->out = kcalloc(outcnt, sizeof(*stream->out), gfp); -@@ -53,6 +58,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, - for (i = 0; i < stream->outcnt; i++) - stream->out[i].state = SCTP_STREAM_OPEN; - -+in: - if (!incnt) - return 0; - --- -2.15.0 - diff --git a/queue/series b/queue/series index 9318e45..6531628 100644 --- a/queue/series +++ b/queue/series @@ -25,7 +25,6 @@ PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch tracing-Exclude-generic-fields-from-histograms.patch ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch -sctp-silence-warns-on-sctp_stream_init-allocations.patch ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch scsi-lpfc-Fix-secure-firmware-updates.patch |