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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 0B950C433ED for ; Wed, 12 May 2021 10:13:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B82A6613BE for ; Wed, 12 May 2021 10:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230183AbhELKOm (ORCPT ); Wed, 12 May 2021 06:14:42 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:2058 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbhELKOk (ORCPT ); Wed, 12 May 2021 06:14:40 -0400 Received: from dggemx753-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Fg9Vz3gpGzWhZs; Wed, 12 May 2021 18:09:15 +0800 (CST) Received: from [10.136.110.154] (10.136.110.154) by dggemx753-chm.china.huawei.com (10.0.44.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Wed, 12 May 2021 18:13:30 +0800 Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoid swapon failure by giving a warning first To: Jaegeuk Kim , , CC: kernel test robot References: <20210511214337.2857522-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: <5c359041-27e8-12d2-5a85-559ab56b835e@huawei.com> Date: Wed, 12 May 2021 18:13:30 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.136.110.154] X-ClientProxiedBy: dggemx701-chm.china.huawei.com (10.1.199.48) To dggemx753-chm.china.huawei.com (10.0.44.37) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jaegeuk, On 2021/5/12 12:00, Jaegeuk Kim wrote: > The final solution can be migrating blocks to form a section-aligned file > internally. Meanwhile, let's ask users to do that when preparing the swap > file initially like: > 1) create() > 2) ioctl(F2FS_IOC_SET_PIN_FILE) > 3) fallocate() > > Reported-by: kernel test robot > Fixes: 36e4d95891ed ("f2fs: check if swapfile is section-alligned") > Signed-off-by: Jaegeuk Kim Reviewed-by: Chao Yu I've not tested yet though, any comments on below patch? [PATCH RFC] f2fs: support migrating swapfile in aligned write mode Thanks, > --- > v2: > - fix to warn out once > - cover check_swap_activate_fast > > fs/f2fs/data.c | 29 +++++++++++++++++++++++------ > 1 file changed, 23 insertions(+), 6 deletions(-) > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 33e56ae84e35..41e260680b27 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -3801,6 +3801,7 @@ static int f2fs_is_file_aligned(struct inode *inode) > block_t pblock; > unsigned long nr_pblocks; > unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > + unsigned int not_aligned = 0; > int ret = 0; > > cur_lblock = 0; > @@ -3833,13 +3834,20 @@ static int f2fs_is_file_aligned(struct inode *inode) > > if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > nr_pblocks & (blocks_per_sec - 1)) { > - f2fs_err(sbi, "Swapfile does not align to section"); > - ret = -EINVAL; > - goto out; > + if (f2fs_is_pinned_file(inode)) { > + f2fs_err(sbi, "Swapfile does not align to section"); > + ret = -EINVAL; > + goto out; > + } > + not_aligned++; > } > > cur_lblock += nr_pblocks; > } > + if (not_aligned) > + f2fs_warn(sbi, "Swapfile (%u) is not align to section: \n" > + "\t1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate()", > + not_aligned); > out: > return ret; > } > @@ -3858,6 +3866,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > int nr_extents = 0; > unsigned long nr_pblocks; > unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > + unsigned int not_aligned = 0; > int ret = 0; > > /* > @@ -3896,9 +3905,12 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > if ((pblock - SM_I(sbi)->main_blkaddr) & (blocks_per_sec - 1) || > nr_pblocks & (blocks_per_sec - 1)) { > - f2fs_err(sbi, "Swapfile does not align to section"); > - ret = -EINVAL; > - goto out; > + if (f2fs_is_pinned_file(inode)) { > + f2fs_err(sbi, "Swapfile does not align to section"); > + ret = -EINVAL; > + goto out; > + } > + not_aligned++; > } > > if (cur_lblock + nr_pblocks >= sis->max) > @@ -3927,6 +3939,11 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > sis->max = cur_lblock; > sis->pages = cur_lblock - 1; > sis->highest_bit = cur_lblock - 1; > + > + if (not_aligned) > + f2fs_warn(sbi, "Swapfile (%u) is not align to section: \n" > + "\t1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate()", > + not_aligned); > out: > return ret; > } >