Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp3885539rwl; Mon, 10 Apr 2023 02:40:52 -0700 (PDT) X-Google-Smtp-Source: AKy350aDtPM2xkav5Y8qXuRfwgN9gV0MRdTWjCM9aWZw6WVPQqoyI+exHwWQoQUGHXlIzeD0WToW X-Received: by 2002:a62:790d:0:b0:634:4f6:86df with SMTP id u13-20020a62790d000000b0063404f686dfmr7876229pfc.1.1681119652424; Mon, 10 Apr 2023 02:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681119652; cv=none; d=google.com; s=arc-20160816; b=WF2MbuFWel9NmkqtjpCKUNEaY6AseK73YyEW6g6+xwdJ9duXHgZtNNpeDh89CNzAgj Hs07LzNlHaAbOr/4Jbcrmnvx3l/qTOYbCE/FqFD/5BoOeK+/xODuN9I/7t4NGWCdNQVa wy2rkTqZlDzyzQjYAJxJUfqOOQslHfJfQAXGDA5gf3hLW2LI+42pO5Trc1vw6KXUAvt9 oCgR4m4ZafGjHAUCNl9qnYEYRM65GxkMrC8LqelXoL0UaiH1R9Zf+nsioqhdgLrrn9vJ 19L8rN4Mr4NVBktVEwJEjzK53jTAi3oUr9Jjjz4SwCEpW413c9GfNEH4OkwCdcRaimdZ BoKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ll6Ml2xivpo4dKJM18/9OF/Dc9jSVBrYm7MF8eSTx9c=; b=MPMtBVunrEfZ5WkRaQyUfcZ7mM5CSJYWDDGid76+e8YF6bHRuCnfAEclnRQg9Mckey 3ONl4ySk0szp2z45xYdl2lTWwiJX48ngmhl+K9NAjrI5rVTPTTdbB0aVGUYrOvcZ7cGa n3cAANb8STqMwV0vJt5ecP2ug3vInCO51MrQK//7//oU1ZAzSqS0tbgvJCnSs2rfbMwK CdeZ2rbY5HAsGJ1ICXd5olv0j0t7xmMWEFlv+jiVudor1ibohyhVvlsPM9+8WStULPke 7SSfPQKJOMWvP7HU1qhtXLtEBglIDKdWUE1gZqPFb2UPazgDvQolJH4YZwPRLVpX4MKJ xl1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=htSUCPpZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b7-20020a62cf07000000b005a908acf446si10548192pfg.104.2023.04.10.02.40.41; Mon, 10 Apr 2023 02:40:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=htSUCPpZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbjDJJjY (ORCPT + 99 others); Mon, 10 Apr 2023 05:39:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbjDJJjX (ORCPT ); Mon, 10 Apr 2023 05:39:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F185D5279 for ; Mon, 10 Apr 2023 02:39:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8CDC761A32 for ; Mon, 10 Apr 2023 09:39:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEE72C43443; Mon, 10 Apr 2023 09:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681119558; bh=hQfvtLSuuwTvz2MLeajEI4NVGlDu7NNc7omUTcL4vyk=; h=From:To:Cc:Subject:Date:From; b=htSUCPpZOVsAJvoQg2qVAmzMdJCiKS4lo+6ZwcvoOlqUbWTB3wqpm/y06AIPYV2ji 3IgmKGtIStSoVph9kxLG19iJEhHEC9ZMoBgEAVRqaSDxN3vnn0UDam4DgfgR0mBzDZ okDsUILdt9SwNpZT5ruVuVZ1Btoxc5F0iV2xDC+2FJQdfe5Iid3Eh0Koj4nPDXhxk6 YBx67YCO3UFIh8rWwG0PYXxArMQNtFzkhfMYgjsQw7DfpsUTOcUiFu19YTcPP6eeC8 bYT9UeFc9r4bVkyUJ5WrFPHxAUl2diDZSf8oRFxtPuM79Xb4gLLurRGsp11N+wEMqR z0Il+vRNOftMg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH RFC] f2fs: fix to use spinlock to avoid page.private update race Date: Mon, 10 Apr 2023 17:39:12 +0800 Message-Id: <20230410093912.2184557-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There may be subtle race condition, make PagePrivate and page_private being inconsistent, result in decreasing page count incorrectly, introduce a per-inode spinlock to avoid such condition. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 19 ++++++++++++++++++- fs/f2fs/super.c | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index c378aedcadea..6b31bef5853e 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -856,6 +856,8 @@ struct f2fs_inode_info { unsigned int atomic_write_cnt; loff_t original_i_size; /* original i_size before atomic write */ + + spinlock_t private_lock; /* protect page->private */ }; static inline void get_read_extent_info(struct extent_info *ext, @@ -1413,21 +1415,28 @@ static inline bool page_private_##name(struct page *page) \ test_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \ } +static inline struct f2fs_inode_info *F2FS_I(struct inode *inode); #define PAGE_PRIVATE_SET_FUNC(name, flagname) \ static inline void set_page_private_##name(struct page *page) \ { \ + unsigned long flags; \ + spin_lock_irqsave(&F2FS_I(page->mapping->host)->private_lock, flags); \ if (!PagePrivate(page)) \ attach_page_private(page, (void *)page->private); \ set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \ set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \ + spin_unlock_irqrestore(&F2FS_I(page->mapping->host)->private_lock, flags); \ } #define PAGE_PRIVATE_CLEAR_FUNC(name, flagname) \ static inline void clear_page_private_##name(struct page *page) \ { \ + unsigned long flags; \ + spin_lock_irqsave(&F2FS_I(page->mapping->host)->private_lock, flags); \ clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \ - if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) \ + if (page_private(page) == (BIT(PAGE_PRIVATE_NOT_POINTER))) \ detach_page_private(page); \ + spin_unlock_irqrestore(&F2FS_I(page->mapping->host)->private_lock, flags); \ } PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER); @@ -1456,17 +1465,25 @@ static inline unsigned long get_page_private_data(struct page *page) static inline void set_page_private_data(struct page *page, unsigned long data) { + unsigned long flags; + + spin_lock_irqsave(&F2FS_I(page->mapping->host)->private_lock, flags); if (!PagePrivate(page)) attach_page_private(page, 0); set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); page_private(page) |= data << PAGE_PRIVATE_MAX; + spin_unlock_irqrestore(&F2FS_I(page->mapping->host)->private_lock, flags); } static inline void clear_page_private_data(struct page *page) { + unsigned long flags; + + spin_lock_irqsave(&F2FS_I(page->mapping->host)->private_lock, flags); page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0); if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) detach_page_private(page); + spin_unlock_irqrestore(&F2FS_I(page->mapping->host)->private_lock, flags); } /* For compression */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index a1b570a5e50f..555424dd85fd 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1419,6 +1419,8 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb) init_f2fs_rwsem(&fi->i_gc_rwsem[WRITE]); init_f2fs_rwsem(&fi->i_xattr_sem); + spin_lock_init(&fi->private_lock); + /* Will be used by directory only */ fi->i_dir_level = F2FS_SB(sb)->dir_level; -- 2.25.1