---- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
-@@ -15,7 +15,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include "modpost.h"
--#include "../../include/generated/autoconf.h"
-+// PLD architectures don't use CONFIG_SYMBOL_PREFIX
-+//#include "../../include/generated/autoconf.h"
- #include "../../include/linux/license.h"
-
- /* Some toolchains use a `_' prefix for all user symbols. */
-
---- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200
-+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200
-@@ -9,6 +9,12 @@
- $cc -print-file-name=lib${lib}.${ext} | grep -q /
- if [ $? -eq 0 ]; then
- echo "-l${lib}"
-+ for libt in tinfow tinfo ; do
-+ $cc -print-file-name=lib${libt}.${ext} | grep -q /
-+ if [ $? -eq 0 ]; then
-+ echo "-l${libt}"
-+ fi
-+ done
- exit
- fi
- done
-
-From 30927520dbae297182990bb21d08762bcc35ce1d Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 9 Sep 2015 21:55:07 -0700
-Subject: [PATCH] tcp_cubic: better follow cubic curve after idle period
+--- linux-5.1/net/sunrpc/Kconfig~ 2019-05-06 02:42:58.000000000 +0200
++++ linux-5.1/net/sunrpc/Kconfig 2019-05-10 12:54:36.566903892 +0200
+@@ -34,7 +34,7 @@ config RPCSEC_GSS_KRB5
+
+ If unsure, say Y.
+
+-config CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES
++config SUNRPC_DISABLE_INSECURE_ENCTYPES
+ bool "Secure RPC: Disable insecure Kerberos encryption types"
+ depends on RPCSEC_GSS_KRB5
+ default n
+Move setting up operation and write hint to xfs_alloc_ioend, and
+then just copy over all needed information from the previous bio
+in xfs_chain_bio and stop passing various parameters to it.
-Jana Iyengar found an interesting issue on CUBIC :
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------
+ 1 file changed, 17 insertions(+), 18 deletions(-)
-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.
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index a6f0f4761a37..9cceb90e77c5 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -665,7 +665,6 @@ xfs_submit_ioend(
+
+ ioend->io_bio->bi_private = ioend;
+ ioend->io_bio->bi_end_io = xfs_end_bio;
+- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+
+ /*
+ * If we are failing the IO now, just mark the ioend with an
+@@ -679,7 +678,6 @@ xfs_submit_ioend(
+ return status;
+ }
+
+- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
+ submit_bio(ioend->io_bio);
+ return 0;
+ }
+@@ -691,7 +689,8 @@ xfs_alloc_ioend(
+ xfs_exntst_t state,
+ xfs_off_t offset,
+ struct block_device *bdev,
+- sector_t sector)
++ sector_t sector,
++ struct writeback_control *wbc)
+ {
+ struct xfs_ioend *ioend;
+ struct bio *bio;
+@@ -699,6 +698,8 @@ xfs_alloc_ioend(
+ bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
+ bio_set_dev(bio, bdev);
+ bio->bi_iter.bi_sector = sector;
++ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
++ bio->bi_write_hint = inode->i_write_hint;
+
+ ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
+ INIT_LIST_HEAD(&ioend->io_list);
+@@ -719,24 +720,22 @@ xfs_alloc_ioend(
+ * so that the bi_private linkage is set up in the right direction for the
+ * traversal in xfs_destroy_ioend().
+ */
+-static void
++static struct bio *
+ xfs_chain_bio(
+- struct xfs_ioend *ioend,
+- struct writeback_control *wbc,
+- struct block_device *bdev,
+- sector_t sector)
++ struct bio *prev)
+ {
+ struct bio *new;
+
+ new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
+- bio_set_dev(new, bdev);
+- new->bi_iter.bi_sector = sector;
+- bio_chain(ioend->io_bio, new);
+- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */
+- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
+- submit_bio(ioend->io_bio);
+- ioend->io_bio = new;
++ bio_copy_dev(new, prev);
++ new->bi_iter.bi_sector = bio_end_sector(prev);
++ new->bi_opf = prev->bi_opf;
++ new->bi_write_hint = prev->bi_write_hint;
++
++ bio_chain(prev, new);
++ bio_get(prev); /* for xfs_destroy_ioend */
++ submit_bio(prev);
++ return new;
+ }
+
+ /*
+@@ -772,7 +772,7 @@ xfs_add_to_ioend(
+ if (wpc->ioend)
+ list_add(&wpc->ioend->io_list, iolist);
+ wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
+- wpc->imap.br_state, offset, bdev, sector);
++ wpc->imap.br_state, offset, bdev, sector, wbc);
+ }
+
+ merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff,
+@@ -783,7 +783,7 @@ xfs_add_to_ioend(
+
+ if (!merged) {
+ if (bio_full(wpc->ioend->io_bio, len))
+- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
++ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
+ bio_add_page(wpc->ioend->io_bio, page, len, poff);
+ }
+
+--
+2.20.1
-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.
+Link every newly allocated writeback bio to cgroup pointed to by the
+writeback control structure, and charge every byte written back to it.
-Reported-by: Jana Iyengar <jri@google.com>
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: Yuchung Cheng <ycheng@google.com>
-Signed-off-by: Neal Cardwell <ncardwell@google.com>
-Cc: Stephen Hemminger <stephen@networkplumber.org>
-Cc: Sangtae Ha <sangtae.ha@gmail.com>
-Cc: Lawrence Brakmo <lawrence@brakmo.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
+Tested-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
- net/ipv4/tcp_cubic.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ fs/xfs/xfs_aops.c | 4 +++-
+ fs/xfs/xfs_super.c | 2 ++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
-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;
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index 9cceb90e77c5..73c291aeae17 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -700,6 +700,7 @@ xfs_alloc_ioend(
+ bio->bi_iter.bi_sector = sector;
+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+ bio->bi_write_hint = inode->i_write_hint;
++ wbc_init_bio(wbc, bio);
+
+ ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
+ INIT_LIST_HEAD(&ioend->io_list);
+@@ -727,7 +728,7 @@ xfs_chain_bio(
+ struct bio *new;
+
+ new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
+- bio_copy_dev(new, prev);
++ bio_copy_dev(new, prev);/* also copies over blkcg information */
+ new->bi_iter.bi_sector = bio_end_sector(prev);
+ new->bi_opf = prev->bi_opf;
+ new->bi_write_hint = prev->bi_write_hint;
+@@ -782,6 +783,7 @@ xfs_add_to_ioend(
+ }
+
+ wpc->ioend->io_size += len;
++ wbc_account_io(wbc, page, len);
}
-+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;
-+ }
-+}
+ STATIC void
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
+index 594c119824cc..ee0df8f611ff 100644
+--- a/fs/xfs/xfs_super.c
++++ b/fs/xfs/xfs_super.c
+@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(
+ sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
+ sb->s_max_links = XFS_MAXLINK;
+ sb->s_time_gran = 1;
++ sb->s_iflags |= SB_I_CGROUPWB;
+
- /* 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",
+ set_posix_acl_flag(sb);
+
+ /* version 5 superblocks support inode version counters. */
+--
+2.20.1
+