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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44BF2EB64D9 for ; Tue, 27 Jun 2023 13:49:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230453AbjF0Ntj (ORCPT ); Tue, 27 Jun 2023 09:49:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231180AbjF0Nti (ORCPT ); Tue, 27 Jun 2023 09:49:38 -0400 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA96A30C7; Tue, 27 Jun 2023 06:49:31 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3fb4146e8fcso13557425e9.0; Tue, 27 Jun 2023 06:49:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687873770; x=1690465770; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JZ5UPZsAXXd/EwYzaHgJ76EEF/BDT+AfXC20CK5Riok=; b=b2t5d3tliGUUZNB2eCUeBTpSO98DoYRLPB5cC6iwLsuAHvt5WDVXXZv0agMK5b3UqZ 2myWSDnGv4SXu6T5sYpM7Q4saFHbqPk16BQRsdm353L4eX3fnlsLSndGwnPIilxr63LG JTzu3RDb2SxFU6+B2Qz2OPhhzmGMHQgwMZu+0bBFNf2xHB0CjzO1mnrXyJsIP0yy8w8T Ykx5mmMsFA4/fnDqT9ai+Ghs0QocN+5kmR7vknJUvLENpDYDD5WuFjLX8iWITst0MYkn om7QYVg7KW9ds6fob1inNpqmcrFrJQNNmw3hN74uNm024t3/u6eDIwllMzSng95tPZ90 ZgGw== X-Gm-Message-State: AC+VfDxfbhaCVB8AE1GbJce2m+LlySq9NxoSAdYZYjn7EXMg6s/G+tBe LwVqGNtO3t5tWHgzN0lf1xA= X-Google-Smtp-Source: ACHHUZ55+HYPOt4lTrmikt44v/5u95rIpnFobtlTFnf4inIm8wtz5zO4X79B1NhnIW1SHbMi+nqHhg== X-Received: by 2002:a05:600c:4e92:b0:3fa:7515:902e with SMTP id f18-20020a05600c4e9200b003fa7515902emr14797741wmq.16.1687873769838; Tue, 27 Jun 2023 06:49:29 -0700 (PDT) Received: from localhost (fwdproxy-cln-000.fbsv.net. [2a03:2880:31ff::face:b00c]) by smtp.gmail.com with ESMTPSA id n2-20020a5d67c2000000b003127741d7desm10381323wrw.58.2023.06.27.06.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 06:49:28 -0700 (PDT) From: Breno Leitao To: Jens Axboe , Pavel Begunkov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: gregkh@linuxfoundation.org, kuniyu@amazon.com, io-uring@vger.kernel.org (open list:IO_URING), linux-kernel@vger.kernel.org (open list), netdev@vger.kernel.org (open list:NETWORKING [GENERAL]) Subject: [PATCH v4] io_uring: Add io_uring command support for sockets Date: Tue, 27 Jun 2023 06:44:24 -0700 Message-Id: <20230627134424.2784797-1-leitao@debian.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Enable io_uring commands on network sockets. Create two new SOCKET_URING_OP commands that will operate on sockets. In order to call ioctl on sockets, use the file_operations->io_uring_cmd callbacks, and map it to a uring socket function, which handles the SOCKET_URING_OP accordingly, and calls socket ioctls. This patches was tested by creating a new test case in liburing. Link: https://github.com/leitao/liburing/tree/io_uring_cmd Signed-off-by: Breno Leitao --- V1 -> V2: * Keep uring code outside of network core subsystem * Uses ioctl to define uring operation * Use a generic ioctl function, instead of copying it over V2 -> V3: * Do not use ioctl() helpers to create uring operations * Rename uring_sock_cmd to io_uring_cmd_sock V3 -> V4: * Uses READ_ONCE() when accessing sk->sk_prot --- include/linux/io_uring.h | 6 ++++++ include/uapi/linux/io_uring.h | 8 ++++++++ io_uring/uring_cmd.c | 28 ++++++++++++++++++++++++++++ net/socket.c | 2 ++ 4 files changed, 44 insertions(+) diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 7fe31b2cd02f..f00baf2929ff 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -71,6 +71,7 @@ static inline void io_uring_free(struct task_struct *tsk) if (tsk->io_uring) __io_uring_free(tsk); } +int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags); #else static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, void *ioucmd) @@ -102,6 +103,11 @@ static inline const char *io_uring_get_opcode(u8 opcode) { return ""; } +static inline int io_uring_cmd_sock(struct io_uring_cmd *cmd, + unsigned int issue_flags) +{ + return -EOPNOTSUPP; +} #endif #endif diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 0716cb17e436..5c25f8c98aa8 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -703,6 +703,14 @@ struct io_uring_recvmsg_out { __u32 flags; }; +/* + * Argument for IORING_OP_URING_CMD when file is a socket + */ +enum { + SOCKET_URING_OP_SIOCINQ = 0, + SOCKET_URING_OP_SIOCOUTQ, +}; + #ifdef __cplusplus } #endif diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 5e32db48696d..bb24f67b0ad3 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -7,6 +7,7 @@ #include #include +#include #include "io_uring.h" #include "rsrc.h" @@ -156,3 +157,30 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, return io_import_fixed(rw, iter, req->imu, ubuf, len); } EXPORT_SYMBOL_GPL(io_uring_cmd_import_fixed); + +int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) +{ + struct socket *sock = cmd->file->private_data; + struct sock *sk = sock->sk; + struct proto *prot = READ_ONCE(sk->sk_prot); + int ret, arg = 0; + + if (!prot || !prot->ioctl) + return -EOPNOTSUPP; + + switch (cmd->sqe->cmd_op) { + case SOCKET_URING_OP_SIOCINQ: + ret = prot->ioctl(sk, SIOCINQ, &arg); + if (ret) + return ret; + return arg; + case SOCKET_URING_OP_SIOCOUTQ: + ret = prot->ioctl(sk, SIOCOUTQ, &arg); + if (ret) + return ret; + return arg; + default: + return -EOPNOTSUPP; + } +} +EXPORT_SYMBOL_GPL(io_uring_cmd_sock); diff --git a/net/socket.c b/net/socket.c index b778fc03c6e0..09b105d00445 100644 --- a/net/socket.c +++ b/net/socket.c @@ -88,6 +88,7 @@ #include #include #include +#include #include #include @@ -159,6 +160,7 @@ static const struct file_operations socket_file_ops = { #ifdef CONFIG_COMPAT .compat_ioctl = compat_sock_ioctl, #endif + .uring_cmd = io_uring_cmd_sock, .mmap = sock_mmap, .release = sock_close, .fasync = sock_fasync, -- 2.34.1