From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05C81C433ED for ; Fri, 23 Apr 2021 00:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D84D4613ED for ; Fri, 23 Apr 2021 00:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236319AbhDWAUW (ORCPT ); Thu, 22 Apr 2021 20:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236162AbhDWAUW (ORCPT ); Thu, 22 Apr 2021 20:20:22 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C80C061756 for ; Thu, 22 Apr 2021 17:19:46 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id k4-20020a7bc4040000b02901331d89fb83so282698wmi.5 for ; Thu, 22 Apr 2021 17:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ldB+ND17rRRy2Ixgkevi+XEnDtIu9kQ9IIw18MO7od0=; b=aSK/x+96pVRjVntYObY1jVp3DYP1MMq7qvjpFNapt9u7hn+Z3YNUNr6s66bfCzz+Fl t4/+VkOhiYe3CWqS2HwC5A5Ez1gCcbza+A8OKtyUgOLTWF8Fo+38Y9cd8qYD2e9k1Dja 2wZgdiR3BPw9fVwx+YuYDOIztXF1BHThKnpGtofWHYb4WJDoO4xCQ3+tSCvxNYmFpmQS t0co+UWtjISxuEnKJ+/J/tXWS25caSJ/oIew1BO8thIOCmHikBh38JLzuDbVcAgZGp8L oKKcxO0gLFKRuVuQNmkFD7x47e4U/ToABrjTnpHbTNltT1EqnWrZou/+BJTKfSor2YTw J2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ldB+ND17rRRy2Ixgkevi+XEnDtIu9kQ9IIw18MO7od0=; b=F068Eo6tCWaLGK2Vk3yL7tlAZ1LxOqtueJFQQNajSHtAXZDENsg4qL03ZELpWtxVO2 yhQENYtlLnnSWyXpxdCQ3UTUG1rWckMJop7IBleJdyc5H85bMZFI1ukZuVC6sjsSzv10 s4VA5oZa0w9rAIfgl+fnSsOrioZHr4u75vwi4XLnJlGIXwZyC/2NmIBLiN9A8FCjVsvB xLnnANoIK03dXmqmMZoX07UDCprXSxAArQWTcm3DjjhPbaLUScJw62EGtXe8VS9joPaN RPsR12Pe3bGN/r61VSEp3u1Krpr/wXYt/yY7JXmXrJP4JuWRIY5azn3vWo4X7BT++ori Y80w== X-Gm-Message-State: AOAM533UgBAbE9APWD3qyv2o63mR30XHpoSDhr+QPO4uebKktsbEo19H HgG6ZmJ2tNt5E7bi7r90X44= X-Google-Smtp-Source: ABdhPJyHbyTN7Te1BeJg+EXlES6woTgJkg0BqIup1pa6MQqja/JoOPsog5DgtecAndEQWCpqIle2Sw== X-Received: by 2002:a05:600c:2dc8:: with SMTP id e8mr2654346wmh.10.1619137185305; Thu, 22 Apr 2021 17:19:45 -0700 (PDT) Received: from localhost.localdomain ([148.252.128.225]) by smtp.gmail.com with ESMTPSA id g12sm6369605wru.47.2021.04.22.17.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 17:19:45 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , io-uring@vger.kernel.org Subject: [PATCH 08/11] io_uring: add generic rsrc update with tags Date: Fri, 23 Apr 2021 01:19:25 +0100 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Add IORING_REGISTER_RSRC_UPDATE, which also supports passing in rsrc tags. Implement it for registered files. Signed-off-by: Pavel Begunkov --- fs/io_uring.c | 52 +++++++++++++++++++++++++++-------- include/uapi/linux/io_uring.h | 22 +++++++++++---- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 9fddac644f90..cff8561d567a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1036,7 +1036,7 @@ static void io_put_task(struct task_struct *task, int nr); static struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req); static void io_queue_linked_timeout(struct io_kiocb *req); static int __io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type, - struct io_uring_rsrc_update *up, + struct io_uring_rsrc_update2 *up, unsigned nr_args); static void io_clean_op(struct io_kiocb *req); static struct file *io_file_get(struct io_submit_state *state, @@ -5808,7 +5808,7 @@ static int io_rsrc_update_prep(struct io_kiocb *req, static int io_files_update(struct io_kiocb *req, unsigned int issue_flags) { struct io_ring_ctx *ctx = req->ctx; - struct io_uring_rsrc_update up; + struct io_uring_rsrc_update2 up; int ret; if (issue_flags & IO_URING_F_NONBLOCK) @@ -5816,6 +5816,8 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags) up.offset = req->rsrc_update.offset; up.data = req->rsrc_update.arg; + up.nr = 0; + up.tags = 0; mutex_lock(&ctx->uring_lock); ret = __io_register_rsrc_update(ctx, IORING_RSRC_FILE, @@ -7728,9 +7730,10 @@ static int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx, } static int __io_sqe_files_update(struct io_ring_ctx *ctx, - struct io_uring_rsrc_update *up, + struct io_uring_rsrc_update2 *up, unsigned nr_args) { + u64 __user *tags = u64_to_user_ptr(up->tags); __s32 __user *fds = u64_to_user_ptr(up->data); struct io_rsrc_data *data = ctx->file_data; struct io_fixed_file *file_slot; @@ -7745,10 +7748,17 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, return -EINVAL; for (done = 0; done < nr_args; done++) { - if (copy_from_user(&fd, &fds[done], sizeof(fd))) { + u64 tag = 0; + + if ((tags && copy_from_user(&tag, &tags[done], sizeof(tag))) || + copy_from_user(&fd, &fds[done], sizeof(fd))) { err = -EFAULT; break; } + if ((fd == IORING_REGISTER_FILES_SKIP || fd == -1) && tag) { + err = -EINVAL; + break; + } if (fd == IORING_REGISTER_FILES_SKIP) continue; @@ -7783,6 +7793,7 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, err = -EBADF; break; } + data->tags[up->offset + done] = tag; io_fixed_file_set(file_slot, file); err = io_sqe_file_register(ctx, file, i); if (err) { @@ -9676,12 +9687,14 @@ static int io_register_enable_rings(struct io_ring_ctx *ctx) } static int __io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type, - struct io_uring_rsrc_update *up, + struct io_uring_rsrc_update2 *up, unsigned nr_args) { __u32 tmp; int err; + if (up->resv) + return -EINVAL; if (check_add_overflow(up->offset, nr_args, &tmp)) return -EOVERFLOW; err = io_rsrc_node_switch_start(ctx); @@ -9695,18 +9708,31 @@ static int __io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type, return -EINVAL; } -static int io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type, - void __user *arg, unsigned nr_args) +static int io_register_files_update(struct io_ring_ctx *ctx, void __user *arg, + unsigned nr_args) { - struct io_uring_rsrc_update up; + struct io_uring_rsrc_update2 up; if (!nr_args) return -EINVAL; + memset(&up, 0, sizeof(up)); + if (copy_from_user(&up, arg, sizeof(struct io_uring_rsrc_update))) + return -EFAULT; + return __io_register_rsrc_update(ctx, IORING_RSRC_FILE, &up, nr_args); +} + +static int io_register_rsrc_update(struct io_ring_ctx *ctx, void __user *arg, + unsigned size) +{ + struct io_uring_rsrc_update2 up; + + if (size != sizeof(up)) + return -EINVAL; if (copy_from_user(&up, arg, sizeof(up))) return -EFAULT; - if (up.resv) + if (!up.nr) return -EINVAL; - return __io_register_rsrc_update(ctx, type, &up, nr_args); + return __io_register_rsrc_update(ctx, up.type, &up, up.nr); } static int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg, @@ -9742,6 +9768,7 @@ static bool io_register_op_must_quiesce(int op) case IORING_REGISTER_PERSONALITY: case IORING_UNREGISTER_PERSONALITY: case IORING_REGISTER_RSRC: + case IORING_REGISTER_RSRC_UPDATE: return false; default: return true; @@ -9823,7 +9850,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, ret = io_sqe_files_unregister(ctx); break; case IORING_REGISTER_FILES_UPDATE: - ret = io_register_rsrc_update(ctx, IORING_RSRC_FILE, arg, nr_args); + ret = io_register_files_update(ctx, arg, nr_args); break; case IORING_REGISTER_EVENTFD: case IORING_REGISTER_EVENTFD_ASYNC: @@ -9874,6 +9901,9 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, case IORING_REGISTER_RSRC: ret = io_register_rsrc(ctx, arg, nr_args); break; + case IORING_REGISTER_RSRC_UPDATE: + ret = io_register_rsrc_update(ctx, arg, nr_args); + break; default: ret = -EINVAL; break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index ce7b2fce6713..6d8360b5b9c5 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -299,6 +299,7 @@ enum { IORING_REGISTER_RESTRICTIONS = 11, IORING_REGISTER_ENABLE_RINGS = 12, IORING_REGISTER_RSRC = 13, + IORING_REGISTER_RSRC_UPDATE = 14, /* this goes last */ IORING_REGISTER_LAST @@ -311,12 +312,6 @@ struct io_uring_files_update { __aligned_u64 /* __s32 * */ fds; }; -struct io_uring_rsrc_update { - __u32 offset; - __u32 resv; - __aligned_u64 data; -}; - enum { IORING_RSRC_FILE = 0, }; @@ -328,6 +323,21 @@ struct io_uring_rsrc_register { __aligned_u64 tags; }; +struct io_uring_rsrc_update { + __u32 offset; + __u32 resv; + __aligned_u64 data; +}; + +struct io_uring_rsrc_update2 { + __u32 offset; + __u32 resv; + __aligned_u64 data; + __aligned_u64 tags; + __u32 type; + __u32 nr; +}; + /* Skip updating fd indexes set to this value in the fd table */ #define IORING_REGISTER_FILES_SKIP (-2) -- 2.31.1