From patchwork Wed Dec 22 21:01:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697292 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 3F0D5C4332F for ; Wed, 22 Dec 2021 21:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237909AbhLVVBh (ORCPT ); Wed, 22 Dec 2021 16:01:37 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:13626 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237830AbhLVVBg (ORCPT ); Wed, 22 Dec 2021 16:01:36 -0500 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.1.2/8.16.1.2) with ESMTP id 1BMHx10B030274 for ; Wed, 22 Dec 2021 13:01:36 -0800 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=MSZQFSxPJFwq865NhhlubeB+7yf1sYa/xbh+40S6LQQ=; b=klwLhPenl6ZwwIvWVx2MgJ7x7fQg2hJ600l22TGwVEdJ707r/UsuKR1Qaef4xMQbikQ9 fNT/CPXANi/nVGK0rFGO067t3p4WNCjL8ijWYWgyuu3bOKNjOnK7yLL1aR8SkILz7XSb DeecfKZadwdapqqdy3UCJOOzDbRdGyrxl8c= Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3d467yt92e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:01:35 -0800 Received: from twshared12416.02.ash9.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:01:34 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 38A9F86EFCD6; Wed, 22 Dec 2021 13:01:30 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v6 1/5] fs: split off do_user_path_at_empty from user_path_at_empty() Date: Wed, 22 Dec 2021 13:01:23 -0800 Message-ID: <20211222210127.958902-2-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210127.958902-1-shr@fb.com> References: <20211222210127.958902-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: lcByOGHq_bn8uWpyphDXCBIIHcs-O5qS X-Proofpoint-GUID: lcByOGHq_bn8uWpyphDXCBIIHcs-O5qS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 malwarescore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=4 impostorscore=0 mlxlogscore=590 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This splits off a do_user_path_at_empty function from the user_path_at_empty_function. This is required so it can be called from io_uring. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/namei.c | 10 ++++++++-- include/linux/namei.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 1f9d2187c765..d988e241b32c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2794,12 +2794,18 @@ int path_pts(struct path *path) } #endif +int do_user_path_at_empty(int dfd, struct filename *filename, unsigned int flags, + struct path *path) +{ + return filename_lookup(dfd, filename, flags, path, NULL); +} + int user_path_at_empty(int dfd, const char __user *name, unsigned flags, - struct path *path, int *empty) + struct path *path, int *empty) { struct filename *filename = getname_flags(name, flags, empty); - int ret = filename_lookup(dfd, filename, flags, path, NULL); + int ret = do_user_path_at_empty(dfd, filename, flags, path); putname(filename); return ret; } diff --git a/include/linux/namei.h b/include/linux/namei.h index e89329bb3134..8f3ef38c057b 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -49,6 +49,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT}; extern int path_pts(struct path *path); +extern int do_user_path_at_empty(int dfd, struct filename *filename, + unsigned int flags, struct path *path); extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty); static inline int user_path_at(int dfd, const char __user *name, unsigned flags, From patchwork Wed Dec 22 21:01:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697293 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 4D7A1C43217 for ; Wed, 22 Dec 2021 21:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237963AbhLVVBh (ORCPT ); Wed, 22 Dec 2021 16:01:37 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:19188 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237793AbhLVVBg (ORCPT ); Wed, 22 Dec 2021 16:01:36 -0500 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BMHx4YT010999 for ; Wed, 22 Dec 2021 13:01:35 -0800 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=ZmlhQUmi0/AvhoKrC/Xi4w1Gh85p1GREugOsxTzoPKA=; b=RuOrsVlBKGxklwgVwLcjR+jChO+ridm5sNx9o+qCDe0EzmZCpcX50p7hf/QbwusN2BzA QCimc8y2+ta0ALk6IFXNN5kPnMGVwd9DXx7wQTiz+0DCyXEGONcU5VpoNNIhyclP/Lt5 mxVauGa7YcWNTmj+lnvrFclultCPNIOZZ6o= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d40wrmg6e-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:01:35 -0800 Received: from twshared10481.23.frc3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:01:34 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 3DAE586EFCD8; Wed, 22 Dec 2021 13:01:30 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v6 2/5] fs: split off setxattr_setup function from setxattr Date: Wed, 22 Dec 2021 13:01:24 -0800 Message-ID: <20211222210127.958902-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210127.958902-1-shr@fb.com> References: <20211222210127.958902-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: m6tITS6LlGvgpBhwhJyMZAa6odW2b2vk X-Proofpoint-ORIG-GUID: m6tITS6LlGvgpBhwhJyMZAa6odW2b2vk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 clxscore=1015 bulkscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This splits of the setup part of the function setxattr in its own dedicated function called setxattr_setup. This makes it possible to call this function from io_uring in the pre-processing of an xattr request. Signed-off-by: Stefan Roesch --- fs/internal.h | 17 ++++++++++++ fs/xattr.c | 75 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 25 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 432ea3ce76ec..e7d5b4a9fb43 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -202,3 +202,20 @@ struct linux_dirent64; int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, unsigned int count, loff_t *pos); + + /* + * fs/xattr.c: + */ +struct xattr_ctx { + /* Value of attribute */ + const void __user *value; + size_t size; + /* Attribute name */ + char *kname; + int kname_sz; + unsigned int flags; +}; + +void *setxattr_setup(struct user_namespace *mnt_userns, + const char __user *name, + struct xattr_ctx *ctx); diff --git a/fs/xattr.c b/fs/xattr.c index 5c8c5175b385..79afea64d7ba 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -25,6 +25,8 @@ #include +#include "internal.h" + static const char * strcmp_prefix(const char *a, const char *a_prefix) { @@ -539,43 +541,66 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); /* * Extended attribute SET operations */ -static long -setxattr(struct user_namespace *mnt_userns, struct dentry *d, - const char __user *name, const void __user *value, size_t size, - int flags) + +void *setxattr_setup(struct user_namespace *mnt_userns, const char __user *name, + struct xattr_ctx *ctx) { - int error; void *kvalue = NULL; - char kname[XATTR_NAME_MAX + 1]; + int error; - if (flags & ~(XATTR_CREATE|XATTR_REPLACE)) - return -EINVAL; + if (ctx->flags & ~(XATTR_CREATE|XATTR_REPLACE)) + return ERR_PTR(-EINVAL); - error = strncpy_from_user(kname, name, sizeof(kname)); - if (error == 0 || error == sizeof(kname)) - error = -ERANGE; + error = strncpy_from_user(ctx->kname, name, ctx->kname_sz); + if (error == 0 || error == ctx->kname_sz) + return ERR_PTR(-ERANGE); if (error < 0) - return error; + return ERR_PTR(error); - if (size) { - if (size > XATTR_SIZE_MAX) - return -E2BIG; - kvalue = kvmalloc(size, GFP_KERNEL); + if (ctx->size) { + if (ctx->size > XATTR_SIZE_MAX) + return ERR_PTR(-E2BIG); + + kvalue = kvmalloc(ctx->size, GFP_KERNEL); if (!kvalue) - return -ENOMEM; - if (copy_from_user(kvalue, value, size)) { - error = -EFAULT; - goto out; + return ERR_PTR(-ENOMEM); + + if (copy_from_user(kvalue, ctx->value, ctx->size)) { + kvfree(kvalue); + return ERR_PTR(-EFAULT); } - if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || - (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) - posix_acl_fix_xattr_from_user(mnt_userns, kvalue, size); + + if ((strcmp(ctx->kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || + (strcmp(ctx->kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) + posix_acl_fix_xattr_from_user(mnt_userns, kvalue, ctx->size); } + return kvalue; +} + +static long +setxattr(struct user_namespace *mnt_userns, struct dentry *d, + const char __user *name, const void __user *value, size_t size, + int flags) +{ + char kname[XATTR_NAME_MAX + 1]; + struct xattr_ctx ctx = { + .value = value, + .size = size, + .kname = kname, + .kname_sz = sizeof(kname), + .flags = flags, + }; + void *kvalue; + int error; + + kvalue = setxattr_setup(mnt_userns, name, &ctx); + if (IS_ERR(kvalue)) + return PTR_ERR(kvalue); + error = vfs_setxattr(mnt_userns, d, kname, kvalue, size, flags); -out: - kvfree(kvalue); + kvfree(kvalue); return error; } From patchwork Wed Dec 22 21:01:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697295 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 036D6C433FE for ; Wed, 22 Dec 2021 21:01:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbhLVVBo (ORCPT ); Wed, 22 Dec 2021 16:01:44 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:20374 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237972AbhLVVBm (ORCPT ); Wed, 22 Dec 2021 16:01:42 -0500 Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.1.2/8.16.1.2) with ESMTP id 1BMHx7lX016701 for ; Wed, 22 Dec 2021 13:01:42 -0800 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=R+gHNHrTjNFVXKBtFBOXRzQyuNrb7FUtOelRI7aqZPo=; b=qJ1+1MSKHXJ2Pj4gFk6BsvkwhTOcKx+fj7cgsGfjFMYjlML6Ro43bUFcK6VouKuALi4X T7NgxwwAtG8s1QELVDOzY3bhsgXbjk4whfqVZ+oW28+CQ9oVUOD/oAENyv30NZ513Uq/ 1T06Tbb/VfEDw1P2m+lS8WzC46Tos54LEQo= Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3d42p2kt2q-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:01:42 -0800 Received: from twshared3115.02.ash8.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:01:39 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 42D8986EFCDA; Wed, 22 Dec 2021 13:01:30 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v6 3/5] fs: split off do_getxattr from getxattr Date: Wed, 22 Dec 2021 13:01:25 -0800 Message-ID: <20211222210127.958902-4-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210127.958902-1-shr@fb.com> References: <20211222210127.958902-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: LTY9S42L9NNxTvU5K21dX0hx5S4QXa2o X-Proofpoint-ORIG-GUID: LTY9S42L9NNxTvU5K21dX0hx5S4QXa2o X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 impostorscore=0 suspectscore=0 malwarescore=0 mlxlogscore=718 phishscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 adultscore=0 priorityscore=1501 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This splits off do_getxattr function from the getxattr function. This will allow io_uring to call it from its io worker. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/internal.h | 6 ++++++ fs/xattr.c | 32 ++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index e7d5b4a9fb43..ea0433799dbc 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -216,6 +216,12 @@ struct xattr_ctx { unsigned int flags; }; +ssize_t do_getxattr(struct user_namespace *mnt_userns, + struct dentry *d, + const char *kname, + void __user *value, + size_t size); + void *setxattr_setup(struct user_namespace *mnt_userns, const char __user *name, struct xattr_ctx *ctx); diff --git a/fs/xattr.c b/fs/xattr.c index 79afea64d7ba..a675c7f0ea0c 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -666,19 +666,12 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name, /* * Extended attribute GET operations */ -static ssize_t -getxattr(struct user_namespace *mnt_userns, struct dentry *d, - const char __user *name, void __user *value, size_t size) +ssize_t +do_getxattr(struct user_namespace *mnt_userns, struct dentry *d, + const char *kname, void __user *value, size_t size) { - ssize_t error; void *kvalue = NULL; - char kname[XATTR_NAME_MAX + 1]; - - error = strncpy_from_user(kname, name, sizeof(kname)); - if (error == 0 || error == sizeof(kname)) - error = -ERANGE; - if (error < 0) - return error; + ssize_t error; if (size) { if (size > XATTR_SIZE_MAX) @@ -702,10 +695,25 @@ getxattr(struct user_namespace *mnt_userns, struct dentry *d, } kvfree(kvalue); - return error; } +static ssize_t +getxattr(struct user_namespace *mnt_userns, struct dentry *d, + const char __user *name, void __user *value, size_t size) +{ + ssize_t error; + char kname[XATTR_NAME_MAX + 1]; + + error = strncpy_from_user(kname, name, sizeof(kname)); + if (error == 0 || error == sizeof(kname)) + error = -ERANGE; + if (error < 0) + return error; + + return do_getxattr(mnt_userns, d, kname, value, size); +} + static ssize_t path_getxattr(const char __user *pathname, const char __user *name, void __user *value, size_t size, unsigned int lookup_flags) From patchwork Wed Dec 22 21:01:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697294 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 5ECBEC433F5 for ; Wed, 22 Dec 2021 21:01:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237896AbhLVVBl (ORCPT ); Wed, 22 Dec 2021 16:01:41 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:62740 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237793AbhLVVBj (ORCPT ); Wed, 22 Dec 2021 16:01:39 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BMHx0Z8013992 for ; Wed, 22 Dec 2021 13:01:39 -0800 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=PWo/JT22xjQNpo7zdUL5yAOEcueOYmQMMUej9BqaF2A=; b=FxRGNynG3nDGHu2SEVBwTF/L2d3dGnUul2JSGIHapRnCLXdtxWYVky2cXdm7vWZcqktp p06J9iv86aFopgUsohFH52SO9HeQhF+cUUv7qPEQL5hYLYihl/WnjULcnJLUK7G7ms8a qz4/SauwG0RzGvdPNn+k37vVVDSHQJeWq5A= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d42mxksgy-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:01:39 -0800 Received: from twshared0654.04.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:01:36 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 491E386EFCDC; Wed, 22 Dec 2021 13:01:30 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v6 4/5] io_uring: add fsetxattr and setxattr support Date: Wed, 22 Dec 2021 13:01:26 -0800 Message-ID: <20211222210127.958902-5-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210127.958902-1-shr@fb.com> References: <20211222210127.958902-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: rTctHMAicTfF342ffeMroVCuZzVbAzlR X-Proofpoint-GUID: rTctHMAicTfF342ffeMroVCuZzVbAzlR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 adultscore=0 clxscore=1015 mlxlogscore=999 lowpriorityscore=0 priorityscore=1501 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 mlxscore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This adds support to io_uring for the fsetxattr and setxattr API. Signed-off-by: Stefan Roesch --- fs/io_uring.c | 170 ++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 6 +- 2 files changed, 175 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index c8258c784116..8b6c70d6cacc 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -82,6 +82,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -726,6 +727,13 @@ struct io_async_rw { struct wait_page_queue wpq; }; +struct io_xattr { + struct file *file; + struct xattr_ctx ctx; + void *value; + struct filename *filename; +}; + enum { REQ_F_FIXED_FILE_BIT = IOSQE_FIXED_FILE_BIT, REQ_F_IO_DRAIN_BIT = IOSQE_IO_DRAIN_BIT, @@ -866,6 +874,7 @@ struct io_kiocb { struct io_symlink symlink; struct io_hardlink hardlink; struct io_getdents getdents; + struct io_xattr xattr; }; u8 opcode; @@ -1118,6 +1127,10 @@ static const struct io_op_def io_op_defs[] = { [IORING_OP_GETDENTS] = { .needs_file = 1, }, + [IORING_OP_FSETXATTR] = { + .needs_file = 1 + }, + [IORING_OP_SETXATTR] = {}, }; /* requests with any of those set should undergo io_disarm_next() */ @@ -3887,6 +3900,144 @@ static int io_renameat(struct io_kiocb *req, unsigned int issue_flags) return 0; } +static int __io_setxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe, + struct user_namespace *user_ns) +{ + struct io_xattr *ix = &req->xattr; + const char __user *name; + void *ret; + + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + if (unlikely(sqe->ioprio)) + return -EINVAL; + if (unlikely(req->flags & REQ_F_FIXED_FILE)) + return -EBADF; + + ix->filename = NULL; + name = u64_to_user_ptr(READ_ONCE(sqe->addr)); + ix->ctx.value = u64_to_user_ptr(READ_ONCE(sqe->addr2)); + ix->ctx.size = READ_ONCE(sqe->len); + ix->ctx.flags = READ_ONCE(sqe->xattr_flags); + + ix->ctx.kname = kmalloc(XATTR_NAME_MAX + 1, GFP_KERNEL); + if (!ix->ctx.kname) + return -ENOMEM; + ix->ctx.kname_sz = XATTR_NAME_MAX + 1; + + ret = setxattr_setup(user_ns, name, &ix->ctx); + if (IS_ERR(ret)) { + kfree(ix->ctx.kname); + return PTR_ERR(ret); + } + + ix->value = ret; + req->flags |= REQ_F_NEED_CLEANUP; + return 0; +} + +static int io_setxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe) +{ + struct io_xattr *ix = &req->xattr; + const char __user *path; + int ret; + + ret = __io_setxattr_prep(req, sqe, current_user_ns()); + if (ret) + return ret; + + path = u64_to_user_ptr(READ_ONCE(sqe->addr3)); + + ix->filename = getname_flags(path, LOOKUP_FOLLOW, NULL); + if (IS_ERR(ix->filename)) { + ret = PTR_ERR(ix->filename); + ix->filename = NULL; + } + + return ret; +} + +static int io_fsetxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe) +{ + return __io_setxattr_prep(req, sqe, file_mnt_user_ns(req->file)); +} + +static int __io_setxattr(struct io_kiocb *req, unsigned int issue_flags, + struct path *path) +{ + struct io_xattr *ix = &req->xattr; + int ret; + + ret = mnt_want_write(path->mnt); + if (!ret) { + ret = vfs_setxattr(mnt_user_ns(path->mnt), path->dentry, + ix->ctx.kname, ix->value, ix->ctx.size, + ix->ctx.flags); + mnt_drop_write(path->mnt); + } + + return ret; +} + +static int io_fsetxattr(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_xattr *ix = &req->xattr; + int ret; + + if (issue_flags & IO_URING_F_NONBLOCK) + return -EAGAIN; + + ret = __io_setxattr(req, issue_flags, &req->file->f_path); + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.kname); + + if (ix->value) + kvfree(ix->value); + if (ret < 0) + req_set_fail(req); + + io_req_complete(req, ret); + return 0; +} + +static int io_setxattr(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_xattr *ix = &req->xattr; + unsigned int lookup_flags = LOOKUP_FOLLOW; + struct path path; + int ret; + + if (issue_flags & IO_URING_F_NONBLOCK) + return -EAGAIN; + +retry: + ret = do_user_path_at_empty(AT_FDCWD, ix->filename, lookup_flags, &path); + if (!ret) { + ret = __io_setxattr(req, issue_flags, &path); + path_put(&path); + if (retry_estale(ret, lookup_flags)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } + } + putname(ix->filename); + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.kname); + + if (ix->value) + kvfree(ix->value); + if (ret < 0) + req_set_fail(req); + + io_req_complete(req, ret); + return 0; +} + static int io_unlinkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { @@ -6623,6 +6774,10 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return io_linkat_prep(req, sqe); case IORING_OP_GETDENTS: return io_getdents_prep(req, sqe); + case IORING_OP_FSETXATTR: + return io_fsetxattr_prep(req, sqe); + case IORING_OP_SETXATTR: + return io_setxattr_prep(req, sqe); } printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n", @@ -6764,6 +6919,14 @@ static void io_clean_op(struct io_kiocb *req) putname(req->hardlink.oldpath); putname(req->hardlink.newpath); break; + case IORING_OP_SETXATTR: + if (req->xattr.filename) + putname(req->xattr.filename); + fallthrough; + case IORING_OP_FSETXATTR: + kfree(req->xattr.ctx.kname); + kvfree(req->xattr.value); + break; } } if ((req->flags & REQ_F_POLLED) && req->apoll) { @@ -6909,6 +7072,12 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) case IORING_OP_GETDENTS: ret = io_getdents(req, issue_flags); break; + case IORING_OP_FSETXATTR: + ret = io_fsetxattr(req, issue_flags); + break; + case IORING_OP_SETXATTR: + ret = io_setxattr(req, issue_flags); + break; default: ret = -EINVAL; break; @@ -11277,6 +11446,7 @@ static int __init io_uring_init(void) BUILD_BUG_SQE_ELEM(42, __u16, personality); BUILD_BUG_SQE_ELEM(44, __s32, splice_fd_in); BUILD_BUG_SQE_ELEM(44, __u32, file_index); + BUILD_BUG_SQE_ELEM(48, __u64, addr3); BUILD_BUG_ON(sizeof(struct io_uring_files_update) != sizeof(struct io_uring_rsrc_update)); diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 57dc88db5793..c62a8bec8cd4 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -45,6 +45,7 @@ struct io_uring_sqe { __u32 rename_flags; __u32 unlink_flags; __u32 hardlink_flags; + __u32 xattr_flags; }; __u64 user_data; /* data to be passed back at completion time */ /* pack this to avoid bogus arm OABI complaints */ @@ -60,7 +61,8 @@ struct io_uring_sqe { __s32 splice_fd_in; __u32 file_index; }; - __u64 __pad2[2]; + __u64 addr3; + __u64 __pad2[1]; }; enum { @@ -144,6 +146,8 @@ enum { IORING_OP_SYMLINKAT, IORING_OP_LINKAT, IORING_OP_GETDENTS, + IORING_OP_FSETXATTR, + IORING_OP_SETXATTR, /* this goes last, obviously */ IORING_OP_LAST, From patchwork Wed Dec 22 21:01:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697296 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 2AA7EC4332F for ; Wed, 22 Dec 2021 21:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237972AbhLVVBo (ORCPT ); Wed, 22 Dec 2021 16:01:44 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27880 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231337AbhLVVBn (ORCPT ); Wed, 22 Dec 2021 16:01:43 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BMHxoxp021861 for ; Wed, 22 Dec 2021 13:01:43 -0800 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=M3kZ+VO42GL0w7WDa5VjfzDgZSIpq4TiQRI0nfJSGJg=; b=DdahXCYfqJivmiwB5pIxtQydj4ytYComsYXApHavTbItbEowMGSvBuf89UcXs81vu9ey CsZ+t3nRlDOLw6bpay9EpKYWMMtAgU7VVknE7wOi5zzIWSCPMbP+SL6QTAEm631nrTs+ Ds+xcpX1OuwjgCFaans0KGozeAztMClPX00= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d3pcp85q3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:01:43 -0800 Received: from twshared3814.24.frc3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:01:42 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 4EED386EFCDE; Wed, 22 Dec 2021 13:01:30 -0800 (PST) From: Stefan Roesch To: , , CC: , Subject: [PATCH v6 5/5] io_uring: add fgetxattr and getxattr support Date: Wed, 22 Dec 2021 13:01:27 -0800 Message-ID: <20211222210127.958902-6-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210127.958902-1-shr@fb.com> References: <20211222210127.958902-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: Reo-wbL8XpqHYQ8GkzNRJ_TKjWElrPIc X-Proofpoint-ORIG-GUID: Reo-wbL8XpqHYQ8GkzNRJ_TKjWElrPIc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 adultscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 phishscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=812 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This adds support to io_uring for the fgetxattr and getxattr API. Signed-off-by: Stefan Roesch --- fs/io_uring.c | 148 ++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 2 + 2 files changed, 150 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 8b6c70d6cacc..4d8c99370f14 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1131,6 +1131,10 @@ static const struct io_op_def io_op_defs[] = { .needs_file = 1 }, [IORING_OP_SETXATTR] = {}, + [IORING_OP_FGETXATTR] = { + .needs_file = 1 + }, + [IORING_OP_GETXATTR] = {}, }; /* requests with any of those set should undergo io_disarm_next() */ @@ -3900,6 +3904,133 @@ static int io_renameat(struct io_kiocb *req, unsigned int issue_flags) return 0; } +static int __io_getxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe) +{ + struct io_xattr *ix = &req->xattr; + const char __user *name; + int ret; + + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + if (unlikely(sqe->ioprio)) + return -EINVAL; + if (unlikely(req->flags & REQ_F_FIXED_FILE)) + return -EBADF; + + ix->filename = NULL; + ix->value = NULL; + name = u64_to_user_ptr(READ_ONCE(sqe->addr)); + ix->ctx.value = u64_to_user_ptr(READ_ONCE(sqe->addr2)); + ix->ctx.size = READ_ONCE(sqe->len); + ix->ctx.flags = READ_ONCE(sqe->xattr_flags); + + if (ix->ctx.flags) + return -EINVAL; + + ix->ctx.kname = kmalloc(XATTR_NAME_MAX + 1, GFP_KERNEL); + if (!ix->ctx.kname) + return -ENOMEM; + + ret = strncpy_from_user(ix->ctx.kname, name, XATTR_NAME_MAX + 1); + if (!ret || ret == XATTR_NAME_MAX + 1) + ret = -ERANGE; + if (ret < 0) { + kfree(ix->ctx.kname); + return ret; + } + + req->flags |= REQ_F_NEED_CLEANUP; + return 0; +} + +static int io_fgetxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe) +{ + return __io_getxattr_prep(req, sqe); +} + +static int io_getxattr_prep(struct io_kiocb *req, + const struct io_uring_sqe *sqe) +{ + struct io_xattr *ix = &req->xattr; + const char __user *path; + int ret; + + ret = __io_getxattr_prep(req, sqe); + if (ret) + return ret; + + path = u64_to_user_ptr(READ_ONCE(sqe->addr3)); + + ix->filename = getname_flags(path, LOOKUP_FOLLOW, NULL); + if (IS_ERR(ix->filename)) { + ret = PTR_ERR(ix->filename); + ix->filename = NULL; + } + + return ret; +} + +static int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_xattr *ix = &req->xattr; + int ret; + + if (issue_flags & IO_URING_F_NONBLOCK) + return -EAGAIN; + + ret = do_getxattr(mnt_user_ns(req->file->f_path.mnt), + req->file->f_path.dentry, + ix->ctx.kname, + (void __user *)ix->ctx.value, + ix->ctx.size); + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.kname); + if (ret < 0) + req_set_fail(req); + + io_req_complete(req, ret); + return 0; +} + +static int io_getxattr(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_xattr *ix = &req->xattr; + unsigned int lookup_flags = LOOKUP_FOLLOW; + struct path path; + int ret; + + if (issue_flags & IO_URING_F_NONBLOCK) + return -EAGAIN; + +retry: + ret = do_user_path_at_empty(AT_FDCWD, ix->filename, lookup_flags, &path); + if (!ret) { + ret = do_getxattr(mnt_user_ns(path.mnt), + path.dentry, + ix->ctx.kname, + (void __user *)ix->ctx.value, + ix->ctx.size); + + path_put(&path); + if (retry_estale(ret, lookup_flags)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } + } + putname(ix->filename); + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.kname); + if (ret < 0) + req_set_fail(req); + + io_req_complete(req, ret); + return 0; +} + static int __io_setxattr_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, struct user_namespace *user_ns) @@ -6778,6 +6909,10 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return io_fsetxattr_prep(req, sqe); case IORING_OP_SETXATTR: return io_setxattr_prep(req, sqe); + case IORING_OP_FGETXATTR: + return io_fgetxattr_prep(req, sqe); + case IORING_OP_GETXATTR: + return io_getxattr_prep(req, sqe); } printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n", @@ -6927,6 +7062,13 @@ static void io_clean_op(struct io_kiocb *req) kfree(req->xattr.ctx.kname); kvfree(req->xattr.value); break; + case IORING_OP_GETXATTR: + if (req->xattr.filename) + putname(req->xattr.filename); + fallthrough; + case IORING_OP_FGETXATTR: + kfree(req->xattr.ctx.kname); + break; } } if ((req->flags & REQ_F_POLLED) && req->apoll) { @@ -7078,6 +7220,12 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) case IORING_OP_SETXATTR: ret = io_setxattr(req, issue_flags); break; + case IORING_OP_FGETXATTR: + ret = io_fgetxattr(req, issue_flags); + break; + case IORING_OP_GETXATTR: + ret = io_getxattr(req, issue_flags); + break; default: ret = -EINVAL; break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index c62a8bec8cd4..efc7ac9b3a6b 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -148,6 +148,8 @@ enum { IORING_OP_GETDENTS, IORING_OP_FSETXATTR, IORING_OP_SETXATTR, + IORING_OP_FGETXATTR, + IORING_OP_GETXATTR, /* this goes last, obviously */ IORING_OP_LAST,