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.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 4678EC33C9E for ; Sat, 11 Jan 2020 09:09:04 +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 119392072E; Sat, 11 Jan 2020 09:09:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="Bf5lyv8Q"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="K7VW+MZq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 119392072E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com 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 1iqClT-0007RH-3E; Sat, 11 Jan 2020 09:09:03 +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 1iqClR-0007R1-5v for linux-f2fs-devel@lists.sourceforge.net; Sat, 11 Jan 2020 09:09:01 +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=bZyN+dNe+EQVXrCcmT1jEU83OSlvWB75S9MMMwr9pbc=; b=Bf5lyv8QfRANWBO7LwZnNO4FEB AmIHPIEnmbrFcoq9r+WfrfZksJ8YQYNkXN+UkQhZZbkzxVakGZxBKn1gaW4f9upTthxTVX1Dl2wXf A5lZu+VgMQaWuvG+dIodERAwL8MLRIaDtv+FZlgk8o6BACcQP1Z0CrM41rCDPn3SIgkk=; 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=bZyN+dNe+EQVXrCcmT1jEU83OSlvWB75S9MMMwr9pbc=; b=K7VW+MZqeVitWtd7mKbG1sc4FW cQUkpjdktzS9gSLRE+nek3zhJ5A23H+KKNLTT4HuUB9w4qWcYKhzjAWlMUNC/d1Srz3KVH9owbqgf YWCDDiDzsJjbUITUzroylLw5aaec6hdWRsrmzwTpi0eEUcbmMzFqsE9DF1JPmED33at8=; Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iqClO-00GJk3-MW for linux-f2fs-devel@lists.sourceforge.net; Sat, 11 Jan 2020 09:09:01 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 0F1D09625D48D0B11230; Sat, 11 Jan 2020 17:08:51 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sat, 11 Jan 2020 17:08:47 +0800 To: Jaegeuk Kim References: <20191216062806.112361-1-yuchao0@huawei.com> <20191218214619.GA20072@jaegeuk-macbookpro.roam.corp.google.com> <20191231004633.GA85441@jaegeuk-macbookpro.roam.corp.google.com> <7a579223-39d4-7e51-c361-4aa592b2500d@huawei.com> <20200102181832.GA1953@jaegeuk-macbookpro.roam.corp.google.com> <20200102190003.GA7597@jaegeuk-macbookpro.roam.corp.google.com> <94786408-219d-c343-70f2-70a2cc68dd38@huawei.com> <20200106181620.GB50058@jaegeuk-macbookpro.roam.corp.google.com> <20200110235214.GA25700@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: <3776cb0b-4b18-ae0d-16a7-a591bec77a5e@huawei.com> Date: Sat, 11 Jan 2020 17:08:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200110235214.GA25700@jaegeuk-macbookpro.roam.corp.google.com> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1iqClO-00GJk3-MW Subject: Re: [f2fs-dev] [RFC PATCH v5] f2fs: support data compression 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2020/1/11 7:52, Jaegeuk Kim wrote: > On 01/06, Jaegeuk Kim wrote: >> On 01/06, Chao Yu wrote: >>> On 2020/1/3 14:50, Chao Yu wrote: >>>> This works to me. Could you run fsstress tests on compressed root directory? >>>> It seems still there are some bugs. >>> >>> Jaegeuk, >>> >>> Did you mean running por_fsstress testcase? >>> >>> Now, at least I didn't hit any problem for normal fsstress case. >> >> Yup. por_fsstress > > Please check https://github.com/jaegeuk/f2fs/commits/g-dev-test. > I've fixed > - truncation offset > - i_compressed_blocks and its lock coverage > - error handling > - etc I changed as below, and por_fsstress stops panic the system. Could you merge all these fixes into original patch? >From bb17d7d77fe0b8a3e3632a7026550800ab9609e9 Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Sat, 11 Jan 2020 16:58:20 +0800 Subject: [PATCH] f2fs: compress: fix f2fs_put_rpages_mapping() Signed-off-by: Chao Yu --- fs/f2fs/compress.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 502cd0ddc2a7..5c6a31d84ce4 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -74,18 +74,10 @@ static void f2fs_put_compressed_page(struct page *page) } static void f2fs_drop_rpages(struct compress_ctx *cc, - struct address_space *mapping, int len, bool unlock) + int len, bool unlock) { unsigned int i; for (i = 0; i < len; i++) { - if (mapping) { - pgoff_t start = start_idx_of_cluster(cc); - struct page *page = find_get_page(mapping, start + i); - - put_page(page); - put_page(page); - cc->rpages[i] = NULL; - } if (!cc->rpages[i]) continue; if (unlock) @@ -97,18 +89,25 @@ static void f2fs_drop_rpages(struct compress_ctx *cc, static void f2fs_put_rpages(struct compress_ctx *cc) { - f2fs_drop_rpages(cc, NULL, cc->cluster_size, false); + f2fs_drop_rpages(cc, cc->cluster_size, false); } static void f2fs_unlock_rpages(struct compress_ctx *cc, int len) { - f2fs_drop_rpages(cc, NULL, len, true); + f2fs_drop_rpages(cc, len, true); } static void f2fs_put_rpages_mapping(struct compress_ctx *cc, - struct address_space *mapping, int len) + struct address_space *mapping, + pgoff_t start, int len) { - f2fs_drop_rpages(cc, mapping, len, false); + int i; + for (i = 0; i < len; i++) { + struct page *page = find_get_page(mapping, start + i); + + put_page(page); + put_page(page); + } } static void f2fs_put_rpages_wbc(struct compress_ctx *cc, @@ -680,7 +679,8 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, if (!PageUptodate(page)) { f2fs_unlock_rpages(cc, i + 1); - f2fs_put_rpages_mapping(cc, mapping, cc->cluster_size); + f2fs_put_rpages_mapping(cc, mapping, start_idx, + cc->cluster_size); f2fs_destroy_compress_ctx(cc); goto retry; } @@ -714,7 +714,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, unlock_pages: f2fs_unlock_rpages(cc, i); release_pages: - f2fs_put_rpages_mapping(cc, mapping, i); + f2fs_put_rpages_mapping(cc, mapping, start_idx, i); f2fs_destroy_compress_ctx(cc); return ret; } -- 2.18.0.rc1 > > One another fix in f2fs-tools as well. > https://github.com/jaegeuk/f2fs-tools > >> >>> >>> Thanks, > . > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel