From patchwork Thu Jun 16 21:22:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12884882 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C652C433EF for ; Thu, 16 Jun 2022 21:39:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 161246B0071; Thu, 16 Jun 2022 17:39:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 110666B0073; Thu, 16 Jun 2022 17:39:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF3776B0074; Thu, 16 Jun 2022 17:39:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DF8956B0071 for ; Thu, 16 Jun 2022 17:39:27 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id B4D77605BB for ; Thu, 16 Jun 2022 21:39:27 +0000 (UTC) X-FDA: 79585415574.26.BCA97A6 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf10.hostedemail.com (Postfix) with ESMTP id 5B33DC0072 for ; Thu, 16 Jun 2022 21:39:27 +0000 (UTC) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 25GKPgTx013455 for ; Thu, 16 Jun 2022 14:39:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=wzl40ncu9+N8GznKN7zuVZtUu0h7x3PlOCjn2K//01I=; b=PelcxXzsTc6vfuU1UwtXbTg6A9oF5CUUkuikGIfh4MFg2dyZgsZX/Qmhnt6Vdvb+fGxg LGagvk6kVNZ5PboByWAX/YD//MaIu7TjcXjl6LnfTsvM8RPndNXTBYKYxh+1mRZI9LBd C7qZRb0VRORg9gjcX1coRwxXPnoD5rUKa1M= Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3gr09vp11r-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 16 Jun 2022 14:39:26 -0700 Received: from twshared17349.03.ash7.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 16 Jun 2022 14:39:24 -0700 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id D01C6108B70B2; Thu, 16 Jun 2022 14:22:23 -0700 (PDT) From: Stefan Roesch To: , , , , CC: , , , , , , Christoph Hellwig , Christian Brauner Subject: [PATCH v9 10/14] fs: Add async write file modification handling. Date: Thu, 16 Jun 2022 14:22:17 -0700 Message-ID: <20220616212221.2024518-11-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220616212221.2024518-1-shr@fb.com> References: <20220616212221.2024518-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: Yc8CS6emSpwvXdjU_Uewk4Lt1cgyH9nU X-Proofpoint-ORIG-GUID: Yc8CS6emSpwvXdjU_Uewk4Lt1cgyH9nU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-16_18,2022-06-16_01,2022-02-23_01 ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=PelcxXzs; dmarc=pass (policy=reject) header.from=fb.com; spf=none (imf10.hostedemail.com: domain of "prvs=7166657324=shr@fb.com" has no SPF policy when checking 67.231.153.30) smtp.mailfrom="prvs=7166657324=shr@fb.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655415567; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wzl40ncu9+N8GznKN7zuVZtUu0h7x3PlOCjn2K//01I=; b=Re9NSyf1ui7G1ahx55SNaBNqffAWNjoVoM1/IZDsdg7vAciHJwpZV45mEG1HTpwkgBhgCn 453biyX/w1f7Uck4YRGSA3LtL+ZEXxW9e7XLzryklFDJULqIb+OrctZrav1G0H2REzuy5m MhfnjD73kjtZyLJgeeTSAgF81YRLpLM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655415567; a=rsa-sha256; cv=none; b=rV/opjR9LBZ13yZN96cyg8bkIAaK0CbPYWnSISSOIwm3Xmj4xn6lSsruwj6Mnl182rjg7+ T4PCZMT0lz6TkL9Npmsbl5z4chzaJ/3sb1yvZsjeeesOlhd04VYv6edwNqU355UL85MZjV 2clj9idH2x+kTItVMOIuAk2YIh7NRPU= X-Stat-Signature: 75xea6i7ta9prbzg5r11mbyenirwjckb X-Rspamd-Queue-Id: 5B33DC0072 X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=PelcxXzs; dmarc=pass (policy=reject) header.from=fb.com; spf=none (imf10.hostedemail.com: domain of "prvs=7166657324=shr@fb.com" has no SPF policy when checking 67.231.153.30) smtp.mailfrom="prvs=7166657324=shr@fb.com" X-Rspamd-Server: rspam10 X-HE-Tag: 1655415567-49569 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This adds a file_modified_async() function to return -EAGAIN if the request either requires to remove privileges or needs to update the file modification time. This is required for async buffered writes, so the request gets handled in the io worker of io-uring. Signed-off-by: Stefan Roesch Reviewed-by: Christoph Hellwig Reviewed-by: Jan Kara Reviewed-by: Christian Brauner (Microsoft) --- fs/inode.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- include/linux/fs.h | 1 + 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index ff726d99ecc7..259ebf438893 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2116,17 +2116,21 @@ int file_update_time(struct file *file) EXPORT_SYMBOL(file_update_time); /** - * file_modified - handle mandated vfs changes when modifying a file + * file_modified_flags - handle mandated vfs changes when modifying a file * @file: file that was modified + * @flags: kiocb flags * * When file has been modified ensure that special * file privileges are removed and time settings are updated. * + * If IOCB_NOWAIT is set, special file privileges will not be removed and + * time settings will not be updated. It will return -EAGAIN. + * * Context: Caller must hold the file's inode lock. * * Return: 0 on success, negative errno on failure. */ -int file_modified(struct file *file) +static int file_modified_flags(struct file *file, int flags) { int ret; struct inode *inode = file_inode(file); @@ -2136,7 +2140,7 @@ int file_modified(struct file *file) * Clear the security bits if the process is not being run by root. * This keeps people from modifying setuid and setgid binaries. */ - ret = __file_remove_privs(file, 0); + ret = __file_remove_privs(file, flags); if (ret) return ret; @@ -2146,11 +2150,46 @@ int file_modified(struct file *file) ret = inode_needs_update_time(inode, &now); if (ret <= 0) return ret; + if (flags & IOCB_NOWAIT) + return -EAGAIN; return __file_update_time(file, &now, ret); } + +/** + * file_modified - handle mandated vfs changes when modifying a file + * @file: file that was modified + * + * When file has been modified ensure that special + * file privileges are removed and time settings are updated. + * + * Context: Caller must hold the file's inode lock. + * + * Return: 0 on success, negative errno on failure. + */ +int file_modified(struct file *file) +{ + return file_modified_flags(file, 0); +} EXPORT_SYMBOL(file_modified); +/** + * kiocb_modified - handle mandated vfs changes when modifying a file + * @iocb: iocb that was modified + * + * When file has been modified ensure that special + * file privileges are removed and time settings are updated. + * + * Context: Caller must hold the file's inode lock. + * + * Return: 0 on success, negative errno on failure. + */ +int kiocb_modified(struct kiocb *iocb) +{ + return file_modified_flags(iocb->ki_filp, iocb->ki_flags); +} +EXPORT_SYMBOL_GPL(kiocb_modified); + int inode_needs_sync(struct inode *inode) { if (IS_SYNC(inode)) diff --git a/include/linux/fs.h b/include/linux/fs.h index bc84847c201e..c0d99b5a166b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2390,6 +2390,7 @@ static inline void file_accessed(struct file *file) } extern int file_modified(struct file *file); +int kiocb_modified(struct kiocb *iocb); int sync_inode_metadata(struct inode *inode, int wait);