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=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 DC8DCC433DF for ; Sat, 30 May 2020 01:49:42 +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 AB2102075A for ; Sat, 30 May 2020 01:49:42 +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="DTCD2KO6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="FvBq5Lci"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZgFhjOA2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB2102075A 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 1jeqd4-0007pV-9f; Sat, 30 May 2020 01:49:42 +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 1jeqd3-0007pO-3i for linux-f2fs-devel@lists.sourceforge.net; Sat, 30 May 2020 01:49:41 +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=88jCXc3EuAexCY4iksBBEbK1cBktwp12ShhYzkJhUoU=; b=DTCD2KO662IJmuQTvqZFhy56Zb Ff2bvH6bh8MzzIOnO2c9utLU/OwFyMRZCHH7QmzNx7jp3/ogJBFpAdXJoJ9oZqrdYOqMvLueO7Yht SQjDDg7k6Cr46ksGnQQfjaPjfLAQlT17UiaMHU+Po2NVbd7i7f/J/xiWzfQUkNQwVulc=; 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=88jCXc3EuAexCY4iksBBEbK1cBktwp12ShhYzkJhUoU=; b=FvBq5LciIoIim35YrKEkvGDcjB Pday1gEKd47+wNa1czDCIJ9k3LxXyPtEcM8UjUhblYsqDRXesrtFsUi2hfFh+JnWHl0+UU31P9Mba Ge2vTcy4CFMxlqf8yCMXxr+J1PpkEBKqbuFDG4PwE2A5awREq5oiVwt/DM6r+aKl/G6o=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jeqcz-000P0Q-I3 for linux-f2fs-devel@lists.sourceforge.net; Sat, 30 May 2020 01:49:41 +0000 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34DBE2075A; Sat, 30 May 2020 01:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590803367; bh=BIqHsLS0l8dGN8SLFgIgF41GvrgmvFj89GJ0W/GH6AY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZgFhjOA2Tg/cDAaLjTfNaZqzCG2tESxAefx1PLDVuEm3NQSd5SWvnA7gwlEPA4J9E 6u8M83SyAx6okIHexmh9qmllwAUBM37YDlX/Ag5b5b9WHN7vB+equLefOWuCQeYZkr 76YCSaWzFbP/Oeb7WML8UZHghJnGO5pgS3mb6uGo= Date: Fri, 29 May 2020 18:49:26 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20200530014926.GA39950@google.com> References: <20200529092947.7890-1-yuchao0@huawei.com> <20200529223426.GA249109@google.com> <96ba756e-a354-1ee8-689e-211f63c294e6@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <96ba756e-a354-1ee8-689e-211f63c294e6@huawei.com> X-Headers-End: 1jeqcz-000P0Q-I3 Subject: Re: [f2fs-dev] [PATCH] Revert "f2fs: fix quota_sync failure due to f2fs_lock_op" 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 05/30, Chao Yu wrote: > On 2020/5/30 6:34, Jaegeuk Kim wrote: > > On 05/29, Chao Yu wrote: > >> Under heavy fsstress, we may triggle panic while issuing discard, > >> because __check_sit_bitmap() detects that discard command may earse > >> valid data blocks, the root cause is as below race stack described, > >> since we removed lock when flushing quota data, quota data writeback > >> may race with write_checkpoint(), so that it causes inconsistency in > >> between cached discard entry and segment bitmap. > >> > >> - f2fs_write_checkpoint > >> - block_operations > >> - set_sbi_flag(sbi, SBI_QUOTA_SKIP_FLUSH) > >> - f2fs_flush_sit_entries > >> - add_discard_addrs > >> - __set_bit_le(i, (void *)de->discard_map); > >> - f2fs_write_data_pages > >> - f2fs_write_single_data_page > >> : inode is quota one, cp_rwsem won't be locked > >> - f2fs_do_write_data_page > >> - f2fs_allocate_data_block > >> - f2fs_wait_discard_bio > >> : discard entry has not been added yet. > >> - update_sit_entry > >> - f2fs_clear_prefree_segments > >> - f2fs_issue_discard > >> : add discard entry > >> > >> This patch fixes this issue by reverting 435cbab95e39 ("f2fs: fix quota_sync > >> failure due to f2fs_lock_op"). > >> > >> Fixes: 435cbab95e39 ("f2fs: fix quota_sync failure due to f2fs_lock_op") > > > > The previous patch fixes quota_sync gets EAGAIN all the time. > > How about this? It seems this works for fsstress test. > > Then this? --- fs/f2fs/segment.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index ebbadde6cbced..ed11dcf2d69ed 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3107,6 +3107,14 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, type = CURSEG_COLD_DATA; } + /* + * We need to wait for node_write to avoid block allocation during + * checkpoint. This can only happen to quota writes which can cause + * the below discard race condition. + */ + if (IS_DATASEG(type)) + down_write(&sbi->node_write); + down_read(&SM_I(sbi)->curseg_lock); mutex_lock(&curseg->curseg_mutex); @@ -3174,6 +3182,9 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, if (put_pin_sem) up_read(&sbi->pin_sem); + + if (IS_DATASEG(type)) + up_write(&sbi->node_write); } static void update_device_state(struct f2fs_io_info *fio) -- 2.27.0.rc0.183.gde8f92d652-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel