From patchwork Wed Dec 15 21:59:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12679551 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 02B9FC4332F for ; Wed, 15 Dec 2021 21:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230308AbhLOV7c (ORCPT ); Wed, 15 Dec 2021 16:59:32 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:64128 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230309AbhLOV7b (ORCPT ); Wed, 15 Dec 2021 16:59:31 -0500 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BFLid8S008246 for ; Wed, 15 Dec 2021 13:59:30 -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=ksBHQidfEShKnwe7+1AkUOhHNpo3hluOCDtYZipjTtQ=; b=W5ihbceAZXOe6y0KsIvmadzeXv11SXG7XHUM/B/9MXOeHhmx+p/jSL02O++zNZgdpfNz xEro0hFA2gDN3p6w2I8IQ58EcY4lIXf9wNXM6puDe7Rm4mn5VG5TXs88Cj7ZfM0R+hxw 9hRF5PnJyEKRkbvjZkdKCVGQT2VW5iLKbCo= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3cy7crfjnn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 15 Dec 2021 13:59:30 -0800 Received: from intmgw006.03.ash8.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; Wed, 15 Dec 2021 13:59:29 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id D29CF81A403D; Wed, 15 Dec 2021 13:59:26 -0800 (PST) From: Stefan Roesch To: , CC: , Subject: [PATCH v6 1/3] fs: split off do_iterate_dir from iterate_dir function Date: Wed, 15 Dec 2021 13:59:22 -0800 Message-ID: <20211215215924.3301586-2-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211215215924.3301586-1-shr@fb.com> References: <20211215215924.3301586-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: wXcp9hXc5EvMHKsXnR6aM2cM4QWCFNnh X-Proofpoint-ORIG-GUID: wXcp9hXc5EvMHKsXnR6aM2cM4QWCFNnh 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-15_13,2021-12-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 priorityscore=1501 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112150121 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This splits of the function do_iterate_dir() from the iterate_dir() function and adds a new parameter. The new parameter allows the caller to specify if the position is the file position or the position stored in the buffer context. The function iterate_dir is calling the new function do_iterate_dir(). This change is required to support getdents in io_uring. Signed-off-by: Stefan Roesch --- fs/readdir.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/fs/readdir.c b/fs/readdir.c index 09e8ed7d4161..e9c197edf73a 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -36,8 +36,15 @@ unsafe_copy_to_user(dst, src, len, label); \ } while (0) - -int iterate_dir(struct file *file, struct dir_context *ctx) +/** + * do_iterate_dir - iterate over directory + * @file : pointer to file struct of directory + * @ctx : pointer to directory ctx structure + * @use_fpos: true : use file offset + * false: use pos in ctx structure + */ +static int do_iterate_dir(struct file *file, struct dir_context *ctx, + bool use_fpos) { struct inode *inode = file_inode(file); bool shared = false; @@ -60,12 +67,17 @@ int iterate_dir(struct file *file, struct dir_context *ctx) res = -ENOENT; if (!IS_DEADDIR(inode)) { - ctx->pos = file->f_pos; + if (use_fpos) + ctx->pos = file->f_pos; + if (shared) res = file->f_op->iterate_shared(file, ctx); else res = file->f_op->iterate(file, ctx); - file->f_pos = ctx->pos; + + if (use_fpos) + file->f_pos = ctx->pos; + fsnotify_access(file); file_accessed(file); } @@ -76,6 +88,11 @@ int iterate_dir(struct file *file, struct dir_context *ctx) out: return res; } + +int iterate_dir(struct file *file, struct dir_context *ctx) +{ + return do_iterate_dir(file, ctx, true); +} EXPORT_SYMBOL(iterate_dir); /* From patchwork Wed Dec 15 21:59: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: 12679555 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 9072FC433F5 for ; Wed, 15 Dec 2021 21:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230306AbhLOV7f (ORCPT ); Wed, 15 Dec 2021 16:59:35 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:28250 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230333AbhLOV7d (ORCPT ); Wed, 15 Dec 2021 16:59:33 -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 1BFLidTp016264 for ; Wed, 15 Dec 2021 13:59:33 -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=quLcGe8M8WkNv4h+9Ale0u3mw4BzXj5UDLOKMkH4Z9I=; b=JaKvz7QQWJLaGtFafuNW30PYHkUGfy5IJl7W2NlXFrcX6+GJglOgvYIJljkyLLK7KoSe xezzUWyfUpb3jvPi7BMJ8BlmYFWf2qqS+OfJmAaHgwE6S0Ns7Ppe42GQRfh1vorWmL1t wHaF8oKJr008rt+gxEC882TgP0q6wz3L3LI= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3cyf7fvsh0-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 15 Dec 2021 13:59:33 -0800 Received: from intmgw002.25.frc3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 15 Dec 2021 13:59:32 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id D9EDB81A403F; Wed, 15 Dec 2021 13:59:26 -0800 (PST) From: Stefan Roesch To: , CC: , , Christian Brauner Subject: [PATCH v6 2/3] fs: split off vfs_getdents function of getdents64 syscall Date: Wed, 15 Dec 2021 13:59:23 -0800 Message-ID: <20211215215924.3301586-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211215215924.3301586-1-shr@fb.com> References: <20211215215924.3301586-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: Rie1f49Q54RfyHFOamkl3l0LC2aFj56Z X-Proofpoint-ORIG-GUID: Rie1f49Q54RfyHFOamkl3l0LC2aFj56Z 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-15_13,2021-12-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 bulkscore=0 spamscore=0 mlxlogscore=854 priorityscore=1501 suspectscore=0 mlxscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112150120 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This splits off the vfs_getdents function from the getdents64 system call. This allows io_uring to call the function. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/internal.h | 8 ++++++++ fs/readdir.c | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 7979ff8d168c..355be993b9f1 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -194,3 +194,11 @@ long splice_file_to_pipe(struct file *in, struct pipe_inode_info *opipe, loff_t *offset, size_t len, unsigned int flags); + +/* + * fs/readdir.c + */ +struct linux_dirent64; + +int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, + unsigned int count, s64 pos); diff --git a/fs/readdir.c b/fs/readdir.c index e9c197edf73a..5c3af16a6178 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -21,6 +21,7 @@ #include #include #include +#include "internal.h" #include @@ -368,22 +369,26 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen, return -EFAULT; } -SYSCALL_DEFINE3(getdents64, unsigned int, fd, - struct linux_dirent64 __user *, dirent, unsigned int, count) +/** + * vfs_getdents - getdents without fdget + * @file : pointer to file struct of directory + * @dirent : pointer to user directory structure + * @count : size of buffer + * @ctx_pos : if file pos is used, pass -1, + * if ctx pos is used, pass ctx pos + */ +int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, + unsigned int count, s64 ctx_pos) { - struct fd f; struct getdents_callback64 buf = { .ctx.actor = filldir64, + .ctx.pos = ctx_pos, .count = count, .current_dir = dirent }; int error; - f = fdget_pos(fd); - if (!f.file) - return -EBADF; - - error = iterate_dir(f.file, &buf.ctx); + error = do_iterate_dir(file, &buf.ctx, ctx_pos < 0); if (error >= 0) error = buf.error; if (buf.prev_reclen) { @@ -396,6 +401,22 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, else error = count - buf.count; } + + return error; +} + +SYSCALL_DEFINE3(getdents64, unsigned int, fd, + struct linux_dirent64 __user *, dirent, unsigned int, count) +{ + struct fd f; + int error; + + f = fdget_pos(fd); + if (!f.file) + return -EBADF; + + error = vfs_getdents(f.file, dirent, count, -1); + fdput_pos(f); return error; } From patchwork Wed Dec 15 21:59: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: 12679553 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 C9575C433FE for ; Wed, 15 Dec 2021 21:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230328AbhLOV7b (ORCPT ); Wed, 15 Dec 2021 16:59:31 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:63428 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230317AbhLOV7b (ORCPT ); Wed, 15 Dec 2021 16:59:31 -0500 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BFLif8I014643 for ; Wed, 15 Dec 2021 13:59:30 -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=TPGTwC/sjpO4chV3paU1y8XS532m0TBytzcqN5Gt/Hc=; b=LMpbnwSwKs73XpzcyoQiFrTPPF/uaT/HlDihVaLr06ZMhpeJIDwuJvxvSLpOovgKF5Qh 9I4MmLEN/akydSCDvJBBlTtP/UFGxXnao8iFfH5/POQyhjc77vomnme66vWkChDU034J yp8qLnT2Rr2J8rObWj86kq+CCW6kl3NxKYY= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3cy84ky7vy-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 15 Dec 2021 13:59:30 -0800 Received: from intmgw001.05.ash7.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 15 Dec 2021 13:59:29 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id E16E381A4041; Wed, 15 Dec 2021 13:59:26 -0800 (PST) From: Stefan Roesch To: , CC: , , Pavel Begunkov Subject: [PATCH v6 3/3] io_uring: add support for getdents64 Date: Wed, 15 Dec 2021 13:59:24 -0800 Message-ID: <20211215215924.3301586-4-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211215215924.3301586-1-shr@fb.com> References: <20211215215924.3301586-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-GUID: BaYRSEHO8cbq1iaiktRc6mMl5Lv2aq0Y X-Proofpoint-ORIG-GUID: BaYRSEHO8cbq1iaiktRc6mMl5Lv2aq0Y 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-15_13,2021-12-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 suspectscore=0 spamscore=0 clxscore=1015 bulkscore=0 mlxlogscore=948 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112150120 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This adds support for getdents64 to io_uring. Signed-off-by: Stefan Roesch Reviewed-by: Pavel Begunkov --- fs/io_uring.c | 52 +++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 1 + 2 files changed, 53 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 5092dfe56da6..bbc00761f5fe 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -693,6 +693,13 @@ struct io_hardlink { int flags; }; +struct io_getdents { + struct file *file; + struct linux_dirent64 __user *dirent; + unsigned int count; + loff_t pos; +}; + struct io_async_connect { struct sockaddr_storage address; }; @@ -858,6 +865,7 @@ struct io_kiocb { struct io_mkdir mkdir; struct io_symlink symlink; struct io_hardlink hardlink; + struct io_getdents getdents; }; u8 opcode; @@ -1107,6 +1115,9 @@ static const struct io_op_def io_op_defs[] = { [IORING_OP_MKDIRAT] = {}, [IORING_OP_SYMLINKAT] = {}, [IORING_OP_LINKAT] = {}, + [IORING_OP_GETDENTS] = { + .needs_file = 1, + }, }; /* requests with any of those set should undergo io_disarm_next() */ @@ -4068,6 +4079,42 @@ static int io_linkat(struct io_kiocb *req, unsigned int issue_flags) return 0; } +static int io_getdents_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) +{ + struct io_getdents *getdents = &req->getdents; + + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + if (sqe->ioprio || sqe->rw_flags || sqe->buf_index) + return -EINVAL; + + getdents->pos = READ_ONCE(sqe->off); + getdents->dirent = u64_to_user_ptr(READ_ONCE(sqe->addr)); + getdents->count = READ_ONCE(sqe->len); + + return 0; +} + +static int io_getdents(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_getdents *getdents = &req->getdents; + int ret; + + if (issue_flags & IO_URING_F_NONBLOCK) + return -EAGAIN; + + ret = vfs_getdents(req->file, getdents->dirent, getdents->count, getdents->pos); + if (ret < 0) { + if (ret == -ERESTARTSYS) + ret = -EINTR; + + req_set_fail(req); + } + + io_req_complete(req, ret); + return 0; +} + static int io_shutdown_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { @@ -6574,6 +6621,8 @@ 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_GETDENTS: + return io_getdents_prep(req, sqe); } printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n", @@ -6857,6 +6906,9 @@ 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_GETDENTS: + ret = io_getdents(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 787f491f0d2a..57dc88db5793 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -143,6 +143,7 @@ enum { IORING_OP_MKDIRAT, IORING_OP_SYMLINKAT, IORING_OP_LINKAT, + IORING_OP_GETDENTS, /* this goes last, obviously */ IORING_OP_LAST,