From nobody Wed Apr 29 03:24:34 2026 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 4751FC433F5 for ; Tue, 24 May 2022 07:36:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235354AbiEXHgo (ORCPT ); Tue, 24 May 2022 03:36:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235321AbiEXHgb (ORCPT ); Tue, 24 May 2022 03:36:31 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 637FB50E0B for ; Tue, 24 May 2022 00:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653377787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cPpYHnXIBZc98vfrpGPPeNO4G+nbrOWi/rqlDfKtk/c=; b=QHyw8IHQEz6QYN4ZFcB+PD4jghKTRtFQq+C0pduSt7aKn47EdM7UG+xSf4F3QPBv3kSKU3 xX9slm6HE8A6lC1LvfEhhk4ATEwwVvjIfDl10VOSyEP/Ho/f+YH59KOtttoMXB50HGMyQF 7VeGEzKg+3YPeEXYA7HX4Aijz2BhV8I= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-300-5KAyOmSPNNG3jYCGv1Q7ow-1; Tue, 24 May 2022 03:36:25 -0400 X-MC-Unique: 5KAyOmSPNNG3jYCGv1Q7ow-1 Received: by mail-wr1-f70.google.com with SMTP id m8-20020adfc588000000b0020c4edd8a57so4486124wrg.10 for ; Tue, 24 May 2022 00:36:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cPpYHnXIBZc98vfrpGPPeNO4G+nbrOWi/rqlDfKtk/c=; b=MNSC6tzH+QLS5U9uf+LY5R8HfWtZaq5kSHA1FKoVjDFSmb1Hrwl+NB/DQWFtnzJ2ER PPBUxm9kYRmOLzgt3H/ii6pecNjIBNQnI4P5iw52+G+QvzwJ5tHXEcKLENVv7WKQozFW Qwr581UT/1lNmy/nhUx6hFVamhIMFepEURAtRmzk/MVK2U+eCL0/NcQH/B5NQw7iXW87 0GFz2cOVl6p84x+OiNol0D+rROk2h1fV8tbEldeSqdtlYqa2ZuUDq9B/TUvRMjySJbwv o1YDoSMQVf6almeMUC3H/pFQk0S2MxFwFjm/HUufTb35gQGMD6CJtCI07Bq7m0XKlTH+ DTLw== X-Gm-Message-State: AOAM531oEvc2pyjJHP8p6K6GAr50JzJBa/MEKWh8h3AtFi23K+iqDc6O SNbFF9Nep+3Az6eJWMBuxLww9V/PXa2hcDRWTLn8KHG7XwnHEq4KWEfyLs2+dk/QKvn1MnEZ/o6 5EzIltTnxpQFm0CTtQAZprQd+q1ph0rWOomRu1FmnhD8vch25RxXxTrS+JUScmkcNRnD5l4prwn Q= X-Received: by 2002:a1c:cc07:0:b0:397:b2f:ac59 with SMTP id h7-20020a1ccc07000000b003970b2fac59mr2402568wmb.157.1653377784581; Tue, 24 May 2022 00:36:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuUGmmf6De8j0Vb1q2r+xRSubiNWQ86vtCLBVplu81PlvJpiqs971RkOnFdaBSvgbgP5aABg== X-Received: by 2002:a1c:cc07:0:b0:397:b2f:ac59 with SMTP id h7-20020a1ccc07000000b003970b2fac59mr2402537wmb.157.1653377784301; Tue, 24 May 2022 00:36:24 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id f2-20020adfc982000000b0020c5253d927sm12202174wrh.115.2022.05.24.00.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 May 2022 00:36:23 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Chung-Chiang Cheng , Lennart Poettering , Colin Walters , Peter Jones , Alexander Larsson , Alberto Ruiz , Christian Kellner , Javier Martinez Canillas , OGAWA Hirofumi Subject: [PATCH v2 1/3] fat: add a vfat_rename2() and make existing .rename callback a helper Date: Tue, 24 May 2022 09:36:02 +0200 Message-Id: <20220524073604.247790-2-javierm@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220524073604.247790-1-javierm@redhat.com> References: <20220524073604.247790-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently vfat only supports the RENAME_NOREPLACE flag which is handled by the virtual file system layer but doesn't support the RENAME_EXCHANGE flag. Add a vfat_rename2() function to be used as the .rename callback and move the current vfat_rename() handler to a helper. This is in preparation for implementing the RENAME_NOREPLACE flag using a different helper function. Signed-off-by: Javier Martinez Canillas --- (no changes since v1) fs/fat/namei_vfat.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index c573314806cf..88ccb2ee3537 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -889,9 +889,8 @@ static int vfat_mkdir(struct user_namespace *mnt_userns= , struct inode *dir, return err; } =20 -static int vfat_rename(struct user_namespace *mnt_userns, struct inode *ol= d_dir, - struct dentry *old_dentry, struct inode *new_dir, - struct dentry *new_dentry, unsigned int flags) +static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry) { struct buffer_head *dotdot_bh; struct msdos_dir_entry *dotdot_de; @@ -902,9 +901,6 @@ static int vfat_rename(struct user_namespace *mnt_usern= s, struct inode *old_dir, int err, is_dir, update_dotdot, corrupt =3D 0; struct super_block *sb =3D old_dir->i_sb; =20 - if (flags & ~RENAME_NOREPLACE) - return -EINVAL; - old_sinfo.bh =3D sinfo.bh =3D dotdot_bh =3D NULL; old_inode =3D d_inode(old_dentry); new_inode =3D d_inode(new_dentry); @@ -1021,13 +1017,24 @@ static int vfat_rename(struct user_namespace *mnt_u= serns, struct inode *old_dir, goto out; } =20 +static int vfat_rename2(struct user_namespace *mnt_userns, struct inode *o= ld_dir, + struct dentry *old_dentry, struct inode *new_dir, + struct dentry *new_dentry, unsigned int flags) +{ + if (flags & ~RENAME_NOREPLACE) + return -EINVAL; + + /* VFS already handled RENAME_NOREPLACE, handle it as a normal rename */ + return vfat_rename(old_dir, old_dentry, new_dir, new_dentry); +} + static const struct inode_operations vfat_dir_inode_operations =3D { .create =3D vfat_create, .lookup =3D vfat_lookup, .unlink =3D vfat_unlink, .mkdir =3D vfat_mkdir, .rmdir =3D vfat_rmdir, - .rename =3D vfat_rename, + .rename =3D vfat_rename2, .setattr =3D fat_setattr, .getattr =3D fat_getattr, .update_time =3D fat_update_time, --=20 2.36.1 From nobody Wed Apr 29 03:24:34 2026 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 9A069C433F5 for ; Tue, 24 May 2022 07:36:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235322AbiEXHgt (ORCPT ); Tue, 24 May 2022 03:36:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235326AbiEXHgc (ORCPT ); Tue, 24 May 2022 03:36:32 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 62CFE41611 for ; Tue, 24 May 2022 00:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653377788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Aaq+8mBUqU62y0VEllgQncQ09kUyTKPkA4vCRiJz8W0=; b=HgFhgt/QcTgK5PgQ1tqtaEPJAoEa0v8sOjhIzL4KXj46f4I2c9XvaT8eV5I6lX038V8nyp iWp0rydDOUPZR0hTJzkgmNQ6+aVapTp1fwzv9JkJeE0bRxZB0XCoioqwUtPfFkU82AWudE pPjOgndM/6rukUGSYNWsoYdV7Ze47Jk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-kUJwZJ1XOeSC_hUUP-fgew-1; Tue, 24 May 2022 03:36:27 -0400 X-MC-Unique: kUJwZJ1XOeSC_hUUP-fgew-1 Received: by mail-wr1-f71.google.com with SMTP id e7-20020adfa747000000b0020fe61b0c62so1018180wrd.22 for ; Tue, 24 May 2022 00:36:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Aaq+8mBUqU62y0VEllgQncQ09kUyTKPkA4vCRiJz8W0=; b=2/hMv5d461vOCwa+t/ycjy7I2V1T8XnAqYKZSM9DYUiH83vWIMiztOX9iptOq8SxMI OR2CusEGJuvBdmUPO9d5L2KONAtaDc0jL1Z3W6l9q7xCZGg1+4Jx5P8CQFJnRtYACBjg C/mAphSGKCG0QfX4/bTcFOwsjQR7Bq9/Ihd6n28r8WkxQfEwa22VzWrMsr0Ic638j9oe v3XffaH+hW/K6yzq1SmmiAOugztxIJXD47d3lI/IwecZBcpw0e6MCoipfToPChdCcJvU IQuYsWgnCkxoffTy4UJwipkuEi3CZ6q8pHJX4fj9114PBdQ6V7OKNnpdeFPyH34RxL5r TlCg== X-Gm-Message-State: AOAM532a28x17y8IYH3x8dwVHZssV2Ehmxlo0vuzrCuv3Z3VNs7AroA9 EqO3JCnvFRKBkIQmhOf+/nVi547+bxGoy0nuM8mhELuwV5kBxsYqDAbMOi33m3uo+6YK3a94U2V VMvr9nSe/z+Q1YfI2e6urLrF5J4INGB7frbjKuPryDBtFXyaX3QN8yrTB66nM9vr1Qx9FiLFdLV 4= X-Received: by 2002:a05:600c:3542:b0:394:6e2f:ffa2 with SMTP id i2-20020a05600c354200b003946e2fffa2mr2468591wmq.132.1653377785901; Tue, 24 May 2022 00:36:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfr923KFwhNSGBDP0eAbz0FKOw7EdGcC26QgZCBbJPbNjaaTj9l7/mPo8Si8fG92veWfpcnA== X-Received: by 2002:a05:600c:3542:b0:394:6e2f:ffa2 with SMTP id i2-20020a05600c354200b003946e2fffa2mr2468551wmq.132.1653377785470; Tue, 24 May 2022 00:36:25 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id f2-20020adfc982000000b0020c5253d927sm12202174wrh.115.2022.05.24.00.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 May 2022 00:36:25 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Chung-Chiang Cheng , Lennart Poettering , Colin Walters , Peter Jones , Alexander Larsson , Alberto Ruiz , Christian Kellner , Javier Martinez Canillas , OGAWA Hirofumi Subject: [PATCH v2 2/3] fat: add renameat2 RENAME_EXCHANGE flag support Date: Tue, 24 May 2022 09:36:03 +0200 Message-Id: <20220524073604.247790-3-javierm@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220524073604.247790-1-javierm@redhat.com> References: <20220524073604.247790-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The renameat2 RENAME_EXCHANGE flag allows to atomically exchange two paths but is currently not supported by the Linux vfat filesystem driver. Add a vfat_rename_exchange() helper function that implements this support. The super block lock is acquired during the operation to ensure atomicity, and in the error path actions made are reversed also with the mutex held. It makes the operation as transactional as possible, within the limitation impossed by vfat due not having a journal with logs to replay. Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Only update the new_dir inode version and timestamps if !=3D old_dir (Alex Larsson). - Add some helper functions to avoid duplicating code (OGAWA Hirofumi). - Use braces for multi-lines blocks even if are one statement (OGAWA Hirofu= mi). - Mention in commit message that the operation is as transactional as possi= ble but within the vfat limitations of not having a journal (Colin Walters). fs/fat/namei_vfat.c | 174 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 88ccb2ee3537..97caec8c5207 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -1017,13 +1017,185 @@ static int vfat_rename(struct inode *old_dir, stru= ct dentry *old_dentry, goto out; } =20 +/* Helpers for vfat_rename_exchange() */ + +static int vfat_get_dotdot_info(struct inode *inode, struct buffer_head **= dotdot_bh, + struct msdos_dir_entry **dotdot_de) +{ + if (!S_ISDIR(inode->i_mode)) + return 0; + + return fat_get_dotdot_entry(inode, dotdot_bh, dotdot_de); +} + +static void vfat_exchange_dentries(struct inode *old_inode, struct inode *= new_inode, + loff_t old_i_pos, loff_t new_i_pos) +{ + fat_detach(old_inode); + fat_detach(new_inode); + + fat_attach(old_inode, new_i_pos); + fat_attach(new_inode, old_i_pos); +} + +static int vfat_sync_after_exchange(struct inode *dir, struct inode *inode) +{ + int err =3D 0; + + if (IS_DIRSYNC(dir)) + err =3D fat_sync_inode(inode); + else + mark_inode_dirty(inode); + + return err; +} + +static int vfat_update_dotdot_info(struct buffer_head *dotdot_bh, struct m= sdos_dir_entry *dotdot_de, + struct inode *dir, struct inode *inode) +{ + int err =3D 0; + + fat_set_start(dotdot_de, MSDOS_I(dir)->i_logstart); + mark_buffer_dirty_inode(dotdot_bh, inode); + + if (IS_DIRSYNC(dir)) + err =3D sync_dirty_buffer(dotdot_bh); + + return err; +} + +static void vfat_update_dir_metadata(struct inode *dir, struct timespec64 = *ts) +{ + inode_inc_iversion(dir); + fat_truncate_time(dir, ts, S_CTIME | S_MTIME); + + if (IS_DIRSYNC(dir)) + (void)fat_sync_inode(dir); + else + mark_inode_dirty(dir); +} + +static int vfat_rename_exchange(struct inode *old_dir, struct dentry *old_= dentry, + struct inode *new_dir, struct dentry *new_dentry) +{ + struct buffer_head *old_dotdot_bh =3D NULL, *new_dotdot_bh =3D NULL; + struct msdos_dir_entry *old_dotdot_de =3D NULL, *new_dotdot_de =3D NULL; + struct inode *old_inode, *new_inode; + struct timespec64 ts =3D current_time(old_dir); + loff_t old_i_pos, new_i_pos; + int err, corrupt =3D 0; + struct super_block *sb =3D old_dir->i_sb; + + old_inode =3D d_inode(old_dentry); + new_inode =3D d_inode(new_dentry); + + /* Acquire super block lock for the operation to be atomic */ + mutex_lock(&MSDOS_SB(sb)->s_lock); + + /* if directories are not the same, get ".." info to update */ + if (old_dir !=3D new_dir) { + err =3D vfat_get_dotdot_info(old_inode, &old_dotdot_bh, &old_dotdot_de); + if (err) + goto out; + + err =3D vfat_get_dotdot_info(new_inode, &new_dotdot_bh, &new_dotdot_de); + if (err) + goto out; + } + + old_i_pos =3D MSDOS_I(old_inode)->i_pos; + new_i_pos =3D MSDOS_I(new_inode)->i_pos; + + /* exchange the two dentries */ + vfat_exchange_dentries(old_inode, new_inode, old_i_pos, new_i_pos); + + err =3D vfat_sync_after_exchange(old_dir, new_inode); + if (err) + goto error_exchange; + + err =3D vfat_sync_after_exchange(new_dir, old_inode); + if (err) + goto error_exchange; + + /* update ".." directory entry info */ + if (old_dotdot_de) { + err =3D vfat_update_dotdot_info(old_dotdot_bh, old_dotdot_de, new_dir, o= ld_inode); + if (err) + goto error_old_dotdot; + + drop_nlink(old_dir); + inc_nlink(new_dir); + } + + if (new_dotdot_de) { + err =3D vfat_update_dotdot_info(new_dotdot_bh, new_dotdot_de, old_dir, n= ew_inode); + if (err) + goto error_new_dotdot; + + drop_nlink(new_dir); + inc_nlink(old_dir); + } + + /* update inode version and timestamps */ + inode_inc_iversion(old_inode); + inode_inc_iversion(new_inode); + + vfat_update_dir_metadata(old_dir, &ts); + + /* if directories are not the same, update new_dir as well */ + if (old_dir !=3D new_dir) + vfat_update_dir_metadata(new_dir, &ts); +out: + brelse(old_dotdot_bh); + brelse(new_dotdot_bh); + mutex_unlock(&MSDOS_SB(sb)->s_lock); + + return err; + +error_new_dotdot: + /* data cluster is shared, serious corruption */ + corrupt =3D 1; + + if (new_dotdot_de) { + corrupt |=3D vfat_update_dotdot_info(new_dotdot_bh, new_dotdot_de, + new_dir, new_inode); + } + +error_old_dotdot: + /* data cluster is shared, serious corruption */ + corrupt =3D 1; + + if (old_dotdot_de) { + corrupt |=3D vfat_update_dotdot_info(old_dotdot_bh, old_dotdot_de, + old_dir, old_inode); + } + +error_exchange: + vfat_exchange_dentries(old_inode, new_inode, new_i_pos, old_i_pos); + + if (corrupt) { + corrupt |=3D fat_sync_inode(old_inode); + corrupt |=3D fat_sync_inode(new_inode); + } + + if (corrupt < 0) { + fat_fs_error(new_dir->i_sb, + "%s: Filesystem corrupted (i_pos %lld, %lld)", + __func__, old_i_pos, new_i_pos); + } + goto out; +} + static int vfat_rename2(struct user_namespace *mnt_userns, struct inode *o= ld_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) { - if (flags & ~RENAME_NOREPLACE) + if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE)) return -EINVAL; =20 + if (flags & RENAME_EXCHANGE) + return vfat_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); + /* VFS already handled RENAME_NOREPLACE, handle it as a normal rename */ return vfat_rename(old_dir, old_dentry, new_dir, new_dentry); } --=20 2.36.1 From nobody Wed Apr 29 03:24:34 2026 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 D939FC433F5 for ; Tue, 24 May 2022 07:36:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235386AbiEXHgz (ORCPT ); Tue, 24 May 2022 03:36:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235344AbiEXHgk (ORCPT ); Tue, 24 May 2022 03:36:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id F41506D1A7 for ; Tue, 24 May 2022 00:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653377798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v9L11SjTsj62SbwNjoc/BXEoQMgxev81E9+gPbEhuK8=; b=RqYXIhed1oA8+uD3M9Jk30OModRSaw5T4DT7B+mtNaUBqWYW1iCGc27sp4c9PhbwnqZImf f4VJO5QyFdKxwFEsus4FddfuCS7u4NWyIM7dIevJXSvO4EHiCKZ94VM5U0GcGdYeA9o07R lZNgGMWA+ZyvJaLZaRCW/SgI+56PSB8= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-281-kjR0Z_T_OsWo1_m5HnELtw-1; Tue, 24 May 2022 03:36:28 -0400 X-MC-Unique: kjR0Z_T_OsWo1_m5HnELtw-1 Received: by mail-wm1-f69.google.com with SMTP id n30-20020a05600c3b9e00b00397335edc7dso139099wms.7 for ; Tue, 24 May 2022 00:36:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v9L11SjTsj62SbwNjoc/BXEoQMgxev81E9+gPbEhuK8=; b=qkEClUG7pOZ0hFVEF7LkutXcVn72dkc30iHoJ+g6y3tb8RdZYtD+BYyCK8PrzUeZtS PH/gwbfda/XOBa0Txbga6Jmx5zt0GAt/X/lHbOWVNK53BoFXiMJ8HB1964neSKq8wVvN oDyK25Gv93Ybn0yW1vD+Zu+of9mAoE0JU/BF3x/jLkhdJjQEy0xKXtZDnLofnrfsTYu4 yIXvSl3bo42uYsdurWcza/43UPN1E70zHpYFpSzZlW5zf9FIdGnOelICj7ys0d06P37V 23zLnbwLP2fpNovjPm/17J9ZlhKH2JdZzVLbXx4nfCBoNrvuLoxpn3aKPp06JycFUlzt jTlQ== X-Gm-Message-State: AOAM533LQ+3tIHf2sm2ppQkkWP+BFlJP6NPZCTOFx/myUu3RR3hhzbu0 1kvAKDpHQ75XzhUhVtvlC8+gUv7oY+RArjHcEO+3gc1kUfwntVBud1NLPMyFk4JGIkcA5g661Gv VIL4V2xPAfgUYnSMNbIMC/0hzMEnQ9km12fDqima8EpWBZgrwHelbi87gKgpr/QHxPdfQOapHt0 Y= X-Received: by 2002:a7b:cd95:0:b0:397:3c5e:9639 with SMTP id y21-20020a7bcd95000000b003973c5e9639mr2486018wmj.12.1653377786945; Tue, 24 May 2022 00:36:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLdafaAxTC7fiyyLNOo5Eud6DnInNC5/4SszhjaKLVsKC0JaDcFNsdPy3iOf0SgAltaEI6bg== X-Received: by 2002:a7b:cd95:0:b0:397:3c5e:9639 with SMTP id y21-20020a7bcd95000000b003973c5e9639mr2485991wmj.12.1653377786670; Tue, 24 May 2022 00:36:26 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id f2-20020adfc982000000b0020c5253d927sm12202174wrh.115.2022.05.24.00.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 May 2022 00:36:26 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Chung-Chiang Cheng , Lennart Poettering , Colin Walters , Peter Jones , Alexander Larsson , Alberto Ruiz , Christian Kellner , Javier Martinez Canillas , OGAWA Hirofumi , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH v2 3/3] selftests/filesystems: add a vfat RENAME_EXCHANGE test Date: Tue, 24 May 2022 09:36:04 +0200 Message-Id: <20220524073604.247790-4-javierm@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220524073604.247790-1-javierm@redhat.com> References: <20220524073604.247790-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a test for the renameat2 RENAME_EXCHANGE support in vfat, but split it in a tool that just does the rename exchange and a script that is run by the kselftests framework on `make TARGETS=3D"filesystems/fat" kselftest`. That way the script can be easily extended to test other file operations. The script creates a 1 MiB disk image, that is then formated with a vfat filesystem and mounted using a loop device. That way all file operations are done on an ephemeral filesystem. Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Call sync to flush the page cache before checking the file contents (Alex Larsson). MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + .../selftests/filesystems/fat/Makefile | 7 ++ .../testing/selftests/filesystems/fat/config | 2 + .../filesystems/fat/rename_exchange.c | 37 +++++++++ .../filesystems/fat/run_fat_tests.sh | 82 +++++++++++++++++++ 6 files changed, 130 insertions(+) create mode 100644 tools/testing/selftests/filesystems/fat/Makefile create mode 100644 tools/testing/selftests/filesystems/fat/config create mode 100644 tools/testing/selftests/filesystems/fat/rename_exchange= .c create mode 100755 tools/testing/selftests/filesystems/fat/run_fat_tests.sh diff --git a/MAINTAINERS b/MAINTAINERS index 4fdbbd6c1984..158771bb7755 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20841,6 +20841,7 @@ M: OGAWA Hirofumi S: Maintained F: Documentation/filesystems/vfat.rst F: fs/fat/ +F: tools/testing/selftests/filesystems/fat/ =20 VFIO DRIVER M: Alex Williamson diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Mak= efile index 0aedcd76cf0f..fc59ad849a90 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -16,6 +16,7 @@ TARGETS +=3D exec TARGETS +=3D filesystems TARGETS +=3D filesystems/binderfs TARGETS +=3D filesystems/epoll +TARGETS +=3D filesystems/fat TARGETS +=3D firmware TARGETS +=3D fpu TARGETS +=3D ftrace diff --git a/tools/testing/selftests/filesystems/fat/Makefile b/tools/testi= ng/selftests/filesystems/fat/Makefile new file mode 100644 index 000000000000..93ee73c16828 --- /dev/null +++ b/tools/testing/selftests/filesystems/fat/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +TEST_PROGS :=3D run_fat_tests.sh +TEST_GEN_PROGS_EXTENDED :=3D rename_exchange +CFLAGS +=3D -O2 -g -Wall -I../../../../usr/include/ + +include ../../lib.mk diff --git a/tools/testing/selftests/filesystems/fat/config b/tools/testing= /selftests/filesystems/fat/config new file mode 100644 index 000000000000..6cf95e787a17 --- /dev/null +++ b/tools/testing/selftests/filesystems/fat/config @@ -0,0 +1,2 @@ +CONFIG_BLK_DEV_LOOP=3Dy +CONFIG_VFAT_FS=3Dy diff --git a/tools/testing/selftests/filesystems/fat/rename_exchange.c b/to= ols/testing/selftests/filesystems/fat/rename_exchange.c new file mode 100644 index 000000000000..e488ad354fce --- /dev/null +++ b/tools/testing/selftests/filesystems/fat/rename_exchange.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Program that atomically exchanges two paths using + * the renameat2() system call RENAME_EXCHANGE flag. + * + * Copyright 2022 Red Hat Inc. + * Author: Javier Martinez Canillas + */ + +#define _GNU_SOURCE +#include +#include +#include + +void print_usage(const char *program) +{ + printf("Usage: %s [oldpath] [newpath]\n", program); + printf("Atomically exchange oldpath and newpath\n"); +} + +int main(int argc, char *argv[]) +{ + int ret; + + if (argc !=3D 3) { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + + ret =3D renameat2(AT_FDCWD, argv[1], AT_FDCWD, argv[2], RENAME_EXCHANGE); + if (ret) { + perror("rename exchange failed"); + exit(EXIT_FAILURE); + } + + exit(EXIT_SUCCESS); +} diff --git a/tools/testing/selftests/filesystems/fat/run_fat_tests.sh b/too= ls/testing/selftests/filesystems/fat/run_fat_tests.sh new file mode 100755 index 000000000000..7f35dc3d15df --- /dev/null +++ b/tools/testing/selftests/filesystems/fat/run_fat_tests.sh @@ -0,0 +1,82 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Run filesystem operations tests on an 1 MiB disk image that is formatted= with +# a vfat filesystem and mounted in a temporary directory using a loop devi= ce. +# +# Copyright 2022 Red Hat Inc. +# Author: Javier Martinez Canillas + +set -e +set -u +set -o pipefail + +BASE_DIR=3D"$(dirname $0)" +TMP_DIR=3D"$(mktemp -d /tmp/fat_tests_tmp.XXXX)" +IMG_PATH=3D"${TMP_DIR}/fat.img" +MNT_PATH=3D"${TMP_DIR}/mnt" + +cleanup() +{ + mountpoint -q "${MNT_PATH}" && unmount_image + rm -rf "${TMP_DIR}" +} +trap cleanup SIGINT SIGTERM EXIT + +create_loopback() +{ + touch "${IMG_PATH}" + chattr +C "${IMG_PATH}" >/dev/null 2>&1 || true + + truncate -s 1M "${IMG_PATH}" + mkfs.vfat "${IMG_PATH}" >/dev/null 2>&1 +} + +mount_image() +{ + mkdir -p "${MNT_PATH}" + sudo mount -o loop "${IMG_PATH}" "${MNT_PATH}" +} + +rename_exchange_test() +{ + local rename_exchange=3D"${BASE_DIR}/rename_exchange" + local old_path=3D"${MNT_PATH}/old_file" + local new_path=3D"${MNT_PATH}/new_file" + + echo old | sudo tee "${old_path}" >/dev/null 2>&1 + echo new | sudo tee "${new_path}" >/dev/null 2>&1 + sudo "${rename_exchange}" "${old_path}" "${new_path}" >/dev/null 2>&1 + sudo sync -f "${MNT_PATH}" + grep new "${old_path}" >/dev/null 2>&1 + grep old "${new_path}" >/dev/null 2>&1 +} + +rename_exchange_subdir_test() +{ + local rename_exchange=3D"${BASE_DIR}/rename_exchange" + local dir_path=3D"${MNT_PATH}/subdir" + local old_path=3D"${MNT_PATH}/old_file" + local new_path=3D"${dir_path}/new_file" + + sudo mkdir -p "${dir_path}" + echo old | sudo tee "${old_path}" >/dev/null 2>&1 + echo new | sudo tee "${new_path}" >/dev/null 2>&1 + sudo "${rename_exchange}" "${old_path}" "${new_path}" >/dev/null 2>&1 + sudo sync -f "${MNT_PATH}" + grep new "${old_path}" >/dev/null 2>&1 + grep old "${new_path}" >/dev/null 2>&1 +} + +unmount_image() +{ + sudo umount "${MNT_PATH}" &> /dev/null +} + +create_loopback +mount_image +rename_exchange_test +rename_exchange_subdir_test +unmount_image + +exit 0 --=20 2.36.1