From patchwork Sat Nov 27 06:03: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: 12642133 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 AE094C433F5 for ; Sat, 27 Nov 2021 06:05:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352107AbhK0GI6 (ORCPT ); Sat, 27 Nov 2021 01:08:58 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:59762 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344092AbhK0GGz (ORCPT ); Sat, 27 Nov 2021 01:06:55 -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 SMTP id 1AR52DMh024520 for ; Fri, 26 Nov 2021 22:03:41 -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=ewaqU2t7m6J/wYYlU7WE+7Hm8wgdez9pYRYBbpwdhzY=; b=KSvkbaJUeJG78f/nlMV2Ju9hg6MAki9YX1oYIWd64iNxLv2mkMY8WwJLaCX9uvW1vMrL Tk4HEsk/BZTaFb/gjMy/hDvHxtA0Sbl7+x5Of5D94KB6TlumbufWG74W288aWCRAVDqn 4vF/EMA2CKMyzpggSJgTNPkv/kOAScZm5yo= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3cke6285tn-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 26 Nov 2021 22:03:40 -0800 Received: from intmgw001.38.frc1.facebook.com (2620:10d:c085:208::f) 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; Fri, 26 Nov 2021 22:03:39 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 200536F679AA; Fri, 26 Nov 2021 22:03:35 -0800 (PST) From: Stefan Roesch To: , CC: , Pavel Begunkov Subject: [PATCH v5 3/3] io_uring: add support for getdents64 Date: Fri, 26 Nov 2021 22:03:26 -0800 Message-ID: <20211127060326.3018505-4-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211127060326.3018505-1-shr@fb.com> References: <20211127060326.3018505-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-FB-Source: Intern X-Proofpoint-ORIG-GUID: EgzM7kFIX6K1DnGdXTktyGJYiHLtRSGS X-Proofpoint-GUID: EgzM7kFIX6K1DnGdXTktyGJYiHLtRSGS 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-27_02,2021-11-25_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 bulkscore=0 clxscore=1015 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 mlxlogscore=938 impostorscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111270032 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 08b1b3de9b3f..8fdff4745742 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -691,6 +691,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; }; @@ -856,6 +863,7 @@ struct io_kiocb { struct io_mkdir mkdir; struct io_symlink symlink; struct io_hardlink hardlink; + struct io_getdents getdents; }; u8 opcode; @@ -1105,6 +1113,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() */ @@ -3971,6 +3982,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) { @@ -6486,6 +6533,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", @@ -6771,6 +6820,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,