From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.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 94267298CC2 for ; Tue, 4 Mar 2025 15:39:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741102788; cv=none; b=jQNYb74eQ5TiNHxSL/3WkaPm0LEBE8WDWYh9Oe5K1Qcn1HLsivFhouZQ8dltqfm7R4VyBsLSZFL1K9VnMIuD0h/BDI5XSVg+kJyaQPcPhJQoE2x039ePYqqXnXCoJRpG9IjuLIIpa7rgt4f43ZwP6C0ZmzjuP1RMfbnW6fAfkEA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741102788; c=relaxed/simple; bh=+ko6qVLwFbY8p2fCkuMHNRIwwTZQjN0AL9uVp4qcr08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=skXr+j+Bl1DS9yL27K4lIg/+dTahY7fvPBBlJ4qxZgRww74v6nMktbG4C5t25NrbzbMGy/t7X//zwlbcBlHFImEEhwwzfpq0/WX8Wy3mhpXH79Jq1A/T3k341gLeh68WzeeVLw8UeHfAsTHdUwk477TVyxV7cNZLeh1oFAoiXBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e2s502pV; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e2s502pV" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5dee07e51aaso10808691a12.3 for ; Tue, 04 Mar 2025 07:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741102782; x=1741707582; 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=yljV5A1erT6qwC3xVxpqpVfrN9r/MNCu0zylOYIEozc=; b=e2s502pVCkXgkM8zMK1hVwPJ43lbTnwaPYIivTt11o7rvd+Ok+zI6yeNyRpG47CBhM ihr0VBwbSEVRGxykbXwNZ0CFJ5CJZAkeIImO7KFqdsyK7gDMmjBcruFLj0ReHnRMUKuE GDFbtCZOelY7wWFY4JPSO5PKTcu2M+PUmc0fycEMj/VAaGr4xjUH2RJCu/T7h0m6UkAA sQqzpoxY8BgGq2fLQ4PQJBNs0MenfPPKG5MGgd0wl1d1yX8HmgRALUW3rstOrJI0gDa7 VLZ4IaTcXX6nVlhp1TlWiplysp7cIKjoLb1b7GFDeWilRdxZP6WbapAWoFDx5Zkfxj9S ovYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741102782; x=1741707582; 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=yljV5A1erT6qwC3xVxpqpVfrN9r/MNCu0zylOYIEozc=; b=YffEtfwDCfUD8wnqykZudJNM//au58xvqcL+qxuX+cwee7Ki/3btCcAEHREM/E38b6 pfYMeFXRUbYYuue6OHMtQP/S1u9/UGbjEecflh5YwuWEU41a6qdVKkvA+aVW7iHBFn2C knfliLZZqYPZHB0PyIxbgzd1JOg+jlbqtvUXfg4txnsQj4UC8j20ZlAlsfpN1d2TyArY yRSZjwfdcydfsBx888wXnZ/oJqtLdVj2h6Zglb10iX3nFKEq3BumH1f1ROE3WLecmfNq 5LH7Sl5aqqjsyUZLZRPv7GDpIA29Wcbghewr3ycm0VLdrFGjZGMvkkgYggimZ1yED8My RODw== X-Gm-Message-State: AOJu0YxudYMX2dqwP+RcR3ZQ3pHy7hRaJULoLgivJM2dzbSs2SKFzvMz pWWTpBVCeJmzRsMiGm56fAqMcCuou4qSTZ+3OuUZvp3eXuwRe4PpfxidOQ== X-Gm-Gg: ASbGncvaw1LLyqgsNFSE8v/poY8HM2PvqhBa2yhOV4bfPpU3djsaY6IwvomcrvBi/le 50X73KJZTfP3amfo1L/EcQY5G/SqLCWpejZpdY7pIL7SWdTQS2NCuoARKh/ngbqNIkd/C00FUZe D7MGKEesyAv89p07wB8at6BJxQ9c2VJw0a7635HeNJMLq6THmiuJUnrQMeZMOKldex9doejO9vp tQWPOzoqeUXGY1NC016OAyKaNwAO7J5fvNHIXgGG6Q6Ff68gtKYMVzaT5tGc4LvhGWm+LeSBSZA LwVB3VhchNylHY1PFhOG2hMK2r8f X-Google-Smtp-Source: AGHT+IF34EN7IqNH71tO9SUK+H1SrNCen0EOMQbCOMPvTq2DkNDEQy16A1SCj3loxqXH/zaL2MimOw== X-Received: by 2002:a17:907:96a7:b0:abf:5b43:5f27 with SMTP id a640c23a62f3a-abf5b4360damr1113282366b.19.1741102782401; Tue, 04 Mar 2025 07:39:42 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:3bd7]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1ecafa17fsm168420966b.162.2025.03.04.07.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 07:39:41 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Andres Freund Subject: [PATCH v2 8/9] io_uring/net: implement vectored reg bufs for zctx Date: Tue, 4 Mar 2025 15:40:29 +0000 Message-ID: <78e94466329f9c2814174219be2b72c03995f329.1741102644.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add support for vectored registered buffers for send zc. Signed-off-by: Pavel Begunkov --- io_uring/net.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/io_uring/net.c b/io_uring/net.c index a4b39343f345..5e27c22e1d58 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -395,6 +395,44 @@ static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe return io_sendmsg_copy_hdr(req, kmsg); } +static int io_sendmsg_zc_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe) +{ + struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); + struct io_async_msghdr *kmsg = req->async_data; + struct user_msghdr msg; + int ret, iovec_off; + struct iovec *iov; + void *res; + + if (!(sr->flags & IORING_RECVSEND_FIXED_BUF)) + return io_sendmsg_setup(req, sqe); + + sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); + + ret = io_msg_copy_hdr(req, kmsg, &msg, ITER_SOURCE, NULL); + if (unlikely(ret)) + return ret; + sr->msg_control = kmsg->msg.msg_control_user; + + if (msg.msg_iovlen > kmsg->vec.nr || WARN_ON_ONCE(!kmsg->vec.iovec)) { + ret = io_vec_realloc(&kmsg->vec, msg.msg_iovlen); + if (ret) + return ret; + req->flags |= REQ_F_NEED_CLEANUP; + } + iovec_off = kmsg->vec.nr - msg.msg_iovlen; + iov = kmsg->vec.iovec + iovec_off; + + res = iovec_from_user(msg.msg_iov, msg.msg_iovlen, kmsg->vec.nr, iov, + io_is_compat(req->ctx)); + if (IS_ERR(res)) + return PTR_ERR(res); + + kmsg->msg.msg_iter.nr_segs = msg.msg_iovlen; + req->flags |= REQ_F_IMPORT_BUFFER; + return ret; +} + #define SENDMSG_FLAGS (IORING_RECVSEND_POLL_FIRST | IORING_RECVSEND_BUNDLE) int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) @@ -1333,8 +1371,6 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (req->opcode != IORING_OP_SEND_ZC) { if (unlikely(sqe->addr2 || sqe->file_index)) return -EINVAL; - if (unlikely(zc->flags & IORING_RECVSEND_FIXED_BUF)) - return -EINVAL; } zc->len = READ_ONCE(sqe->len); @@ -1350,7 +1386,7 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return -ENOMEM; if (req->opcode != IORING_OP_SENDMSG_ZC) return io_send_setup(req, sqe); - return io_sendmsg_setup(req, sqe); + return io_sendmsg_zc_setup(req, sqe); } static int io_sg_from_iter_iovec(struct sk_buff *skb, @@ -1506,6 +1542,22 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) unsigned flags; int ret, min_ret = 0; + kmsg->msg.sg_from_iter = io_sg_from_iter_iovec; + + if (req->flags & REQ_F_IMPORT_BUFFER) { + unsigned uvec_segs = kmsg->msg.msg_iter.nr_segs; + unsigned iovec_off = kmsg->vec.nr - uvec_segs; + int ret; + + ret = io_import_reg_vec(ITER_SOURCE, &kmsg->msg.msg_iter, req, + &kmsg->vec, uvec_segs, iovec_off, + issue_flags); + if (unlikely(ret)) + return ret; + kmsg->msg.sg_from_iter = io_sg_from_iter; + req->flags &= ~REQ_F_IMPORT_BUFFER; + } + sock = sock_from_file(req->file); if (unlikely(!sock)) return -ENOTSOCK; @@ -1524,7 +1576,6 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) kmsg->msg.msg_control_user = sr->msg_control; kmsg->msg.msg_ubuf = &io_notif_to_data(sr->notif)->uarg; - kmsg->msg.sg_from_iter = io_sg_from_iter_iovec; ret = __sys_sendmsg_sock(sock, &kmsg->msg, flags); if (unlikely(ret < min_ret)) { -- 2.48.1