From e855175e3f7da27aeb63c8fb6b9c3c0e0126d33d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 25 Jun 2019 17:36:23 +0200 Subject: [PATCH] - up to 5.1.15; improved xfs writeback support (from xfs ml) --- kernel-small_fixes.patch | 200 +++++++++++++++++++++++++++++++-------- kernel.spec | 4 +- 2 files changed, 162 insertions(+), 42 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index bf7da33a..0eb6a215 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,43 +1,3 @@ -From: Shaohua Li - -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 ---- - fs/xfs/xfs_aops.c | 2 ++ - fs/xfs/xfs_super.c | 1 + - 2 files changed, 3 insertions(+) - ---- linux-4.19/fs/xfs/xfs_aops.c.org 2018-11-21 10:31:12.348955352 +0100 -+++ linux-4.19/fs/xfs/xfs_aops.c 2018-11-21 10:34:35.241764742 +0100 -@@ -660,8 +660,10 @@ xfs_add_to_ioend( - list_add(&wpc->ioend->io_list, iolist); - wpc->ioend = xfs_alloc_ioend(inode, wpc->fork, - wpc->imap.br_state, offset, bdev, sector); -+ wbc_init_bio(wbc, wpc->ioend->io_bio); - } - -+ wbc_account_io(wbc, page, len); - if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) { - if (iop) - atomic_inc(&iop->write_count); -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) --- 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 @@ -49,3 +9,163 @@ index 584cf2d..aea3bc2 100644 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. + +Signed-off-by: Christoph Hellwig +--- + fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------ + 1 file changed, 17 insertions(+), 18 deletions(-) + +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; + } + + /* +@@ -771,14 +770,14 @@ 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); + } + + if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) { + if (iop) + atomic_inc(&iop->write_count); + if (bio_full(wpc->ioend->io_bio)) +- 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 + + +Link every newly allocated writeback bio to cgroup pointed to by the +writeback control structure, and charge every byte written back to it. + +Tested-by: Stefan Priebe - Profihost AG +Signed-off-by: Christoph Hellwig +--- + fs/xfs/xfs_aops.c | 4 +++- + fs/xfs/xfs_super.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +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 +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; ++ + set_posix_acl_flag(sb); + + /* version 5 superblocks support inode version counters. */ +-- +2.20.1 + diff --git a/kernel.spec b/kernel.spec index d79a2d7c..cc090e85 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ %define rel 1 %define basever 5.1 -%define postver .12 +%define postver .15 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -123,7 +123,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: 15fbdff95ff98483069ac6e215b9f4f9 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: e72efeff316e384ab47ebcc804a83f02 +# Patch0-md5: aed4686410e23561f67f5c512d0a6245 %endif Source1: kernel.sysconfig -- 2.43.0