From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.53 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794844509; b=4b0qMAJZkd3wlWTfG0PhAByw8vABYxpV9ZE6nmJizK8DAdOmhZeJ6PkIlbYlPU+OOQxa 7PfHux9XmuR972a747EPXLRK1P6fmS70VwXy3pk+wX6HUeVmvnSU5eRUvFEObhYPXBBzz wHY5ITt2Co58mj3HU5PISE7lzRa1CupFUTGfQfBSImBegpcF9sARWqJDhZld8VtqXwonB gNruJcvNILUtE/6rClpVdWcnq+zgnnusyl9swbVvGscDX5fwV/q5fY9tcRT1MuZYYNCLy 9zZJlNyct02JZkbg8rejEgONKKArWSA6MbdB6bBu6ZbFcCg9TdS+nHjsj+w0ZdAUARA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794844509; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Mime-Version:Content-Type:Date:Message-Id:Subject:From:To:Cc:X-Mailer: References:In-Reply-To; bh=040W0WtrDSqyLSlnE1PnGtn4Yj+G8VjPGcb4tUhpFSw=; b=utRa99wS7Sp4IckjJxl+pU96suVOtalyfnb2bUqzMvyX5w5Jt8karH8zlovrxTKDgcVz jftAvr16QHtuVcSAakWywELQcfA16tM6YSmvEa5WIJryOZ1+tYDzUb80tC0bfU3fniYt1 V2KU73YL9fi6yFihNogmPPOnSnWr0CPOKL7NP/vAU4j9II0v0S5c+JEfWqweEmj5BAI58 Y1ABvA7cfnN+hDBXyAw/a4LoNbc8tTQsXR6ADdTSQXFbCaQMxnrYOI0xunF6QB0Ofzdye ub4bxlmY7NaiJeZMUK9ERu/08zQALUUEfHVBPoT/hUJwKByGAS6Bo/gxF5s6BuZAMGA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=cqEV0zd+; arc=none smtp.remote-ip=209.85.128.53 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36D5E606A323 for ; Mon, 16 Nov 2026 15:55:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 36D5E606A323 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=cqEV0zd+ Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4a9a8d6cea8so38419925e9.1 for ; Mon, 16 Nov 2026 07:55:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794844508; x=1795449308; darn=vger.kernel.org; h=in-reply-to:references:cc:to:from:subject:message-id:date :content-type:mime-version:from:to:cc:subject:date:message-id :reply-to:content-type; bh=040W0WtrDSqyLSlnE1PnGtn4Yj+G8VjPGcb4tUhpFSw=; b=cqEV0zd+AbiMi51fjQ5aimX6vzyUxz11j8T1ly8M2Efy4yRNPwwfHkdE6S8K++0xxK cZIKMYC1m1E2i8yrd/eQpRAwn6FhsD3VizNUvCSAf185TmamDfm7UOeqZvfIV2tBuOIQ IzZ5LmYLTLvSa16w6LZUVyjgt/OoxJoWuJfrv7p/nrODUAGcvrf1y/62rXpP6JU9RiE1 e8hwffw5TK2FU292iNdr4R22mWnxeto48Yg97JWKM0+kyMIXh2kwHVq0GPTi5ig5tkHL DjB1KxuAaUeApjW3VLcJWrN/ys3FQwCa/V7MIOim3h2IdBH16+lXC5uzIeplxCNkG8qp dF3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794844508; x=1795449308; h=in-reply-to:references:cc:to:from:subject:message-id:date :content-type:mime-version:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=040W0WtrDSqyLSlnE1PnGtn4Yj+G8VjPGcb4tUhpFSw=; b=Gh7JosVhZk5nB1jSxCBKZ66fOAvK+zLxq5P+HwIhGwY3zSW1X0rcj/spwQ38motBnY QoCDwKE7ceizVA3O1rrqjrxqpRHHEhJC+JC21eWv3eh4udd3YGsViPcPXzIFQZfTP2NB EpujB74B0h8dk/bpYCclcd253siU0h+8J2ddWQH7EWYA3757KIYrePNngz3TJjJcMtcV qVj1Z3k5pfU+pvPL9EOjJZuG16OG89v+EIcj4PyGKz7cYDLTwap7JoPPXpQkBLhUutXk VBpVUDEyEMugSJAt1EQCaHkMm64K9/+l0hUjA53VDj5dznZlfUJHL76pmkmARSXp/1+h WG/Q== X-Forwarded-Encrypted: i=1; AL+hErHn9OgGFe8vdNtrbzAcXPtkNc8VIWYmpDiu7eCnyGBRW40qEsGlWpETi5HD8Xpse/FUYx8lMtCAIQJDvEcj@vger.kernel.org X-Gm-Message-State: APuU4Z8MxseCUFq5sPdIOe3KjaNAebjjpfAfkNxROZ/VuRu3LotQEBS2 Jux0nY4YNzJJ40pha7GGNKQccfMgoXq6X+EQvOwA4OKI5O1ZnbvutvDt X-Gm-Gg: AYBFou07SBv5iH5PzY56IAlP/RW7j5vuzbmHPBiTKvDvPudpxwdd6TPE4FhaOmVoaYX 4F5sh21qvg50Fz+na/XkyRzavb8LUjI8/BAOmBH+KUMhYNjyAFi8MQPHKaVQ8DDoEedV+9bbgHe IlN4++poYJMaNzaZH8/QGRtD8+PRGeYa7RRGgBdOhi32xAx6Or/sQk5AqNfy4mhC0xzTkiRtFoX wyKXzFfm8JhVk2c0/N7dxGNyl+ZdLP22XxtTTIJNHDyvy/zxPbJJeeXZdc/AibkYR6ecP/Q2S6y 2nkjX8YkKsQcI5sxY2wwZlw5SEa3wDDFf2eSPwP8hwX8U82B9HctKVpRa32Qi+2XcoCNexLJe+l dkWirDtmfSz5F/jsUUUzaF454Sv79o4nkdx9luiWXwCEOdvQAPGkw2s/RY27KpeGAX/ZZp5q+Tm VZVOE66WXGMsthHeQ+liA8n4l4puwx++3rU7n8oUnqdMxU6547XuqUBYjUHYIRTRW6x3CVHr5Ds hsnPkHiwroSSFgEZP41Y/uIVVLXkd1SYOxYWmU3Uf7ZIFzI80sfZSS1zpgPdMYAO5IA7fi0NFWJ z7TsPtRXr7ILZpVjm4zGpo83CQ== X-Received: by 2002:a05:600c:1906:b0:4a1:c6f5:2450 with SMTP id 5b1f17b1804b1-4bb55ac2a34mr244783135e9.17.1794844507334; Mon, 16 Nov 2026 07:55:07 -0800 (PST) Received: from localhost ([2001:b07:5d26:7a6a:365a:60ff:fe0d:cfc6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb55ae501bsm321476945e9.10.2026.11.16.07.55.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Nov 2026 07:55:05 -0800 (PST) X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 Content-Type: multipart/signed; boundary=f93caca3b757f4039ce5a884d522f788c6958abee5364c6a1026cc96907d; micalg=pgp-sha512; protocol="application/pgp-signature" Date: Mon, 16 Nov 2026 16:55:02 +0100 Message-Id: Subject: Re: [RFC PATCH v4 06/10] vfs: add __vfs_fileattr_set_locked() for inode_lock()'d callers From: "koraynilay" To: "Amir Goldstein" , "koraynilay" Cc: "David Sterba" , "Namjae Jeon" , "Sungjong Seo" , "Alexander Viro" , "Christian Brauner" , "Trond Myklebust" , "Anna Schumaker" , "Chuck Lever" , "Jeff Layton" , "Konstantin Komarov" , "Paulo Alcantara" , "Chris Mason" , "Yuezhang Mo" , "Jan Kara" , "NeilBrown" , "Olga Kornievskaia" , "Dai Ngo" , "Tom Talpey" , "Ronnie Sahlberg" , "Shyam Prasad N" , "Bharath SM" , "Sergey Senozhatsky" , "ChenXiaoSong" , "Darrick J . Wong" , "Sean Smith" , "Andrey Albershteyn" , "Pedro Falcato" , =?utf-8?q?Pali_Roh=C3=A1r?= , , , , , , , , X-Mailer: aerc 0.22.0-0-gc2f86b7abde3 References: <20261115180343.576773-1-koray.fra@gmail.com> <20261115180343.576773-7-koray.fra@gmail.com> In-Reply-To: --f93caca3b757f4039ce5a884d522f788c6958abee5364c6a1026cc96907d Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 On Mon Nov 16, 2026 at 2:52 PM CET, Amir Goldstein wrote: > On Sun, Nov 15, 2026 at 7:04=E2=80=AFPM koraynilay = wrote: >> >> Currently there is no way for a caller to invoke vfs_fileattr_set() >> while holding an inode lock without having the kernel go into deadlock. >> >> Fix this by moving the vfs_fileattr_set() logic into >> __vfs_fileattr_set_locked() and making vfs_fileattr_set() a simple >> wrapper that only handles the inode lock. >> >> Assisted-by: Gemini:3.8-flash-high antigravity-cli-1.5.7 >> Signed-off-by: koraynilay >> --- >> fs/file_attr.c | 139 +++++++++++++++++++++++---------------- >> include/linux/fileattr.h | 2 + >> 2 files changed, 86 insertions(+), 55 deletions(-) >> >> diff --git a/fs/file_attr.c b/fs/file_attr.c >> index 12610fb6a751..063c81fbfa6a 100644 >> --- a/fs/file_attr.c >> +++ b/fs/file_attr.c >> @@ -288,6 +288,89 @@ static int fileattr_set_prepare(struct inode *inode= , >> return 0; >> } >> >> +/** >> + * __vfs_fileattr_set_locked - change miscellaneous file attributes whi= le >> + * holding the inode lock >> + * >> + * @idmap: idmap of the mount >> + * @dentry: the object to change >> + * @fa: fileattr pointer >> + * >> + * Same as vfs_fileattr_set(), but caller must hold the inode lock. >> + * >> + * Return: 0 on success, or a negative error on failure. >> + */ >> +int __vfs_fileattr_set_locked(const struct mnt_idmap *idmap, struct den= try *dentry, >> + struct file_kattr *fa) >> +{ >> + struct inode *inode =3D d_inode(dentry); >> + struct file_kattr old_ma =3D {}; >> + int err; >> + >> + if (!inode->i_op->fileattr_set) >> + return -ENOIOCTLCMD; >> + >> + if (!inode_owner_or_capable(idmap, inode)) >> + return -EPERM; >> + >> + err =3D vfs_fileattr_get(dentry, &old_ma); >> + if (err) >> + return err; >> + >> + /* initialize missing bits from old_ma */ >> + if (fa->flags_valid) { >> + /* FS_IOC_SETFLAGS */ >> + fa->fsx_xflags |=3D (old_ma.fsx_xflags & FS_XFLAGS_MASK)= & >> + ~FS_XFLAG_COMMON; >> + fa->fsx_extsize =3D old_ma.fsx_extsize; >> + fa->fsx_nextents =3D old_ma.fsx_nextents; >> + fa->fsx_projid =3D old_ma.fsx_projid; >> + fa->fsx_cowextsize =3D old_ma.fsx_cowextsize; >> + fa->fsx_ptime =3D old_ma.fsx_ptime; >> + } else { >> + /* >> + * Preserve unmasked xflags when running file_setattr() >> + * with a mask, which doesn't need a read-modify-write >> + * so these attributes would be set to 0. >> + * >> + * With FS_IOC_FSSETXATTR or mask =3D=3D 0 (legacy mode) >> + * this is not needed as userspace does >> + * read-modify-write already. >> + */ >> + if (fa->fsx_xflags_mask) { >> + fa->fsx_xflags |=3D old_ma.fsx_xflags & >> + ~fa->fsx_xflags_mask; >> + fileattr_fill_xflags(fa, fa->fsx_xflags & >> + ~FS_XFLAG_RDONLY_MASK); >> + if (!(fa->fsx_xflags_mask & FS_XFLAG_EXTSIZE)) >> + fa->fsx_extsize =3D old_ma.fsx_extsize; >> + if (!(fa->fsx_xflags_mask & FS_XFLAG_PROJID)) >> + fa->fsx_projid =3D old_ma.fsx_projid; >> + if (!(fa->fsx_xflags_mask & FS_XFLAG_COWEXTSIZE)= ) >> + fa->fsx_cowextsize =3D old_ma.fsx_cowext= size; >> + } >> + fa->flags |=3D old_ma.flags & ~FS_COMMON_FL; >> + >> + /* xflags not present in fsxattr */ >> + if (!(fa->fsx_xflags_mask & FS_XFLAG_PTIME)) >> + fa->fsx_ptime =3D old_ma.fsx_ptime; >> + } >> + >> + err =3D fileattr_set_prepare(inode, &old_ma, fa); >> + if (err) >> + return err; >> + err =3D security_inode_file_setattr(dentry, fa); >> + if (err) >> + return err; >> + err =3D inode->i_op->fileattr_set(idmap, dentry, fa); >> + if (err) >> + return err; >> + fsnotify_xattr(dentry); >> + >> + return 0; >> +} >> +EXPORT_SYMBOL(__vfs_fileattr_set_locked); >> + >> /** >> * vfs_fileattr_set - change miscellaneous file attributes >> * @idmap: idmap of the mount >> @@ -308,7 +391,6 @@ int vfs_fileattr_set(const struct mnt_idmap *idmap, = struct dentry *dentry, >> struct file_kattr *fa) >> { >> struct inode *inode =3D d_inode(dentry); >> - struct file_kattr old_ma =3D {}; >> int err; >> >> if (!inode->i_op->fileattr_set) >> @@ -318,60 +400,7 @@ int vfs_fileattr_set(const struct mnt_idmap *idmap,= struct dentry *dentry, >> return -EPERM; >> >> inode_lock(inode); >> - err =3D vfs_fileattr_get(dentry, &old_ma); >> - if (!err) { >> - /* initialize missing bits from old_ma */ >> - if (fa->flags_valid) { >> - /* FS_IOC_SETFLAGS */ >> - fa->fsx_xflags |=3D (old_ma.fsx_xflags & FS_XFLA= GS_MASK) & >> - ~FS_XFLAG_COMMON; >> - fa->fsx_extsize =3D old_ma.fsx_extsize; >> - fa->fsx_nextents =3D old_ma.fsx_nextents; >> - fa->fsx_projid =3D old_ma.fsx_projid; >> - fa->fsx_cowextsize =3D old_ma.fsx_cowextsize; >> - fa->fsx_ptime =3D old_ma.fsx_ptime; >> - } else { >> - /* >> - * Preserve unmasked xflags when running file_se= tattr() >> - * with a mask, which doesn't need a read-modify= -write >> - * so these attributes would be set to 0. >> - * >> - * With FS_IOC_FSSETXATTR or mask =3D=3D 0 (lega= cy mode) >> - * this is not needed as userspace does >> - * read-modify-write already. >> - */ >> - if (fa->fsx_xflags_mask) { >> - fa->fsx_xflags |=3D old_ma.fsx_xflags & >> - ~fa->fsx_xflags_mask; >> - fileattr_fill_xflags(fa, fa->fsx_xflags = & >> - ~FS_XFLAG_RDONLY_MA= SK); >> - if (!(fa->fsx_xflags_mask & FS_XFLAG_EXT= SIZE)) >> - fa->fsx_extsize =3D old_ma.fsx_e= xtsize; >> - if (!(fa->fsx_xflags_mask & FS_XFLAG_PRO= JID)) >> - fa->fsx_projid =3D old_ma.fsx_pr= ojid; >> - if (!(fa->fsx_xflags_mask & FS_XFLAG_COW= EXTSIZE)) >> - fa->fsx_cowextsize =3D old_ma.fs= x_cowextsize; >> - } >> - fa->flags |=3D old_ma.flags & ~FS_COMMON_FL; >> - >> - /* xflags not present in fsxattr */ >> - if (!(fa->fsx_xflags_mask & FS_XFLAG_PTIME)) >> - fa->fsx_ptime =3D old_ma.fsx_ptime; >> - } >> - >> - err =3D fileattr_set_prepare(inode, &old_ma, fa); >> - if (err) >> - goto out; >> - err =3D security_inode_file_setattr(dentry, fa); >> - if (err) >> - goto out; >> - err =3D inode->i_op->fileattr_set(idmap, dentry, fa); >> - if (err) >> - goto out; >> - fsnotify_xattr(dentry); >> - } >> - >> -out: >> + err =3D __vfs_fileattr_set_locked(idmap, dentry, fa); >> inode_unlock(inode); >> return err; >> } >> diff --git a/include/linux/fileattr.h b/include/linux/fileattr.h >> index ba7ed3b387d8..7ff62ee27e58 100644 >> --- a/include/linux/fileattr.h >> +++ b/include/linux/fileattr.h >> @@ -97,6 +97,8 @@ static inline bool fileattr_has_fsx(const struct file_= kattr *fa) >> int vfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa); >> int vfs_fileattr_set(const struct mnt_idmap *idmap, struct dentry *dent= ry, >> struct file_kattr *fa); >> +int __vfs_fileattr_set_locked(const struct mnt_idmap *idmap, struct den= try *dentry, >> + struct file_kattr *fa); > > There is no reason for __ prefix here and I think it should be discourage= d for > global scope if possible. Ah ok, I copied what had been done for __vfs_setxattr_locked() / vfs_setxattr() and __vfs_removexattr_locked() / vfs_removexattr(), but I agree that __ makes it more "internal", I'll change it for v5. Thanks, koraynilay > Thanks, > Amir. --f93caca3b757f4039ce5a884d522f788c6958abee5364c6a1026cc96907d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSgVimKafU5DQMcjcDmj22qf5IGXAUCavsnVgAKCRDmj22qf5IG XC40APwLpgC2qCi2ygC417CAeeBgnvIyXQNVw3WOnFMBGg8tUQEAsuqI0c//BtxD +1WkW5Y6mUri16pC/bv/iBr7lSbFFAs= =Rkz6 -----END PGP SIGNATURE----- --f93caca3b757f4039ce5a884d522f788c6958abee5364c6a1026cc96907d--