X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=1fbd7c139408c56eeeec5bf7b1f8c086a8440c98;hb=234da52fc4c0749529be74422c132f4a5f391a1a;hp=905698f15e67cf7faa0c6367450f78374a4b159e;hpb=e34d68adc429325fe7503703a6ea71b64cb69226;p=packages%2Fkernel.git diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 905698f1..1fbd7c13 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -26,114 +26,80 @@ exit fi done - -From 30927520dbae297182990bb21d08762bcc35ce1d Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Wed, 9 Sep 2015 21:55:07 -0700 -Subject: [PATCH] tcp_cubic: better follow cubic curve after idle period - -Jana Iyengar found an interesting issue on CUBIC : - -The epoch is only updated/reset initially and when experiencing losses. -The delta "t" of now - epoch_start can be arbitrary large after app idle -as well as the bic_target. Consequentially the slope (inverse of -ca->cnt) would be really large, and eventually ca->cnt would be -lower-bounded in the end to 2 to have delayed-ACK slow-start behavior. - -This particularly shows up when slow_start_after_idle is disabled -as a dangerous cwnd inflation (1.5 x RTT) after few seconds of idle -time. - -Jana initial fix was to reset epoch_start if app limited, -but Neal pointed out it would ask the CUBIC algorithm to recalculate the -curve so that we again start growing steeply upward from where cwnd is -now (as CUBIC does just after a loss). Ideally we'd want the cwnd growth -curve to be the same shape, just shifted later in time by the amount of -the idle period. - -Reported-by: Jana Iyengar -Signed-off-by: Eric Dumazet -Signed-off-by: Yuchung Cheng -Signed-off-by: Neal Cardwell -Cc: Stephen Hemminger -Cc: Sangtae Ha -Cc: Lawrence Brakmo -Signed-off-by: David S. Miller +From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= +Date: Mon, 6 Feb 2017 14:45:15 +0100 +Subject: [PATCH] mac80211: Print text for disassociation reason +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When disassociation happens only numeric reason is printed +in ieee80211_rx_mgmt_disassoc(). Add text variant, too. + +Signed-off-by: Arkadiusz Miśkiewicz --- - net/ipv4/tcp_cubic.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c -index 28011fb1..c6ded6b 100644 ---- a/net/ipv4/tcp_cubic.c -+++ b/net/ipv4/tcp_cubic.c -@@ -151,6 +151,21 @@ static void bictcp_init(struct sock *sk) - tcp_sk(sk)->snd_ssthresh = initial_ssthresh; - } + net/mac80211/mlme.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index 098ce9b179ee..fcf8d0aa66ec 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, -+static void bictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event) -+{ -+ if (event == CA_EVENT_TX_START) { -+ s32 delta = tcp_time_stamp - tcp_sk(sk)->lsndtime; -+ struct bictcp *ca = inet_csk_ca(sk); -+ -+ /* We were application limited (idle) for a while. -+ * Shift epoch_start to keep cwnd growth to cubic curve. -+ */ -+ if (ca->epoch_start && delta > 0) -+ ca->epoch_start += delta; -+ return; -+ } -+} -+ - /* calculate the cubic root of x using a table lookup followed by one - * Newton-Raphson iteration. - * Avg err ~= 0.195% -@@ -450,6 +465,7 @@ static struct tcp_congestion_ops cubictcp __read_mostly = { - .cong_avoid = bictcp_cong_avoid, - .set_state = bictcp_state, - .undo_cwnd = bictcp_undo_cwnd, -+ .cwnd_event = bictcp_cwnd_event, - .pkts_acked = bictcp_acked, - .owner = THIS_MODULE, - .name = "cubic", -From: Tim Gardner - -commit 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 upstream. - -Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move -flush_scheduled_work() to workqueue.h") moved the exported non GPL -flush_scheduled_work() from a function to an inline wrapper. -Unfortunately, it directly calls flush_workqueue() which is a GPL function. -This has the effect of changing the licensing requirement for this function -and makes it unavailable to non GPL modules. + reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); + +- sdata_info(sdata, "disassociated from %pM (Reason: %u)\n", +- mgmt->sa, reason_code); ++ sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n", ++ mgmt->sa, reason_code, ++ ieee80211_get_reason_code_string(reason_code)); + + ieee80211_set_disassoc(sdata, 0, 0, false, NULL); + +-- +2.11.0 -See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make -schedule_work() available again to non GPL modules") for precedent. +From: Shaohua Li -Signed-off-by: Tim Gardner -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman +Basically this is a copy of commit 001e4a8775f6(ext4: implement cgroup +writeback support). Tested with a fio test, verified writeback is +throttled against cgroup io.max write bandwidth, also verified moving +the fio test to another cgroup and the writeback is throttled against +new cgroup setting. +Cc: Tejun Heo +Signed-off-by: Shaohua Li --- - kernel/workqueue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_st - out_unlock: - mutex_unlock(&wq->mutex); - } --EXPORT_SYMBOL_GPL(flush_workqueue); -+EXPORT_SYMBOL(flush_workqueue); + fs/xfs/xfs_aops.c | 2 ++ + fs/xfs/xfs_super.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c +index f18e593..6535054 100644 +--- a/fs/xfs/xfs_aops.c ++++ b/fs/xfs/xfs_aops.c +@@ -630,8 +630,10 @@ xfs_add_to_ioend( + if (wpc->ioend) + list_add(&wpc->ioend->io_list, iolist); + wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset, bh); ++ wbc_init_bio(wbc, wpc->ioend->io_bio); + } - /** - * drain_workqueue - drain a workqueue - - --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ ++ wbc_account_io(wbc, bh->b_page, bh->b_size); + /* + * If the buffer doesn't fit into the bio we need to allocate a new + * one. This shouldn't happen more than once for a given buffer. +diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c +index 584cf2d..aea3bc2 100644 +--- a/fs/xfs/xfs_super.c ++++ b/fs/xfs/xfs_super.c +@@ -1634,6 +1634,7 @@ xfs_fs_fill_super( + sb->s_max_links = XFS_MAXLINK; + sb->s_time_gran = 1; + set_posix_acl_flag(sb); ++ sb->s_iflags |= SB_I_CGROUPWB; + + /* version 5 superblocks support inode version counters. */ + if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)