From patchwork Mon Jan 22 02:23:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 189884 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2329209dyb; Sun, 21 Jan 2024 18:23:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQJ7AjSLLLFLT8f8GwkTCbAfr+LPAYO+WPg4Yo7ECykagXrWrSntZfuV9zCkc/8hkAhtqS X-Received: by 2002:a17:902:c3cc:b0:1d7:4398:1611 with SMTP id j12-20020a170902c3cc00b001d743981611mr417571plj.81.1705890219515; Sun, 21 Jan 2024 18:23:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705890219; cv=pass; d=google.com; s=arc-20160816; b=b4Nt8JKLJVAxTZulye7q+gHQeOqo180fVhQVK44qbwpQxQ1TuV25snwAiSXkVBVfDb AMf/x9FE1oKFdaJ9p+wQ0OIgUuMnee7zlP8jK8kjGfbZThhq50wM50HRJVYhwxnW1x2b j+7JS6Y6jg5iIbqY/IJ5TXcizwEEguB6s3YQaHvANKuBeV1DM+q1rWXBVHUPYagsrtia /H3OS+CAJidSRoPsVFVrf3b3tbYn8IawljUEITgQEAcsDqOf48Hs6Vy/vap0yf4UZ6zI gCcg5FFjcipeDaeznQrFYex9JlSnMMaK10C2LiyEqe2YtGjqg3qWz6cKrA5aKqtrFcwz j0gg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=qeyilFyzqKvtFdQ1VSbpyJxMr2l1q8q+FZiMDVVvDQc=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=N1nPh3lx/kbU9YoBgo/12+D/0XL5wBp/bY66XQ8OGCOL/bX9Vz8GgS2jCggejK1QRx g8ry1aYpnQOBi6hzMyOpkPCRnWbK3qgBX4oPRruoe7nZu+f/378uLL8NUHASf6oxwPbr PyKvYUjDg4nMsx0mpmI950047STikjdOVUvhws3ftz3xaUOnP8Q+L8aCN4kpUDmra3X0 C9slNeJS5fConcSJxCQAPQ/+ebbWNMOCpc3bs4dVbEPtF6CBsiKHUFkpDL6XJESLRv6R OPzl74Ieu1DZlxOcyHN6vk5LX37jrdn9z32nPpxnTS/OVYBJHx/5fI3oriBU3E21LHXZ BOuQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kn7lVm1f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-32275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h15-20020a170902680f00b001cf5cc3029fsi7327253plk.548.2024.01.21.18.23.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 18:23:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-32275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kn7lVm1f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-32275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 03EE42821BD for ; Mon, 22 Jan 2024 02:23:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 15B454A39; Mon, 22 Jan 2024 02:23:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kn7lVm1f" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B2591C27 for ; Mon, 22 Jan 2024 02:23:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705890203; cv=none; b=A6k9US/k/IRfh0aY5sweuCEyJGKpriT1Za1b3tmUQ/pf9Mk4ddBZV55KoH0XuwfHeppK4V593i1z+mF2cQV42eyvaNklejEyPAgW0q61IIAtcLCEbYBPET0eBCIjVmjRJvQ8B2NVFANTIWxu933QJuLV35SF5VkfM5us1K7JX6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705890203; c=relaxed/simple; bh=z6sXpXgjIIXF4ORGPRhbVLiWL3zHNdnmLT0QW9aWDvc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PKqZFgurY5og4nTeo3IGdd0LVUZyuxa9qKQnb5weDCt7XD+zpENhyIFMKAhzsqZKfA0EAh2R8mmpj6zPOKzPG1AZiIaQqresx3myhnzz+HZU7nkKqGIp6eHpMo4XTw96OFh8gBNyKSFY0jPowcXdW3189jKRbp7fosJPhi1bjhI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kn7lVm1f; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2E9AC433F1; Mon, 22 Jan 2024 02:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705890203; bh=z6sXpXgjIIXF4ORGPRhbVLiWL3zHNdnmLT0QW9aWDvc=; h=From:To:Cc:Subject:Date:From; b=kn7lVm1fUxlPx66h/CBV2QAlk0VPF75oaJwp5oc0y7G2bZEJ+3Z9eOc0IBHaqhlkW af8ID2Zv7bBqCI2vcOLinzvqe8H7/9YuCSNE2fX/iU7kJd+HNPb3dc3YtqD+lfbXZY Lr6RQHe1JtD9SOMmZ1+Ep1I9GvyX+CMx29upvdpk2qI71DbBsDdpjpmss8+KiuKSbM wGZ8plr4kU758CR3W67LayaxEcbwN5VL02FIf0B2TqhN7mmd2eSF1rioHutaHkcCjK BWU1GmfewrENNlQo2T4APOWn43pXxKiRsOnoJ76joAJLML2zlMp/7GVxF3D07ZlVIb /BLPld6QnqGFg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2] f2fs: compress: fix to cover f2fs_disable_compressed_file() w/ i_sem Date: Mon, 22 Jan 2024 10:23:13 +0800 Message-Id: <20240122022313.3054810-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788755542355588086 X-GMAIL-MSGID: 1788755542355588086 - f2fs_disable_compressed_file - check inode_has_data - f2fs_file_mmap - mkwrite - f2fs_get_block_locked : update metadata in compressed inode's disk layout - fi->i_flags &= ~F2FS_COMPR_FL - clear_inode_flag(inode, FI_COMPRESSED_FILE); we should use i_sem lock to prevent above race case. Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- v2: - remove unneeded i_size check pointed out by Jaegeuk. fs/f2fs/f2fs.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4481f68d6418..c6655fbdeb5e 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4409,15 +4409,24 @@ static inline bool f2fs_disable_compressed_file(struct inode *inode) { struct f2fs_inode_info *fi = F2FS_I(inode); - if (!f2fs_compressed_file(inode)) + f2fs_down_write(&F2FS_I(inode)->i_sem); + + if (!f2fs_compressed_file(inode)) { + f2fs_up_write(&F2FS_I(inode)->i_sem); return true; - if (S_ISREG(inode->i_mode) && F2FS_HAS_BLOCKS(inode)) + } + if (f2fs_is_mmap_file(inode) || + (S_ISREG(inode->i_mode) && F2FS_HAS_BLOCKS(inode))) { + f2fs_up_write(&F2FS_I(inode)->i_sem); return false; + } fi->i_flags &= ~F2FS_COMPR_FL; stat_dec_compr_inode(inode); clear_inode_flag(inode, FI_COMPRESSED_FILE); f2fs_mark_inode_dirty_sync(inode, true); + + f2fs_up_write(&F2FS_I(inode)->i_sem); return true; }