From patchwork Mon Jun 13 13:12:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12879816 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 E38D6C43334 for ; Mon, 13 Jun 2022 17:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238619AbiFMRoJ (ORCPT ); Mon, 13 Jun 2022 13:44:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236916AbiFMRmq (ORCPT ); Mon, 13 Jun 2022 13:42:46 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18639158772 for ; Mon, 13 Jun 2022 06:13:33 -0700 (PDT) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25D1d68h022959 for ; Mon, 13 Jun 2022 06:13:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=YVDzKMOKGKG8h77weDdq3OggI2tckbaO/ENb+ZiltXA=; b=q5K+Lqg0uNCWx0R7BD+mHZYgC6KCAkSPgoXWO3N9sYS3wawTf3SeDLQvLepFPL0A2qFt G4QfldyJfXT43vovqaEfvXVMXgtJSW7+Zn6nNHg96gVrCOqvYU8QR254QaW4MdtdqVgA MYgmn4juRTeIk9JprhmlAIyXIv66MyCq+jg= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gmrrn85ev-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 13 Jun 2022 06:13:06 -0700 Received: from twshared22934.08.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 06:13:04 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 510FC19A7604; Mon, 13 Jun 2022 06:12:56 -0700 (PDT) From: Dylan Yudaken To: , , CC: , Dylan Yudaken Subject: [PATCH liburing 1/4] remove non-existent manpage reference Date: Mon, 13 Jun 2022 06:12:50 -0700 Message-ID: <20220613131253.974205-2-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613131253.974205-1-dylany@fb.com> References: <20220613131253.974205-1-dylany@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: PnXgy6HIxeBL2PuMkpkRKbAdA__9mrcS X-Proofpoint-ORIG-GUID: PnXgy6HIxeBL2PuMkpkRKbAdA__9mrcS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-13_06,2022-06-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This function doesn't exist Signed-off-by: Dylan Yudaken --- man/io_uring_register_buf_ring.3 | 1 - 1 file changed, 1 deletion(-) diff --git a/man/io_uring_register_buf_ring.3 b/man/io_uring_register_buf_ring.3 index 82a8efc..9e0b53d 100644 --- a/man/io_uring_register_buf_ring.3 +++ b/man/io_uring_register_buf_ring.3 @@ -131,7 +131,6 @@ On success returns 0. On failure it returns .BR -errno . .SH SEE ALSO -.BR io_uring_buf_ring_alloc (3), .BR io_uring_buf_ring_add (3), .BR io_uring_buf_ring_advance (3), .BR io_uring_buf_ring_cq_advance (3) From patchwork Mon Jun 13 13:12:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12879731 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 963E3C43334 for ; Mon, 13 Jun 2022 15:41:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242065AbiFMPlQ (ORCPT ); Mon, 13 Jun 2022 11:41:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351968AbiFMPjL (ORCPT ); Mon, 13 Jun 2022 11:39:11 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3ACF15894C for ; Mon, 13 Jun 2022 06:13:35 -0700 (PDT) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25CNZ3m9013775 for ; Mon, 13 Jun 2022 06:13:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=cN7Di7G0t4/Y7+kSBh1jAsEx7pU/D5JRlNMXVfvFfcs=; b=qp3pkKRykBoSlCCAzzZwOkelDecPWlxE9EO3x4Xu0xnqJbdPn/vr17kBQcrbOup0HcOm iaol5XvYYMAMiVqnhwk1z5Q/qY32tdOH7aWyq72+9TYRNuByFlmLg0vTg9xibvR0pnl1 HtShhEkJ9HkZxohi0JXXTfpL2zJX1r8h0vo= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gmq3kgeej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 13 Jun 2022 06:13:12 -0700 Received: from twshared25107.07.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 06:13:11 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 5963C19A7606; Mon, 13 Jun 2022 06:12:56 -0700 (PDT) From: Dylan Yudaken To: , , CC: , Dylan Yudaken Subject: [PATCH liburing 2/4] add mask parameter to io_uring_buf_ring_add Date: Mon, 13 Jun 2022 06:12:51 -0700 Message-ID: <20220613131253.974205-3-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613131253.974205-1-dylany@fb.com> References: <20220613131253.974205-1-dylany@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: tPbLNjIaBF4LkbIIJPZYlTxLWg2dUXuB X-Proofpoint-ORIG-GUID: tPbLNjIaBF4LkbIIJPZYlTxLWg2dUXuB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-13_05,2022-06-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Without the mask parameter, it's not feasible to use this API without knowing where the tail is and performing some arithmetic Signed-off-by: Dylan Yudaken --- man/io_uring_buf_ring_add.3 | 5 +++++ man/io_uring_buf_ring_mask.3 | 27 +++++++++++++++++++++++++++ src/include/liburing.h | 13 +++++++++++-- test/send_recvmsg.c | 3 ++- 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 man/io_uring_buf_ring_mask.3 diff --git a/man/io_uring_buf_ring_add.3 b/man/io_uring_buf_ring_add.3 index 741cba6..9d8283b 100644 --- a/man/io_uring_buf_ring_add.3 +++ b/man/io_uring_buf_ring_add.3 @@ -13,6 +13,7 @@ io_uring_buf_ring_add \- add buffers to a shared buffer ring .BI " void *" addr ", .BI " unsigned int " len ", .BI " unsigned short " bid ", +.BI " int " mask ", .BI " int " buf_offset ");" .fi .SH DESCRIPTION @@ -28,6 +29,9 @@ and is of bytes of length. .I bid is the buffer ID, which will be returned in the CQE. +.I mask +is the size mask of the ring, available from +.BR io_uring_buf_ring_mask (3) . .I buf_offset is the offset to insert at from the current tail. If just one buffer is provided before the ring tail is committed with @@ -44,5 +48,6 @@ must be incremented by one for each buffer added. None .SH SEE ALSO .BR io_uring_register_buf_ring (3), +.BR io_uring_buf_ring_mask (3), .BR io_uring_buf_ring_advance (3), .BR io_uring_buf_ring_cq_advance (3) diff --git a/man/io_uring_buf_ring_mask.3 b/man/io_uring_buf_ring_mask.3 new file mode 100644 index 0000000..9160663 --- /dev/null +++ b/man/io_uring_buf_ring_mask.3 @@ -0,0 +1,27 @@ +.\" Copyright (C) 2022 Dylan Yudaken +.\" +.\" SPDX-License-Identifier: LGPL-2.0-or-later +.\" +.TH io_uring_buf_ring_mask 3 "June 13, 2022" "liburing-2.2" "liburing Manual" +.SH NAME +io_uring_buf_ring_mask \- Calculate buffer ring mask size +.SH SYNOPSIS +.nf +.B #include +.PP +.BI "int io_uring_buf_ring_mask(__u32 " ring_entries ");" +.fi +.SH DESCRIPTION +.PP +.BR io_uring_buf_ring_mask (3) +calculates the appropriate size mask for a buffer ring. +.IR ring_entries +is the ring entries as specified in +.BR io_uring_register_buf_ring (3) . + +.SH RETURN VALUE +Size mask for the buffer ring. + +.SH SEE ALSO +.BR io_uring_register_buf_ring (3), +.BR io_uring_buf_ring_add (3) diff --git a/src/include/liburing.h b/src/include/liburing.h index 6eece30..9beef0b 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -1089,14 +1089,23 @@ static inline struct io_uring_sqe *_io_uring_get_sqe(struct io_uring *ring) return NULL; } +/* + * Return the appropriate mask for a buffer ring of size 'ring_entries' + */ +static inline int io_uring_buf_ring_mask(__u32 ring_entries) +{ + return ring_entries - 1; +} + /* * Assign 'buf' with the addr/len/buffer ID supplied */ static inline void io_uring_buf_ring_add(struct io_uring_buf_ring *br, void *addr, unsigned int len, - unsigned short bid, int buf_offset) + unsigned short bid, int mask, + int buf_offset) { - struct io_uring_buf *buf = &br->bufs[br->tail + buf_offset]; + struct io_uring_buf *buf = &br->bufs[(br->tail + buf_offset) & mask]; buf->addr = (unsigned long) (uintptr_t) addr; buf->len = len; diff --git a/test/send_recvmsg.c b/test/send_recvmsg.c index 44a01b0..6f18bae 100644 --- a/test/send_recvmsg.c +++ b/test/send_recvmsg.c @@ -199,7 +199,8 @@ static void *recv_fn(void *data) } br = ptr; - io_uring_buf_ring_add(br, buf, sizeof(buf), BUF_BID, 0); + io_uring_buf_ring_add(br, buf, sizeof(buf), BUF_BID, + io_uring_buf_ring_mask(1), 0); io_uring_buf_ring_advance(br, 1); } else { struct io_uring_sqe *sqe; From patchwork Mon Jun 13 13:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12879817 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 16194C433EF for ; Mon, 13 Jun 2022 17:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236392AbiFMRoJ (ORCPT ); Mon, 13 Jun 2022 13:44:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242514AbiFMRmU (ORCPT ); Mon, 13 Jun 2022 13:42:20 -0400 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20149674F7 for ; Mon, 13 Jun 2022 06:13:31 -0700 (PDT) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 25D1c2hi004996 for ; Mon, 13 Jun 2022 06:13:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=1NhJdfddzkg0aEJBzsN0i2MMU4fyQbPWOLEMQ7xo/Cc=; b=Z4e9S0rExPJwCIMn563ZrWA4tS0k8zCPsLQejipy9s3+q33Com9g1ydPTAVrFsHznX6z gt7VCCNSMrsFutp+0sYkMjlqEDt44hvWbm4YPijNYVplTgjtxY3FnJyTJcyP8yag/dd6 tYuahcBYfwKnJ7C9Gw0Qsw/XsHIk2FIJTiw= Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3gmpj88eew-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 13 Jun 2022 06:13:04 -0700 Received: from twshared17349.03.ash7.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 06:13:03 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 6388719A7608; Mon, 13 Jun 2022 06:12:56 -0700 (PDT) From: Dylan Yudaken To: , , CC: , Dylan Yudaken Subject: [PATCH liburing 3/4] add io_uring_buf_ring_init Date: Mon, 13 Jun 2022 06:12:52 -0700 Message-ID: <20220613131253.974205-4-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613131253.974205-1-dylany@fb.com> References: <20220613131253.974205-1-dylany@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: 152RaOOOIlUMQHZmFij-k3rZwHKZiT6R X-Proofpoint-ORIG-GUID: 152RaOOOIlUMQHZmFij-k3rZwHKZiT6R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-13_05,2022-06-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Kernel expects the tail to start at 0, so provide an API to init the ring appropriately. Signed-off-by: Dylan Yudaken --- man/io_uring_buf_ring_init.3 | 30 ++++++++++++++++++++++++++++++ man/io_uring_register_buf_ring.3 | 5 ++++- src/include/liburing.h | 5 +++++ test/send_recvmsg.c | 1 + 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 man/io_uring_buf_ring_init.3 diff --git a/man/io_uring_buf_ring_init.3 b/man/io_uring_buf_ring_init.3 new file mode 100644 index 0000000..50cf69a --- /dev/null +++ b/man/io_uring_buf_ring_init.3 @@ -0,0 +1,30 @@ +.\" Copyright (C) 2022 Dylan Yudaken +.\" +.\" SPDX-License-Identifier: LGPL-2.0-or-later +.\" +.TH io_uring_buf_ring_init 3 "June 13, 2022" "liburing-2.2" "liburing Manual" +.SH NAME +io_uring_buf_ring_init \- Initialise a buffer ring +.SH SYNOPSIS +.nf +.B #include +.PP +.BI "void io_uring_buf_ring_init(struct io_uring_buf_ring *" br ");" +.fi +.SH DESCRIPTION +.PP +.BR io_uring_buf_ring_init (3) +initialises +.IR br +so that it is ready to be used. It may be called after +.BR io_uring_register_buf_ring (3) +but must be called before the buffer ring is used in any other way. + +.SH RETURN VALUE +None + +.SH SEE ALSO +.BR io_uring_register_buf_ring (3), +.BR io_uring_buf_ring_add (3) +.BR io_uring_buf_ring_advance (3), +.BR io_uring_buf_ring_cq_advance (3) diff --git a/man/io_uring_register_buf_ring.3 b/man/io_uring_register_buf_ring.3 index 9e0b53d..9e520bf 100644 --- a/man/io_uring_register_buf_ring.3 +++ b/man/io_uring_register_buf_ring.3 @@ -115,7 +115,9 @@ is the length of the buffer in bytes, and .I bid is the buffer ID that will be returned in the CQE once consumed. -Reserved fields must not be touched. Applications may use +Reserved fields must not be touched. Applications must use +.BR io_uring_buf_ring_init (3) +to initialise the buffer ring. Applications may use .BR io_uring_buf_ring_add (3) and .BR io_uring_buf_ring_advance (3) @@ -131,6 +133,7 @@ On success returns 0. On failure it returns .BR -errno . .SH SEE ALSO +.BR io_uring_buf_ring_init (3), .BR io_uring_buf_ring_add (3), .BR io_uring_buf_ring_advance (3), .BR io_uring_buf_ring_cq_advance (3) diff --git a/src/include/liburing.h b/src/include/liburing.h index 9beef0b..c31ece2 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -1097,6 +1097,11 @@ static inline int io_uring_buf_ring_mask(__u32 ring_entries) return ring_entries - 1; } +static inline void io_uring_buf_ring_init(struct io_uring_buf_ring *br) +{ + br->tail = 0; +} + /* * Assign 'buf' with the addr/len/buffer ID supplied */ diff --git a/test/send_recvmsg.c b/test/send_recvmsg.c index 6f18bae..cce6c45 100644 --- a/test/send_recvmsg.c +++ b/test/send_recvmsg.c @@ -199,6 +199,7 @@ static void *recv_fn(void *data) } br = ptr; + io_uring_buf_ring_init(br); io_uring_buf_ring_add(br, buf, sizeof(buf), BUF_BID, io_uring_buf_ring_mask(1), 0); io_uring_buf_ring_advance(br, 1); From patchwork Mon Jun 13 13:12:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12879732 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 550CAC433EF for ; Mon, 13 Jun 2022 15:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242560AbiFMPlR (ORCPT ); Mon, 13 Jun 2022 11:41:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351773AbiFMPjJ (ORCPT ); Mon, 13 Jun 2022 11:39:09 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 490A9158947 for ; Mon, 13 Jun 2022 06:13:35 -0700 (PDT) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25CMwPM4011288 for ; Mon, 13 Jun 2022 06:13:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=Cd2OafK1TiUXRh0JQc82sGL8VM0TCs07e6btQkfgPSI=; b=AnczQqp00N55wAH0v0efi4X2dKqvZ9cuypHEVRUMRiYxBtD0rCMUy7T+rvbHNsmH9ZZX 2I75oZAzIw3EQGgWQ+jVT/NKnIqFBAsT3js5oRO1Hmf/r9rD+g5jp2M1C2wLpPuVJN2T 2ZDt+tc5wtTWVz5n3/om/Ib30DSj9ETbI3U= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gmq3kgeeg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 13 Jun 2022 06:13:11 -0700 Received: from twshared5131.09.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 06:13:11 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 6FD5619A760A; Mon, 13 Jun 2022 06:12:56 -0700 (PDT) From: Dylan Yudaken To: , , CC: , Dylan Yudaken Subject: [PATCH liburing 4/4] buf-ring: add tests that cycle through the provided buffer ring Date: Mon, 13 Jun 2022 06:12:53 -0700 Message-ID: <20220613131253.974205-5-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613131253.974205-1-dylany@fb.com> References: <20220613131253.974205-1-dylany@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: HP0bCrY60FNckx01ivLByxB9JW9JvLKr X-Proofpoint-ORIG-GUID: HP0bCrY60FNckx01ivLByxB9JW9JvLKr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-13_05,2022-06-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Add tests that make sure that the buffer ring logic works properly without actually using the data in each buffer. This exposes some bugs in 5.19-rc1 Signed-off-by: Dylan Yudaken --- test/buf-ring.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/test/buf-ring.c b/test/buf-ring.c index 5fd1e53..2fcc360 100644 --- a/test/buf-ring.c +++ b/test/buf-ring.c @@ -206,9 +206,134 @@ static int test_reg_unreg(int bgid) return 0; } +static int test_one_nop(int bgid, struct io_uring *ring) +{ + int ret; + struct io_uring_cqe *cqe; + struct io_uring_sqe *sqe; + + sqe = io_uring_get_sqe(ring); + if (!sqe) { + fprintf(stderr, "get sqe failed\n"); + return -1; + } + + io_uring_prep_nop(sqe); + sqe->flags |= IOSQE_BUFFER_SELECT; + sqe->buf_group = bgid; + ret = io_uring_submit(ring); + if (ret <= 0) { + fprintf(stderr, "sqe submit failed: %d\n", ret); + ret = -1; + goto out; + } + + ret = io_uring_wait_cqe(ring, &cqe); + if (ret < 0) { + fprintf(stderr, "wait completion %d\n", ret); + ret = -1; + goto out; + } + + if (cqe->res == -ENOBUFS) { + ret = cqe->res; + goto out; + } + + if (cqe->res != 0) { + fprintf(stderr, "nop result %d\n", ret); + ret = -1; + goto out; + } + + ret = cqe->flags >> 16; + +out: + io_uring_cqe_seen(ring, cqe); + return ret; +} + +static int test_running(int bgid, int entries, int loops) +{ + struct io_uring_buf_reg reg = { }; + struct io_uring ring; + void *ptr; + int ret; + int ring_size = (entries * sizeof(struct io_uring_buf) + 4095) & (~4095); + int ring_mask = io_uring_buf_ring_mask(entries); + + int loop, idx; + bool *buffers; + struct io_uring_buf_ring *br; + + ret = t_create_ring(1, &ring, 0); + if (ret == T_SETUP_SKIP) + return 0; + else if (ret != T_SETUP_OK) + return 1; + + if (posix_memalign(&ptr, 4096, ring_size)) + return 1; + + br = (struct io_uring_buf_ring *)ptr; + io_uring_buf_ring_init(br); + + buffers = malloc(sizeof(bool) * entries); + if (!buffers) + return 1; + + reg.ring_addr = (unsigned long) ptr; + reg.ring_entries = entries; + reg.bgid = bgid; + + ret = io_uring_register_buf_ring(&ring, ®, 0); + if (ret) { + /* by now should have checked if this is supported or not */ + fprintf(stderr, "Buffer ring register failed %d\n", ret); + return 1; + } + + for (loop = 0; loop < loops; loop++) { + memset(buffers, 0, sizeof(bool) * entries); + for (idx = 0; idx < entries; idx++) + io_uring_buf_ring_add(br, ptr, 1, idx, ring_mask, idx); + io_uring_buf_ring_advance(br, entries); + + for (idx = 0; idx < entries; idx++) { + ret = test_one_nop(bgid, &ring); + if (ret < 0) { + fprintf(stderr, "bad run %d/%d = %d\n", loop, idx, ret); + return ret; + } + if (buffers[ret]) { + fprintf(stderr, "reused buffer %d/%d = %d!\n", loop, idx, ret); + return 1; + } + buffers[ret] = true; + } + ret = test_one_nop(bgid, &ring); + if (ret != -ENOBUFS) { + fprintf(stderr, "expected enobufs run %d = %d\n", loop, ret); + return 1; + } + + } + + ret = io_uring_unregister_buf_ring(&ring, bgid); + if (ret) { + fprintf(stderr, "Buffer ring register failed %d\n", ret); + return 1; + } + + io_uring_queue_exit(&ring); + free(buffers); + return 0; +} + int main(int argc, char *argv[]) { int bgids[] = { 1, 127, -1 }; + int entries[] = {1, 32768, 4096, -1 }; int ret, i; if (argc > 1) @@ -242,5 +367,13 @@ int main(int argc, char *argv[]) } } + for (i = 0; !no_buf_ring && entries[i] != -1; i++) { + ret = test_running(2, entries[i], 3); + if (ret) { + fprintf(stderr, "test_running(%d) failed\n", entries[i]); + return 1; + } + } + return 0; }