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=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2CD60C433DB for ; Tue, 2 Mar 2021 04:25:51 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CEFE860202; Tue, 2 Mar 2021 04:25:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEFE860202 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lGwbV-00056V-8K; Tue, 02 Mar 2021 04:25:49 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGwbT-00056N-3K for linux-f2fs-devel@lists.sourceforge.net; Tue, 02 Mar 2021 04:25:47 +0000 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=uliBFqxbSvXjfLvW05BLLhzI2qgEbZ8NISitqjoK9qE=; b=b3tUtKx49j3zrGOqmw+3X9MzxP HoJqoIxI9XHhmPFHhAPWIrwsWH9Wu18U9K2VnrUkmIm29FI0tyANnEiPZMhTabNkPmZKjC/A/bYvF oGjRwBEjai31ewkFhs+XthkHVqJoKEvij5hodfDvhvtOIOaS06VZ2J9EXMWEYEStbSwc=; 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=uliBFqxbSvXjfLvW05BLLhzI2qgEbZ8NISitqjoK9qE=; b=ZPr7AOGWdgSpsZsB4pWKkYKMZ6 OEHZkbs/E8m/Y6tTuV57ZpdOS4UJLxAadEanZhaKPu3Ar5kggmSl5F6zvjpS60FJt0dYaoxepMbue de7aLVdJvnQxDlbqWf1DwCUsfaNPcabWUeTbWG50+ME9cxkn+sRE7ihIYIg0YCprffrA=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lGwbO-00AkHM-Dt for linux-f2fs-devel@lists.sourceforge.net; Tue, 02 Mar 2021 04:25:47 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D6230601FA; Tue, 2 Mar 2021 04:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614659137; bh=o9jvHY0CvMpjwiy06HTjeIBGpD7VgACJshBkrL38PrQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YumWO4uOFkLOswsrk09TlzwX/MAHDgBy3Uyy3vgQ/RteLM7UGzpsMVUJvxjz6bhJk VOwspeBUT4nQ9xJYURcbcg7QpSmE0WhGEWa10VNQXDyk+Z4nSZDSkSg9YkkypUA0uW xXZvtj/WaOOvUKEydRZDiTaxhbYZmRD8b24AvNEd9D+u8uVwT3JjOcXvfs5UcRBaCB wMOQIwhUvL4kdSC5OzJpAyfjXWM3Jw7V7O5rMnNXO/fTXo9ZSyTNCxGWrRgg1+32fD wQjg8OtiEXGdP/aMAg4KoTGtZPsjTX2quHCqYDM51N2hQnoJoUhc2MbIjfLxK8d54u F2ymTBYoM2yYw== Date: Mon, 1 Mar 2021 20:25:35 -0800 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20210227120231.136559-1-huangjianan@oppo.com> <20210227120231.136559-3-huangjianan@oppo.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Headers-End: 1lGwbO-00AkHM-Dt Subject: Re: [f2fs-dev] [PATCH 3/3] f2fs: check if swapfile is section-alligned X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhangshiming@oppo.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 03/01, Jaegeuk Kim wrote: > On 03/01, Chao Yu wrote: > > Hi Jianan, > > Merged 1/3 and 2/3, so please post v2 on 3/3. NVM. Found v2. > > Thanks, > > > > > On 2021/2/27 20:02, Huang Jianan via Linux-f2fs-devel wrote: > > > If the swapfile isn't created by pin and fallocate, it cann't be > > > > Typo: > > > > can't > > > > > guaranteed section-aligned, so it may be selected by f2fs gc. When > > > gc_pin_file_threshold is reached, the address of swapfile may change, > > > but won't be synchroniz to swap_extent, so swap will write to wrong > > > > synchronized > > > > > address, which will cause data corruption. > > > > > > Signed-off-by: Huang Jianan > > > Signed-off-by: Guo Weichao > > > --- > > > fs/f2fs/data.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 63 insertions(+) > > > > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 4dbc1cafc55d..3e523d6e4643 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -3781,11 +3781,63 @@ int f2fs_migrate_page(struct address_space *mapping, > > > #endif > > > #ifdef CONFIG_SWAP > > > +static int f2fs_check_file_aligned(struct inode *inode) > > > > f2fs_check_file_alignment() or f2fs_is_file_aligned()? > > > > > +{ > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > + block_t main_blkaddr = SM_I(sbi)->main_blkaddr; > > > + block_t cur_lblock; > > > + block_t last_lblock; > > > + block_t pblock; > > > + unsigned long len; > > > + unsigned long nr_pblocks; > > > + unsigned int blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; > > > > unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > > > > > + int ret; > > > + > > > + cur_lblock = 0; > > > + last_lblock = bytes_to_blks(inode, i_size_read(inode)); > > > + len = i_size_read(inode); > > > + > > > + while (cur_lblock < last_lblock) { > > > + struct f2fs_map_blocks map; > > > + pgoff_t next_pgofs; > > > + > > > + memset(&map, 0, sizeof(map)); > > > + map.m_lblk = cur_lblock; > > > + map.m_len = bytes_to_blks(inode, len) - cur_lblock; > > > > map.m_len = last_lblock - cur_lblock; > > > > > + map.m_next_pgofs = &next_pgofs; > > > > map.m_next_pgofs = NULL; > > map.m_next_extent = NULL; > > > > > + map.m_seg_type = NO_CHECK_TYPE; > > > > map.m_may_create = false; > > > > > + > > > + ret = f2fs_map_blocks(inode, &map, 0, F2FS_GET_BLOCK_FIEMAP); > > > + > > > > Unneeded blank line. > > > > > + if (ret) > > > + goto err_out; > > > + > > > + /* hole */ > > > + if (!(map.m_flags & F2FS_MAP_FLAGS)) > > > > ret = -ENOENT; > > > > > + goto err_out; > > > + > > > + pblock = map.m_pblk; > > > + nr_pblocks = map.m_len; > > > + > > > + if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > > + nr_pblocks & (blocks_per_sec - 1)) > > > > ret = -EINVAL; > > > > > + goto err_out; > > > + > > > + cur_lblock += nr_pblocks; > > > + } > > > + > > > + return 0; > > > +err_out: > > > + pr_err("swapon: swapfile isn't section-aligned\n"); > > > > We should show above message only after we fail in check condition: > > > > if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > nr_pblocks & (blocks_per_sec - 1)) { > > f2fs_err(sbi, "Swapfile does not align to section"); > > goto err_out; > > } > > > > And please use f2fs_{err,warn,info..} macro rather than pr_{err,warn,info..}. > > > > Could you please fix above related issues in check_swap_activate_fast() as well. > > > > > + return -EINVAL; > > > > return ret; > > > > > +} > > > + > > > static int check_swap_activate_fast(struct swap_info_struct *sis, > > > struct file *swap_file, sector_t *span) > > > { > > > struct address_space *mapping = swap_file->f_mapping; > > > struct inode *inode = mapping->host; > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > sector_t cur_lblock; > > > sector_t last_lblock; > > > sector_t pblock; > > > @@ -3793,6 +3845,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > sector_t highest_pblock = 0; > > > int nr_extents = 0; > > > unsigned long nr_pblocks; > > > + unsigned int blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; > > > > Ditto, > > > > > u64 len; > > > int ret; > > > @@ -3827,6 +3880,13 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > pblock = map.m_pblk; > > > nr_pblocks = map.m_len; > > > + if ((pblock - SM_I(sbi)->main_blkaddr) & (blocks_per_sec - 1) || > > > + nr_pblocks & (blocks_per_sec - 1)) { > > > + pr_err("swapon: swapfile isn't section-aligned\n"); > > > > Ditto, > > > > > + ret = -EINVAL; > > > + goto out; > > > + } > > > + > > > if (cur_lblock + nr_pblocks >= sis->max) > > > nr_pblocks = sis->max - cur_lblock; > > > @@ -3878,6 +3938,9 @@ static int check_swap_activate(struct swap_info_struct *sis, > > > if (PAGE_SIZE == F2FS_BLKSIZE) > > > return check_swap_activate_fast(sis, swap_file, span); > > > + if (f2fs_check_file_aligned(inode)) > > > > ret = f2fs_check_file_aligned(); > > if (ret) > > return ret; > > > > Thanks, > > > > > + return -EINVAL; > > > + > > > blocks_per_page = bytes_to_blks(inode, PAGE_SIZE); > > > /* > > > > > > > > > _______________________________________________ > > Linux-f2fs-devel mailing list > > Linux-f2fs-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 8B500C433DB for ; Tue, 2 Mar 2021 08:12:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D62B64DE8 for ; Tue, 2 Mar 2021 08:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1577533AbhCBGXQ (ORCPT ); Tue, 2 Mar 2021 01:23:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:49686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1576231AbhCBE0R (ORCPT ); Mon, 1 Mar 2021 23:26:17 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D6230601FA; Tue, 2 Mar 2021 04:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614659137; bh=o9jvHY0CvMpjwiy06HTjeIBGpD7VgACJshBkrL38PrQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YumWO4uOFkLOswsrk09TlzwX/MAHDgBy3Uyy3vgQ/RteLM7UGzpsMVUJvxjz6bhJk VOwspeBUT4nQ9xJYURcbcg7QpSmE0WhGEWa10VNQXDyk+Z4nSZDSkSg9YkkypUA0uW xXZvtj/WaOOvUKEydRZDiTaxhbYZmRD8b24AvNEd9D+u8uVwT3JjOcXvfs5UcRBaCB wMOQIwhUvL4kdSC5OzJpAyfjXWM3Jw7V7O5rMnNXO/fTXo9ZSyTNCxGWrRgg1+32fD wQjg8OtiEXGdP/aMAg4KoTGtZPsjTX2quHCqYDM51N2hQnoJoUhc2MbIjfLxK8d54u F2ymTBYoM2yYw== Date: Mon, 1 Mar 2021 20:25:35 -0800 From: Jaegeuk Kim To: Chao Yu Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, zhangshiming@oppo.com Subject: Re: [f2fs-dev] [PATCH 3/3] f2fs: check if swapfile is section-alligned Message-ID: References: <20210227120231.136559-1-huangjianan@oppo.com> <20210227120231.136559-3-huangjianan@oppo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/01, Jaegeuk Kim wrote: > On 03/01, Chao Yu wrote: > > Hi Jianan, > > Merged 1/3 and 2/3, so please post v2 on 3/3. NVM. Found v2. > > Thanks, > > > > > On 2021/2/27 20:02, Huang Jianan via Linux-f2fs-devel wrote: > > > If the swapfile isn't created by pin and fallocate, it cann't be > > > > Typo: > > > > can't > > > > > guaranteed section-aligned, so it may be selected by f2fs gc. When > > > gc_pin_file_threshold is reached, the address of swapfile may change, > > > but won't be synchroniz to swap_extent, so swap will write to wrong > > > > synchronized > > > > > address, which will cause data corruption. > > > > > > Signed-off-by: Huang Jianan > > > Signed-off-by: Guo Weichao > > > --- > > > fs/f2fs/data.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 63 insertions(+) > > > > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 4dbc1cafc55d..3e523d6e4643 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -3781,11 +3781,63 @@ int f2fs_migrate_page(struct address_space *mapping, > > > #endif > > > #ifdef CONFIG_SWAP > > > +static int f2fs_check_file_aligned(struct inode *inode) > > > > f2fs_check_file_alignment() or f2fs_is_file_aligned()? > > > > > +{ > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > + block_t main_blkaddr = SM_I(sbi)->main_blkaddr; > > > + block_t cur_lblock; > > > + block_t last_lblock; > > > + block_t pblock; > > > + unsigned long len; > > > + unsigned long nr_pblocks; > > > + unsigned int blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; > > > > unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > > > > > + int ret; > > > + > > > + cur_lblock = 0; > > > + last_lblock = bytes_to_blks(inode, i_size_read(inode)); > > > + len = i_size_read(inode); > > > + > > > + while (cur_lblock < last_lblock) { > > > + struct f2fs_map_blocks map; > > > + pgoff_t next_pgofs; > > > + > > > + memset(&map, 0, sizeof(map)); > > > + map.m_lblk = cur_lblock; > > > + map.m_len = bytes_to_blks(inode, len) - cur_lblock; > > > > map.m_len = last_lblock - cur_lblock; > > > > > + map.m_next_pgofs = &next_pgofs; > > > > map.m_next_pgofs = NULL; > > map.m_next_extent = NULL; > > > > > + map.m_seg_type = NO_CHECK_TYPE; > > > > map.m_may_create = false; > > > > > + > > > + ret = f2fs_map_blocks(inode, &map, 0, F2FS_GET_BLOCK_FIEMAP); > > > + > > > > Unneeded blank line. > > > > > + if (ret) > > > + goto err_out; > > > + > > > + /* hole */ > > > + if (!(map.m_flags & F2FS_MAP_FLAGS)) > > > > ret = -ENOENT; > > > > > + goto err_out; > > > + > > > + pblock = map.m_pblk; > > > + nr_pblocks = map.m_len; > > > + > > > + if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > > + nr_pblocks & (blocks_per_sec - 1)) > > > > ret = -EINVAL; > > > > > + goto err_out; > > > + > > > + cur_lblock += nr_pblocks; > > > + } > > > + > > > + return 0; > > > +err_out: > > > + pr_err("swapon: swapfile isn't section-aligned\n"); > > > > We should show above message only after we fail in check condition: > > > > if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > nr_pblocks & (blocks_per_sec - 1)) { > > f2fs_err(sbi, "Swapfile does not align to section"); > > goto err_out; > > } > > > > And please use f2fs_{err,warn,info..} macro rather than pr_{err,warn,info..}. > > > > Could you please fix above related issues in check_swap_activate_fast() as well. > > > > > + return -EINVAL; > > > > return ret; > > > > > +} > > > + > > > static int check_swap_activate_fast(struct swap_info_struct *sis, > > > struct file *swap_file, sector_t *span) > > > { > > > struct address_space *mapping = swap_file->f_mapping; > > > struct inode *inode = mapping->host; > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > sector_t cur_lblock; > > > sector_t last_lblock; > > > sector_t pblock; > > > @@ -3793,6 +3845,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > sector_t highest_pblock = 0; > > > int nr_extents = 0; > > > unsigned long nr_pblocks; > > > + unsigned int blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; > > > > Ditto, > > > > > u64 len; > > > int ret; > > > @@ -3827,6 +3880,13 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > pblock = map.m_pblk; > > > nr_pblocks = map.m_len; > > > + if ((pblock - SM_I(sbi)->main_blkaddr) & (blocks_per_sec - 1) || > > > + nr_pblocks & (blocks_per_sec - 1)) { > > > + pr_err("swapon: swapfile isn't section-aligned\n"); > > > > Ditto, > > > > > + ret = -EINVAL; > > > + goto out; > > > + } > > > + > > > if (cur_lblock + nr_pblocks >= sis->max) > > > nr_pblocks = sis->max - cur_lblock; > > > @@ -3878,6 +3938,9 @@ static int check_swap_activate(struct swap_info_struct *sis, > > > if (PAGE_SIZE == F2FS_BLKSIZE) > > > return check_swap_activate_fast(sis, swap_file, span); > > > + if (f2fs_check_file_aligned(inode)) > > > > ret = f2fs_check_file_aligned(); > > if (ret) > > return ret; > > > > Thanks, > > > > > + return -EINVAL; > > > + > > > blocks_per_page = bytes_to_blks(inode, PAGE_SIZE); > > > /* > > > > > > > > > _______________________________________________ > > Linux-f2fs-devel mailing list > > Linux-f2fs-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel