From patchwork Thu Jun 30 14:10:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12901929 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 37509CCA47B for ; Thu, 30 Jun 2022 14:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235504AbiF3O1t (ORCPT ); Thu, 30 Jun 2022 10:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237207AbiF3O1b (ORCPT ); Thu, 30 Jun 2022 10:27:31 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAC547B37C for ; Thu, 30 Jun 2022 07:10:57 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id n185so11416336wmn.4 for ; Thu, 30 Jun 2022 07:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XxjPxsaxC4InhhQuR77UkgiYJHDnnofimUEVznPbP7s=; b=l/NfeYe0tdguL+g1X/X75itf1/gPxFViiIij3BEjcOMfZ08zinsB3mixauKbw4MK4D /wCkkmmhOtuYBWtvwGNxRa4iQADhKRRigxVeuj9fH14uP3E1eT1F7P+XuOH/CpFwyR5o 6+Vj2CEKKnB7gwEGsyG+nffEQ6I93hV5vbvNYrgUui6HEpgLue3vSB72C/qn2pZB3NHJ sz7UcTNbO8pETK7OOEVdtnyrzNSvw9UEq2mdHSKYVYUfN2EGoAHLBtOrsdUf5DHrPmDc odvsTSFDDqrhZmQ0SYwLNqn4Nbts7GgVIR/pdvfG6fLyEUV16pY0hQXXhjnIGvdSox2p JXlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XxjPxsaxC4InhhQuR77UkgiYJHDnnofimUEVznPbP7s=; b=0HT6cTGbt/mL5UJ/hmf24b53WJZvt2AA4N/UeMqxL1OstU8b0s40+XvOWbsNrMcIti royw7Ms34LRtSepHcyllba3mnYB6i50+9Vxops/Gqbv6PrZAXDxh5DIC2ntsbEz/bVNu M6HOkMQkOm/FKm6SX8ZHMN882USwqZcnYoDBZIzAgFJn7G9emwYb+Wj5jG5ehGf93gls ieIhxGLon9prI0Q1zwxEeHMsRi+LfoD9qfkzjWXnqOOSugdCy30X+Y2yaD0BB4Y+plsb Yx75o43AkKJ0YkuZwy1Tb0dxpBjM5SiDa5cyYixZanpZfZRPQNzwx7yU+h5byDW/JztB z5+Q== X-Gm-Message-State: AJIora/4dwCqyhmxQYNYm1Qip0EIph+faBN94CS5+eh97yHx25lo3pHI 66nge/lDXLNc9R/sLo4LrAkrzFJeoU43rg== X-Google-Smtp-Source: AGRyM1v+H9P1nr2UZOl187bGlHhfRFFT4sYYHBfjoUZG2u4vHAz3/TuA4DpNEE+7zH6Tk+jSsb9NIA== X-Received: by 2002:a1c:6a06:0:b0:3a0:5099:f849 with SMTP id f6-20020a1c6a06000000b003a05099f849mr11634173wmc.14.1656598237426; Thu, 30 Jun 2022 07:10:37 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-232-9.dab.02.net. [82.132.232.9]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b003a03be171b1sm3741392wmb.43.2022.06.30.07.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:10:37 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH liburing v2 1/5] update io_uring.h with file slot alloc ranges Date: Thu, 30 Jun 2022 15:10:13 +0100 Message-Id: <8f98bd6d014b9e8b1d86d04aa165b6d36cfb0ed5.1656597976.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Signed-off-by: Pavel Begunkov --- src/include/liburing/io_uring.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/include/liburing/io_uring.h b/src/include/liburing/io_uring.h index 0fd1f98..c01c5a3 100644 --- a/src/include/liburing/io_uring.h +++ b/src/include/liburing/io_uring.h @@ -414,6 +414,9 @@ enum { /* sync cancelation API */ IORING_REGISTER_SYNC_CANCEL = 24, + /* register a range of fixed file slots for automatic slot allocation */ + IORING_REGISTER_FILE_ALLOC_RANGE = 25, + /* this goes last */ IORING_REGISTER_LAST }; @@ -558,6 +561,13 @@ struct io_uring_getevents_arg { __u64 ts; }; +struct io_uring_file_index_range { + /* [off, off + len) */ + __u32 off; + __u32 len; + __u64 resv; +}; + /* * accept flags stored in sqe->ioprio */ From patchwork Thu Jun 30 14:10:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12901930 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 77B25CCA481 for ; Thu, 30 Jun 2022 14:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235520AbiF3O1u (ORCPT ); Thu, 30 Jun 2022 10:27:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237219AbiF3O1b (ORCPT ); Thu, 30 Jun 2022 10:27:31 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85D8C7B35E for ; Thu, 30 Jun 2022 07:10:58 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id e28so22350191wra.0 for ; Thu, 30 Jun 2022 07:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iv9sCq1Dh8AT+NVbMp9Aj2CUQWJDfbOKsX2SJqvDIl4=; b=dE9k0pS6IjzW/AVEDtl7LNSTBZuH+yN+gnl3bITkD1RVNHoSUeCgF5FDjwa5RulgQE /ZQoiE+9M05QacQSxF/W7zvMbcXP10EkUROqQ7keafWFTJyCdOOMA85xx0k0TYvn9oF8 sccMflHhfMSoxb2IWzqFyAVI0rHYxkMrtIWs4hy3NBxoeEAf2fT8RK06rOus4Qxc/v2U VmqeNNMQViiZA1gYsE4ozyIguAroSW4fSVxqN+RIy9YS22MJ7+EjDEtOxLDCmv74T8vZ OgrVeWylsdzTJ4eN4hdB/TuuHpi7uBwdFrmihsoLatKVm2lqV/zkXGnEhUC6VH9goZA3 y/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iv9sCq1Dh8AT+NVbMp9Aj2CUQWJDfbOKsX2SJqvDIl4=; b=SpbYG87oE0ozbIWuwft3iFQmEMfhQ1osTKRHEbe4WxgDL/pAL2gKSNRCNwnHFpSYRe L9kK2qXjGiIN06bb/xp99EgQ1lIA/ve39iWMVfnTC5IuEMEIjpoFIcSmtaYE/a4ODWFH vcWdioCQ6f4kTLMDA+nW/2wm+l0IPCXFa7Tpfl68aTQeNAwY7hoQfoCruPvbqx/5E/J6 Lv+0RX1azy5+uy8ROhkKre50cL0twFAX2BUr5AVA/dcTFk+4vXhO9ABHA+lsoo85mB79 CZj82e3dmHtCwt+YqLosg5DiIiWXdaadsfJSKaIJIhdrrrZdw3dcsASS5O15FvX/G5DC Lxnw== X-Gm-Message-State: AJIora8h/uujNcIbA+hH4y631ahwJRcwObp8dHGXZ1/W0xLN7NVhQkak 7mwCdOLdy+Jwm/O+44VugJ0zm9Uk7RIdiQ== X-Google-Smtp-Source: AGRyM1u2Ww9dxK7CycMWG+T8SuS+t/QgBZoZyYnuEMZS2Mu6KAmWQh+kBcTJTJeqgjiW7N+oR6QF3g== X-Received: by 2002:a05:6000:10c4:b0:21b:8ea4:a27a with SMTP id b4-20020a05600010c400b0021b8ea4a27amr8642291wrx.575.1656598238918; Thu, 30 Jun 2022 07:10:38 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-232-9.dab.02.net. [82.132.232.9]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b003a03be171b1sm3741392wmb.43.2022.06.30.07.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:10:38 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH liburing v2 2/5] alloc range helpers Date: Thu, 30 Jun 2022 15:10:14 +0100 Message-Id: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Signed-off-by: Pavel Begunkov --- src/include/liburing.h | 3 +++ src/liburing.map | 1 + src/register.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/include/liburing.h b/src/include/liburing.h index bb2fb87..45b4da0 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -186,6 +186,9 @@ int io_uring_unregister_buf_ring(struct io_uring *ring, int bgid); int io_uring_register_sync_cancel(struct io_uring *ring, struct io_uring_sync_cancel_reg *reg); +int io_uring_register_file_alloc_range(struct io_uring *ring, + unsigned off, unsigned len); + /* * Helper for the peek/wait single cqe functions. Exported because of that, * but probably shouldn't be used directly in an application. diff --git a/src/liburing.map b/src/liburing.map index a487865..318d3d7 100644 --- a/src/liburing.map +++ b/src/liburing.map @@ -59,4 +59,5 @@ LIBURING_2.2 { LIBURING_2.3 { global: io_uring_register_sync_cancel; + io_uring_register_file_alloc_range; } LIBURING_2.2; diff --git a/src/register.c b/src/register.c index f2b1026..ee370d6 100644 --- a/src/register.c +++ b/src/register.c @@ -352,3 +352,17 @@ int io_uring_register_sync_cancel(struct io_uring *ring, return ____sys_io_uring_register(ring->ring_fd, IORING_REGISTER_SYNC_CANCEL, reg, 1); } + +int io_uring_register_file_alloc_range(struct io_uring *ring, + unsigned off, unsigned len) +{ + struct io_uring_file_index_range range; + + memset(&range, 0, sizeof(range)); + range.off = off; + range.len = len; + + return ____sys_io_uring_register(ring->ring_fd, + IORING_REGISTER_FILE_ALLOC_RANGE, + &range, 0); +} From patchwork Thu Jun 30 14:10:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12901932 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 D9AFCCCA480 for ; Thu, 30 Jun 2022 14:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235776AbiF3O1u (ORCPT ); Thu, 30 Jun 2022 10:27:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237229AbiF3O1c (ORCPT ); Thu, 30 Jun 2022 10:27:32 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C2B0970E0 for ; Thu, 30 Jun 2022 07:11:00 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id i25so21988488wrc.13 for ; Thu, 30 Jun 2022 07:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9SES2uJe1XQEEw4lFujdU37YT/Twd7J82sjSG5PHuJQ=; b=YlyJOch6waf9fb6yXVp/C/KnWAKo755q3m/Oj92f65wcX9KSPv1nj5OXAyoNXvED0v LDndkR3GoiNtqFCvi1ARFi/6iDrQhv8lDrzVDTyz7GV+sejBVMRjDZLzXK2z1oFbz6sS slpOp6ilaXm0ihaHnarnnzZ1oIMph9Gqozb0otVk0iyvNWItZBEQRqWoEIaNTdfIur/X BFfQ1dG6Sl6MgGPZm2dqLnDcjlh6tKFbHkHqVwTm3exPjtn732pEmLtEwnEqaQqyZI67 +xmseaVMKp/B8fmRIroTiJbsuk4NmokTmnfDg0LKCHpCiGpAmqHTyoj4ltsJfbpuMSvq +Cbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9SES2uJe1XQEEw4lFujdU37YT/Twd7J82sjSG5PHuJQ=; b=XCHv5iUjSQDJyzi/18di8RJuQRGHWA5IguNyqYwBzCxWW1C4EVBPr+CD0aqS/r/4hF F5EPRzZ4h6E39fgu20Tx8/9LvzoLWuVkyOqOCu5wfMLZIdxIH1h2TQ6ofHq0bFl7O+j1 yjYcQON6/Gaf1xzyo6AsNiclCyV6CVqzAHz4Kb3BlvCLgwEkCdi5srP6aAa9kFuXAaKl qIXDTR6qM0E+2258dPKe770yBucxpqKDVmw+eNWY47jg9j5cb5Lr03RaL2bT+Vh1pWDp 5n/DOb4cMRU5wREBEEtcNec5eyqog5ZBwTVNb0Pz2GAfAzQVwWQ+pq2OYGcBpaSutovq J8Hg== X-Gm-Message-State: AJIora8+sqwYxlBCuzJZMV1yatR0du6G40XtCrO4c9MflnN3/BrSu5rx tNwBgMw5DoJIvVMAS4J4xdfxTPDRu445Zg== X-Google-Smtp-Source: AGRyM1tlDa1WIBO2YnA8OaRVNvTcEFArxaI8jNIQrxTPY++fkJxYu4iAuJ49DIUtI2GxMybFTZAlaA== X-Received: by 2002:a5d:5c03:0:b0:21b:90e6:42bc with SMTP id cc3-20020a5d5c03000000b0021b90e642bcmr9056898wrb.36.1656598240597; Thu, 30 Jun 2022 07:10:40 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-232-9.dab.02.net. [82.132.232.9]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b003a03be171b1sm3741392wmb.43.2022.06.30.07.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:10:40 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH liburing v2 3/5] file-register: fix return codes Date: Thu, 30 Jun 2022 15:10:15 +0100 Message-Id: <758c2ea5ceb0de6f8b4be66c0dcda79b7a7aed8d.1656597976.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Use T_EXIT* in file-register.c Signed-off-by: Pavel Begunkov --- test/file-register.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/file-register.c b/test/file-register.c index cd00a90..6a9cbb1 100644 --- a/test/file-register.c +++ b/test/file-register.c @@ -847,25 +847,25 @@ int main(int argc, char *argv[]) ret = test_basic(&ring, 0); if (ret) { printf("test_basic failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_basic(&ring, 1); if (ret) { printf("test_basic failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_basic_many(&ring); if (ret) { printf("test_basic_many failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_sparse(&ring); if (ret) { printf("test_sparse failed\n"); - return ret; + return T_EXIT_FAIL; } if (no_update) @@ -874,49 +874,49 @@ int main(int argc, char *argv[]) ret = test_additions(&ring); if (ret) { printf("test_additions failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_removals(&ring); if (ret) { printf("test_removals failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_replace(&ring); if (ret) { printf("test_replace failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_replace_all(&ring); if (ret) { printf("test_replace_all failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_grow(&ring); if (ret) { printf("test_grow failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_shrink(&ring); if (ret) { printf("test_shrink failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_zero(&ring); if (ret) { printf("test_zero failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_huge(&ring); if (ret) { printf("test_huge failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_skip(&ring); @@ -928,7 +928,7 @@ int main(int argc, char *argv[]) ret = test_sparse_updates(); if (ret) { printf("test_sparse_updates failed\n"); - return ret; + return T_EXIT_FAIL; } ret = test_fixed_removal_ordering(); @@ -946,7 +946,7 @@ int main(int argc, char *argv[]) ret = test_partial_register_fail(); if (ret) { printf("test_partial_register_fail failed\n"); - return ret; + return T_EXIT_FAIL; } return T_EXIT_PASS; From patchwork Thu Jun 30 14:10:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12901931 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 3F07AC433EF for ; Thu, 30 Jun 2022 14:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235716AbiF3O1u (ORCPT ); Thu, 30 Jun 2022 10:27:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237231AbiF3O1c (ORCPT ); Thu, 30 Jun 2022 10:27:32 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2017F7BD12 for ; Thu, 30 Jun 2022 07:11:00 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id i25so21988594wrc.13 for ; Thu, 30 Jun 2022 07:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g5eL2S5tzNaGAY7wK7p0NilJ83pONxXsgwXX15Q/gZE=; b=q1T049KxKm9YY9lx1FbkrpRt3OryvlkVmLAJo5WD8U4io+k2+owrQkCmgZTUP6l0qL 3IOkAQJ+t4vAN61szcxPuV682zOL+GXYZq8judfwsBeKREth0DR55rQPDe87hGh1LTuA KVu4HN2oFPpM9QurEgLCPIodljahiS1y12tia3qVd3tohqiiPfO8WHDXhamGitHxqEvt plNx/P7iJutBBn/rtVl6zDd7ZM+aW4hI6JYxEyurNX5JiV0KiIp16S7sJtIn1QxdsPW8 h0B3fEHPVv0V11B5HRaRPb+nAqanzU9i/w6yBxthhba4m9CoDEWDmKPuFkXckpQXRacO rHow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g5eL2S5tzNaGAY7wK7p0NilJ83pONxXsgwXX15Q/gZE=; b=IEliM5wMOG+J71Jz959S4sma0ZSZIoQLxtHY67V3bEuzE+hnQ7/OAO7TJpmTB2IuvG znmedAfhjFwfsGItq/lOimOUUWsCJpWMmLOV3erpv0eQR9iArTCGyGTEs4RfUfCZOUaH VvJZdpU5luDPbbSaD/EaVzljG3LDH/B7JfC9qQWoPrEkHfOoYghgqQKNViXQYmF28K6j Yz4oOrOCK4HT2A7eIQITGoUMnt893O8uQl//A8lrQeBYbv/LDV16p0csBsxQRLJyD3be hhWrkqMCxbmA1N4u1iPXdLcwVfA4IwV36y586DfW+hSJwQ3EFg2M3OaBumEispAfeajg nCaw== X-Gm-Message-State: AJIora/OIgfX9OwgWB8jBF8lel0l3PhAD33jmFf/2XxRIFtpf6/aSQwl ldB74gW6WttJH3C7x4ReFfy3ogm3iLO6oQ== X-Google-Smtp-Source: AGRyM1tptsiNqpamvjxiNGi/d/Sl3W6Idsfbxk6Z3h3GfULIXQN9NZgK2HmO4DVGTVNJmxoxojqm5A== X-Received: by 2002:a5d:470c:0:b0:21b:812e:1b70 with SMTP id y12-20020a5d470c000000b0021b812e1b70mr8348868wrq.147.1656598241893; Thu, 30 Jun 2022 07:10:41 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-232-9.dab.02.net. [82.132.232.9]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b003a03be171b1sm3741392wmb.43.2022.06.30.07.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:10:41 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH liburing v2 4/5] tests: print file-register errors to stderr Date: Thu, 30 Jun 2022 15:10:16 +0100 Message-Id: <83964670becc86df23d1db74b6429337c87e3c9f.1656597976.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Signed-off-by: Pavel Begunkov --- test/file-register.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/test/file-register.c b/test/file-register.c index 6a9cbb1..4004a81 100644 --- a/test/file-register.c +++ b/test/file-register.c @@ -840,31 +840,31 @@ int main(int argc, char *argv[]) ret = io_uring_queue_init(8, &ring, 0); if (ret) { - printf("ring setup failed\n"); + fprintf(stderr, "ring setup failed\n"); return T_EXIT_FAIL; } ret = test_basic(&ring, 0); if (ret) { - printf("test_basic failed\n"); + fprintf(stderr, "test_basic failed\n"); return T_EXIT_FAIL; } ret = test_basic(&ring, 1); if (ret) { - printf("test_basic failed\n"); + fprintf(stderr, "test_basic failed\n"); return T_EXIT_FAIL; } ret = test_basic_many(&ring); if (ret) { - printf("test_basic_many failed\n"); + fprintf(stderr, "test_basic_many failed\n"); return T_EXIT_FAIL; } ret = test_sparse(&ring); if (ret) { - printf("test_sparse failed\n"); + fprintf(stderr, "test_sparse failed\n"); return T_EXIT_FAIL; } @@ -873,79 +873,79 @@ int main(int argc, char *argv[]) ret = test_additions(&ring); if (ret) { - printf("test_additions failed\n"); + fprintf(stderr, "test_additions failed\n"); return T_EXIT_FAIL; } ret = test_removals(&ring); if (ret) { - printf("test_removals failed\n"); + fprintf(stderr, "test_removals failed\n"); return T_EXIT_FAIL; } ret = test_replace(&ring); if (ret) { - printf("test_replace failed\n"); + fprintf(stderr, "test_replace failed\n"); return T_EXIT_FAIL; } ret = test_replace_all(&ring); if (ret) { - printf("test_replace_all failed\n"); + fprintf(stderr, "test_replace_all failed\n"); return T_EXIT_FAIL; } ret = test_grow(&ring); if (ret) { - printf("test_grow failed\n"); + fprintf(stderr, "test_grow failed\n"); return T_EXIT_FAIL; } ret = test_shrink(&ring); if (ret) { - printf("test_shrink failed\n"); + fprintf(stderr, "test_shrink failed\n"); return T_EXIT_FAIL; } ret = test_zero(&ring); if (ret) { - printf("test_zero failed\n"); + fprintf(stderr, "test_zero failed\n"); return T_EXIT_FAIL; } ret = test_huge(&ring); if (ret) { - printf("test_huge failed\n"); + fprintf(stderr, "test_huge failed\n"); return T_EXIT_FAIL; } ret = test_skip(&ring); if (ret) { - printf("test_skip failed\n"); + fprintf(stderr, "test_skip failed\n"); return T_EXIT_FAIL; } ret = test_sparse_updates(); if (ret) { - printf("test_sparse_updates failed\n"); + fprintf(stderr, "test_sparse_updates failed\n"); return T_EXIT_FAIL; } ret = test_fixed_removal_ordering(); if (ret) { - printf("test_fixed_removal_ordering failed\n"); + fprintf(stderr, "test_fixed_removal_ordering failed\n"); return T_EXIT_FAIL; } ret = test_mixed_af_unix(); if (ret) { - printf("test_mixed_af_unix failed\n"); + fprintf(stderr, "test_mixed_af_unix failed\n"); return T_EXIT_FAIL; } ret = test_partial_register_fail(); if (ret) { - printf("test_partial_register_fail failed\n"); + fprintf(stderr, "test_partial_register_fail failed\n"); return T_EXIT_FAIL; } From patchwork Thu Jun 30 14:10:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12901933 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 B7FF6C43334 for ; Thu, 30 Jun 2022 14:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235904AbiF3O1v (ORCPT ); Thu, 30 Jun 2022 10:27:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237248AbiF3O1e (ORCPT ); Thu, 30 Jun 2022 10:27:34 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2F30970FA for ; Thu, 30 Jun 2022 07:11:00 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id d17so21858964wrc.10 for ; Thu, 30 Jun 2022 07:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CSSBlVA41txnEF4i9iPkjMmXpNWeV/0IRlPML7MZQ8=; b=Fd54ukisVzQPnUSLQF+pqPjVBEKaxkDd7xMx9ZB5QSxTQf0J+PeYtnnrSEQOS8Y2mn OaE0zVjnzaeOJh/4JRnW0/1jqJ17CwmxGjCa+eCsDMOsRSrlWTJMO06FO36bkkRxa2zE bgqhhDyTegtwDuzHSQFU09WT4yTrPoO6hLAKEMerJbd+DNx2XpvC34si0GVaTPI6NrZq q7hvMD9wa7p6mwsHzzLUgVug27vKRZdDgF8/xgBJckmwnR8kJwXW9VrC/uIYmpguEgtA ycWALfuFsXyhfNuv0DZRCaAhmuqOSAzkFuwVqhQIpk0SjgJ26rLZG4lUZe0pTS6dmxyu MF+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CSSBlVA41txnEF4i9iPkjMmXpNWeV/0IRlPML7MZQ8=; b=BsMXPbqncKmd9kEWPFVF2bFLSWixMlWIBubhjmeMLzeafOm/EbRO+GmwhqcqgHpjLk dulii3b2YlJ/uwHP8zEfsVl+9wHdmW9GDYXbqFTxqVq9fS9tovX5Cw8VWysyom+letie F4eWBPpZ27JfAdAOUk5vj4Ml26gS9NWl8Xjupz+tNMs61wq9LQAoMX7rix2N5al+0WLW YpID/vT4I4138mlny/Y+DNYSCRLWmAq4V+41lhGXHz64lTUXr098eLY6NWQuSX64GRKa JhM8gInKuk48vaEXGzxLlyr6xIks8FUnSGCfDqHjEbypDqc/MSmUf3hB8FQeX22SBY18 IdCQ== X-Gm-Message-State: AJIora9jOOgd4PQC4gGHYGAZbues062lRz39bZ310A5V4uQ+EoaWH5WS RZe3p/7e0Kc1+h2bFM49JfSHTGKRgIs4Vw== X-Google-Smtp-Source: AGRyM1tpje9GIR4K4XYkoO4FXIW+kSrRNnU5qrP0NjSl/n3SYa8+2xzRNXRSCm+ULO+LfsMApDRH4A== X-Received: by 2002:a5d:47a1:0:b0:21d:34:67b with SMTP id 1-20020a5d47a1000000b0021d0034067bmr8448488wrb.305.1656598243160; Thu, 30 Jun 2022 07:10:43 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-232-9.dab.02.net. [82.132.232.9]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b003a03be171b1sm3741392wmb.43.2022.06.30.07.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:10:42 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH liburing v2 5/5] test range file alloc Date: Thu, 30 Jun 2022 15:10:17 +0100 Message-Id: <504f4ad22b4eb81f137d6a2208209459122c0fec.1656597976.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Signed-off-by: Pavel Begunkov --- test/file-register.c | 171 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/test/file-register.c b/test/file-register.c index 4004a81..e713233 100644 --- a/test/file-register.c +++ b/test/file-register.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "helpers.h" @@ -830,6 +831,170 @@ static int test_partial_register_fail(void) return 0; } +static int file_update_alloc(struct io_uring *ring, int *fd) +{ + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; + int ret; + + sqe = io_uring_get_sqe(ring); + io_uring_prep_files_update(sqe, fd, 1, IORING_FILE_INDEX_ALLOC); + + ret = io_uring_submit(ring); + if (ret != 1) { + fprintf(stderr, "%s: got %d, wanted 1\n", __FUNCTION__, ret); + return -1; + } + + ret = io_uring_wait_cqe(ring, &cqe); + if (ret < 0) { + fprintf(stderr, "%s: io_uring_wait_cqe=%d\n", __FUNCTION__, ret); + return -1; + } + ret = cqe->res; + io_uring_cqe_seen(ring, cqe); + return ret; +} + +static int test_out_of_range_file_ranges(struct io_uring *ring) +{ + int ret; + + ret = io_uring_register_file_alloc_range(ring, 8, 3); + if (ret != -EINVAL) { + fprintf(stderr, "overlapping range %i\n", ret); + return 1; + } + + ret = io_uring_register_file_alloc_range(ring, 10, 1); + if (ret != -EINVAL) { + fprintf(stderr, "out of range index %i\n", ret); + return 1; + } + + ret = io_uring_register_file_alloc_range(ring, 7, ~1U); + if (ret != -EOVERFLOW) { + fprintf(stderr, "overflow %i\n", ret); + return 1; + } + + return 0; +} + +static int test_overallocating_file_range(struct io_uring *ring, int fds[2]) +{ + int roff = 7, rlen = 2; + int ret, i, fd; + + ret = io_uring_register_file_alloc_range(ring, roff, rlen); + if (ret) { + fprintf(stderr, "io_uring_register_file_alloc_range %i\n", ret); + return 1; + } + + for (i = 0; i < rlen; i++) { + fd = fds[0]; + ret = file_update_alloc(ring, &fd); + if (ret != 1) { + fprintf(stderr, "file_update_alloc\n"); + return 1; + } + + if (fd < roff || fd >= roff + rlen) { + fprintf(stderr, "invalid off result %i\n", fd); + return 1; + } + } + + fd = fds[0]; + ret = file_update_alloc(ring, &fd); + if (ret != -ENFILE) { + fprintf(stderr, "overallocated %i, off %i\n", ret, fd); + return 1; + } + + return 0; +} + +static int test_zero_range_alloc(struct io_uring *ring, int fds[2]) +{ + int ret, fd; + + ret = io_uring_register_file_alloc_range(ring, 7, 0); + if (ret) { + fprintf(stderr, "io_uring_register_file_alloc_range failed %i\n", ret); + return 1; + } + + fd = fds[0]; + ret = file_update_alloc(ring, &fd); + if (ret != -ENFILE) { + fprintf(stderr, "zero alloc %i\n", ret); + return 1; + } + return 0; +} + +static int test_file_alloc_ranges(void) +{ + struct io_uring ring; + int ret, pipe_fds[2]; + + if (pipe(pipe_fds)) { + fprintf(stderr, "pipes\n"); + return 1; + } + ret = io_uring_queue_init(8, &ring, 0); + if (ret) { + fprintf(stderr, "queue_init: %d\n", ret); + return 1; + } + + ret = io_uring_register_files_sparse(&ring, 10); + if (ret == -EINVAL) { +not_supported: + close(pipe_fds[0]); + close(pipe_fds[1]); + io_uring_queue_exit(&ring); + printf("file alloc ranges are not supported, skip\n"); + return 0; + } else if (ret) { + fprintf(stderr, "io_uring_register_files_sparse %i\n", ret); + return ret; + } + + ret = io_uring_register_file_alloc_range(&ring, 0, 1); + if (ret) { + if (ret == -EINVAL) + goto not_supported; + fprintf(stderr, "io_uring_register_file_alloc_range %i\n", ret); + return 1; + } + + ret = test_overallocating_file_range(&ring, pipe_fds); + if (ret) { + fprintf(stderr, "test_overallocating_file_range() failed\n"); + return 1; + } + + ret = test_out_of_range_file_ranges(&ring); + if (ret) { + fprintf(stderr, "test_out_of_range_file_ranges() failed\n"); + return 1; + } + + ret = test_zero_range_alloc(&ring, pipe_fds); + if (ret) { + fprintf(stderr, "test_zero_range_alloc() failed\n"); + return 1; + } + + close(pipe_fds[0]); + close(pipe_fds[1]); + io_uring_queue_exit(&ring); + return 0; +} + int main(int argc, char *argv[]) { struct io_uring ring; @@ -949,5 +1114,11 @@ int main(int argc, char *argv[]) return T_EXIT_FAIL; } + ret = test_file_alloc_ranges(); + if (ret) { + fprintf(stderr, "test_partial_register_fail failed\n"); + return T_EXIT_FAIL; + } + return T_EXIT_PASS; }