Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3728014pxb; Mon, 24 Jan 2022 16:30:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXh0UIEObCx63hgmwZ5QCsNVhCeSewuBA+3uI/rzQSCEp/9ITlmbWBmk2fU0YCtmW/aS1G X-Received: by 2002:a17:90b:3a8e:: with SMTP id om14mr860604pjb.84.1643070608043; Mon, 24 Jan 2022 16:30:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643070608; cv=none; d=google.com; s=arc-20160816; b=Zl1P85tBRFumPF+fvtA2ZSHEsYVSkcQ+H6/0bIR35+ApvPOKds8jyDB1SQfmsQMFbS XB6TZfn6NAyqDtQTJBLGOf8nFQSCCQKuUfcknqmiMB1KD79M7uKc7kfG3w1H+ERw6up/ 45l4m49QRzgK+KHji37JRafxO2U2lqxHQU+53N6M+w5sC7bRCBUnZU0rM5ry5HrkZM6q vtMo7eMOBwL9zE2IJcvYHdzoNdd+/L4URfT1E72FTB+3Tb3UXuZ7mH/6bKtkBwyCfwoK XrurgVTz8ZYdooZP53bVZ8pIH1mukyDTZYZcijXhQC2PBjrrTLPtc2SLJ+w95dD0dJE5 eSVQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FsfvOuBr464CLg2Ik5rb4+bY1IFpgSwZRWlmPmeoP04=; b=kD4nBqctZdWglBoSpswPR54a/XYHXSCijTI3FFH9AiSe55E9rLBvwUs2qK/mfwc1A4 sEYY92Ezu0iLaN3E10T7MbIra/0BWo15ZV2nO5md/WFsA154EmyV+B5Oq8PZb5KbljwV X2XUssDCM7rEHyTMQDlXu2r6Iw/yuGsaJV2nWYYedZ97rP+HTwXCyI8iD/M93sfhxMS0 qyTSyLUBzKzCG5yzcbjfmZilcat9Bk3mhglYFAkPOKf00c086RLKcajgEp/vx+u1oEEv opFnKuRQ8YhVhrUaQRpMaqJgeKRnIP6yottXYpFandLAHNGrG24r67QyOHehJfJ8dYcD 2Btw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=g7XFjzde; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 11si14506233pfl.113.2022.01.24.16.29.54; Mon, 24 Jan 2022 16:30:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=g7XFjzde; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S3408021AbiAYAVW (ORCPT + 99 others); Mon, 24 Jan 2022 19:21:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2360899AbiAXXil (ORCPT ); Mon, 24 Jan 2022 18:38:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDC3FC078504; Mon, 24 Jan 2022 13:38:20 -0800 (PST) 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 8A86A61469; Mon, 24 Jan 2022 21:38:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F3A0C340E4; Mon, 24 Jan 2022 21:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643060300; bh=TZn8Yh7VlVGc1UIog89OIJSotNjIoF9dA/3e+R3TaEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g7XFjzdeodfBfDCPBeehV2i5uVzjJps4FhKIYGroC6SAcFwmbxuqV6tAwSZ7dFXit tO64Vg2+2lK8WYg64a92zAvuMh9336HtH+q8omYDYFPIYCf4+tZ9JRnhjwYC2xog6b 9V93tx/HutOQplJ92hWb6uFUIqgDfFPTNNcgC5RI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Theodore Tso , Lukas Czerner , stable@kernel.org Subject: [PATCH 5.16 0901/1039] ext4: dont use the orphan list when migrating an inode Date: Mon, 24 Jan 2022 19:44:50 +0100 Message-Id: <20220124184155.577831829@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Theodore Ts'o commit 6eeaf88fd586f05aaf1d48cb3a139d2a5c6eb055 upstream. We probably want to remove the indirect block to extents migration feature after a deprecation window, but until then, let's fix a potential data loss problem caused by the fact that we put the tmp_inode on the orphan list. In the unlikely case where we crash and do a journal recovery, the data blocks belonging to the inode being migrated are also represented in the tmp_inode on the orphan list --- and so its data blocks will get marked unallocated, and available for reuse. Instead, stop putting the tmp_inode on the oprhan list. So in the case where we crash while migrating the inode, we'll leak an inode, which is not a disaster. It will be easily fixed the next time we run fsck, and it's better than potentially having blocks getting claimed by two different files, and losing data as a result. Signed-off-by: Theodore Ts'o Reviewed-by: Lukas Czerner Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/ext4/migrate.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c @@ -437,12 +437,12 @@ int ext4_ext_migrate(struct inode *inode percpu_down_write(&sbi->s_writepages_rwsem); /* - * Worst case we can touch the allocation bitmaps, a bgd - * block, and a block to link in the orphan list. We do need - * need to worry about credits for modifying the quota inode. + * Worst case we can touch the allocation bitmaps and a block + * group descriptor block. We do need need to worry about + * credits for modifying the quota inode. */ handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, - 4 + EXT4_MAXQUOTAS_TRANS_BLOCKS(inode->i_sb)); + 3 + EXT4_MAXQUOTAS_TRANS_BLOCKS(inode->i_sb)); if (IS_ERR(handle)) { retval = PTR_ERR(handle); @@ -463,10 +463,6 @@ int ext4_ext_migrate(struct inode *inode * Use the correct seed for checksum (i.e. the seed from 'inode'). This * is so that the metadata blocks will have the correct checksum after * the migration. - * - * Note however that, if a crash occurs during the migration process, - * the recovery process is broken because the tmp_inode checksums will - * be wrong and the orphans cleanup will fail. */ ei = EXT4_I(inode); EXT4_I(tmp_inode)->i_csum_seed = ei->i_csum_seed; @@ -478,7 +474,6 @@ int ext4_ext_migrate(struct inode *inode clear_nlink(tmp_inode); ext4_ext_tree_init(handle, tmp_inode); - ext4_orphan_add(handle, tmp_inode); ext4_journal_stop(handle); /* @@ -503,12 +498,6 @@ int ext4_ext_migrate(struct inode *inode handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1); if (IS_ERR(handle)) { - /* - * It is impossible to update on-disk structures without - * a handle, so just rollback in-core changes and live other - * work to orphan_list_cleanup() - */ - ext4_orphan_del(NULL, tmp_inode); retval = PTR_ERR(handle); goto out_tmp_inode; }