From patchwork Mon Nov 29 22:12:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12645835 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 90F74C4332F for ; Mon, 29 Nov 2021 22:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231234AbhK2WQ3 (ORCPT ); Mon, 29 Nov 2021 17:16:29 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:51822 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231176AbhK2WQZ (ORCPT ); Mon, 29 Nov 2021 17:16:25 -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 SMTP id 1ATIlAHE028209 for ; Mon, 29 Nov 2021 14:13:07 -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=6BYGb+rUOoqGB/UnZ04lCfqwbkH4+RgVOtLm1IKLgqI=; b=Pcz8T8lEaTCR1srgLKvhLW1LZ4e6TsPVSewZq2t0xx6dL2OvjRleUNj6myfgfCjyfo68 MMa08E/U24Mjpsdt7tQrg5JNywAcmzNN7Vn8C+8HxTimlOGRfuGvVAzbcctjL5cARaZJ etSKga2kHGr1W94E+wYOkECq2mFLADmF6CM= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 3cn1as32gg-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 29 Nov 2021 14:13:07 -0800 Received: from intmgw001.05.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Mon, 29 Nov 2021 14:13:05 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 906227101606; Mon, 29 Nov 2021 14:12:59 -0800 (PST) From: Stefan Roesch To: , CC: Subject: [PATCH v1 1/5] fs: make user_path_at_empty() take a struct filename Date: Mon, 29 Nov 2021 14:12:53 -0800 Message-ID: <20211129221257.2536146-2-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129221257.2536146-1-shr@fb.com> References: <20211129221257.2536146-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: nIEuHp-8ou7r0IH_9yNVx_c0gS0Az4f8 X-Proofpoint-ORIG-GUID: nIEuHp-8ou7r0IH_9yNVx_c0gS0Az4f8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-29_11,2021-11-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 mlxlogscore=755 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111290105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Summary: - Changes the user_path_at_empty function to take a filename struct instead of an user character pointer. - It also includes the necessary changes in stat.c and namei.c to call the user_path_at_empty function. Signed-off-by: Stefan Roesch Reported-by: kernel test robot --- fs/namei.c | 5 ++--- fs/stat.c | 7 ++++++- include/linux/namei.h | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 1f9d2187c765..baf34cde9ecd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2794,10 +2794,9 @@ int path_pts(struct path *path) } #endif -int user_path_at_empty(int dfd, const char __user *name, unsigned flags, - struct path *path, int *empty) +int user_path_at_empty(int dfd, struct filename *filename, unsigned flags, + struct path *path) { - struct filename *filename = getname_flags(name, flags, empty); int ret = filename_lookup(dfd, filename, flags, path, NULL); putname(filename); diff --git a/fs/stat.c b/fs/stat.c index 28d2020ba1f4..d8752c103062 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -435,12 +435,17 @@ static int do_readlinkat(int dfd, const char __user *pathname, int error; int empty = 0; unsigned int lookup_flags = LOOKUP_EMPTY; + struct filename *filename; if (bufsiz <= 0) return -EINVAL; retry: - error = user_path_at_empty(dfd, pathname, lookup_flags, &path, &empty); + filename = getname_flags(pathname, lookup_flags, &empty); + if (IS_ERR(filename)) + return PTR_ERR(filename); + + error = user_path_at_empty(dfd, filename, lookup_flags, &path); if (!error) { struct inode *inode = d_backing_inode(path.dentry); diff --git a/include/linux/namei.h b/include/linux/namei.h index e89329bb3134..dc1ae29478b0 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -49,12 +49,12 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT}; extern int path_pts(struct path *path); -extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty); +extern int user_path_at_empty(int, struct filename *, unsigned, struct path *); static inline int user_path_at(int dfd, const char __user *name, unsigned flags, struct path *path) { - return user_path_at_empty(dfd, name, flags, path, NULL); + return user_path_at_empty(dfd, getname_flags(name, flags, NULL), flags, path); } extern int kern_path(const char *, unsigned, struct path *); From patchwork Mon Nov 29 22:12:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12645829 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 DE4C7C4332F for ; Mon, 29 Nov 2021 22:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbhK2WQV (ORCPT ); Mon, 29 Nov 2021 17:16:21 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:13330 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231128AbhK2WQU (ORCPT ); Mon, 29 Nov 2021 17:16:20 -0500 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1ATIlA2S004379 for ; Mon, 29 Nov 2021 14:13:02 -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=3XeOk35Kz+BYWy2e1a0qtLhPm51HxDkAZ0BZcsH0wTE=; b=LJNwjHfjX0INMDXPrIvjzGhZee41/P0kO9nLbQyYXFQyOi+C93OoH4IUjY+hXeHHJuqL WpU4o+qyjxPIxnI2V9Wb99ZlHs5GBLwp86vYfVq7+LICQSYA4Agr9H4rV7VwsM1YIrAt 6bcbu6FfLLYqviEdz9RgGnhgJdLisFc/fqY= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3cmyfmkxtm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 29 Nov 2021 14:13:02 -0800 Received: from intmgw001.05.ash7.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Mon, 29 Nov 2021 14:13:01 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 95C5F7101608; Mon, 29 Nov 2021 14:12:59 -0800 (PST) From: Stefan Roesch To: , CC: Subject: [PATCH v1 2/5] fs: split off setxattr_setup function from setxattr Date: Mon, 29 Nov 2021 14:12:54 -0800 Message-ID: <20211129221257.2536146-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129221257.2536146-1-shr@fb.com> References: <20211129221257.2536146-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: vHqm6EBrZ7ACAErXb9sBt8Bgt5ovdZor X-Proofpoint-ORIG-GUID: vHqm6EBrZ7ACAErXb9sBt8Bgt5ovdZor X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-29_11,2021-11-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 impostorscore=0 malwarescore=0 mlxlogscore=999 lowpriorityscore=0 clxscore=1015 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111290105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Summary: 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 | 77 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 26 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 7979ff8d168c..c5c82bfb5ecf 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -194,3 +194,20 @@ long splice_file_to_pipe(struct file *in, struct pipe_inode_info *opipe, loff_t *offset, size_t len, unsigned int flags); + + /* + * fs/xattr.c: + */ +struct xattr_ctx { + /* Value of attribute */ + const void __user *value; + size_t size; + /* Attribute name */ + char *name; + int name_sz; + int flags; +}; + +void *setxattr_setup(struct user_namespace *mnt_userns, + const char __user *name, + struct xattr_ctx *data); diff --git a/fs/xattr.c b/fs/xattr.c index 5c8c5175b385..13963b914ac5 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) { + void *ret = NULL; int error; - void *kvalue = NULL; - char kname[XATTR_NAME_MAX + 1]; - 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->name, name, ctx->name_sz); + if (error == 0 || error == ctx->name_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 (!kvalue) - return -ENOMEM; - if (copy_from_user(kvalue, value, size)) { - error = -EFAULT; - goto out; + if (ctx->size) { + if (ctx->size > XATTR_SIZE_MAX) + return ERR_PTR(-E2BIG); + + ret = kvmalloc(ctx->size, GFP_KERNEL); + if (!ret) + return ERR_PTR(-ENOMEM); + + if (copy_from_user(ret, ctx->value, ctx->size)) { + kfree(ret); + 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->name, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || + (strcmp(ctx->name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) + posix_acl_fix_xattr_from_user(mnt_userns, ret, ctx->size); } + return ret; +} + +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, + .name = kname, + .name_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 Mon Nov 29 22:12:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12645827 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 9E731C43219 for ; Mon, 29 Nov 2021 22:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230120AbhK2WQW (ORCPT ); Mon, 29 Nov 2021 17:16:22 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:41192 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231147AbhK2WQV (ORCPT ); Mon, 29 Nov 2021 17:16:21 -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 SMTP id 1ATIlAof028212 for ; Mon, 29 Nov 2021 14:13:03 -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=r8StrTaZD8bttQsZuBxeUQ8HxsyxBTGKeS63+8sOiQ4=; b=VdbVEgX29HZlLTY85o5AH0iIma2zlnCH8rCO4CAYV8cKNaqaegATk/exXgCiu9tDWcrz AuBAoVZiG3k2iMwr3bZPqFKI5IEI/91wvo64lgfrwvKZuMG/ZpLZsLt2MFnWtu7UXUkK mrp0Pf2tVztHW6oib5NGKocNsXE1jbw0GgA= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 3cn1as32g9-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 29 Nov 2021 14:13:03 -0800 Received: from intmgw001.37.frc1.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; Mon, 29 Nov 2021 14:13:01 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 9DB45710160A; Mon, 29 Nov 2021 14:12:59 -0800 (PST) From: Stefan Roesch To: , CC: Subject: [PATCH v1 3/5] fs: split off the vfs_getxattr from getxattr Date: Mon, 29 Nov 2021 14:12:55 -0800 Message-ID: <20211129221257.2536146-4-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129221257.2536146-1-shr@fb.com> References: <20211129221257.2536146-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: 6Bld2907t_uy1QBLQnqTpA1ZeqQL106C X-Proofpoint-ORIG-GUID: 6Bld2907t_uy1QBLQnqTpA1ZeqQL106C X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-29_11,2021-11-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 mlxlogscore=919 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111290105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Summary: This splits off vfs_getxattr call from the getxattr function. This will allow io_uring to call it from its io worker. Signed-off-by: Stefan Roesch Reported-by: kernel test robot --- fs/internal.h | 6 ++++++ fs/xattr.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index c5c82bfb5ecf..9805415b199c 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -208,6 +208,12 @@ struct xattr_ctx { 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 *data); diff --git a/fs/xattr.c b/fs/xattr.c index 13963b914ac5..9e1dba601a03 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 *name, 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; + size_t error; if (size) { if (size > XATTR_SIZE_MAX) @@ -688,10 +681,10 @@ getxattr(struct user_namespace *mnt_userns, struct dentry *d, return -ENOMEM; } - error = vfs_getxattr(mnt_userns, d, kname, kvalue, size); + error = vfs_getxattr(mnt_userns, d, name, kvalue, size); if (error > 0) { - if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || - (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) + if ((strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || + (strcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) posix_acl_fix_xattr_to_user(mnt_userns, kvalue, error); if (size && copy_to_user(value, kvalue, error)) error = -EFAULT; @@ -706,6 +699,22 @@ getxattr(struct user_namespace *mnt_userns, struct dentry *d, 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 Mon Nov 29 22:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12645831 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 8B4BAC43217 for ; Mon, 29 Nov 2021 22:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230515AbhK2WQX (ORCPT ); Mon, 29 Nov 2021 17:16:23 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:18378 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230466AbhK2WQV (ORCPT ); Mon, 29 Nov 2021 17:16:21 -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 SMTP id 1ATIlKbF000892 for ; Mon, 29 Nov 2021 14:13:03 -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=6BfG9tZLZ4hCeWjyGqqq6un6fisO/IQSuY6qXzd6A1c=; b=OSrzhhojAHtzxZ3fpgOmkA6o+e8DSyBo7qN2hZUWjQ1kGmWc4xyRTjIikCJj4MkX8f2y OXzgmembNaMa5dEf3ywDNOhhhRkfrUjRjEAa0V1AnD8MiQnqOn5W5X+BItkhdT5c6L0Z rWH1b4jSIpjNF2jK2/SdEjOoTjxg0Mbh6LI= Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net with ESMTP id 3cms5jx69s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 29 Nov 2021 14:13:02 -0800 Received: from intmgw001.05.ash7.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Mon, 29 Nov 2021 14:13:01 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id A15A1710160C; Mon, 29 Nov 2021 14:12:59 -0800 (PST) From: Stefan Roesch To: , CC: Subject: [PATCH v1 4/5] io_uring: add fsetxattr and setxattr support Date: Mon, 29 Nov 2021 14:12:56 -0800 Message-ID: <20211129221257.2536146-5-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129221257.2536146-1-shr@fb.com> References: <20211129221257.2536146-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-ORIG-GUID: wIKMD0o3JdFvZC8Hy6znIsS3QIyzlcVa X-Proofpoint-GUID: wIKMD0o3JdFvZC8Hy6znIsS3QIyzlcVa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-29_11,2021-11-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxlogscore=999 impostorscore=0 spamscore=0 suspectscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111290105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Summary: This adds support to io_uring for the following API's: - fsetxattr - setxattr Signed-off-by: Stefan Roesch --- fs/io_uring.c | 173 ++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 6 +- 2 files changed, 178 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 568729677e25..4a18431e13a3 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -81,6 +81,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -717,6 +718,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, @@ -856,6 +864,7 @@ struct io_kiocb { struct io_mkdir mkdir; struct io_symlink symlink; struct io_hardlink hardlink; + struct io_xattr xattr; }; u8 opcode; @@ -1105,6 +1114,10 @@ static const struct io_op_def io_op_defs[] = { [IORING_OP_MKDIRAT] = {}, [IORING_OP_SYMLINKAT] = {}, [IORING_OP_LINKAT] = {}, + [IORING_OP_FSETXATTR] = { + .needs_file = 1 + }, + [IORING_OP_SETXATTR] = {}, }; /* requests with any of those set should undergo io_disarm_next() */ @@ -3818,6 +3831,146 @@ 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.name = kmalloc(XATTR_NAME_MAX + 1, GFP_KERNEL); + if (!ix->ctx.name) + return -ENOMEM; + ix->ctx.name_sz = XATTR_NAME_MAX + 1; + + ret = setxattr_setup(user_ns, name, &ix->ctx); + if (IS_ERR(ret)) { + kfree(ix->ctx.name); + 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) +{ + if (!req->file) + return -EBADF; + + 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.name, 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.name); + + 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 = 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; + } + } + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.name); + + 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) { @@ -6531,6 +6684,10 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return io_symlinkat_prep(req, sqe); case IORING_OP_LINKAT: return io_linkat_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", @@ -6674,6 +6831,15 @@ 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.name); + if (req->xattr.value) + kvfree(req->xattr.value); + break; } } if ((req->flags & REQ_F_POLLED) && req->apoll) { @@ -6816,6 +6982,12 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) case IORING_OP_LINKAT: ret = io_linkat(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; @@ -11183,6 +11355,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 787f491f0d2a..dbf473900da2 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 { @@ -143,6 +145,8 @@ enum { IORING_OP_MKDIRAT, IORING_OP_SYMLINKAT, IORING_OP_LINKAT, + IORING_OP_FSETXATTR, + IORING_OP_SETXATTR, /* this goes last, obviously */ IORING_OP_LAST, From patchwork Mon Nov 29 22:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12645837 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 75018C43219 for ; Mon, 29 Nov 2021 22:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231255AbhK2WQ3 (ORCPT ); Mon, 29 Nov 2021 17:16:29 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:28928 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231215AbhK2WQ0 (ORCPT ); Mon, 29 Nov 2021 17:16:26 -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 SMTP id 1ATIlEas032312 for ; Mon, 29 Nov 2021 14:13:07 -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=MU9kvJnfQ1hfm+fa97pHqAe6I4k6kxvYAS94gGN7+7E=; b=VZ8qzWWprnsKapNjyo7xoAdqa49Vvnc/5WsUfh5+cHUpLRJqNYO4oW++n+2Mwg4YMWm2 JBvLYbaee6pMxb1t635k5EMXk0Ym6CTFDIQuAaojMVmPkFFNzzxdFQpFLH7o8SUKRoIx q32G+nKxQgdX65FhXTAju/U+SekVQ3lTnBg= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0089730.ppops.net with ESMTP id 3cmna6728w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 29 Nov 2021 14:13:07 -0800 Received: from intmgw006.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Mon, 29 Nov 2021 14:13:07 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id A7289710160E; Mon, 29 Nov 2021 14:12:59 -0800 (PST) From: Stefan Roesch To: , CC: Subject: [PATCH v1 5/5] io_uring: add fgetxattr and getxattr support Date: Mon, 29 Nov 2021 14:12:57 -0800 Message-ID: <20211129221257.2536146-6-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129221257.2536146-1-shr@fb.com> References: <20211129221257.2536146-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: UIKzKyaaa732QNMPMtvJJlTwUoVy8VAE X-Proofpoint-ORIG-GUID: UIKzKyaaa732QNMPMtvJJlTwUoVy8VAE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-29_11,2021-11-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 adultscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=786 spamscore=0 bulkscore=0 malwarescore=0 clxscore=1015 phishscore=0 mlxscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111290105 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Summary: This adds support to io_uring for the following API's: - fgetxattr - getxattr Signed-off-by: Stefan Roesch --- fs/io_uring.c | 152 ++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 2 + 2 files changed, 154 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 4a18431e13a3..265024204a59 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1114,6 +1114,10 @@ static const struct io_op_def io_op_defs[] = { [IORING_OP_MKDIRAT] = {}, [IORING_OP_SYMLINKAT] = {}, [IORING_OP_LINKAT] = {}, + [IORING_OP_FGETXATTR] = { + .needs_file = 1 + }, + [IORING_OP_GETXATTR] = {}, [IORING_OP_FSETXATTR] = { .needs_file = 1 }, @@ -3831,6 +3835,135 @@ 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.name = kmalloc(XATTR_NAME_MAX + 1, GFP_KERNEL); + if (!ix->ctx.name) + return -ENOMEM; + + ret = strncpy_from_user(ix->ctx.name, name, XATTR_NAME_MAX + 1); + if (!ret || ret == XATTR_NAME_MAX + 1) + ret = -ERANGE; + if (ret < 0) { + kfree(ix->ctx.name); + 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) +{ + if (!req->file) + return -EBADF; + + 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.name, + (void __user *)ix->ctx.value, + ix->ctx.size); + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.name); + 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 = 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.name, + (void __user *)ix->ctx.value, + ix->ctx.size); + + path_put(&path); + if (retry_estale(ret, lookup_flags)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } + } + + req->flags &= ~REQ_F_NEED_CLEANUP; + kfree(ix->ctx.name); + 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) @@ -6684,6 +6817,10 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return io_symlinkat_prep(req, sqe); case IORING_OP_LINKAT: return io_linkat_prep(req, sqe); + case IORING_OP_FGETXATTR: + return io_fgetxattr_prep(req, sqe); + case IORING_OP_GETXATTR: + return io_getxattr_prep(req, sqe); case IORING_OP_FSETXATTR: return io_fsetxattr_prep(req, sqe); case IORING_OP_SETXATTR: @@ -6831,6 +6968,15 @@ static void io_clean_op(struct io_kiocb *req) putname(req->hardlink.oldpath); putname(req->hardlink.newpath); break; + + case IORING_OP_GETXATTR: + if (req->xattr.filename) + putname(req->xattr.filename); + fallthrough; + case IORING_OP_FGETXATTR: + kfree(req->xattr.ctx.name); + break; + case IORING_OP_SETXATTR: if (req->xattr.filename) putname(req->xattr.filename); @@ -6982,6 +7128,12 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) case IORING_OP_LINKAT: ret = io_linkat(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; case IORING_OP_FSETXATTR: ret = io_fsetxattr(req, issue_flags); break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index dbf473900da2..cd9160272308 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -145,7 +145,9 @@ enum { IORING_OP_MKDIRAT, IORING_OP_SYMLINKAT, IORING_OP_LINKAT, + IORING_OP_FGETXATTR, IORING_OP_FSETXATTR, + IORING_OP_GETXATTR, IORING_OP_SETXATTR, /* this goes last, obviously */