From patchwork Thu Jun 15 03:29:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yuezhang.Mo@sony.com" X-Patchwork-Id: 13280686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 097C6EB64D9 for ; Thu, 15 Jun 2023 04:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243036AbjFOE3a (ORCPT ); Thu, 15 Jun 2023 00:29:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237726AbjFOE32 (ORCPT ); Thu, 15 Jun 2023 00:29:28 -0400 X-Greylist: delayed 3590 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 14 Jun 2023 21:29:26 PDT Received: from mx07-001d1705.pphosted.com (mx07-001d1705.pphosted.com [185.132.183.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6CA212B for ; Wed, 14 Jun 2023 21:29:26 -0700 (PDT) Received: from pps.filterd (m0209326.ppops.net [127.0.0.1]) by mx08-001d1705.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35ENLK1V030487; Thu, 15 Jun 2023 03:29:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sony.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=S1; bh=AOL5ot312TBpsYB2SJLfmwQiP99A4RF1n5uHkWVx2KA=; b=NiaJj88L5iijPY932/mIjEI+o+hTfW4KnReOz8ozgBoEa6oxNMRFbe4L63bQ5ZTsHLoM jbOoV+wrTWFByIDai4AOkujSPpElYmtXEiUjIVDpHdyRyN/7GdaqHcENMh8YGpqQ9mqJ 3MgSTyUw07kqsUTmrVBgEfZAivIR6wGRoOuOsRkqGh+QCCSb5gSSXlsCapybOQtBdKDl r1cZNTOFfyh4Cwp4uswzqIJ7LtbFE5kzqS0pqgljYnMwug0/7f84VGmKkLAn5/XvqnKh yDk6xvGnCi9712V80O2B955NiMHUyaq0cYWEB7Nda+tYg2+NhZ+8PWJjTDnF0ekVKSlY QQ== Received: from apc01-sg2-obe.outbound.protection.outlook.com (mail-sgaapc01lp2106.outbound.protection.outlook.com [104.47.26.106]) by mx08-001d1705.pphosted.com (PPS) with ESMTPS id 3r6uunsna5-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Jun 2023 03:29:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W18jtP/s/UGvmVRfcDvtDv4NtzwsbD71vDdXvLnk3TgbNOIaIbVUg+jcE7nR8tZgCcKwbC+DmU++6IJ36l9O1TyAWeQTzbDqb7dpAa3WYR8cymRdeS7R0s0vby/ULxg6dBlBB6H0uryoLdJCz/egLQtgTOf+R3mStFeQPIyFohJsmmycvLLM9oYLuk6kj9FJmoGcl549OecQaaKRqygAj6VkBwkP6ypPgLkDFsUIjUX5+XdluLFXDTOfMeHWJYHXCWdVNT7SuT1+szLladmWsL7x/o2rBXQ+nuXjme3qW2TpNI79IMwB9934ehcGLX2L9CeP9g0vh39ZuL/BgjNWNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AOL5ot312TBpsYB2SJLfmwQiP99A4RF1n5uHkWVx2KA=; b=ir0w/Czi42P2db3ahsXMpIgRs+4TTkI/N6Q2ED/tYxCGafIt1PuEaW/3/BPO93kVdU49jyKzAPjCuMFVL3jReXByl2pZ4MB15EBr7ZegGwHAhcMxQiKJxeEzEsA0xZQoaOe7GRbKUjhVkT8rt7E/Tbh1vvensEOAonT6atMrCMn42t7YPR4rS/oPCa5F9qATPeOY20IqSJXU3awg0r+uTPTTgwoGnrLSyEBUCKziMZO3zADF2AtI4xJrNtrorxg8XUJWAh66QNhRwM52ElGHESy5dqQyEb7O8M1ZlEpClhwIB1dDQKxrrTwivaPy2kh2YAAqPMDtTnu+L/4zgPGe0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sony.com; dmarc=pass action=none header.from=sony.com; dkim=pass header.d=sony.com; arc=none Received: from PUZPR04MB6316.apcprd04.prod.outlook.com (2603:1096:301:fc::7) by KL1PR0401MB4212.apcprd04.prod.outlook.com (2603:1096:820:27::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25; Thu, 15 Jun 2023 03:29:13 +0000 Received: from PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::ce2d:a9dc:4955:5275]) by PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::ce2d:a9dc:4955:5275%5]) with mapi id 15.20.6455.037; Thu, 15 Jun 2023 03:29:13 +0000 From: "Yuezhang.Mo@sony.com" To: "linkinjeon@kernel.org" , "sj1557.seo@samsung.com" CC: "linux-fsdevel@vger.kernel.org" , "Andy.Wu@sony.com" , "Wataru.Aoyama@sony.com" Subject: [PATCH v1 2/2] exfat: do not zeroed the extended part Thread-Topic: [PATCH v1 2/2] exfat: do not zeroed the extended part Thread-Index: AdmfORbaqcRl7y32Sz2Kb5mg+c6LvA== Date: Thu, 15 Jun 2023 03:29:13 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PUZPR04MB6316:EE_|KL1PR0401MB4212:EE_ x-ms-office365-filtering-correlation-id: c760dad0-9624-47eb-9125-08db6d50b0a7 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Hz2C5hY+kWLEUJOkdry82CeWWVDRaJoy0No3XHrYEi7FqnroBxdaXQytwe/IEpeemV1SITK6MDiHjupxp+LvDSh8gAe+AO2wf09QebWtZaliWcW8H8ha6t5zXkgihU8uN9k06xEZYeXs7X5ORVOY9tKC9FvJ/IrCKqkFwbBMigdopvI9d5x3HK2tvKlp/qEKCZbWPdTFEHEOg2wxCYJefDflYp9GLiVaqkDGA40BrM8H62KqqK4r4wJeKM9TwABWIdfgi4JZ2fMn6wGpX+qqbN5uqSsifvHN5m/kq+Ccr66nWw+wQsa8Vz1dF6TGcc/DGOYuSj0SS+9BLDGnxXFem5GPG/nVKTKHcppNXaUjs0+heOS4UhxdwIqVOZ/yAknVEIDn/ThOVgb7TKLtOJHBeBmwFCUl0kQnhqody3gDimbUpTSbhuqR7xmYtxyYkJXKUapl2ec6QT0IR8cO8YGGusoYPjYWRCeE+oYMEPTIQwO50y1G8waT1xHfbAypNeiP9wNqBjAxXSAyLuMD54lU91pwpziCLQ+syrKGELexoCbBRCkZeAikraKSt5Ou+8bsoARirzzxT2iFbrTKDGwqvimMVZmTtjeQYrXpTcsrOWTeWE1kX5aJZOBiSBlHVV+U x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR04MB6316.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(136003)(346002)(39860400002)(376002)(451199021)(76116006)(4326008)(2906002)(86362001)(38070700005)(316002)(64756008)(66446008)(66476007)(66556008)(66946007)(41300700001)(110136005)(5660300002)(52536014)(8936002)(8676002)(54906003)(38100700002)(478600001)(122000001)(82960400001)(7696005)(71200400001)(83380400001)(107886003)(55016003)(9686003)(26005)(6506007)(186003)(33656002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?l5Bm1Fic2cmsmm85lI/5vkd5pB6x?= =?utf-8?q?+f8aC5IcfoILckAI6bGRfSYRCaOeWG3tR/zybjW5yBJHuGKEeQdc34AeIrm0Br3r9?= =?utf-8?q?5zHoBmjKRrl2TOKU1eOrn3cn545looYDRqYUuCRvUhHBvfS59+slZumN88QaTD4Km?= =?utf-8?q?gD06BSzAuCSYqHrhXEq+CEp2rqC3GytoofNUnXu/uouSh7fB5UbJQ4lpyP1dwaFDP?= =?utf-8?q?+i6dYQV4egHjBhOVEvQf1USMAj3WLTzNczcRlTXt2mUb4loeIGGfsRAFp5tEuh5aA?= =?utf-8?q?4ZIx4Z5h/VdPKU8ehoKGXg8PG22nufFGcnfqX+APw7YGzcosQt0eLSSn3ASJOY1Rn?= =?utf-8?q?D3S4THL1JfFTFPhi+k07EtgACSgxEpczrXQ1nFTZ9D72VQCW++jymnRnsv2loMy85?= =?utf-8?q?oruyeEmz4y/kGmcYKDfasRg5fsDb+Lmo4AhqE2z+/BN9UcJd7vxJ5JNDVhmxgDOTA?= =?utf-8?q?4QvgUF1yjJuKJConE/09iMwl2CswOwm1C8Nh0cxLQUt2wGsc92m8++JuKCQocBN75?= =?utf-8?q?NkZS3JgHIJVxHxhbP1lekN/Uh0gaQlgmgji1V2Po6l14VXVbfsZbK73wnQxbVLAGA?= =?utf-8?q?OLyCAKkULAhLXAULrhAo5XjT0mY3ca/98Oo5si8+qyjK/qMxjqx/Zw9oPnjH+kPVj?= =?utf-8?q?ZSqhPSF/k6b3Nknco9YEunaPvvVCNXpbM/pZ/vsKiTEoKF5M9jN7bt2g0Fxj4PLsf?= =?utf-8?q?r1cYTVhz4CWkkoszgXdF+sGDTuWUHYFakqkDlFJrjjmm0rAT1ud0ISdrLWjdOcm86?= =?utf-8?q?rOgDJPQ6f9/PL7M30p6srXRxjti4HRjZDiMpffJx0V+Lv9Nl/4dWOxXkb4TGypN7W?= =?utf-8?q?ERKqDYlOBrn6uqbgy9SxrM08mImBTBR5BTUW4tmeTJOci9kKeLtFUi8GHPHEGoSrR?= =?utf-8?q?yKlwOc3HrhEFh1F7v7uBs77Yrqy3XeC1Vwzz/uMrUykFNII44/ZOOpcagzwOQCplW?= =?utf-8?q?+Ti7dzBCAGjQlEhd/9pEiuAjGSPARfLVf152Zk+M2P1M5DM8J//0RU4e18knplSco?= =?utf-8?q?R2X58i9NQRDFqg/VMG/9x7X2LveVgnl+rI9zW8xiJ2xHstloX2rwiWiePvtoaUNcA?= =?utf-8?q?TINcEF9tyf41NDqzZBk91c4R4IdvvC2etXizQAMzJt1KgFPEYN8pUrVAFtWV30M+N?= =?utf-8?q?tBSrwllB3rt1Kn6wzku3Zor0AHamuD2FS9xSesUThnY7S0ZlmZmhzH0mdGKHcBW/v?= =?utf-8?q?Ax8udegx0XjIYEojfrJBh548KH3p2EkUOAbQtDeKvOk0EQ11v8bZoRKJ/nuHyD3KG?= =?utf-8?q?UhEvKFG6S9O5P5mMU/1FyztJRv6shUunlHEaDBjxMUR6j+Y2SUpEX0NQwM5Y/hL7K?= =?utf-8?q?KwPH99j/gFeUyCCQVP0lkhhGBUIj+SnpLIvSKyQjWBsisIMB+SqicXB2QI/mrdjxK?= =?utf-8?q?mTZF5vqDAQvoea8PnfoiqZ3XB8TIt0Dzm4OOoIIlNshZyvzEYdXzO/YuGUgaq48gY?= =?utf-8?q?Z5Y7xxzqzvbfUHZp5iXD89du8V4OhMzM3uic1xKu1hIS680zzQdmkjAfr+Wt3E581?= =?utf-8?q?CKZ5mza+7D2c?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CF4jTwv5+PENww1h7VutkIuvrXXBX/Ipt0uLH63/9ZIMnetanbwbw/IRyAN07mhi57TDQcZM8562brtIBiMbIhBv/QekmrDcrgRQmPUeY7vmI1mScV+7iLCIIUt1Ih8Vk5zGdTsZxt5utcIGy46JP/rGi8lfjk9SAbVKiiHCvPc7IGZ6eAZvV6HdJNiv8PCRmPsImVNKo8b2rKX+Z4WvGtHxTAjeFSMia69MzvCVLs6BZ+d+02YVtvhobvVbRVsn497JWSvEj176AVNSSUzUJNhce1e3YbJelN0VYezrLobRQC6DTqdKXgJHMk2/0+vuZLM8VJhwW17MLPkOR6kaYEP0iJPB64TaDDT2BZmMhMOIIawo/KplRrRGw2sousQ0pesGTaTgH6BpMPXoipSKskQ96NbGc7yb+u/NZYTeNclS1rLCSOCKiHOxNVgeDIH/R3u6oT21RORFfOcDYVlHmVRssJV0vYDFq+Gs038bCjM+hZDAfV8xMGoLl49JCiYT3JgPzr65H68BrKJa5dZTE034ner/oznPE7MH3C5KRwtNd0Ql8gyYITtJWctkOhMBrjOYybzrpgsyzXsaDhPCq6EWv3K2UbeUrLBtfIygnqfKs1sWNqLzVjKFevB1/bqo5PY15b/qAOLwv7fYKj4VFhCRvZH8D7Cyi9wAhQGAX0MjMimr6PODNbpMJkW4z502kl+PA5LDkIr1/z+s8F2tnVrLOIVInblfLEVjANjTJmyglwC9PnaWq0V7K2rGaD8VZT8D5alCJieDF9d1syCoM/i2q9PBTlxpEo7EcI/QBG8M+bvkUZ2V3P4yZSsJzDmhhMCNChTg1hLpvIZu3Vi7ow== X-OriginatorOrg: sony.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PUZPR04MB6316.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c760dad0-9624-47eb-9125-08db6d50b0a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2023 03:29:13.1447 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 66c65d8a-9158-4521-a2d8-664963db48e4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: eLR+tEfUBwh8BwWV25YXFmEsYv3ZgEmn3ANvGjgRz5dowVVE2yrkG4tAgikiGQcG0jFj6Lxr2vMcFzm77NV2eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0401MB4212 X-Proofpoint-ORIG-GUID: kqguvwZoEGSWlj_8xLfsZKbPQX2LoqHS X-Proofpoint-GUID: kqguvwZoEGSWlj_8xLfsZKbPQX2LoqHS X-Sony-Outbound-GUID: kqguvwZoEGSWlj_8xLfsZKbPQX2LoqHS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-14_14,2023-06-14_02,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Since the read operation beyond the ValidDataLength returns zero, if we just extend the size of the file, we don't need to zero the extended part, but only change the DataLength without changing the ValidDataLength. Signed-off-by: Yuezhang Mo Reviewed-by: Andy Wu Reviewed-by: Aoyama Wataru --- fs/exfat/file.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/fs/exfat/file.c b/fs/exfat/file.c index 680597f3237d..3daf31a4b0ab 100644 --- a/fs/exfat/file.c +++ b/fs/exfat/file.c @@ -13,7 +13,7 @@ #include "exfat_raw.h" #include "exfat_fs.h" -static int exfat_cont_expand(struct inode *inode, loff_t size, bool sync) +static int exfat_expand_and_zero(struct inode *inode, loff_t size, bool sync) { struct address_space *mapping = inode->i_mapping; loff_t start = i_size_read(inode), count = size - i_size_read(inode); @@ -43,6 +43,81 @@ static int exfat_cont_expand(struct inode *inode, loff_t size, bool sync) return filemap_fdatawait_range(mapping, start, start + count - 1); } +static int exfat_expand(struct inode *inode, loff_t size) +{ + int ret; + unsigned int num_clusters, new_num_clusters, last_clu; + struct exfat_inode_info *ei = EXFAT_I(inode); + struct super_block *sb = inode->i_sb; + struct exfat_sb_info *sbi = EXFAT_SB(sb); + struct exfat_chain clu; + + ret = inode_newsize_ok(inode, size); + if (ret) + return ret; + + num_clusters = EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi); + new_num_clusters = EXFAT_B_TO_CLU_ROUND_UP(size, sbi); + + if (new_num_clusters == num_clusters) + goto out; + + exfat_chain_set(&clu, ei->start_clu, num_clusters, ei->flags); + ret = exfat_find_last_cluster(sb, &clu, &last_clu); + if (ret) + return ret; + + clu.dir = (last_clu == EXFAT_EOF_CLUSTER) ? + EXFAT_EOF_CLUSTER : last_clu + 1; + clu.size = 0; + clu.flags = ei->flags; + + ret = exfat_alloc_cluster(inode, new_num_clusters - num_clusters, + &clu, IS_DIRSYNC(inode)); + if (ret) + return ret; + + /* Append new clusters to chain */ + if (clu.flags != ei->flags) { + exfat_chain_cont_cluster(sb, ei->start_clu, num_clusters); + ei->flags = ALLOC_FAT_CHAIN; + } + if (clu.flags == ALLOC_FAT_CHAIN) + if (exfat_ent_set(sb, last_clu, clu.dir)) + goto free_clu; + + if (num_clusters == 0) + ei->start_clu = clu.dir; + +out: + inode->i_ctime = inode->i_mtime = current_time(inode); + /* Expanded range not zeroed, do not update valid_size */ + i_size_write(inode, size); + + ei->i_size_aligned = round_up(size, sb->s_blocksize); + ei->i_size_ondisk = ei->i_size_aligned; + inode->i_blocks = round_up(size, sbi->cluster_size) >> 9; + + if (IS_DIRSYNC(inode)) + return write_inode_now(inode, 1); + + mark_inode_dirty(inode); + + return 0; + +free_clu: + exfat_free_cluster(inode, &clu); + return -EIO; +} + +static int exfat_cont_expand(struct inode *inode, loff_t size) +{ + if (mapping_writably_mapped(inode->i_mapping)) + return exfat_expand_and_zero(inode, size, IS_SYNC(inode)); + + return exfat_expand(inode, size); +} + static bool exfat_allow_set_time(struct exfat_sb_info *sbi, struct inode *inode) { mode_t allow_utime = sbi->options.allow_utime; @@ -256,7 +331,7 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size > i_size_read(inode)) { - error = exfat_cont_expand(inode, attr->ia_size, IS_SYNC(inode)); + error = exfat_cont_expand(inode, attr->ia_size); if (error || attr->ia_valid == ATTR_SIZE) return error; attr->ia_valid &= ~ATTR_SIZE; @@ -444,7 +519,7 @@ static ssize_t exfat_file_write_iter(struct kiocb *iocb, struct iov_iter *iter) goto unlock; if (pos + count > size) { - ret = exfat_cont_expand(inode, pos + count, false); + ret = exfat_expand_and_zero(inode, pos + count, false); if (ret < 0) goto unlock; }