From nobody Thu Dec 18 09:11:16 2025 Received: from mail-qv1-f100.google.com (mail-qv1-f100.google.com [209.85.219.100]) (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 2705125A35E for ; Tue, 25 Mar 2025 14:39:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742913591; cv=none; b=YqCSAkoujMeiXMz0iKhsdSPAjI8i/LB/9hQVGf4+MmTsuKZX1NuMtq0VOp5VDP+hMDNl3JBPGn8qV23IOBJLqmve2mWsRHENPCrJXf+ogCOD1i9A/npA4i67CnKzdhSZeaHeSlcxBafLcZFtjL1G9NeljnXEGl5uUjU2FldpHb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742913591; c=relaxed/simple; bh=rCLSYeIfXuVSPFtngy9ZTWChJeLAUNk74DjLait3gKI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=q1yE2pxxjDQ8Ljukhy8vP9aDe5ieUvvS2b87HWye8lOZUSD9JiW1D87LCv395yBNMuCgiLZ/byFt1OK/yYu+s5j39H46VgZLvmrhidVb9yf7Wrp67++EVRSBnkpnmyH72qPs1l4/DQwqolf2rUQ3v6gvqWPM8L0Y9+0MbSqBBKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=F9x6+6R1; arc=none smtp.client-ip=209.85.219.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="F9x6+6R1" Received: by mail-qv1-f100.google.com with SMTP id 6a1803df08f44-6eaf348103cso12175646d6.0 for ; Tue, 25 Mar 2025 07:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1742913588; x=1743518388; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KvEoHJR3H5rDtrh76cias56A8NX1LxdTDYMAo9ZEIug=; b=F9x6+6R1Cka3xUiCXNJM7VL/QYoEyVEgl4yoptQVdZQT9LMb4AG3P0/2b7LgpFiTG9 sIw6PwdH9AEbBMlXs/xWXmd3alDrbi/C+FKndS+ciKXk+lKpxG0XH17NmoUJNfKtQfI5 uMae7ucukA/tDcScBDG6O2Li9s31ss1JK8rvH6OpAWDpQVV3gduzFJJbhq7fKXF+lGTg MgGRXeWi3qMim5M6Z0m6KHQNVYgL+G9+NwezI3xgzSYZ/T/Dtj9n9VZRzM+NFgKhA+IJ fVFXII7HfHI1wOz8piiFka6fo1wRvCrj33An8OzM7DHgxyynSavYpw7Ww4YAiu4cUHPf hJFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742913588; x=1743518388; 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=KvEoHJR3H5rDtrh76cias56A8NX1LxdTDYMAo9ZEIug=; b=QzWireaLzGVY6zPprxXoJb3BLZqvPdNJIlPgaIph6y1/eSoYAlLHPyyiKSQrN11fEe ZjGMywrDoPxELOyK0OWnJuirji8qO1OpoYqttnXK8w91unLFNxiI++ePMxPPpX+1RcKC +N5LKcMpRs3h1Ci61WSUUU00CWJX20hRf+CykY3taZoTjKfg2Lc0uzmqNdjox9w7GIVm VnVgGURR+QvJMft1mgqHGEuxLNf5PetK0wqgv9rE28g4g2waPA0sX4+osVSj62kxyMgl s3oljDsnedkrabJAvChtnNmvoZ7pCxrJVHEbu5UX3EmCiOW0V97CMDtZGpVqI2lMknh5 EgNw== X-Forwarded-Encrypted: i=1; AJvYcCUlyF5/1WPoI48rxOmeBoEabmsXC2Xflv43LTx8bRF5IrrSwKZ6FPewJEztdBuOydw/9PKHa3tYHA7LAhI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1YEX1AKj8gJ/k5seJ8aLbUTONzk+QqI9CnPjEV21XOv9+BEi3 Blc/ZZf+OpJVOUwZZt3YNFelxnUqEKpXv0IxKSmt04+ZJJ49LWproN5TGXNJUgdrAWmAu0bD9FJ CTeAhaRtqtGRq/2Jy5UWKEcX2r3n8uNWx3CJ6t3/3xzHGUSjk X-Gm-Gg: ASbGncuCYFXMRbJOLNxthuy0U0DVd4tiSYWsald4pAk1rNGfI6yBPDESPJFNnP0iGgQ OA48Rh+o56/pAkeE7ZdeA+QvNI6x6FBAwfUD+Mk4R2cl1NWoYxzs2rfIXFA9N2e6Rc3IESMp9Zc 6o4rmdjzK+MXzD8SbI94IFYYj3YnTDY1yxneWCMUR1pz42jXtNIVEvxe9mAKsiTrYUsxCMDWqpA /0M3/FbGdtGl1k3JmrbeKc2WtVtJh6WParq19RNeW8fbzgijiFeS/TWr0iFrCxZ3WerYVRO23Gs LgN4v1bFFkelbbveAJ7oe87Ts9P1XVTwaQ== X-Google-Smtp-Source: AGHT+IEhlp6iFJ/nyrhTZLyoIqP0PYN5prYdCkGBn4s3G3ahC1K2ifu4QgQbVRpdOZOSyBRCptdVsrJl6HW/ X-Received: by 2002:a05:6214:e4e:b0:6e6:9c39:ae44 with SMTP id 6a1803df08f44-6ed0c28045emr16629676d6.10.1742913587787; Tue, 25 Mar 2025 07:39:47 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-6eb3efa9663sm5438656d6.34.2025.03.25.07.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 07:39:47 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 8E6973404BA; Tue, 25 Mar 2025 08:39:46 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 96FC8E40ACF; Tue, 25 Mar 2025 08:39:46 -0600 (MDT) From: Caleb Sander Mateos To: Jens Axboe , Pavel Begunkov Cc: Caleb Sander Mateos , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] io_uring/net: use REQ_F_IMPORT_BUFFER for send_zc Date: Tue, 25 Mar 2025 08:39:42 -0600 Message-ID: <20250325143943.1226467-1-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of a bool field in struct io_sr_msg, use REQ_F_IMPORT_BUFFER to track whether io_send_zc() has already imported the buffer. This flag already serves a similar purpose for sendmsg_zc and {read,write}v_fixed. Signed-off-by: Caleb Sander Mateos Suggested-by: Pavel Begunkov Reviewed-by: Pavel Begunkov --- include/linux/io_uring_types.h | 5 ++++- io_uring/net.c | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index c17d2eedf478..699e2c0895ae 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -583,11 +583,14 @@ enum { REQ_F_BUFFERS_COMMIT =3D IO_REQ_FLAG(REQ_F_BUFFERS_COMMIT_BIT), /* buf node is valid */ REQ_F_BUF_NODE =3D IO_REQ_FLAG(REQ_F_BUF_NODE_BIT), /* request has read/write metadata assigned */ REQ_F_HAS_METADATA =3D IO_REQ_FLAG(REQ_F_HAS_METADATA_BIT), - /* resolve padded iovec to registered buffers */ + /* + * For vectored fixed buffers, resolve iovec to registered buffers. + * For SEND_ZC, whether to import buffers (i.e. the first issue). + */ REQ_F_IMPORT_BUFFER =3D IO_REQ_FLAG(REQ_F_IMPORT_BUFFER_BIT), }; =20 typedef void (*io_req_tw_func_t)(struct io_kiocb *req, io_tw_token_t tw); =20 diff --git a/io_uring/net.c b/io_uring/net.c index c87af980b98e..a7b3e2688689 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -75,11 +75,10 @@ struct io_sr_msg { unsigned nr_multishot_loops; u16 flags; /* initialised and used only by !msg send variants */ u16 buf_group; bool retry; - bool imported; /* only for io_send_zc */ void __user *msg_control; /* used only for send zerocopy */ struct io_kiocb *notif; }; =20 @@ -1305,11 +1304,10 @@ int io_send_zc_prep(struct io_kiocb *req, const str= uct io_uring_sqe *sqe) struct io_ring_ctx *ctx =3D req->ctx; struct io_kiocb *notif; =20 zc->done_io =3D 0; zc->retry =3D false; - zc->imported =3D false; req->flags |=3D REQ_F_POLL_NO_LAZY; =20 if (unlikely(READ_ONCE(sqe->__pad2[0]) || READ_ONCE(sqe->addr3))) return -EINVAL; /* we don't support IOSQE_CQE_SKIP_SUCCESS just yet */ @@ -1351,12 +1349,14 @@ int io_send_zc_prep(struct io_kiocb *req, const str= uct io_uring_sqe *sqe) if (io_is_compat(req->ctx)) zc->msg_flags |=3D MSG_CMSG_COMPAT; =20 if (unlikely(!io_msg_alloc_async(req))) return -ENOMEM; - if (req->opcode !=3D IORING_OP_SENDMSG_ZC) + if (req->opcode =3D=3D IORING_OP_SEND_ZC) { + req->flags |=3D REQ_F_IMPORT_BUFFER; return io_send_setup(req, sqe); + } return io_sendmsg_zc_setup(req, sqe); } =20 static int io_sg_from_iter_iovec(struct sk_buff *skb, struct iov_iter *from, size_t length) @@ -1447,12 +1447,12 @@ int io_send_zc(struct io_kiocb *req, unsigned int i= ssue_flags) if (unlikely(!sock)) return -ENOTSOCK; if (!test_bit(SOCK_SUPPORT_ZC, &sock->flags)) return -EOPNOTSUPP; =20 - if (!zc->imported) { - zc->imported =3D true; + if (req->flags & REQ_F_IMPORT_BUFFER) { + req->flags &=3D ~REQ_F_IMPORT_BUFFER; ret =3D io_send_zc_import(req, issue_flags); if (unlikely(ret)) return ret; } =20 --=20 2.45.2