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=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 69B70C07E94 for ; Fri, 4 Jun 2021 11:12:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 538FE6136E for ; Fri, 4 Jun 2021 11:12:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230163AbhFDLOR (ORCPT ); Fri, 4 Jun 2021 07:14:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:53806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230127AbhFDLOP (ORCPT ); Fri, 4 Jun 2021 07:14:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C0130613FF; Fri, 4 Jun 2021 11:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622805149; bh=EaamOoaxvp+eQyHQXEhJxeYA2RnZ//SUI/o659y+jJY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=EWM/2B1XN6YBGSv0Zb0Sc8pn4U8YjYdezg4H7L7uBzpiSzfFE0z22Dkc7AyFPPaUc 2z9ukyY6n1yrPv43KDJNn7uMbtejOTulRr0+EhV8Pprgjrikos6z9/xdUtige+D5Sy Nq2iSa1w0/fjGDTuUOp1NA9UPd+4Oo0b8sZ7iZbJdT4c9vcG9l3ujUFq+S7YfKsnJ7 Sb6cXOYkKdep8n32M2MEvNy5amcjLRX8zT6VSaOWkqvJlRonVqVSd0JYG1Yzo3lqxv rfQvMNAWkk67eTh5RqP6VqQh1AIoRVDuoGCgRY6LAsj1iS+MJaxA49wEZIX3YbF4O+ S4+QYV/TxinbQ== Subject: Re: [PATCH 1/2] f2fs: swap: remove dead codes To: Chao Yu , Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org References: <20210526062927.52629-1-yuchao0@huawei.com> <21ec5a95-bdbc-358d-99c7-e75e91228039@huawei.com> From: Chao Yu Message-ID: Date: Fri, 4 Jun 2021 19:12:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <21ec5a95-bdbc-358d-99c7-e75e91228039@huawei.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/5/27 10:12, Chao Yu wrote: > On 2021/5/27 9:40, Jaegeuk Kim wrote: >> On 05/26, Chao Yu wrote: >>> On 2021/5/26 21:30, Jaegeuk Kim wrote: >>>> On 05/26, Chao Yu wrote: >>>>> After commit af4b6b8edf6a ("f2fs: introduce check_swap_activate_fast()"), >>>>> we will never run into original logic of check_swap_activate() before >>>>> f2fs supports non 4k-sized page, so let's delete those dead codes. >>>> >>>> Why not keeping this for large page support in future maybe? >>> >>> Well, if so, at that time, it would be better to refactor >>> check_swap_activate_fast() implementation based on f2fs_map_block() rather >>> than refactoring check_swap_activate() implementation based on low efficient >>> bmap()? >> >> Let's first check whether we support large page. Have you quickly tested it? >> If we support it now and current flow is just inefficient, I'd say keeping but >> refactoring it later. > > Let me check this, but I guess it missed to handle large page in lots of flows, > not sure where we may panic at... :( I've checked f2fs behavior on 64kb page size in arm64 vm, - 'ls -ls' will cause f2fs printing "invalid namelen(0), ino:%u, run fsck to fix." each time. - after touch a file and umount, fsck reports that image is corrupted. F2FS uses PAGE_SIZE and F2FS_BLKSIZE directly in a lot of places, I doubt most of places may not consider large page size condition. So, thoughts? I guess we have to admit we do not support 64KB page right now... :P Thanks, > > Thanks, > >> >>> >>> Thanks, >>> >>>> >>>>> >>>>> Signed-off-by: Chao Yu >>>>> --- >>>>>    fs/f2fs/data.c | 171 +------------------------------------------------ >>>>>    1 file changed, 3 insertions(+), 168 deletions(-) >>>>> >>>>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c >>>>> index 3058c7e28b11..9c23fde93b76 100644 >>>>> --- a/fs/f2fs/data.c >>>>> +++ b/fs/f2fs/data.c >>>>> @@ -3830,67 +3830,7 @@ int f2fs_migrate_page(struct address_space *mapping, >>>>>    #endif >>>>>    #ifdef CONFIG_SWAP >>>>> -static int f2fs_is_file_aligned(struct inode *inode) >>>>> -{ >>>>> -    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 nr_pblocks; >>>>> -    unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); >>>>> -    unsigned int not_aligned = 0; >>>>> -    int ret = 0; >>>>> - >>>>> -    cur_lblock = 0; >>>>> -    last_lblock = bytes_to_blks(inode, i_size_read(inode)); >>>>> - >>>>> -    while (cur_lblock < last_lblock) { >>>>> -        struct f2fs_map_blocks map; >>>>> - >>>>> -        memset(&map, 0, sizeof(map)); >>>>> -        map.m_lblk = cur_lblock; >>>>> -        map.m_len = last_lblock - cur_lblock; >>>>> -        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); >>>>> -        if (ret) >>>>> -            goto out; >>>>> - >>>>> -        /* hole */ >>>>> -        if (!(map.m_flags & F2FS_MAP_FLAGS)) { >>>>> -            f2fs_err(sbi, "Swapfile has holes\n"); >>>>> -            ret = -ENOENT; >>>>> -            goto out; >>>>> -        } >>>>> - >>>>> -        pblock = map.m_pblk; >>>>> -        nr_pblocks = map.m_len; >>>>> - >>>>> -        if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || >>>>> -            nr_pblocks & (blocks_per_sec - 1)) { >>>>> -            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; >>>>> -} >>>>> - >>>>> -static int check_swap_activate_fast(struct swap_info_struct *sis, >>>>> +static int check_swap_activate(struct swap_info_struct *sis, >>>>>                    struct file *swap_file, sector_t *span) >>>>>    { >>>>>        struct address_space *mapping = swap_file->f_mapping; >>>>> @@ -3907,6 +3847,8 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, >>>>>        unsigned int not_aligned = 0; >>>>>        int ret = 0; >>>>> +    f2fs_bug_on(sbi, PAGE_SIZE != F2FS_BLKSIZE); >>>>> + >>>>>        /* >>>>>         * Map all the blocks into the extent list.  This code doesn't try >>>>>         * to be very smart. >>>>> @@ -3986,113 +3928,6 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, >>>>>        return ret; >>>>>    } >>>>> -/* Copied from generic_swapfile_activate() to check any holes */ >>>>> -static int check_swap_activate(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); >>>>> -    unsigned blocks_per_page; >>>>> -    unsigned long page_no; >>>>> -    sector_t probe_block; >>>>> -    sector_t last_block; >>>>> -    sector_t lowest_block = -1; >>>>> -    sector_t highest_block = 0; >>>>> -    int nr_extents = 0; >>>>> -    int ret = 0; >>>>> - >>>>> -    if (PAGE_SIZE == F2FS_BLKSIZE) >>>>> -        return check_swap_activate_fast(sis, swap_file, span); >>>>> - >>>>> -    ret = f2fs_is_file_aligned(inode); >>>>> -    if (ret) >>>>> -        goto out; >>>>> - >>>>> -    blocks_per_page = bytes_to_blks(inode, PAGE_SIZE); >>>>> - >>>>> -    /* >>>>> -     * Map all the blocks into the extent list.  This code doesn't try >>>>> -     * to be very smart. >>>>> -     */ >>>>> -    probe_block = 0; >>>>> -    page_no = 0; >>>>> -    last_block = bytes_to_blks(inode, i_size_read(inode)); >>>>> -    while ((probe_block + blocks_per_page) <= last_block && >>>>> -            page_no < sis->max) { >>>>> -        unsigned block_in_page; >>>>> -        sector_t first_block; >>>>> -        sector_t block = 0; >>>>> - >>>>> -        cond_resched(); >>>>> - >>>>> -        block = probe_block; >>>>> -        ret = bmap(inode, &block); >>>>> -        if (ret) >>>>> -            goto out; >>>>> -        if (!block) >>>>> -            goto bad_bmap; >>>>> -        first_block = block; >>>>> - >>>>> -        /* >>>>> -         * It must be PAGE_SIZE aligned on-disk >>>>> -         */ >>>>> -        if (first_block & (blocks_per_page - 1)) { >>>>> -            probe_block++; >>>>> -            goto reprobe; >>>>> -        } >>>>> - >>>>> -        for (block_in_page = 1; block_in_page < blocks_per_page; >>>>> -                    block_in_page++) { >>>>> - >>>>> -            block = probe_block + block_in_page; >>>>> -            ret = bmap(inode, &block); >>>>> -            if (ret) >>>>> -                goto out; >>>>> -            if (!block) >>>>> -                goto bad_bmap; >>>>> - >>>>> -            if (block != first_block + block_in_page) { >>>>> -                /* Discontiguity */ >>>>> -                probe_block++; >>>>> -                goto reprobe; >>>>> -            } >>>>> -        } >>>>> - >>>>> -        first_block >>= (PAGE_SHIFT - inode->i_blkbits); >>>>> -        if (page_no) {    /* exclude the header page */ >>>>> -            if (first_block < lowest_block) >>>>> -                lowest_block = first_block; >>>>> -            if (first_block > highest_block) >>>>> -                highest_block = first_block; >>>>> -        } >>>>> - >>>>> -        /* >>>>> -         * We found a PAGE_SIZE-length, PAGE_SIZE-aligned run of blocks >>>>> -         */ >>>>> -        ret = add_swap_extent(sis, page_no, 1, first_block); >>>>> -        if (ret < 0) >>>>> -            goto out; >>>>> -        nr_extents += ret; >>>>> -        page_no++; >>>>> -        probe_block += blocks_per_page; >>>>> -reprobe: >>>>> -        continue; >>>>> -    } >>>>> -    ret = nr_extents; >>>>> -    *span = 1 + highest_block - lowest_block; >>>>> -    if (page_no == 0) >>>>> -        page_no = 1;    /* force Empty message */ >>>>> -    sis->max = page_no; >>>>> -    sis->pages = page_no - 1; >>>>> -    sis->highest_bit = page_no - 1; >>>>> -out: >>>>> -    return ret; >>>>> -bad_bmap: >>>>> -    f2fs_err(sbi, "Swapfile has holes\n"); >>>>> -    return -EINVAL; >>>>> -} >>>>> - >>>>>    static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file, >>>>>                    sector_t *span) >>>>>    { >>>>> -- >>>>> 2.29.2 >> . >> 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.9 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E1EC8C07E94 for ; Fri, 4 Jun 2021 11:12:52 +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 92CC4613FF; Fri, 4 Jun 2021 11:12:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92CC4613FF 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lp7ku-00083a-Un; Fri, 04 Jun 2021 11:12:48 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp7kt-00083S-8l for linux-f2fs-devel@lists.sourceforge.net; Fri, 04 Jun 2021 11:12:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: 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=S6H00pHD4jTyXf0pg/lf0lNOO8kaacaEswxWYkFyVQY=; b=CloryASIA6yX14/lCMFt1skp7K B/1V7+i7JHsRo40m2v2m2N9V1bj63zqigbhZYWMjpTlw6+1vt5sT7V+eeX2tuwVvcUe7akn9X5d3+ 7WFmqvYaOqyLVqOJs0JD5QiJar9xPewcdYo7h7ZfQ+JhRpt9w/fJT/Bh7luIeI00eBwY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: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=S6H00pHD4jTyXf0pg/lf0lNOO8kaacaEswxWYkFyVQY=; b=l76WkRjH2JFjT0O+zbwk13PACR IWOgMD1djv2Oi7ZH79rbiekrUA2lAGd1dkYXYTGaTBZzKbrPt8eCNxPGT32qqGZ3zoVmFaJW9zwy+ oWkqc9rtw5wZ+9mSOUAPf+IsUmVTqrMj/oyHjvXWJ4Ea5nlHxSSPlrxZtJ/KdGEm4gbo=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lp7ki-0008OF-JY for linux-f2fs-devel@lists.sourceforge.net; Fri, 04 Jun 2021 11:12:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id C0130613FF; Fri, 4 Jun 2021 11:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622805149; bh=EaamOoaxvp+eQyHQXEhJxeYA2RnZ//SUI/o659y+jJY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=EWM/2B1XN6YBGSv0Zb0Sc8pn4U8YjYdezg4H7L7uBzpiSzfFE0z22Dkc7AyFPPaUc 2z9ukyY6n1yrPv43KDJNn7uMbtejOTulRr0+EhV8Pprgjrikos6z9/xdUtige+D5Sy Nq2iSa1w0/fjGDTuUOp1NA9UPd+4Oo0b8sZ7iZbJdT4c9vcG9l3ujUFq+S7YfKsnJ7 Sb6cXOYkKdep8n32M2MEvNy5amcjLRX8zT6VSaOWkqvJlRonVqVSd0JYG1Yzo3lqxv rfQvMNAWkk67eTh5RqP6VqQh1AIoRVDuoGCgRY6LAsj1iS+MJaxA49wEZIX3YbF4O+ S4+QYV/TxinbQ== To: Chao Yu , Jaegeuk Kim References: <20210526062927.52629-1-yuchao0@huawei.com> <21ec5a95-bdbc-358d-99c7-e75e91228039@huawei.com> From: Chao Yu Message-ID: Date: Fri, 4 Jun 2021 19:12:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <21ec5a95-bdbc-358d-99c7-e75e91228039@huawei.com> Content-Language: en-US X-Headers-End: 1lp7ki-0008OF-JY Subject: Re: [f2fs-dev] [PATCH 1/2] f2fs: swap: remove dead codes 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: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="windows-1252"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2021/5/27 10:12, Chao Yu wrote: > On 2021/5/27 9:40, Jaegeuk Kim wrote: >> On 05/26, Chao Yu wrote: >>> On 2021/5/26 21:30, Jaegeuk Kim wrote: >>>> On 05/26, Chao Yu wrote: >>>>> After commit af4b6b8edf6a ("f2fs: introduce check_swap_activate_fast(= )"), >>>>> we will never run into original logic of check_swap_activate() before >>>>> f2fs supports non 4k-sized page, so let's delete those dead codes. >>>> >>>> Why not keeping this for large page support in future maybe? >>> >>> Well, if so, at that time, it would be better to refactor >>> check_swap_activate_fast() implementation based on f2fs_map_block() rat= her >>> than refactoring check_swap_activate() implementation based on low effi= cient >>> bmap()? >> >> Let's first check whether we support large page. Have you quickly tested= it? >> If we support it now and current flow is just inefficient, I'd say keepi= ng but >> refactoring it later. > = > Let me check this, but I guess it missed to handle large page in lots of = flows, > not sure where we may panic at... :( I've checked f2fs behavior on 64kb page size in arm64 vm, - 'ls -ls' will cause f2fs printing "invalid namelen(0), ino:%u, run fsck to fix." each time. - after touch a file and umount, fsck reports that image is corrupted. F2FS uses PAGE_SIZE and F2FS_BLKSIZE directly in a lot of places, I doubt most of places may not consider large page size condition. So, thoughts? I guess we have to admit we do not support 64KB page right now... :P Thanks, > = > Thanks, > = >> >>> >>> Thanks, >>> >>>> >>>>> >>>>> Signed-off-by: Chao Yu >>>>> --- >>>>> =A0=A0 fs/f2fs/data.c | 171 +----------------------------------------= -------- >>>>> =A0=A0 1 file changed, 3 insertions(+), 168 deletions(-) >>>>> >>>>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c >>>>> index 3058c7e28b11..9c23fde93b76 100644 >>>>> --- a/fs/f2fs/data.c >>>>> +++ b/fs/f2fs/data.c >>>>> @@ -3830,67 +3830,7 @@ int f2fs_migrate_page(struct address_space *ma= pping, >>>>> =A0=A0 #endif >>>>> =A0=A0 #ifdef CONFIG_SWAP >>>>> -static int f2fs_is_file_aligned(struct inode *inode) >>>>> -{ >>>>> -=A0=A0=A0 struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); >>>>> -=A0=A0=A0 block_t main_blkaddr =3D SM_I(sbi)->main_blkaddr; >>>>> -=A0=A0=A0 block_t cur_lblock; >>>>> -=A0=A0=A0 block_t last_lblock; >>>>> -=A0=A0=A0 block_t pblock; >>>>> -=A0=A0=A0 unsigned long nr_pblocks; >>>>> -=A0=A0=A0 unsigned int blocks_per_sec =3D BLKS_PER_SEC(sbi); >>>>> -=A0=A0=A0 unsigned int not_aligned =3D 0; >>>>> -=A0=A0=A0 int ret =3D 0; >>>>> - >>>>> -=A0=A0=A0 cur_lblock =3D 0; >>>>> -=A0=A0=A0 last_lblock =3D bytes_to_blks(inode, i_size_read(inode)); >>>>> - >>>>> -=A0=A0=A0 while (cur_lblock < last_lblock) { >>>>> -=A0=A0=A0=A0=A0=A0=A0 struct f2fs_map_blocks map; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 memset(&map, 0, sizeof(map)); >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_lblk =3D cur_lblock; >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_len =3D last_lblock - cur_lblock; >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_next_pgofs =3D NULL; >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_next_extent =3D NULL; >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_seg_type =3D NO_CHECK_TYPE; >>>>> -=A0=A0=A0=A0=A0=A0=A0 map.m_may_create =3D false; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 ret =3D f2fs_map_blocks(inode, &map, 0, F2FS_G= ET_BLOCK_FIEMAP); >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (ret) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 /* hole */ >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (!(map.m_flags & F2FS_MAP_FLAGS)) { >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 f2fs_err(sbi, "Swapfile has holes\= n"); >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D -ENOENT; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> -=A0=A0=A0=A0=A0=A0=A0 } >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 pblock =3D map.m_pblk; >>>>> -=A0=A0=A0=A0=A0=A0=A0 nr_pblocks =3D map.m_len; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 if ((pblock - main_blkaddr) & (blocks_per_sec = - 1) || >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 nr_pblocks & (blocks_per_sec - 1))= { >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (f2fs_is_pinned_file(inode)) { >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 f2fs_err(sbi, "Swapfil= e does not align to section"); >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D -EINVAL; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 } >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 not_aligned++; >>>>> -=A0=A0=A0=A0=A0=A0=A0 } >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 cur_lblock +=3D nr_pblocks; >>>>> -=A0=A0=A0 } >>>>> -=A0=A0=A0 if (not_aligned) >>>>> -=A0=A0=A0=A0=A0=A0=A0 f2fs_warn(sbi, "Swapfile (%u) is not align to = section: \n" >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 "\t1) creat(), 2) ioctl(F2FS_IOC_S= ET_PIN_FILE), 3) fallocate()", >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 not_aligned); >>>>> -out: >>>>> -=A0=A0=A0 return ret; >>>>> -} >>>>> - >>>>> -static int check_swap_activate_fast(struct swap_info_struct *sis, >>>>> +static int check_swap_activate(struct swap_info_struct *sis, >>>>> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct file *s= wap_file, sector_t *span) >>>>> =A0=A0 { >>>>> =A0=A0=A0=A0=A0=A0 struct address_space *mapping =3D swap_file->f_map= ping; >>>>> @@ -3907,6 +3847,8 @@ static int check_swap_activate_fast(struct swap= _info_struct *sis, >>>>> =A0=A0=A0=A0=A0=A0 unsigned int not_aligned =3D 0; >>>>> =A0=A0=A0=A0=A0=A0 int ret =3D 0; >>>>> +=A0=A0=A0 f2fs_bug_on(sbi, PAGE_SIZE !=3D F2FS_BLKSIZE); >>>>> + >>>>> =A0=A0=A0=A0=A0=A0 /* >>>>> =A0=A0=A0=A0=A0=A0=A0 * Map all the blocks into the extent list.=A0 T= his code doesn't try >>>>> =A0=A0=A0=A0=A0=A0=A0 * to be very smart. >>>>> @@ -3986,113 +3928,6 @@ static int check_swap_activate_fast(struct sw= ap_info_struct *sis, >>>>> =A0=A0=A0=A0=A0=A0 return ret; >>>>> =A0=A0 } >>>>> -/* Copied from generic_swapfile_activate() to check any holes */ >>>>> -static int check_swap_activate(struct swap_info_struct *sis, >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct file *swap_file= , sector_t *span) >>>>> -{ >>>>> -=A0=A0=A0 struct address_space *mapping =3D swap_file->f_mapping; >>>>> -=A0=A0=A0 struct inode *inode =3D mapping->host; >>>>> -=A0=A0=A0 struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); >>>>> -=A0=A0=A0 unsigned blocks_per_page; >>>>> -=A0=A0=A0 unsigned long page_no; >>>>> -=A0=A0=A0 sector_t probe_block; >>>>> -=A0=A0=A0 sector_t last_block; >>>>> -=A0=A0=A0 sector_t lowest_block =3D -1; >>>>> -=A0=A0=A0 sector_t highest_block =3D 0; >>>>> -=A0=A0=A0 int nr_extents =3D 0; >>>>> -=A0=A0=A0 int ret =3D 0; >>>>> - >>>>> -=A0=A0=A0 if (PAGE_SIZE =3D=3D F2FS_BLKSIZE) >>>>> -=A0=A0=A0=A0=A0=A0=A0 return check_swap_activate_fast(sis, swap_file= , span); >>>>> - >>>>> -=A0=A0=A0 ret =3D f2fs_is_file_aligned(inode); >>>>> -=A0=A0=A0 if (ret) >>>>> -=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> - >>>>> -=A0=A0=A0 blocks_per_page =3D bytes_to_blks(inode, PAGE_SIZE); >>>>> - >>>>> -=A0=A0=A0 /* >>>>> -=A0=A0=A0=A0 * Map all the blocks into the extent list.=A0 This code= doesn't try >>>>> -=A0=A0=A0=A0 * to be very smart. >>>>> -=A0=A0=A0=A0 */ >>>>> -=A0=A0=A0 probe_block =3D 0; >>>>> -=A0=A0=A0 page_no =3D 0; >>>>> -=A0=A0=A0 last_block =3D bytes_to_blks(inode, i_size_read(inode)); >>>>> -=A0=A0=A0 while ((probe_block + blocks_per_page) <=3D last_block && >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 page_no < sis->max) { >>>>> -=A0=A0=A0=A0=A0=A0=A0 unsigned block_in_page; >>>>> -=A0=A0=A0=A0=A0=A0=A0 sector_t first_block; >>>>> -=A0=A0=A0=A0=A0=A0=A0 sector_t block =3D 0; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 cond_resched(); >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 block =3D probe_block; >>>>> -=A0=A0=A0=A0=A0=A0=A0 ret =3D bmap(inode, &block); >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (ret) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (!block) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto bad_bmap; >>>>> -=A0=A0=A0=A0=A0=A0=A0 first_block =3D block; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 /* >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0 * It must be PAGE_SIZE aligned on-disk >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0 */ >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (first_block & (blocks_per_page - 1)) { >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 probe_block++; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto reprobe; >>>>> -=A0=A0=A0=A0=A0=A0=A0 } >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 for (block_in_page =3D 1; block_in_page < bloc= ks_per_page; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 block_in_p= age++) { >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 block =3D probe_block + block_in_p= age; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D bmap(inode, &block); >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (ret) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (!block) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto bad_bmap; >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (block !=3D first_block + block= _in_page) { >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* Discontiguity */ >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 probe_block++; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto reprobe; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 } >>>>> -=A0=A0=A0=A0=A0=A0=A0 } >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 first_block >>=3D (PAGE_SHIFT - inode->i_blkbi= ts); >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (page_no) {=A0=A0=A0 /* exclude the header = page */ >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (first_block < lowest_block) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lowest_block =3D first= _block; >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (first_block > highest_block) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 highest_block =3D firs= t_block; >>>>> -=A0=A0=A0=A0=A0=A0=A0 } >>>>> - >>>>> -=A0=A0=A0=A0=A0=A0=A0 /* >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0 * We found a PAGE_SIZE-length, PAGE_SIZE-al= igned run of blocks >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0 */ >>>>> -=A0=A0=A0=A0=A0=A0=A0 ret =3D add_swap_extent(sis, page_no, 1, first= _block); >>>>> -=A0=A0=A0=A0=A0=A0=A0 if (ret < 0) >>>>> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 goto out; >>>>> -=A0=A0=A0=A0=A0=A0=A0 nr_extents +=3D ret; >>>>> -=A0=A0=A0=A0=A0=A0=A0 page_no++; >>>>> -=A0=A0=A0=A0=A0=A0=A0 probe_block +=3D blocks_per_page; >>>>> -reprobe: >>>>> -=A0=A0=A0=A0=A0=A0=A0 continue; >>>>> -=A0=A0=A0 } >>>>> -=A0=A0=A0 ret =3D nr_extents; >>>>> -=A0=A0=A0 *span =3D 1 + highest_block - lowest_block; >>>>> -=A0=A0=A0 if (page_no =3D=3D 0) >>>>> -=A0=A0=A0=A0=A0=A0=A0 page_no =3D 1;=A0=A0=A0 /* force Empty message= */ >>>>> -=A0=A0=A0 sis->max =3D page_no; >>>>> -=A0=A0=A0 sis->pages =3D page_no - 1; >>>>> -=A0=A0=A0 sis->highest_bit =3D page_no - 1; >>>>> -out: >>>>> -=A0=A0=A0 return ret; >>>>> -bad_bmap: >>>>> -=A0=A0=A0 f2fs_err(sbi, "Swapfile has holes\n"); >>>>> -=A0=A0=A0 return -EINVAL; >>>>> -} >>>>> - >>>>> =A0=A0 static int f2fs_swap_activate(struct swap_info_struct *sis, st= ruct file *file, >>>>> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 sector_t *span) >>>>> =A0=A0 { >>>>> -- = >>>>> 2.29.2 >> . >> _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel