diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | undo_cwnd.patch | 77 |
3 files changed, 89 insertions, 5 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Mar 16 08:50:39 UTC 2018 +# Sun Mar 25 00:36:36 UTC 2018 pkgbase = linux-mptcp pkgver = 0.94 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = http://www.multipath-tcp.org/ arch = x86_64 @@ -20,6 +20,7 @@ pkgbase = linux-mptcp source = linux-mptcp.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch + source = undo_cwnd.patch sha256sums = 4b12cb81fd7d6b65496d7bf52bec96a225e22439d0704f88d33c0c895bcd8436 sha256sums = 039c824a72c1c10c3a44fc9d5f50a3ea2d6147ae7db115ba33c1136c13781b97 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -27,6 +28,7 @@ pkgbase = linux-mptcp sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98 sha256sums = 6364edabad4182dcf148ae7c14d8f45d61037d4539e76486f978f1af3a090794 + sha256sums = 27421905cf8e6cae6c1053d13ad2d9f85c282f1faa293e750ce551d3b58fbcdf pkgname = linux-mptcp pkgdesc = The Linux kernel and modules with Multipath TCP support (based on linux 4.14.24) @@ -8,7 +8,7 @@ pkgbase=linux-mptcp _srcname=mptcp pkgver=0.94 -pkgrel=1 +pkgrel=2 epoch=1 arch=('x86_64') url="http://www.multipath-tcp.org/" @@ -21,14 +21,16 @@ source=("https://github.com/multipath-tcp/mptcp/archive/v${pkgver}/${pkgbase}-${ '90-linux.hook' # pacman hook for initramfs regeneration 'linux-mptcp.preset' # standard config files for mkinitcpio ramdisk '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch') + '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch' + 'undo_cwnd.patch') sha256sums=('4b12cb81fd7d6b65496d7bf52bec96a225e22439d0704f88d33c0c895bcd8436' '039c824a72c1c10c3a44fc9d5f50a3ea2d6147ae7db115ba33c1136c13781b97' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98' - '6364edabad4182dcf148ae7c14d8f45d61037d4539e76486f978f1af3a090794') + '6364edabad4182dcf148ae7c14d8f45d61037d4539e76486f978f1af3a090794' + '27421905cf8e6cae6c1053d13ad2d9f85c282f1faa293e750ce551d3b58fbcdf') _kernelname=${pkgbase#linux} @@ -41,6 +43,9 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i "${srcdir}/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch" + # Fix issue that prevents any congestion control to be loaded + patch -Np1 -i "${srcdir}/undo_cwnd.patch" + cat "${srcdir}/config" > ./.config if [ "${_kernelname}" != "" ]; then diff --git a/undo_cwnd.patch b/undo_cwnd.patch new file mode 100644 index 000000000000..1f7be1e45f2c --- /dev/null +++ b/undo_cwnd.patch @@ -0,0 +1,77 @@ +From c2119e001dd45a4fa3cf2c33d513e84662dd030e Mon Sep 17 00:00:00 2001 +From: Ycarus <ycarus@zugaina.org> +Date: Fri, 16 Mar 2018 17:26:19 +0100 +Subject: [PATCH] mptcp: add undo_cwnd to all MPTCP congestion modules. + +This patch add tcp_reno_undo_cwnd to all MPTCP congestion modules. +This was the fallback used before +https://github.com/multipath-tcp/mptcp/commit/e97991832a4ea4a5f47d65f068a4c966a2eb5730 + +The patch remove this error: +``` +Thu Mar 15 15:24:09 2018 kern.err kernel: [ 0.180797] TCP: lia does not implement required ops +Thu Mar 15 15:24:09 2018 kern.err kernel: [ 0.181160] TCP: olia does not implement required ops +Thu Mar 15 15:24:09 2018 kern.err kernel: [ 0.181527] TCP: wvegas does not implement required ops +Thu Mar 15 15:24:09 2018 kern.err kernel: [ 0.181901] TCP: balia does not implement required ops +``` + +Fixes: 0bc2117826d3 ("Merge tag 'v4.10' into mptcp_trunk") +Signed-off-by: Ycarus (Yannick Chabanois) <ycarus@zugaina.org> +Signed-off-by: Christoph Paasch <cpaasch@apple.com> +(cherry picked from commit a16eccb970a3715d902d2bd8da1e2092998ee22f) +Signed-off-by: Christoph Paasch <cpaasch@apple.com> +--- + net/mptcp/mptcp_balia.c | 1 + + net/mptcp/mptcp_coupled.c | 1 + + net/mptcp/mptcp_olia.c | 1 + + net/mptcp/mptcp_wvegas.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/net/mptcp/mptcp_balia.c b/net/mptcp/mptcp_balia.c +index 73f365b436bd..8b1fe11b08d5 100644 +--- a/net/mptcp/mptcp_balia.c ++++ b/net/mptcp/mptcp_balia.c +@@ -241,6 +241,7 @@ static struct tcp_congestion_ops mptcp_balia = { + .init = mptcp_balia_init, + .ssthresh = mptcp_balia_ssthresh, + .cong_avoid = mptcp_balia_cong_avoid, ++ .undo_cwnd = tcp_reno_undo_cwnd, + .cwnd_event = mptcp_balia_cwnd_event, + .set_state = mptcp_balia_set_state, + .owner = THIS_MODULE, +diff --git a/net/mptcp/mptcp_coupled.c b/net/mptcp/mptcp_coupled.c +index 9d97947aed03..f9d856334ca9 100644 +--- a/net/mptcp/mptcp_coupled.c ++++ b/net/mptcp/mptcp_coupled.c +@@ -244,6 +244,7 @@ static struct tcp_congestion_ops mptcp_ccc = { + .init = mptcp_ccc_init, + .ssthresh = tcp_reno_ssthresh, + .cong_avoid = mptcp_ccc_cong_avoid, ++ .undo_cwnd = tcp_reno_undo_cwnd, + .cwnd_event = mptcp_ccc_cwnd_event, + .set_state = mptcp_ccc_set_state, + .owner = THIS_MODULE, +diff --git a/net/mptcp/mptcp_olia.c b/net/mptcp/mptcp_olia.c +index 201b595e0a31..c17c306849a3 100644 +--- a/net/mptcp/mptcp_olia.c ++++ b/net/mptcp/mptcp_olia.c +@@ -284,6 +284,7 @@ static struct tcp_congestion_ops mptcp_olia = { + .init = mptcp_olia_init, + .ssthresh = tcp_reno_ssthresh, + .cong_avoid = mptcp_olia_cong_avoid, ++ .undo_cwnd = tcp_reno_undo_cwnd, + .set_state = mptcp_olia_set_state, + .owner = THIS_MODULE, + .name = "olia", +diff --git a/net/mptcp/mptcp_wvegas.c b/net/mptcp/mptcp_wvegas.c +index 87a496811c0d..4373b8d1ee8d 100644 +--- a/net/mptcp/mptcp_wvegas.c ++++ b/net/mptcp/mptcp_wvegas.c +@@ -240,6 +240,7 @@ static struct tcp_congestion_ops mptcp_wvegas __read_mostly = { + .init = mptcp_wvegas_init, + .ssthresh = tcp_reno_ssthresh, + .cong_avoid = mptcp_wvegas_cong_avoid, ++ .undo_cwnd = tcp_reno_undo_cwnd, + .pkts_acked = mptcp_wvegas_pkts_acked, + .set_state = mptcp_wvegas_state, + .cwnd_event = mptcp_wvegas_cwnd_event, |