From patchwork Fri Mar 7 16:22:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14006725 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 E49B6238D22 for ; Fri, 7 Mar 2025 16:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364522; cv=none; b=pj17kSu55sZROnpkFrbBOgxSIzKXRg/4UbaZA7hs7mABayWztG/VwzzXd3Jy1Mr9GDCMsNnyOdbVLDZNcfGtJ/we/BXOCFs2yObryzOO26jYpRloEgAmD1PU8g/U4fWfLCB7zPnev7AfehH+RbrJ0lSHskQ5BHe5Bd3Rs4KwNAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364522; c=relaxed/simple; bh=zmb2k6k6jgV2K1wnuxoBBaYJ6Ngox0NmxaYiJP8PoMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MVLPl/caeBRx8kbg8PDhnUZ2izsoT3Qx6hEszS4qbVaf4M9yJrG6SuBUu5qvVBosNXA1WyFFW/eV/4r6DfieeYHMN+7m80ED6EUN67aBdYY/HIORH4aZF9ywIOGBgDBIwsxnCbBhZ4wrNm3oeK965kdFiEwQMTtxzHL71K7Ifyk= 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=IZGpWmiG; arc=none smtp.client-ip=209.85.208.51 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="IZGpWmiG" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5e033c2f106so2005944a12.3 for ; Fri, 07 Mar 2025 08:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741364519; x=1741969319; 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=w+ZdpBqb28yOU5hmh13mX3JRPokuYrGgCWaPXJUGppQ=; b=IZGpWmiGdcEUcg0rQZXyGyNprkDLpiO156pfy3CdY8JfWsSBkXGaHhBTdz1AVb0WKC c2ExX/RVjK4D785O9ISCslrqDRa3ohpB8OGn7ZGRvHrGa0KuYEWGMNfa7nmDBtyWY1U0 4XonFyynCBuJNRuwYI/+NZ2su6GBh/tZCQ0nZpG0gUDDgDi3PCq97up8Tv0PpTsdjwSH ZZQmjY/3vgFH64WiyX8jBWD0mRj3eAKTUL285ykcQR8BqDs+iI2EoJJBnLeGApFoxYb3 FEoKpdfJX6oHERV2/jzD14vlivJWPU9YRkMXBk3DH85Nl8/nd4PAP6UZ2x+rN9Z9UT+b nG2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741364519; x=1741969319; 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=w+ZdpBqb28yOU5hmh13mX3JRPokuYrGgCWaPXJUGppQ=; b=ZMd9kQRzCRLYwh/6KyA5jsAsR/ZfqFr/KzLd3su+a5YOgdWqE8bJOAyd888MCIPqR5 WE5kpQHk2hWTHG4nUTyMqWV8hkU/V+iI8xKvUX+PphZI8aMs99sbvfzqE6iAvEU2uABo FHUrlo8mDM2YQxu6LPs/ZnJa1jI8SOK3mb+Nax6lJkyq/3lZHNunDhsFGpGcKuqCvUO2 QgFqGr8PxKF3dxYJNSS4DcOKoX7FgYCmE/GQblV+Dz5EhTTKxVgqnIlYTzblKYIQHI/o bEJcDKLv1p9WdH+SAI3JDb0Cc4oZ/LiHWho5tC5hHQlijoEuy9Ov2uIJ0AU52TLIgqFl DEag== X-Gm-Message-State: AOJu0YxeXnEiTwsKQ1BQ4t15Z7Kr8zjuxHprDGZ1u1wC+eNIsEW2/QPx 3a+O6B3nEz2HzgU71S2EthiqBzU+JrkfbEHhfqROsB2Ha0sZhIP9BzMHiQ== X-Gm-Gg: ASbGncv4S4Ty2/4MALRqJulX42rbKdDF1ArcyfV5VnZAdD7ngWf0ajc6IkNv98zImCK 4giINwedydoV4L1IUcJAtFPmMOsJ2T7+XGIhGj4z4S3eC3Ld+R7OV2U+UHZnykoVVVcjbQBhCdN uZx9aA5YsnZpHdh9umyEXtpTLQdKK66x+DUnRPFY57C8Wx0f/G7AXILTkuFoLZdk/gcG/qifHk8 cUj8T7JOZBRc/CTOF7B4x6gilbUrWzVftilXgwlWS/unKgukZO/ZeMy55ErVSz8ZTOLpf/R8UGo NLVj3Ixech++Z0m6bDO8BFSv7J6r X-Google-Smtp-Source: AGHT+IGDR6M2wTVheQJRxRnyagxDN3e4IurwiKktTb3igXAvunzpX6nLw7wgraoUknqHkGtj8wqh+g== X-Received: by 2002:a05:6402:42c2:b0:5dc:7374:261d with SMTP id 4fb4d7f45d1cf-5e5e22a3716mr8278479a12.7.1741364517280; Fri, 07 Mar 2025 08:21:57 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:a068]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239438955sm300566166b.19.2025.03.07.08.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:21:56 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH liburing 1/4] Add vectored registered buffer req init helpers Date: Fri, 7 Mar 2025 16:22:43 +0000 Message-ID: <60182eae68ff13f31d158e08abc351205d59c929.1741364284.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 Signed-off-by: Pavel Begunkov --- src/include/liburing.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/include/liburing.h b/src/include/liburing.h index d162d0e6..e71551ed 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -556,6 +556,16 @@ IOURINGINLINE void io_uring_prep_read_fixed(struct io_uring_sqe *sqe, int fd, sqe->buf_index = (__u16) buf_index; } +IOURINGINLINE void io_uring_prep_readv_fixed(struct io_uring_sqe *sqe, int fd, + const struct iovec *iovecs, + unsigned nr_vecs, __u64 offset, + int flags, int buf_index) +{ + io_uring_prep_readv2(sqe, fd, iovecs, nr_vecs, offset, flags); + sqe->opcode = IORING_OP_WRITE_FIXED; + sqe->buf_index = (__u16)buf_index; +} + IOURINGINLINE void io_uring_prep_writev(struct io_uring_sqe *sqe, int fd, const struct iovec *iovecs, unsigned nr_vecs, __u64 offset) @@ -580,6 +590,16 @@ IOURINGINLINE void io_uring_prep_write_fixed(struct io_uring_sqe *sqe, int fd, sqe->buf_index = (__u16) buf_index; } +IOURINGINLINE void io_uring_prep_writev2_fixed(struct io_uring_sqe *sqe, int fd, + const struct iovec *iovecs, + unsigned nr_vecs, __u64 offset, + int flags, int buf_index) +{ + io_uring_prep_writev2(sqe, fd, iovecs, nr_vecs, offset, flags); + sqe->opcode = IORING_OP_WRITE_FIXED; + sqe->buf_index = (__u16)buf_index; +} + IOURINGINLINE void io_uring_prep_recvmsg(struct io_uring_sqe *sqe, int fd, struct msghdr *msg, unsigned flags) { @@ -964,6 +984,17 @@ IOURINGINLINE void io_uring_prep_sendmsg_zc(struct io_uring_sqe *sqe, int fd, sqe->opcode = IORING_OP_SENDMSG_ZC; } +IOURINGINLINE void io_uring_prep_sendmsg_zc_fixed(struct io_uring_sqe *sqe, + int fd, + const struct msghdr *msg, + unsigned flags, + unsigned buf_index) +{ + io_uring_prep_sendmsg_zc(sqe, fd, msg, flags); + sqe->ioprio |= IORING_RECVSEND_FIXED_BUF; + sqe->buf_index = buf_index; +} + IOURINGINLINE void io_uring_prep_recv(struct io_uring_sqe *sqe, int sockfd, void *buf, size_t len, int flags) { From patchwork Fri Mar 7 16:22:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14006724 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 E2302238179 for ; Fri, 7 Mar 2025 16:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364522; cv=none; b=PhAiRUStOLel1vgMHWYu8rgKvjbWiQT9n15qmjqbLW7dt4gAmCdstWyYc9cR643TTZ7TyiK/tKbCGdhY9telqC7H9X3ePu5q0ubt/6KFD+kWGm6NVY+2g4h/NPUGsNQygw1N7quaQUZ/Mpar2DjtvDCU7oD9JKZDcsHDLyQ1W/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364522; c=relaxed/simple; bh=ekUvtFH/SfQXgIHgfIYiXK40M2zqG/dda6QIuokadQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sMGpRYk8iw3OtbPXflGMOXKCdmZYg9JT3qql+/q0JT8Mxramx/xTZBDevoD8PNxMxncZ8U7JpivjFtFQfYZZhrGVej1eGiqWaTwKqZGri7aDgc2BoUYjZTSx2HBFue5p6ROQO1qMnWRMhv4n66dPUTO3IcmSigHr+Sm7HFqu9QA= 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=mDKhVxvZ; arc=none smtp.client-ip=209.85.218.44 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="mDKhVxvZ" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-abf48293ad0so324388066b.0 for ; Fri, 07 Mar 2025 08:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741364519; x=1741969319; 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=rwjHxuGNfHhbmaESXrubOfAJtb+l3BJVFh0Fi9idhfo=; b=mDKhVxvZaoERSt3r0qD09i7dOns/P+jWTkkD95KEmEDY2WeoqzlLYFb0bwl0vBGHmN B97Br601Ja4MLAO901XKItn3lMGtYOW2tjRKpeWx5+t0baLwt7hCR5pGWlvXg838U01w S7/TT/NYxJYIUW4pZFjzX+i/wKlEwL+PIs6Ccn+VAbZbY5IsJ9RgVJx3jaKuss5HCUpL 7Mep4+gBdJTD+j2DJm0mE6QhrGuhHQWMfiw1J/74+vMPrPMf6GjVIjvEE4ZXX1mYcarW jGfNL1cCoYt1LKyh6aCIZMqKMpB9DxKqHqPEBUSm2SuWXg+x59Am0VK2idGSJjcrBa+Z k/1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741364519; x=1741969319; 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=rwjHxuGNfHhbmaESXrubOfAJtb+l3BJVFh0Fi9idhfo=; b=uqZYerOh44F8LIGdrTYmWBCRDXHHuIBl1kplv+BxI8I4GW2J0QReSZL7nlVV5AykkZ IEQRv9UzOlOI75Wxq+N/6SepC4clpZjzMzIu9dPHZ4bpmx7w6spvjRYXmen+ScjCtyrf 1k528+54P1ymX9Mipa8TpPaV4fbDYi/XHLiiek2xLqU5GKoVudKrZiAKlapOmk5cxbSq XZemJbltTBWdETnlIe8cuZ32UH4gwi8Zc663j2IS89zzX4rqRWIFjgGm0Qkhu3J2dWXT QdzVv29agX8Jtz4F0/4vVYCXaro7Q66UFYJyUJ/DoyF3Mk3xXL5hzM9DewWMyBcgi3zb Lh0g== X-Gm-Message-State: AOJu0YwQnqZ5dJvhB/6FagGI4aV3vQOhv5yTT0gao3xNqWQI07ztEXAy kwdILkQER1oV95ku6DhRGSG/LXsBDm7owctmv5vH/qMMqIuttR1Zr/GwCA== X-Gm-Gg: ASbGncuPLHigeTCuJfsD2easC+TNfTrxiB5LoFx0BouUponiJ3l7Jnu1+F8E+i/GNXN /LJp5obE0LCNCR9DPKc50T2CPlYDkyQxSsoZFCFV3IJXPi8NozJsctZjfj3fHcrRoehWsOqRRpW euw7mblI727E8pym/SMs4OlYtxWNMsIwpE/S1iCcVwiZM1RhzFyW760gUtLI37lok3rFOTYtapp 8nxQIh2Ew8r88pnbc2FOpxZ6VtjmsA3n8Zqq+1LbzoooVDCfdk+zQezjQVOXKk+vAnr24NxXN/8 7ze6uzNVo9yCDbVIgnpTCdiGL7jJ X-Google-Smtp-Source: AGHT+IG2COW4QwB1M301Y84BZByda+Ytc1fDRR3LsYgvr9WuNV+H5xXltgnHTi1rx6O+ztGmrjZ6QQ== X-Received: by 2002:a17:907:3e23:b0:ac0:527c:9cd5 with SMTP id a640c23a62f3a-ac252fa204fmr383013066b.42.1741364518334; Fri, 07 Mar 2025 08:21:58 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:a068]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239438955sm300566166b.19.2025.03.07.08.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:21:57 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH liburing 2/4] test/sendzc: test registered vectored buffers Date: Fri, 7 Mar 2025 16:22:44 +0000 Message-ID: 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 Signed-off-by: Pavel Begunkov --- test/send-zerocopy.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c index c8eafe28..680481a0 100644 --- a/test/send-zerocopy.c +++ b/test/send-zerocopy.c @@ -69,6 +69,7 @@ static size_t page_sz; static char *tx_buffer, *rx_buffer; static struct iovec buffers_iov[__BUF_NR]; +static bool has_regvec; static bool has_sendzc; static bool has_sendmsg; static bool hit_enomem; @@ -96,6 +97,7 @@ static int probe_zc_support(void) has_sendzc = p->ops_len > IORING_OP_SEND_ZC; has_sendmsg = p->ops_len > IORING_OP_SENDMSG_ZC; + has_regvec = p->ops_len > IORING_OP_READV_FIXED; io_uring_queue_exit(&ring); free(p); return 0; @@ -448,6 +450,11 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se else io_uring_prep_sendmsg(sqe, sock_client, &msghdr[i], msg_flags); + if (real_fixed_buf) { + sqe->ioprio |= IORING_RECVSEND_FIXED_BUF; + sqe->buf_index = conf->buf_index; + } + if (!conf->iovec) { io = &iov[i]; iov_len = 1; @@ -619,7 +626,11 @@ static int test_inet_send(struct io_uring *ring) conf.tcp = tcp; regbuf = conf.mix_register || conf.fixed_buf; - if (conf.iovec && (!conf.use_sendmsg || regbuf || conf.cork)) + if (!tcp && conf.long_iovec) + continue; + if (conf.use_sendmsg && regbuf && !has_regvec) + continue; + if (conf.iovec && (!conf.use_sendmsg || conf.cork)) continue; if (!conf.zc) { if (regbuf) @@ -637,7 +648,7 @@ static int test_inet_send(struct io_uring *ring) continue; if (!client_connect && conf.addr == NULL) continue; - if (conf.use_sendmsg && (regbuf || !has_sendmsg)) + if (conf.use_sendmsg && !has_sendmsg) continue; if (msg_zc_set && !conf.zc) continue; From patchwork Fri Mar 7 16:22:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14006726 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 5B9C723A9BB for ; Fri, 7 Mar 2025 16:22:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364524; cv=none; b=Lq9k5qt4QcR4+1IRt0+Q9HSbEJo4Me7M9xnRp4zqCq+3nUMOXLLdjS4IeSN3K21baifh4FQSkuiVSLYnMWvpLW17HMD6n2B4h25nQjSNr0y+M63svCryW1Q6JmYP4fQVZumxR+ZfdW34d6wSWI0mvq0Lc3+yeOdG6g+aifMbw4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364524; c=relaxed/simple; bh=CdQWfCZybetwuh0QHo4vHCvZ4DVJZbuxlvbLWuDqrUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bE5F8v+Sd1Nqt6VqyNUPNKsBAQCKg0hAEju2kMjINw4/mKFfM4QCW1nwtxojBj1XirOeVrOYkTs3dt196iPP0edtV5F9rkT+yuzMr9abF8rg9gpaZSkQnCQuLDKF1p5AMcWxkVCADVyZZCkD4RN/YCnoGmQpBwTHkGooGqQ4rfw= 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=LjgL3Ziq; arc=none smtp.client-ip=209.85.208.42 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="LjgL3Ziq" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5dca468c5e4so3696311a12.1 for ; Fri, 07 Mar 2025 08:22:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741364520; x=1741969320; 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=wjAyPpy+7gR3wP8zN7zP6bimQJIBWv2Ey6Arcbs3jQQ=; b=LjgL3ZiqcWFlKtgTxgGQESwONFunr1axMv9wtW4VuoTHefrsXNIu3+coUlg1X8lUJr YTPWFo4Jc58oXzFdo+3GkROjWw548O/MNi9/fCw0hO98wv+Tqf5vIO7oY01jUgcTA5XZ StRYBxqaPZ6voVg0ZOe+f75F6wFfLcfgb0+s+CHDD56ylCAOxHAeNCqFFXFP9dXmkTq7 plA0Bn2eEovcmxan90bYHMByZdESIS3txymZ92nZnzGF0vLr28ylmppajggXbtnUVOLz +IQA+GFIxUCuIelUvxfqofUJEu9PregOLWoPkRsUIPZ1P2JjzF7EaGojhUS2Zk03SiT8 GUWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741364520; x=1741969320; 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=wjAyPpy+7gR3wP8zN7zP6bimQJIBWv2Ey6Arcbs3jQQ=; b=XxPWLWs2RsdWRem4IAYw1GwZ37rhoSoXolEqfCeZXbfur9H5qjntnarx/zBe5guMCC UIDewIxRW91hDRJ3JImS7LLwWds/8qFcGb5IkaniOET4T2XmbC+5sr7S73UGOOrRJOvi OVxVmJLZSd2hveMtZVDOiMdmC/jn1SmYn2MmLgwRgzSDJZclKQPANo5fWp6EsKNJzXCT +45w4os7P5NEpsxqZTeSBbhd/KxE2xivkQWUS5C54Fzsfr9xtsmRjL//emlXlChorQAi z+RJ5ue/USfutEaJvbWsM5hddjlBkSMJqLDToMUommI3DLH5zO3LVX3Lnp3aIgH1P8kU O5OQ== X-Gm-Message-State: AOJu0YxjyQ6WoiAKIFb4ibJeEp+zrPJfbu8qOhIyX+NqwXyNd2tlwzFw 9x23Md1U1LDNEJyBCEaf91MtBm1GiCEtJsM/C/oTsqBLriOt3B9GL9Lokg== X-Gm-Gg: ASbGncu+4FL/6T5gJrvDre7Xpp9qsOGWQlAUY1fabpLDpytp74PlzRxPHRWCyfvaYtx HhPpg95G7oDPT9ZBwXJg85OiTrlExnKqBSgXXcnwTPVlqX8YzoOQf6umT/0vIdb5eeo6L2FhxgH pukL/nc/bYG68O26pOg51KzeVi2tYBCI4GDQ2ANZPlborvvd6pkB6mInKqaaCoN65nuP3jS0Qxe 1Ae+n6tXMBpzACuEerPsAAkydwFiTHEsDYovzgat8uxTag28a054mC5d30jm0tDdAPdclPRaqqu vgXvo20razZrdwReTfQdqdUtC3W+ X-Google-Smtp-Source: AGHT+IEeLPcMY9wxNtSDe/2OgbmwVXSStYUSP+rL4pbVoWcnxLgQhp2G4ITqmpMJ00nvOkYuQPF+0A== X-Received: by 2002:a17:907:6e9e:b0:ab7:d454:11c9 with SMTP id a640c23a62f3a-ac25259859amr452676566b.8.1741364519871; Fri, 07 Mar 2025 08:21:59 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:a068]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239438955sm300566166b.19.2025.03.07.08.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:21:58 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH liburing 3/4] tests/helpers: add t_create_socketpair_ip Date: Fri, 7 Mar 2025 16:22:45 +0000 Message-ID: <8b22b1bd210938bb908bd9c630ba8b118e4e5d47.1741364284.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 create_socketpair_ip() is useful for zerocopy tx testing as it needs TCP sockets and not just AF_UNIX. There will be tx zc tests in more files, so move the function to helpers. Signed-off-by: Pavel Begunkov --- test/helpers.c | 111 ++++++++++++++++++++++++++++++++++++++ test/helpers.h | 5 ++ test/send-zerocopy.c | 123 ++++--------------------------------------- 3 files changed, 127 insertions(+), 112 deletions(-) diff --git a/test/helpers.c b/test/helpers.c index 07186911..b2d386f4 100644 --- a/test/helpers.c +++ b/test/helpers.c @@ -373,3 +373,114 @@ void *aligned_alloc(size_t alignment, size_t size) return ret; } + +int t_create_socketpair_ip(struct sockaddr_storage *addr, + int *sock_client, int *sock_server, + bool ipv6, bool client_connect, + bool msg_zc, bool tcp, const char *name) +{ + socklen_t addr_size; + int family, sock, listen_sock = -1; + int ret; + + memset(addr, 0, sizeof(*addr)); + if (ipv6) { + struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr; + + family = AF_INET6; + saddr->sin6_family = family; + saddr->sin6_port = htons(0); + addr_size = sizeof(*saddr); + } else { + struct sockaddr_in *saddr = (struct sockaddr_in *)addr; + + family = AF_INET; + saddr->sin_family = family; + saddr->sin_port = htons(0); + saddr->sin_addr.s_addr = htonl(INADDR_ANY); + addr_size = sizeof(*saddr); + } + + /* server sock setup */ + if (tcp) { + sock = listen_sock = socket(family, SOCK_STREAM, IPPROTO_TCP); + } else { + sock = *sock_server = socket(family, SOCK_DGRAM, 0); + } + if (sock < 0) { + perror("socket"); + return 1; + } + + ret = bind(sock, (struct sockaddr *)addr, addr_size); + if (ret < 0) { + perror("bind"); + return 1; + } + + ret = getsockname(sock, (struct sockaddr *)addr, &addr_size); + if (ret < 0) { + fprintf(stderr, "getsockname failed %i\n", errno); + return 1; + } + + if (tcp) { + ret = listen(sock, 128); + assert(ret != -1); + } + + if (ipv6) { + struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr; + + inet_pton(AF_INET6, name, &(saddr->sin6_addr)); + } else { + struct sockaddr_in *saddr = (struct sockaddr_in *)addr; + + inet_pton(AF_INET, name, &saddr->sin_addr); + } + + /* client sock setup */ + if (tcp) { + *sock_client = socket(family, SOCK_STREAM, IPPROTO_TCP); + assert(client_connect); + } else { + *sock_client = socket(family, SOCK_DGRAM, 0); + } + if (*sock_client < 0) { + perror("socket"); + return 1; + } + if (client_connect) { + ret = connect(*sock_client, (struct sockaddr *)addr, addr_size); + if (ret < 0) { + perror("connect"); + return 1; + } + } + if (msg_zc) { +#ifdef SO_ZEROCOPY + int val = 1; + + /* + * NOTE: apps must not set SO_ZEROCOPY when using io_uring zc. + * It's only here to test interactions with MSG_ZEROCOPY. + */ + if (setsockopt(*sock_client, SOL_SOCKET, SO_ZEROCOPY, &val, sizeof(val))) { + perror("setsockopt zc"); + return 1; + } +#else + fprintf(stderr, "no SO_ZEROCOPY\n"); + return 1; +#endif + } + if (tcp) { + *sock_server = accept(listen_sock, NULL, NULL); + if (!*sock_server) { + fprintf(stderr, "can't accept\n"); + return 1; + } + close(listen_sock); + } + return 0; +} diff --git a/test/helpers.h b/test/helpers.h index d0294eba..f8a5c7f2 100644 --- a/test/helpers.h +++ b/test/helpers.h @@ -81,6 +81,11 @@ struct iovec *t_create_buffers(size_t buf_num, size_t buf_size); */ int t_create_socket_pair(int fd[2], bool stream); +int t_create_socketpair_ip(struct sockaddr_storage *addr, + int *sock_client, int *sock_server, + bool ipv6, bool client_connect, + bool msg_zc, bool tcp, const char *name); + /* * Helper for setting up a ring and checking for user privs */ diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c index 680481a0..b505e4d0 100644 --- a/test/send-zerocopy.c +++ b/test/send-zerocopy.c @@ -258,117 +258,6 @@ static int test_send_faults(int sock_tx, int sock_rx) return T_EXIT_PASS; } -static int create_socketpair_ip(struct sockaddr_storage *addr, - int *sock_client, int *sock_server, - bool ipv6, bool client_connect, - bool msg_zc, bool tcp) -{ - socklen_t addr_size; - int family, sock, listen_sock = -1; - int ret; - - memset(addr, 0, sizeof(*addr)); - if (ipv6) { - struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr; - - family = AF_INET6; - saddr->sin6_family = family; - saddr->sin6_port = htons(0); - addr_size = sizeof(*saddr); - } else { - struct sockaddr_in *saddr = (struct sockaddr_in *)addr; - - family = AF_INET; - saddr->sin_family = family; - saddr->sin_port = htons(0); - saddr->sin_addr.s_addr = htonl(INADDR_ANY); - addr_size = sizeof(*saddr); - } - - /* server sock setup */ - if (tcp) { - sock = listen_sock = socket(family, SOCK_STREAM, IPPROTO_TCP); - } else { - sock = *sock_server = socket(family, SOCK_DGRAM, 0); - } - if (sock < 0) { - perror("socket"); - return 1; - } - - ret = bind(sock, (struct sockaddr *)addr, addr_size); - if (ret < 0) { - perror("bind"); - return 1; - } - - ret = getsockname(sock, (struct sockaddr *)addr, &addr_size); - if (ret < 0) { - fprintf(stderr, "getsockname failed %i\n", errno); - return 1; - } - - if (tcp) { - ret = listen(sock, 128); - assert(ret != -1); - } - - if (ipv6) { - struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr; - - inet_pton(AF_INET6, HOSTV6, &(saddr->sin6_addr)); - } else { - struct sockaddr_in *saddr = (struct sockaddr_in *)addr; - - inet_pton(AF_INET, HOST, &saddr->sin_addr); - } - - /* client sock setup */ - if (tcp) { - *sock_client = socket(family, SOCK_STREAM, IPPROTO_TCP); - assert(client_connect); - } else { - *sock_client = socket(family, SOCK_DGRAM, 0); - } - if (*sock_client < 0) { - perror("socket"); - return 1; - } - if (client_connect) { - ret = connect(*sock_client, (struct sockaddr *)addr, addr_size); - if (ret < 0) { - perror("connect"); - return 1; - } - } - if (msg_zc) { -#ifdef SO_ZEROCOPY - int val = 1; - - /* - * NOTE: apps must not set SO_ZEROCOPY when using io_uring zc. - * It's only here to test interactions with MSG_ZEROCOPY. - */ - if (setsockopt(*sock_client, SOL_SOCKET, SO_ZEROCOPY, &val, sizeof(val))) { - perror("setsockopt zc"); - return 1; - } -#else - fprintf(stderr, "no SO_ZEROCOPY\n"); - return 1; -#endif - } - if (tcp) { - *sock_server = accept(listen_sock, NULL, NULL); - if (!*sock_server) { - fprintf(stderr, "can't accept\n"); - return 1; - } - close(listen_sock); - } - return 0; -} - struct send_conf { bool fixed_buf; bool mix_register; @@ -574,6 +463,16 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se return 0; } +static int create_socketpair_ip(struct sockaddr_storage *addr, + int *sock_client, int *sock_server, + bool ipv6, bool client_connect, + bool msg_zc, bool tcp) +{ + return t_create_socketpair_ip(addr, sock_client, sock_server, ipv6, + client_connect, msg_zc, tcp, + ipv6 ? HOSTV6 : HOST); +} + static int test_inet_send(struct io_uring *ring) { struct send_conf conf; @@ -598,7 +497,7 @@ static int test_inet_send(struct io_uring *ring) continue; #endif ret = create_socketpair_ip(&addr, &sock_client, &sock_server, ipv6, - client_connect, msg_zc_set, tcp); + client_connect, msg_zc_set, tcp); if (ret) { fprintf(stderr, "sock prep failed %d\n", ret); return 1; From patchwork Fri Mar 7 16:22:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14006727 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 AC478238179 for ; Fri, 7 Mar 2025 16:22:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364525; cv=none; b=rA9+EzEQuhNJHP7TYbCM5i2LG1tWEL2cxZe9BDrFyu/tHXZog87cT6ti3OgZHUaH3LsKyorKKwOZ3C91Xut95plr1zMzpty8aW3HXhxbPvIJTjG1D8i145T6GzQNIeXOL/EWqxffOOrA7FXD1u/SIEkwXEexI+b7eOrt4vW8fj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741364525; c=relaxed/simple; bh=KQQ92RQwl3BYZLoDQCBHGLxPOWbQJo82lmMwnAQsA3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YMhjWRObvJrplIwGoFqP70jUvquR2ifmAOUEmGUtHxZfW5rsa5Pw7aOzyl/1tcaOuhyU4QHnstK1XCg3f67foma3CUqBPyk8ifbZMnCW6MVwYwNBtn9GexBRPSMgYl33gYh52KYBdLBh3EwB2NfHlpceyoU7/b5EglzL7dnq+/c= 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=i4lERb/X; arc=none smtp.client-ip=209.85.218.54 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="i4lERb/X" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aaf900cc7fbso412630466b.3 for ; Fri, 07 Mar 2025 08:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741364522; x=1741969322; 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=ZpcH6TEytGVYVOSfZ8EtOMSsZbd/LP1y0YHsaiqJfbg=; b=i4lERb/XVutCdCkmOH0cI47ENM6LF+qvyaUepkqqGYHG9Tcc4Nn/uRBvi+umaVaya3 C647aI8pOH9JHp4CS/UGR7vB2obfDo+ChTS9FFz+lMVXhCVh1PZYA0ltfwKQH4Wmnv1m yWUfouVv3vbktckYgWlNhCQcZkB4FIUs7KkaaK2KhrwJp/0Gk9aTAuMWyS5Es3+RVtjg pQbFR55YcMQGq0nVME7gvlDuL3pmq8hix/N0j19E82vaOIJpA3B5eRDL+T+aviVLPOj2 ONZVkTZZ7UoCIbNON41GR+asCNOyzVGQ5SqEDJ2nmNeq3ivfUcFQIluL1QLfy8XvSuPc k/Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741364522; x=1741969322; 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=ZpcH6TEytGVYVOSfZ8EtOMSsZbd/LP1y0YHsaiqJfbg=; b=Ld/320dA/ycecuFKRBx4BC0DBdK30hWEDjaY8dT/xaQa8qq6T7a+CKXmnewK6ZHCXK pToJyKEho+DxF1peVFRkMnYgC2XvCIy7eRWRwjF37YDorGKICLqYpyT8/398GecjNx/B 2d0sC28aEQ69mSP0T4tbRwinM7JdzuIjfHk+y7DAqvGFKISfiq7Ea9L9JLYXuOSrx9RV 1FA+3W0tTTrafejuGVCiRXWrhhEOHQcSLolmjs6YwblU4Q/vCB6Ati+Tsf559hgfV3VP Ws1XYNvAh3+cIVbvpGflNx6+iIvlq0j1kM8fmZUGapLxYLr48g0doxhnCNKxIPiOvE1p 8LyA== X-Gm-Message-State: AOJu0YyZCX00rE1n2al9Cli83nFmqjpGgmxmO+rD5PxJGB4nw2klG0zc Ji936ojA2JFpIj6VI2Yb5SccDLeAac+INWdSnXZsDL4Y6aOSNFKOWoPeog== X-Gm-Gg: ASbGnctOkBtFqo+AEgIYgRfAk1D5pUxluPwpfgMAGOmKSZth0ViFuyfl6u9pdIzqsGl WfDexVfMruoQQgq4xVvJucG++mZw7XYx2HD9ntA9jnMCrtHzSF1pLzwskllsFaeBSW4MHCMl3YB o7T8iDYvkwFIGoCgXTZm7r/PKvKLFZtpMJsRxqjlSxgs3IIyO5IEXStXjWDJf1YzX1AKW8fGjrt y0KRB23la5h9bqUq8C5Z8z16Fyi90aJ1DTfVNixOFnOPlVfXSQQ3yTEjcs5m+oPOQNgL1q3ZzK5 NRxg2q8llfWPsDBq/6rqTP0w0KKP X-Google-Smtp-Source: AGHT+IGW1qENc7ECIsBQgXPREKyeVGTWyf8Pv3OSHpet9IWt9NXxK+ILXhqmsoPUqR9h2R88f2M+dQ== X-Received: by 2002:a17:906:5982:b0:abf:607b:d11 with SMTP id a640c23a62f3a-ac252650630mr386403366b.18.1741364521238; Fri, 07 Mar 2025 08:22:01 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:a068]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239438955sm300566166b.19.2025.03.07.08.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:22:00 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH liburing 4/4] tests: targeted registered vector tests Date: Fri, 7 Mar 2025 16:22:46 +0000 Message-ID: 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 The main part here is to exercise various iovec->bvec reallocation scenarios, but it also checks edge cases and validates final data. Signed-off-by: Pavel Begunkov --- test/Makefile | 1 + test/regvec.c | 604 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 605 insertions(+) create mode 100644 test/regvec.c diff --git a/test/Makefile b/test/Makefile index 0367ef72..e937c852 100644 --- a/test/Makefile +++ b/test/Makefile @@ -241,6 +241,7 @@ test_srcs := \ wq-aff.c \ xattr.c \ zcrx.c \ + regvec.c \ # EOL # Please keep this list sorted alphabetically. diff --git a/test/regvec.c b/test/regvec.c new file mode 100644 index 00000000..3afa82b3 --- /dev/null +++ b/test/regvec.c @@ -0,0 +1,604 @@ +/* SPDX-License-Identifier: MIT */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "helpers.h" +#include "liburing.h" + +static bool has_regvec; + +struct buf_desc { + char *buf_wr; + char *buf_rd; + size_t size; + + struct io_uring ring; + bool ring_init; + bool fixed; + int buf_idx; + bool rw; +}; + +#define BUF_BASE_IDX 1 +static int page_sz; + +static void probe_support(void) +{ + struct io_uring_probe *p; + struct io_uring ring; + int ret = 0; + + ret = io_uring_queue_init(1, &ring, 0); + if (ret) { + fprintf(stderr, "queue init failed: %d\n", ret); + exit(ret); + } + + p = t_calloc(1, sizeof(*p) + 256 * sizeof(struct io_uring_probe_op)); + ret = io_uring_register_probe(&ring, p, 256); + + /* if we don't have PROBE_REGISTER, we don't have OP_READ/WRITE */ + if (ret == -EINVAL) + goto out; + if (ret) { + fprintf(stderr, "register_probe: %d\n", ret); + goto out; + } + + has_regvec = p->ops_len > IORING_OP_READV_FIXED && + (p->ops[IORING_OP_READV_FIXED].flags & IO_URING_OP_SUPPORTED); +out: + io_uring_queue_exit(&ring); + if (p) + free(p); +} + +static void bind_ring(struct buf_desc *bd, struct io_uring *ring, unsigned buf_idx) +{ + size_t size = bd->size; + struct iovec iov; + int ret; + + iov.iov_len = size; + iov.iov_base = bd->buf_wr; + + ret = io_uring_register_buffers_update_tag(ring, buf_idx, &iov, NULL, 1); + if (ret != 1) { + if (geteuid()) { + fprintf(stderr, "Not root, skipping\n"); + exit(0); + } + fprintf(stderr, "buf reg failed %i\n", ret); + exit(1); + } + bd->buf_idx = buf_idx; +} + +static void reinit_ring(struct buf_desc *bd) +{ + struct io_uring *ring = &bd->ring; + int ret; + + if (bd->ring_init) { + io_uring_queue_exit(ring); + bd->ring_init = false; + } + + ret = io_uring_queue_init(32, ring, 0); + if (ret) { + fprintf(stderr, "ring init error %i\n", ret); + exit(1); + } + + ret = io_uring_register_buffers_sparse(ring, 128); + if (ret) { + fprintf(stderr, "table reg error %i\n", ret); + exit(1); + } + + bind_ring(bd, &bd->ring, BUF_BASE_IDX); + bd->ring_init = true; +} + +static void init_buffers(struct buf_desc *bd, size_t size) +{ + void *start; + void *mem; + + start = mmap(NULL, size + page_sz * 2, PROT_NONE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); + if (start == MAP_FAILED) { + fprintf(stderr, "Unable to preserve the page mixture memory.\n"); + exit(1); + } + + mem = mmap(start + page_sz, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); + if (mem == MAP_FAILED) { + fprintf(stderr, "mmap fail\n"); + exit(1); + } + + memset(bd, 0, sizeof(*bd)); + bd->size = size; + bd->buf_wr = mem; + bd->buf_rd = malloc(size); + if (!bd->buf_rd) { + fprintf(stderr, "malloc fail\n"); + exit(1); + } +} + +static int verify_data(struct buf_desc *bd, struct iovec *wr_vecs, int nr_iovec, + int fd) +{ + int iov_idx, ret; + + for (iov_idx = 0; iov_idx < nr_iovec; iov_idx++) { + struct iovec *vec = &wr_vecs[iov_idx]; + size_t seg_size = vec->iov_len; + size_t read_bytes = 0; + + while (1) { + ret = read(fd, bd->buf_rd + read_bytes, seg_size - read_bytes); + if (ret < 0) { + fprintf(stderr, "read error %i", ret); + return 1; + } + read_bytes += ret; + if (read_bytes == seg_size) + break; + if (ret == 0) { + fprintf(stderr, "can't read %i", ret); + return 2; + } + } + + ret = memcmp(bd->buf_rd, vec->iov_base, seg_size); + if (ret != 0) { + fprintf(stderr, "data mismatch %i\n", ret); + return 3; + } + } + return 0; +} + +struct verify_data { + struct buf_desc *bd; + struct iovec *vecs; + int nr_vec; + int fd; +}; + +static void *verify_thread_cb(void *data) +{ + struct verify_data *vd = data; + int ret; + + ret = verify_data(vd->bd, vd->vecs, vd->nr_vec, vd->fd); + return (void *)(unsigned long)ret; +} + +static int test_rw(struct buf_desc *bd, struct iovec *vecs, int nr_vec, int fd_wr) +{ + unsigned buf_idx = bd->buf_idx; + struct io_uring *ring = &bd->ring; + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; + int ret; + + sqe = io_uring_get_sqe(ring); + io_uring_prep_writev(sqe, fd_wr, vecs, nr_vec, 0); + if (bd->fixed) + sqe->buf_index = buf_idx; + + ret = io_uring_submit(ring); + if (ret != 1) { + fprintf(stderr, "submit failed %i\n", ret); + exit(1); + } + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) { + fprintf(stderr, "wait_cqe=%d\n", ret); + exit(1); + } + + ret = cqe->res; + io_uring_cqe_seen(ring, cqe); + return ret; +} + +static int test_sendzc(struct buf_desc *bd, struct iovec *vecs, int nr_vec, int fd_wr) +{ + unsigned buf_idx = bd->buf_idx; + struct io_uring *ring = &bd->ring; + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; + int ret, cqe_ret, more; + struct msghdr msghdr; + + memset(&msghdr, 0, sizeof(msghdr)); + msghdr.msg_iov = vecs; + msghdr.msg_iovlen = nr_vec; + + sqe = io_uring_get_sqe(ring); + if (bd->fixed) + io_uring_prep_sendmsg_zc_fixed(sqe, fd_wr, &msghdr, 0, buf_idx); + else + io_uring_prep_sendmsg_zc(sqe, fd_wr, &msghdr, 0); + + ret = io_uring_submit(ring); + if (ret != 1) { + fprintf(stderr, "submit failed %i\n", ret); + exit(1); + } + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) { + fprintf(stderr, "wait_cqe=%d\n", ret); + exit(1); + } + + cqe_ret = cqe->res; + more = cqe->flags & IORING_CQE_F_MORE; + io_uring_cqe_seen(ring, cqe); + + if (more) { + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) { + fprintf(stderr, "wait_cqe=%d\n", ret); + exit(1); + } + io_uring_cqe_seen(ring, cqe); + } + return cqe_ret; +} + +static int test_vec(struct buf_desc *bd, struct iovec *vecs, int nr_vec, + bool expect_fail, int *cqe_ret) +{ + struct sockaddr_storage addr; + int sock_server, sock_client; + struct verify_data vd; + size_t total_len = 0; + int i, ret; + void *verify_res; + pthread_t th; + + ret = t_create_socketpair_ip(&addr, &sock_client, &sock_server, + true, true, false, true, "::1"); + if (ret) { + fprintf(stderr, "sock prep failed %d\n", ret); + return 1; + } + + for (i = 0; i < bd->size; i++) + bd->buf_wr[i] = i; + memset(bd->buf_rd, 0, bd->size); + + for (i = 0; i < nr_vec; i++) + total_len += vecs[i].iov_len; + + vd.bd = bd; + vd.vecs = vecs; + vd.nr_vec = nr_vec; + vd.fd = sock_server; + + if (!expect_fail) { + ret = pthread_create(&th, NULL, verify_thread_cb, &vd); + if (ret) { + fprintf(stderr, "pthread_create failed %i\n", ret); + return ret; + } + } + + if (bd->rw) + ret = test_rw(bd, vecs, nr_vec, sock_client); + else + ret = test_sendzc(bd, vecs, nr_vec, sock_client); + + *cqe_ret = ret; + + if (!expect_fail && ret != total_len) { + fprintf(stderr, "invalid cqe %i, expected %lu\n", + ret, (unsigned long)total_len); + return 1; + } + + if (!expect_fail) { + pthread_join(th, &verify_res); + ret = (int)(unsigned long)verify_res; + if (ret) { + fprintf(stderr, "verify failed %i\n", ret); + return 1; + } + } + close(sock_client); + close(sock_server); + return 0; +} + +struct work { + struct iovec *vecs; + unsigned nr_vecs; +}; + +static int test_sequence(struct buf_desc *bd, unsigned nr, struct work *ws) +{ + int i, ret; + int cqe_ret; + + reinit_ring(bd); + + for (i = 0; i < nr; i++) { + ret = test_vec(bd, ws[i].vecs, ws[i].nr_vecs, false, &cqe_ret); + if (ret) { + fprintf(stderr, "sequence failed, idx %i/%i\n", i, nr); + return ret; + } + } + return 0; +} + +static void test_basic(struct buf_desc *bd) +{ + void *p = bd->buf_wr; + int ret; + struct iovec iov_page = { .iov_base = p, + .iov_len = page_sz, }; + struct iovec iov_inner = { .iov_base = p + 1, + .iov_len = 3, }; + struct iovec iov_maxbvec = { .iov_base = p + page_sz - 1, + .iov_len = page_sz + 2, }; + struct iovec iov_big = { .iov_base = p, + .iov_len = page_sz * 12 + 33, }; + struct iovec iov_big_unalign = { .iov_base = p + 10, + .iov_len = page_sz * 7 + 41, }; + struct iovec iov_full = { .iov_base = p, + .iov_len = bd->size, }; + struct iovec iov_right1 = { .iov_base = p + bd->size - page_sz + 5, + .iov_len = page_sz - 5 }; + struct iovec iov_right2 = { .iov_base = p + bd->size - page_sz - 5, + .iov_len = page_sz + 5 }; + struct iovec iov_full_unalign = { .iov_base = p + 1, + .iov_len = bd->size - 1, }; + struct iovec vecs[] = { + iov_page, + iov_big, + iov_inner, + iov_big_unalign, + iov_big_unalign, + }; + struct iovec vecs_basic[] = { iov_page, iov_page, iov_page }; + struct iovec vecs_full[] = { iov_full, iov_full, iov_full }; + struct iovec vecs_full_unalign[] = { iov_full_unalign, iov_full_unalign, + iov_full_unalign }; + struct iovec vecs_maxsegs[] = { iov_maxbvec, iov_maxbvec, iov_maxbvec, + iov_maxbvec, iov_maxbvec, iov_maxbvec}; + + ret = test_sequence(bd, 1, (struct work[]) { + { &iov_page, 1 }, + { vecs, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: basic aligned, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs, 1 }, + { vecs, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: basic aligned, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs + 1, 1 }, + { vecs + 1, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: multi page buffer, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs + 2, 1 }, + { vecs + 2, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: misaligned buffer, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs + 3, 1 }, + { vecs + 3, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: misaligned multipage buffer, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs, 1 }, + { vecs + 3, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: realloc + increase bvec, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs + 3, 1 }, + { vecs + 0, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: realloc + decrease bvec, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 2, (struct work[]) { + { vecs, 4 }, + { vecs, 4 }}); + if (ret) { + fprintf(stderr, "seq failure: multisegment, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs, 2 }, + { vecs, 3 }, + { vecs, 4 }}); + if (ret) { + fprintf(stderr, "seq failure: multisegment 2, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_basic, 1 }, + { vecs_basic, 2 }, + { vecs_basic, 3 }}); + if (ret) { + fprintf(stderr, "seq failure: increase iovec, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_basic, 3 }, + { vecs_basic, 2 }, + { vecs_basic, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: decrease iovec, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { &iov_right1, 1 }, + { &iov_right2, 1 }, + { &iov_right1, 1 }}); + if (ret) { + fprintf(stderr, "seq failure: right aligned, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_full, 1 }, + { vecs_full, 1 }, + { vecs_full, 3 }}); + if (ret) { + fprintf(stderr, "seq failure: full size, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_full_unalign, 1 }, + { vecs_full_unalign, 1 }, + { vecs_full_unalign, 3 }}); + if (ret) { + fprintf(stderr, "seq failure: full size unsigned, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_maxsegs, 1 }, + { vecs_maxsegs, 2 }, + { vecs_maxsegs, 3 }}); + if (ret) { + fprintf(stderr, "seq failure: overestimated segments, %i\n", ret); + exit(1); + } + + ret = test_sequence(bd, 3, (struct work[]) { + { vecs_maxsegs, 6 }, + { vecs_maxsegs, 6 }, + { vecs_maxsegs, 6 }}); + if (ret) { + fprintf(stderr, "seq failure: overestimated segments 2, %i\n", ret); + exit(1); + } +} + +static void test_fail(struct buf_desc *bd) +{ + int ret, cqe_ret; + void *p = bd->buf_wr; + struct iovec iov_0len = { .iov_base = p, .iov_len = 0 }; + struct iovec iov_0buf = { .iov_base = 0, .iov_len = 1 }; + struct iovec iov_inv = { .iov_base = (void *)-1U, .iov_len = 1 }; + struct iovec iov_under = { .iov_base = p - 1, .iov_len = 1 }; + struct iovec iov_over = { .iov_base = p + bd->size, .iov_len = 1 }; + struct iovec vecs_0[] = { iov_0len, iov_0len, iov_0len, iov_0len, + iov_0len, iov_0len, iov_0len, iov_0len }; + + reinit_ring(bd); + ret = test_vec(bd, vecs_0, 8, true, &cqe_ret); + if (ret || cqe_ret > 0) { + fprintf(stderr, "0 length test failed %i, cqe %i\n", + ret, cqe_ret); + exit(1); + } + + reinit_ring(bd); + ret = test_vec(bd, &iov_0buf, 1, true, &cqe_ret); + if (ret || cqe_ret >= 0) { + fprintf(stderr, "0 buf test failed %i, cqe %i\n", + ret, cqe_ret); + exit(1); + } + + reinit_ring(bd); + ret = test_vec(bd, &iov_inv, 1, true, &cqe_ret); + if (ret || cqe_ret >= 0) { + fprintf(stderr, "inv buf test failed %i, cqe %i\n", + ret, cqe_ret); + exit(1); + } + + reinit_ring(bd); + ret = test_vec(bd, &iov_under, 1, true, &cqe_ret); + if (ret || cqe_ret >= 0) { + fprintf(stderr, "inv buf underflow failed %i, cqe %i\n", + ret, cqe_ret); + exit(1); + } + + reinit_ring(bd); + ret = test_vec(bd, &iov_over, 1, true, &cqe_ret); + if (ret || cqe_ret >= 0) { + fprintf(stderr, "inv buf overflow failed %i, cqe %i\n", + ret, cqe_ret); + exit(1); + } +} + +int main(void) +{ + struct buf_desc bd = {}; + int i = 0; + + page_sz = sysconf(_SC_PAGESIZE); + + probe_support(); + if (!has_regvec) { + printf("doesn't support registered vector ops, skip\n"); + return 0; + } + + init_buffers(&bd, page_sz * 32); + bd.fixed = true; + + for (i = 0; i < 2; i++) { + bool rw = i & 1; + + bd.rw = rw; + + test_basic(&bd); + test_fail(&bd); + } + + io_uring_queue_exit(&bd.ring); + return 0; +}