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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 658AAC3526C for ; Fri, 18 Dec 2020 18:08:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AF2F23B75 for ; Fri, 18 Dec 2020 18:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727058AbgLRSI1 (ORCPT ); Fri, 18 Dec 2020 13:08:27 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:37302 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725932AbgLRSI0 (ORCPT ); Fri, 18 Dec 2020 13:08:26 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BII4Zab147294; Fri, 18 Dec 2020 18:07:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=gH9OIEg9fITpKWTSujOkXsrPwTJuEk0uFnNQ3AT1s3E=; b=wRBmOi3/dFqkNJ3oTXFYvwls2tDIgLtM9LY7PZ0WeS+BB7zlrnO5mQryFC2KtwTBGELC LSAK4/r/htzWphEqV8KHv1XtXG9hvxgJpzev+GfI0eqVEdxqtRVqKmbofQXDovNgQ6FZ naMyrN8OMmQIykYTg9gn76cmsHttgvuu45XuxLHsctYWcauWmBjWs3KwEAwSxmQvWQB2 XURJtWnrJIrlQdYOKURo6pjNcFgRu9oNdc4gqvtNCAiATc23oQAMnxF7zaTFEZwveNTX lFZKeW9NmMbP/VOCPHwHhSjq35BDFGWKQnof0rEQxR48ZYlgOvJKmq/A4ysOfoMWm+au IQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 35cn9ruhvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 18 Dec 2020 18:07:42 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BII5QMa095798; Fri, 18 Dec 2020 18:07:42 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 35e6ev0xpk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Dec 2020 18:07:41 +0000 Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0BII7e9V003621; Fri, 18 Dec 2020 18:07:40 GMT Received: from ca-ldom147.us.oracle.com (/10.129.68.131) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 18 Dec 2020 10:07:40 -0800 From: Bijan Mottahedeh To: axboe@kernel.dk, asml.silence@gmail.com, io-uring@vger.kernel.org Subject: [PATCH v3 11/13] io_uring: support buffer registration updates Date: Fri, 18 Dec 2020 10:07:26 -0800 Message-Id: <1608314848-67329-12-git-send-email-bijan.mottahedeh@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1608314848-67329-1-git-send-email-bijan.mottahedeh@oracle.com> References: <1608314848-67329-1-git-send-email-bijan.mottahedeh@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9839 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012180124 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9839 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999 impostorscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 malwarescore=0 priorityscore=1501 phishscore=0 mlxscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012180124 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Introduce IORING_REGISTER_BUFFERS_UPDATE and IORING_OP_BUFFERS_UPDATE, consistent with file registration update. Signed-off-by: Bijan Mottahedeh --- fs/io_uring.c | 123 +++++++++++++++++++++++++++++++++++++++++- include/uapi/linux/io_uring.h | 2 + 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index dbac1ea..87c1420 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1009,6 +1009,9 @@ struct io_op_def { .work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_FILES | IO_WQ_WORK_FS | IO_WQ_WORK_BLKCG, }, + [IORING_OP_BUFFERS_UPDATE] = { + .work_flags = IO_WQ_WORK_MM, + }, }; enum io_mem_account { @@ -1028,6 +1031,9 @@ static void __io_complete_rw(struct io_kiocb *req, long res, long res2, static int __io_sqe_files_update(struct io_ring_ctx *ctx, struct io_uring_rsrc_update *ip, unsigned nr_args); +static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, + struct io_uring_rsrc_update *up, + unsigned int nr_args); static void __io_clean_op(struct io_kiocb *req); static struct file *io_file_get(struct io_submit_state *state, struct io_kiocb *req, int fd, bool fixed); @@ -6012,6 +6018,12 @@ static int io_files_update(struct io_kiocb *req, bool force_nonblock, return io_rsrc_update(req, force_nonblock, cs, __io_sqe_files_update); } +static int io_buffers_update(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) +{ + return io_rsrc_update(req, force_nonblock, cs, __io_sqe_buffers_update); +} + static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { switch (req->opcode) { @@ -6083,11 +6095,13 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return io_renameat_prep(req, sqe); case IORING_OP_UNLINKAT: return io_unlinkat_prep(req, sqe); + case IORING_OP_BUFFERS_UPDATE: + return io_rsrc_update_prep(req, sqe); } printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n", req->opcode); - return-EINVAL; + return -EINVAL; } static int io_req_defer_prep(struct io_kiocb *req, @@ -6342,6 +6356,9 @@ static int io_issue_sqe(struct io_kiocb *req, bool force_nonblock, case IORING_OP_UNLINKAT: ret = io_unlinkat(req, force_nonblock); break; + case IORING_OP_BUFFERS_UPDATE: + ret = io_buffers_update(req, force_nonblock, cs); + break; default: ret = -EINVAL; break; @@ -8345,6 +8362,7 @@ static void io_buffer_unmap(struct io_ring_ctx *ctx, struct io_mapped_ubuf *imu) if (imu->acct_pages) io_unaccount_mem(ctx, imu->nr_bvecs, ACCT_PINNED); kvfree(imu->bvec); + imu->bvec = NULL; imu->nr_bvecs = 0; } @@ -8548,6 +8566,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov, if (pret > 0) unpin_user_pages(pages, pret); kvfree(imu->bvec); + imu->bvec = NULL; goto done; } @@ -8676,6 +8695,8 @@ static int io_buffer_validate(struct iovec *iov) static void io_ring_buf_put(struct io_ring_ctx *ctx, struct io_rsrc_put *prsrc) { io_buffer_unmap(ctx, prsrc->buf); + kvfree(prsrc->buf); + prsrc->buf = NULL; } static struct fixed_rsrc_ref_node *alloc_fixed_buf_ref_node( @@ -8747,6 +8768,102 @@ static int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, return 0; } +static inline int io_queue_buffer_removal(struct fixed_rsrc_data *data, + struct io_mapped_ubuf *imu) +{ + return io_queue_rsrc_removal(data, (void *)imu); +} + +static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, + struct io_uring_rsrc_update *up, + unsigned int nr_args) +{ + struct fixed_rsrc_data *data = ctx->buf_data; + struct fixed_rsrc_ref_node *ref_node; + struct io_mapped_ubuf *imu; + struct iovec iov; + struct iovec __user *iovs; + struct page *last_hpage = NULL; + __u32 done; + int i, err; + bool needs_switch = false; + + if (check_add_overflow(up->offset, nr_args, &done)) + return -EOVERFLOW; + if (done > ctx->nr_user_bufs) + return -EINVAL; + + ref_node = alloc_fixed_buf_ref_node(ctx); + if (IS_ERR(ref_node)) + return PTR_ERR(ref_node); + + done = 0; + iovs = u64_to_user_ptr(up->iovs); + while (nr_args) { + struct fixed_rsrc_table *table; + unsigned int index; + + err = 0; + if (copy_from_user(&iov, &iovs[done], sizeof(iov))) { + err = -EFAULT; + break; + } + i = array_index_nospec(up->offset, ctx->nr_user_bufs); + table = &ctx->buf_data->table[i >> IORING_BUF_TABLE_SHIFT]; + index = i & IORING_BUF_TABLE_MASK; + imu = &table->bufs[index]; + if (table->bufs[index].ubuf) { + struct io_mapped_ubuf *dup; + + dup = kmemdup(imu, sizeof(*imu), GFP_KERNEL); + if (!dup) { + err = -ENOMEM; + break; + } + err = io_queue_buffer_removal(data, dup); + if (err) + break; + memset(imu, 0, sizeof(*imu)); + needs_switch = true; + } + if (!io_buffer_validate(&iov)) { + err = io_sqe_buffer_register(ctx, &iov, imu, + &last_hpage); + if (err) { + memset(imu, 0, sizeof(*imu)); + break; + } + } + nr_args--; + done++; + up->offset++; + } + + if (needs_switch) + switch_fixed_rsrc_ref_node(ref_node, data, ctx); + else + destroy_fixed_rsrc_ref_node(ref_node); + + return done ? done : err; +} + +static int io_sqe_buffers_update(struct io_ring_ctx *ctx, void __user *arg, + unsigned int nr_args) +{ + struct io_uring_rsrc_update up; + + if (!ctx->buf_data) + return -ENXIO; + if (!nr_args) + return -EINVAL; + if (copy_from_user(&up, arg, sizeof(up))) + return -EFAULT; + if (up.resv) + return -EINVAL; + + return __io_sqe_buffers_update(ctx, &up, nr_args); +} + static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg) { __s32 __user *fds = arg; @@ -10027,6 +10144,7 @@ static bool io_register_op_must_quiesce(int op) case IORING_UNREGISTER_FILES: case IORING_REGISTER_FILES_UPDATE: case IORING_UNREGISTER_BUFFERS: + case IORING_REGISTER_BUFFERS_UPDATE: case IORING_REGISTER_PROBE: case IORING_REGISTER_PERSONALITY: case IORING_UNREGISTER_PERSONALITY: @@ -10102,6 +10220,9 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, break; ret = io_sqe_buffers_unregister(ctx); break; + case IORING_REGISTER_BUFFERS_UPDATE: + ret = io_sqe_buffers_update(ctx, arg, nr_args); + break; case IORING_REGISTER_FILES: ret = io_sqe_files_register(ctx, arg, nr_args); break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 8cc672c..0d9ac12 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -137,6 +137,7 @@ enum { IORING_OP_SHUTDOWN, IORING_OP_RENAMEAT, IORING_OP_UNLINKAT, + IORING_OP_BUFFERS_UPDATE, /* this goes last, obviously */ IORING_OP_LAST, @@ -280,6 +281,7 @@ enum { IORING_UNREGISTER_PERSONALITY = 10, IORING_REGISTER_RESTRICTIONS = 11, IORING_REGISTER_ENABLE_RINGS = 12, + IORING_REGISTER_BUFFERS_UPDATE = 13, /* this goes last */ IORING_REGISTER_LAST -- 1.8.3.1