From patchwork Wed May 8 14:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13658830 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E10F877624 for ; Wed, 8 May 2024 14:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715178451; cv=none; b=uJHKF6ZR1nf6of93jC5l8x/GXKtPz01GsoUlwY0i8OCk2aAWsPaAKxkQ8Sq5mpMosG9op6oU5XQNjbtVKw/N41QjQcqV3SfZTFEloLwKhv1AiWHQuNebVtL6lnX9rxMlJeP5QUqVG6nxFllqlusU9mpMDfnjaE/azL91jR1C/Eo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715178451; c=relaxed/simple; bh=ngeGAEp/ZBKHhQhDu65N2XXViW3ET3T58id989WUgew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t+mUdqQK45ikJi5NKqoAb0Qew6nQFY4X3MWw4+5zSMt3KDzBKUsa4WNrl+HAEl+F132TF/QMbUdf0BoAUz8B3djTVA7skCGOOtP2TnJ9f9eP2Tu2mt79pZwxDnKurhMh22kzsNytDYNEmWpNd1O4rf6ofyY6i6QZ8ec7cJxKwX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=MuTZqe48; arc=none smtp.client-ip=209.85.166.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="MuTZqe48" Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-7e17a11da38so20494639f.3 for ; Wed, 08 May 2024 07:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1715178448; x=1715783248; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HS+WCfJSQkl2qkWfmJpt8e1SuovUq9/OToUo67UUpKg=; b=MuTZqe486AWtpmI4oi0Q4RD2lsi4knW9n6nkCBnF0GeOOfYFfv/DWOVt0gi2J0qdwy JI/1wj1uyXYAhnsUaZXFxtbdBlxBbx2Y68FdJwUrSn5o2jN8LyCeotcU32PdKdIeF3Em IRE8QJivyp2uqoxoT5HE5qNa2GrGjtW0WLMc5DvygOknq4Zyt3sCGq4gDlc0vuMAFzRk Hu3FMLnOv+J+rfG56O+a0XfpdEqHFE1f9fbirBKmyse7BYpi45HnfeTXyO1uxmpstni0 pq3H3kKMLsCz7n3WRG1o8S3Ok9mO6sKLj8d1GUiSICOWaFItew1IfPnI85Ch67YiZXgt LElw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715178448; x=1715783248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HS+WCfJSQkl2qkWfmJpt8e1SuovUq9/OToUo67UUpKg=; b=Icy3cK0hcCZ8tovDb9HP6RlCe6pVRhV32i9Xlkqz+hWYadx5vmRD5FuVePMheWjRyu 8Kjtk10oRSXR8LAIGAGINfmM4hfN2MazfxMajdoOtWp0dP5ZTH0LH/zgCKpvUPQm/Opr oFyV+KXhY8UEwhYoO4qJemcFEiU09dQxCe9Bm+Qkg99NtPCZJveH1HBn5cakxMQPZWhP NG0D0YUbNV5l4/8KaQFWfcPAhZmcyF83p+9iAhSJpOvNImPcG/FnDAkeobNVOn5/cYtU WvGb/LNp/m+EgLpLd7TBGXCEEAr2+c0N7xIHcqLq42RqVnmzNFRPkttjzZEA1PuX8nH+ yrng== X-Gm-Message-State: AOJu0YxVLx8B7dURGnyqpMovV64AZK7dau54eu85t9v8vGPlM/+XgAUa K+cCUYSSIrTg6f4LB/7mBAezUISTJol5pZodt75DbNF5mndfeVkdeMn8U0K0B5lx86qP4FOMX6I h X-Google-Smtp-Source: AGHT+IFpizDDpQB2G95by4GozZFZijqbiPqwT+G9bbKANObMpGbJbuf0SfgXhKO3nLMlAnPB391qHQ== X-Received: by 2002:a05:6e02:1c2d:b0:36b:2a68:d7ee with SMTP id e9e14a558f8ab-36caecd9fbamr28890935ab.1.1715178448268; Wed, 08 May 2024 07:27:28 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id k10-20020a92c24a000000b0036c6ebd0455sm3180672ilo.88.2024.05.08.07.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 07:27:27 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 1/2] io_uring/net: add IORING_ACCEPT_DONTWAIT flag Date: Wed, 8 May 2024 08:25:36 -0600 Message-ID: <20240508142725.91273-2-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240508142725.91273-1-axboe@kernel.dk> References: <20240508142725.91273-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This allows the caller to perform a non-blocking attempt, similarly to how recvmsg has MSG_DONTWAIT. If set, and we get -EAGAIN on a connection attempt, propagate the result to userspace rather than arm poll and wait for a retry. Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 1 + io_uring/net.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index f093cb2300d9..4a645d15516f 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -379,6 +379,7 @@ enum io_uring_op { * accept flags stored in sqe->ioprio */ #define IORING_ACCEPT_MULTISHOT (1U << 0) +#define IORING_ACCEPT_DONTWAIT (1U << 1) /* * IORING_OP_MSG_RING command types, stored in sqe->addr diff --git a/io_uring/net.c b/io_uring/net.c index b0bf8471ecb7..7861bc8fe8b1 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -28,6 +28,7 @@ struct io_accept { struct sockaddr __user *addr; int __user *addr_len; int flags; + int iou_flags; u32 file_slot; unsigned long nofile; }; @@ -1489,7 +1490,6 @@ void io_sendrecv_fail(struct io_kiocb *req) int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_accept *accept = io_kiocb_to_cmd(req, struct io_accept); - unsigned flags; if (sqe->len || sqe->buf_index) return -EINVAL; @@ -1498,15 +1498,15 @@ int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2)); accept->flags = READ_ONCE(sqe->accept_flags); accept->nofile = rlimit(RLIMIT_NOFILE); - flags = READ_ONCE(sqe->ioprio); - if (flags & ~IORING_ACCEPT_MULTISHOT) + accept->iou_flags = READ_ONCE(sqe->ioprio); + if (accept->iou_flags & ~(IORING_ACCEPT_MULTISHOT | IORING_ACCEPT_DONTWAIT)) return -EINVAL; accept->file_slot = READ_ONCE(sqe->file_index); if (accept->file_slot) { if (accept->flags & SOCK_CLOEXEC) return -EINVAL; - if (flags & IORING_ACCEPT_MULTISHOT && + if (accept->iou_flags & IORING_ACCEPT_MULTISHOT && accept->file_slot != IORING_FILE_INDEX_ALLOC) return -EINVAL; } @@ -1514,8 +1514,10 @@ int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return -EINVAL; if (SOCK_NONBLOCK != O_NONBLOCK && (accept->flags & SOCK_NONBLOCK)) accept->flags = (accept->flags & ~SOCK_NONBLOCK) | O_NONBLOCK; - if (flags & IORING_ACCEPT_MULTISHOT) + if (accept->iou_flags & IORING_ACCEPT_MULTISHOT) req->flags |= REQ_F_APOLL_MULTISHOT; + if (accept->iou_flags & IORING_ACCEPT_DONTWAIT) + req->flags |= REQ_F_NOWAIT; return 0; } @@ -1540,7 +1542,8 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags) if (!fixed) put_unused_fd(fd); ret = PTR_ERR(file); - if (ret == -EAGAIN && force_nonblock) { + if (ret == -EAGAIN && force_nonblock && + !(accept->iou_flags & IORING_ACCEPT_DONTWAIT)) { /* * if it's multishot and polled, we don't need to * return EAGAIN to arm the poll infra since it From patchwork Wed May 8 14:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13658832 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40CE4182CC for ; Wed, 8 May 2024 14:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715178454; cv=none; b=W60PS5uBArdLtfm3K7fO1uTfor6D1HXSJxdppAnNauHe7BwAzxzTWm/Es7Hjn3ntiDfWxheetK8QGgnX3AzmuSKvw9nHdqbAox46LggAf2x4/ANxiXcW78SYI5Jhny5Vx/0/PdICs/OugDuZHbU0JY9DEh6Q9T0HhGy7jK+hXX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715178454; c=relaxed/simple; bh=GXFyDkGHAJklQ8XkFA0GcrAY6q+2BKptyc8P7wz4BiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S3TmONJ8TDzhGlPfZNj5mg9hDFkyOIM6D/pBuPSjd8soechq24Kmux/WjA+Wo2uVP9sJr6Bt6npk/caRaTQMbaUcuP9jUScIQj/jgjZw62Jt6KBywj/GbioX2YstDozPR7sEGMrf8Eor8Xq2EnI9CVaPGdU2VFXD6xDkqZ7ECv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=RWrCv+6q; arc=none smtp.client-ip=209.85.166.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="RWrCv+6q" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7d9d591e660so11462539f.2 for ; Wed, 08 May 2024 07:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1715178450; x=1715783250; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kuGxhO/l3ke6ObTpcXOcU2V2ZdgwmLVGPG3n99j8t20=; b=RWrCv+6qoNrLVgTUObT1Pvt8t5NupBKOJSlffIQwj8KLLdD6I8o1NPe5f6Nn7qP9Qn VDb0YD1/IRqJr37XsgI0W01hTAhICgnzmW033XurZ/2ynyDn/7Wwgl4S3Yvr8ioE+IuE KOhpPbJKYB0ebNk0dSb40wRzzWtzwnt6RwMgDTrIBsE/ZaOpaTqG2QnzURrla4/FQ22I UEoiIt0EAAmzu8NtU+18RZeCcPTu3nPKVcCBIb+Pwl7IObFFueYW9j5an8gmB4RJgKAM XbdAc8OnxWLK9YjnLC3B5JiFel5DuyoWgEdAfAzlPUFPqm6LxWYlafTnCD3dLi/vWIxp F6uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715178450; x=1715783250; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kuGxhO/l3ke6ObTpcXOcU2V2ZdgwmLVGPG3n99j8t20=; b=wTYy0RyGvnfEQguUe4sQxeFRvzza+7Fe7YQ9BCJhnuxgruHjO1ik3Vg7yuDHfd4Bvl S07hieYncMxfWahBnlxFZlaypD9RljDXAlbi2difaI0WEuNiCscu4fzA46wahw5tG/z3 ZieK8GMBGdt2a81mFDnNlxZQMR06vp0AmtPCO0yY9UPZvBW+lACLmFH2ErpBGLpvIAk5 GxO/Lh4h/2TbmKqyP82AUKJb6Lhh3ZphCTQVDCKbvSovfaKgu9Yl8k6T1YT6AK02jyOH 6BiwXqgsh/5RSpDztuN9gkBCZywK0eYuZSXj4T32b/hjXKx4YxQEQTeR7eL8g4/nLOsO gCjg== X-Gm-Message-State: AOJu0Yx3qccffuFXrpfX//zaM2yVe81lVQ918HuGtIwgLo85wuG0ycp3 S8blCYuhC6KSfa+Sngxr6e7oue9KdPSrkVo5RJpceOGqNlQsWvYGRT/kOxUaQDhD6YXr2J6M58P K X-Google-Smtp-Source: AGHT+IG0SOQmPo5qRDBal7QxygtYYIn18Y+fBW38P7W6wYP49allz7f73GWYW/gGHJEKMW+4j43RsA== X-Received: by 2002:a05:6e02:1d0d:b0:36b:2ff9:9275 with SMTP id e9e14a558f8ab-36caed52f66mr30114505ab.2.1715178449983; Wed, 08 May 2024 07:27:29 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id k10-20020a92c24a000000b0036c6ebd0455sm3180672ilo.88.2024.05.08.07.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 07:27:28 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 2/2] io_uring/net: add IORING_ACCEPT_POLL_FIRST flag Date: Wed, 8 May 2024 08:25:37 -0600 Message-ID: <20240508142725.91273-3-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240508142725.91273-1-axboe@kernel.dk> References: <20240508142725.91273-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Similarly to how polling first is supported for receive, it makes sense to provide the same for accept. An accept operation does a lot of expensive setup, like allocating an fd, a socket/inode, etc. If no connection request is already pending, this is wasted and will just be cleaned up and freed, only to retry via the usual poll trigger. Add IORING_ACCEPT_POLL_FIRST, which tells accept to only initiate the accept request if poll says we have something to accept. Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 1 + io_uring/net.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 4a645d15516f..6dbac55f8686 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -380,6 +380,7 @@ enum io_uring_op { */ #define IORING_ACCEPT_MULTISHOT (1U << 0) #define IORING_ACCEPT_DONTWAIT (1U << 1) +#define IORING_ACCEPT_POLL_FIRST (1U << 2) /* * IORING_OP_MSG_RING command types, stored in sqe->addr diff --git a/io_uring/net.c b/io_uring/net.c index 7861bc8fe8b1..070dea9a4eda 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1487,6 +1487,9 @@ void io_sendrecv_fail(struct io_kiocb *req) req->cqe.flags |= IORING_CQE_F_MORE; } +#define ACCEPT_FLAGS (IORING_ACCEPT_MULTISHOT | IORING_ACCEPT_DONTWAIT | \ + IORING_ACCEPT_POLL_FIRST) + int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_accept *accept = io_kiocb_to_cmd(req, struct io_accept); @@ -1499,7 +1502,7 @@ int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) accept->flags = READ_ONCE(sqe->accept_flags); accept->nofile = rlimit(RLIMIT_NOFILE); accept->iou_flags = READ_ONCE(sqe->ioprio); - if (accept->iou_flags & ~(IORING_ACCEPT_MULTISHOT | IORING_ACCEPT_DONTWAIT)) + if (accept->iou_flags & ~ACCEPT_FLAGS) return -EINVAL; accept->file_slot = READ_ONCE(sqe->file_index); @@ -1530,6 +1533,10 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags) struct file *file; int ret, fd; + if (!(req->flags & REQ_F_POLLED) && + accept->iou_flags & IORING_ACCEPT_POLL_FIRST) + return -EAGAIN; + retry: if (!fixed) { fd = __get_unused_fd_flags(accept->flags, accept->nofile);