From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69DC3C43441 for ; Thu, 15 Nov 2018 07:52:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21F54223DD for ; Thu, 15 Nov 2018 07:52:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="n0OQzb6P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21F54223DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728829AbeKOR7L (ORCPT ); Thu, 15 Nov 2018 12:59:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:36762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727984AbeKOR7L (ORCPT ); Thu, 15 Nov 2018 12:59:11 -0500 Received: from localhost (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA94E2089D; Thu, 15 Nov 2018 07:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542268347; bh=WFHF2a+WfKg8SK1wjimVErdtos0lWfg6NmS4ZEjLzf0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n0OQzb6PXWfRSbPKVd0GCU5sbBVjmFleXvTTHnFaF6GZE+bB8CZTf7m+ZWb5W7yZL wFdBS5HydjqkRsfccakJWVHqIoUCzLAJdTVZwECzv3xo33L56c+WTHRnD22LnJs2WV OtQHTGCIcgLzOn//8D9IgIjp2aK8mWrkR3PnWeM8= Date: Wed, 14 Nov 2018 23:52:26 -0800 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org Subject: Re: [PATCH] f2fs: add bio cache for IPU Message-ID: <20181115075226.GA83610@jaegeuk-macbookpro.roam.corp.google.com> References: <20181023083817.3466-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181023083817.3466-1-yuchao0@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Chao, I suspect this brings a system stuck by missing bio being flushed. Please check the changes. Thanks, On 10/23, Chao Yu wrote: > SQLite in Wal mode may trigger sequential IPU write in db-wal file, after > commit d1b3e72d5490 ("f2fs: submit bio of in-place-update pages"), we > lost the chance of merging page in inner managed bio cache, result in > submitting more small-sized IO. > > So let's add temporary bio in writepages() to cache mergeable write IO as > much as possible. > > Test case: > 1. xfs_io -f /mnt/f2fs/file -c "pwrite 0 65536" -c "fsync" > 2. xfs_io -f /mnt/f2fs/file -c "pwrite 0 65536" -c "fsync" > > Before: > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65544, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65552, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65560, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65568, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65576, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65584, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65592, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65600, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65608, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65616, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65624, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65632, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65640, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65648, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65656, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65664, size = 4096 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), NODE, sector = 57352, size = 4096 > > After: > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), DATA, sector = 65544, size = 65536 > f2fs_submit_write_bio: dev = (251,0)/(251,0), rw = WRITE(S), NODE, sector = 57368, size = 4096 > > Signed-off-by: Chao Yu > --- > fs/f2fs/data.c | 57 +++++++++++++++++++++++++++++++++++++++++++++-- > fs/f2fs/f2fs.h | 3 +++ > fs/f2fs/segment.c | 5 ++++- > 3 files changed, 62 insertions(+), 3 deletions(-) > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 01b7f59523dc..0c8f18dc140d 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -491,6 +491,49 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) > return 0; > } > > +int f2fs_merge_page_bio(struct f2fs_io_info *fio) > +{ > + struct bio *bio = *fio->bio; > + struct page *page = fio->encrypted_page ? > + fio->encrypted_page : fio->page; > + > + if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr, > + __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) > + return -EFAULT; > + > + trace_f2fs_submit_page_bio(page, fio); > + f2fs_trace_ios(fio, 0); > + > + if (bio && (*fio->last_block + 1 != fio->new_blkaddr || > + !__same_bdev(fio->sbi, fio->new_blkaddr, bio))) { > + __submit_bio(fio->sbi, bio, fio->type); > + bio = NULL; > + } > +alloc_new: > + if (!bio) { > + bio = __bio_alloc(fio->sbi, fio->new_blkaddr, fio->io_wbc, > + BIO_MAX_PAGES, false, fio->type, fio->temp); > + *fio->last_block = fio->new_blkaddr; > + bio_set_op_attrs(bio, fio->op, fio->op_flags); > + } > + > + if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) { > + __submit_bio(fio->sbi, bio, fio->type); > + bio = NULL; > + goto alloc_new; > + } > + > + if (fio->io_wbc) > + wbc_account_io(fio->io_wbc, page, PAGE_SIZE); > + > + *fio->last_block = fio->new_blkaddr; > + > + inc_page_count(fio->sbi, WB_DATA_TYPE(fio->page)); > + > + *fio->bio = bio; > + return 0; > +} > + > void f2fs_submit_page_write(struct f2fs_io_info *fio) > { > struct f2fs_sb_info *sbi = fio->sbi; > @@ -1899,6 +1942,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) > } > > static int __write_data_page(struct page *page, bool *submitted, > + struct bio **bio, > + sector_t *last_block, > struct writeback_control *wbc, > enum iostat_type io_type) > { > @@ -1924,6 +1969,8 @@ static int __write_data_page(struct page *page, bool *submitted, > .need_lock = LOCK_RETRY, > .io_type = io_type, > .io_wbc = wbc, > + .bio = bio, > + .last_block = last_block, > }; > > trace_f2fs_writepage(page, DATA); > @@ -2051,7 +2098,7 @@ static int __write_data_page(struct page *page, bool *submitted, > static int f2fs_write_data_page(struct page *page, > struct writeback_control *wbc) > { > - return __write_data_page(page, NULL, wbc, FS_DATA_IO); > + return __write_data_page(page, NULL, NULL, NULL, wbc, FS_DATA_IO); > } > > /* > @@ -2067,6 +2114,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > int done = 0; > struct pagevec pvec; > struct f2fs_sb_info *sbi = F2FS_M_SB(mapping); > + struct bio *bio = NULL; > + sector_t last_block; > int nr_pages; > pgoff_t uninitialized_var(writeback_index); > pgoff_t index; > @@ -2154,7 +2203,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > if (!clear_page_dirty_for_io(page)) > goto continue_unlock; > > - ret = __write_data_page(page, &submitted, wbc, io_type); > + ret = __write_data_page(page, &submitted, &bio, > + &last_block, wbc, io_type); > if (unlikely(ret)) { > /* > * keep nr_to_write, since vfs uses this to > @@ -2201,6 +2251,9 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > if (nwritten) > f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host, > NULL, 0, DATA); > + /* submit cached bio of IPU write */ > + if (bio) > + __submit_bio(sbi, bio, DATA); > > return ret; > } > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 8932276015f9..6af2a105529d 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1042,6 +1042,8 @@ struct f2fs_io_info { > bool retry; /* need to reallocate block address */ > enum iostat_type io_type; /* io type */ > struct writeback_control *io_wbc; /* writeback control */ > + struct bio **bio; /* bio for ipu */ > + sector_t *last_block; /* last block number in bio */ > unsigned char version; /* version of the node */ > }; > > @@ -3085,6 +3087,7 @@ void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi, > nid_t ino, enum page_type type); > void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi); > int f2fs_submit_page_bio(struct f2fs_io_info *fio); > +int f2fs_merge_page_bio(struct f2fs_io_info *fio); > void f2fs_submit_page_write(struct f2fs_io_info *fio); > struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi, > block_t blk_addr, struct bio *bio); > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 3aa2f00262b3..b51b182dd7f4 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -3194,7 +3194,10 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) > > stat_inc_inplace_blocks(fio->sbi); > > - err = f2fs_submit_page_bio(fio); > + if (fio->bio) > + err = f2fs_merge_page_bio(fio); > + else > + err = f2fs_submit_page_bio(fio); > if (!err) > update_device_state(fio); > > -- > 2.18.0.rc1