From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaegeuk Kim Subject: Re: [PATCH 08/17] f2fs: remove FAULT_ALLOC_BIO Date: Thu, 28 Jan 2021 08:11:28 -0800 Message-ID: References: <20210126145247.1964410-1-hch@lst.de> <20210126145247.1964410-9-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HByha+5zBmKRkUXCSrQ4MQRd21N7Dkyqss7cxHNnCU0=; b=SRwNn2JZ4PNtFOivi1MiluMj44 FlPQ3q4GRYJuHHGF6lrcWuQN18/7IzNbtjYe0oxPmjPLxv1JvofJeis3wpXsXNKtNEKJ/WShGcOTl cn73CAwxlJeYAWw95dTHgkfY8bTMbW+B+gibJ0eCxvS5vR1SSy0xAu+NbXpsFibajyDI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=HByha+5zBmKRkUXCSrQ4MQRd21N7Dkyqss7cxHNnCU0=; b=mCrQYEGh5DEAkwZ53Eq2zb7DPn 15b3eRIIBfuGJ/d8eJSK77eKaDnea7/eTtbdrlUuclbOUu9kstnCZoBFNlGVkkQchb7xZIFeR0Kxs +r6wWzT9lXtAe/aEy+0DqwdaL/l+HM+cj+YvwBn5UhecxCvuyNVT6sY6iSbGaf/GRPIY=; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611850291; bh=l1fZVj6lNKrtqOWXBXFlHL9KLwU2deosKLGUjGIPhaQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ae6xo2EqTNtPiMkPuwUBcZnLyMNEeIUX+7ThLWDfngvLkjuzBSsT7Pp5WbxiOPQho O6jLUshdETUx1nN4PLVPFnCLafOw9dc+CXzttS8jN/C7hNRWXbzwJxsWaoyVHO2Zak boAYycf/k6EsmAbrDlF+KkgSnuk0aRy1li4Y1jQCu0cqT5tL3yDWnu6TkthAWMZ7Dx DC7+JL5QB88HCrDHygJRXveBJosYNKqjW8sNNn4SLZ0p6m6F4YaeXBueIVrn/8gnEY BRgUeUzaBoReyjCxZvUdOjJysQUQlUOO/PKLFRuM9Cf/ybkQZOvsk0t6nN8lV4QP9L vk5bWmlQu//Pg== Content-Disposition: inline In-Reply-To: <20210126145247.1964410-9-hch@lst.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: Christoph Hellwig Cc: Mike Snitzer , Song Liu , dm-devel@redhat.com, drbd-dev@lists.linbit.com, Naohiro Aota , linux-nilfs@vger.kernel.org, Josef Bacik , Coly Li , linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, David Sterba , Ryusuke Konishi , Jens Axboe , linux-block@vger.kernel.org, Damien Le Moal , Andrew Morton , linux-mm@kvack.org, Philipp Reisner , linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, Lars Ellenberg , linux-nfs@vger.kernel.org, linux-btrfs@vger.kernel.org On 01/26, Christoph Hellwig wrote: > Sleeping bio allocations do not fail, which means that injecting an error > into sleeping bio allocations is a little silly. > > Signed-off-by: Christoph Hellwig Already merged tho. Acked-by: Jaegeuk Kim > --- > Documentation/filesystems/f2fs.rst | 1 - > fs/f2fs/data.c | 29 ++++------------------------- > fs/f2fs/f2fs.h | 1 - > fs/f2fs/super.c | 1 - > 4 files changed, 4 insertions(+), 28 deletions(-) > > diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst > index dae15c96e659e2..624f5f3ed93e86 100644 > --- a/Documentation/filesystems/f2fs.rst > +++ b/Documentation/filesystems/f2fs.rst > @@ -179,7 +179,6 @@ fault_type=%d Support configuring fault injection type, should be > FAULT_KVMALLOC 0x000000002 > FAULT_PAGE_ALLOC 0x000000004 > FAULT_PAGE_GET 0x000000008 > - FAULT_ALLOC_BIO 0x000000010 > FAULT_ALLOC_NID 0x000000020 > FAULT_ORPHAN 0x000000040 > FAULT_BLOCK 0x000000080 > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 0cf0c605992431..9fb6be65592b1f 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -50,28 +50,6 @@ void f2fs_destroy_bioset(void) > bioset_exit(&f2fs_bioset); > } > > -static inline struct bio *__f2fs_bio_alloc(gfp_t gfp_mask, > - unsigned int nr_iovecs) > -{ > - return bio_alloc_bioset(gfp_mask, nr_iovecs, &f2fs_bioset); > -} > - > -static struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, > - bool noio) > -{ > - if (noio) { > - /* No failure on bio allocation */ > - return __f2fs_bio_alloc(GFP_NOIO, npages); > - } > - > - if (time_to_inject(sbi, FAULT_ALLOC_BIO)) { > - f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO); > - return NULL; > - } > - > - return __f2fs_bio_alloc(GFP_KERNEL, npages); > -} > - > static bool __is_cp_guaranteed(struct page *page) > { > struct address_space *mapping = page->mapping; > @@ -433,7 +411,7 @@ static struct bio *__bio_alloc(struct f2fs_io_info *fio, int npages) > struct f2fs_sb_info *sbi = fio->sbi; > struct bio *bio; > > - bio = f2fs_bio_alloc(sbi, npages, true); > + bio = bio_alloc_bioset(GFP_NOIO, npages, &f2fs_bioset); > > f2fs_target_device(sbi, fio->new_blkaddr, bio); > if (is_read_io(fio->op)) { > @@ -1029,8 +1007,9 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, > struct bio_post_read_ctx *ctx; > unsigned int post_read_steps = 0; > > - bio = f2fs_bio_alloc(sbi, min_t(int, nr_pages, BIO_MAX_PAGES), > - for_write); > + bio = bio_alloc_bioset(for_write ? GFP_NOIO : GFP_KERNEL, > + min_t(int, nr_pages, BIO_MAX_PAGES), > + &f2fs_bioset); > if (!bio) > return ERR_PTR(-ENOMEM); > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 902bd3267c03e1..6c78365d80ceb5 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -43,7 +43,6 @@ enum { > FAULT_KVMALLOC, > FAULT_PAGE_ALLOC, > FAULT_PAGE_GET, > - FAULT_ALLOC_BIO, > FAULT_ALLOC_NID, > FAULT_ORPHAN, > FAULT_BLOCK, > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index b4a07fe62d1a58..3a312642907e86 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -45,7 +45,6 @@ const char *f2fs_fault_name[FAULT_MAX] = { > [FAULT_KVMALLOC] = "kvmalloc", > [FAULT_PAGE_ALLOC] = "page alloc", > [FAULT_PAGE_GET] = "page get", > - [FAULT_ALLOC_BIO] = "alloc bio", > [FAULT_ALLOC_NID] = "alloc nid", > [FAULT_ORPHAN] = "orphan", > [FAULT_BLOCK] = "no more block", > -- > 2.29.2