From patchwork Fri Jan 27 11:11:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 13118378 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 B3FF2C38142 for ; Fri, 27 Jan 2023 11:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232867AbjA0LL7 (ORCPT ); Fri, 27 Jan 2023 06:11:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232741AbjA0LL6 (ORCPT ); Fri, 27 Jan 2023 06:11:58 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6DCA5AB41 for ; Fri, 27 Jan 2023 03:11:57 -0800 (PST) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30R8D3Xx024286 for ; Fri, 27 Jan 2023 03:11:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=j+T2de/rQ1tKJORsJG3n8q8AhcOofqpPkUtnpca9BnU=; b=a99+vAedfQxWwnulTigbS0KStJWcaEie1TzIHgjH87J4LCVLmnLO7IfJYaoyfB/YmR0h LjYS1+JI3j41MlHjzJkgo3fDeg5jY8QbKGwnyOFsVD0alBeB5D1N5iD+zTOYD101QIOk wj3SLVS95n49+ngN5/a9Xof6w9MWkX0vsDBV7+birAWHj5wB2zpNBc0AyX80O+Pp3WH0 cP462KN4v8KRoFHyo0ua9CDv0X2pEw+KDgOJoI5SkV6ZyE09HjgdrncdGqMxLNWz4Aq0 2DeDbeFv1g5giL4T0VbP16MAskv5kDTjACNZ5txnHS88vdx1VMKH/a2WLZw4GYz7cEyP yg== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nc35x2mca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 27 Jan 2023 03:11:57 -0800 Received: from twshared9608.03.ash7.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 27 Jan 2023 03:11:54 -0800 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id EFC57EA01684; Fri, 27 Jan 2023 03:11:44 -0800 (PST) From: Dylan Yudaken To: Jens Axboe , Pavel Begunkov CC: , , Dylan Yudaken Subject: [PATCH liburing 1/2] add a test using drain with IORING_SETUP_DEFER_TASKRUN Date: Fri, 27 Jan 2023 03:11:32 -0800 Message-ID: <20230127111133.2551653-2-dylany@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230127111133.2551653-1-dylany@meta.com> References: <20230127111133.2551653-1-dylany@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: xT-hKq117UZaXbuTD7WKXs4JEVCc0W-Q X-Proofpoint-GUID: xT-hKq117UZaXbuTD7WKXs4JEVCc0W-Q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-27_06,2023-01-27_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This exposes a bug in the kernels handling of drain on an empty ring. Signed-off-by: Dylan Yudaken --- test/defer-taskrun.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c index 624285ec9582..a013cfdf02d9 100644 --- a/test/defer-taskrun.c +++ b/test/defer-taskrun.c @@ -283,6 +283,45 @@ static int test_ring_shutdown(void) return 0; } +static int test_drain(void) +{ + struct io_uring ring; + int ret, i, fd[2]; + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; + struct iovec iovecs[128]; + char buff[ARRAY_SIZE(iovecs)]; + + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_DEFER_TASKRUN | + IORING_SETUP_TASKRUN_FLAG); + CHECK(!ret); + + for (i = 0; i < ARRAY_SIZE(iovecs); i++) { + iovecs[i].iov_base = &buff[i]; + iovecs[i].iov_len = 1; + } + + ret = t_create_socket_pair(fd, true); + CHECK(!ret); + + sqe = io_uring_get_sqe(&ring); + io_uring_prep_writev(sqe, fd[1], &iovecs[0], ARRAY_SIZE(iovecs), 0); + sqe->flags |= IOSQE_IO_DRAIN; + io_uring_submit(&ring); + + for (i = 0; i < ARRAY_SIZE(iovecs); i++) + iovecs[i].iov_base = NULL; + + CHECK(io_uring_wait_cqe(&ring, &cqe) == 0); + CHECK(cqe->res == 128); + + close(fd[0]); + close(fd[1]); + io_uring_queue_exit(&ring); + return 0; +} + int main(int argc, char *argv[]) { int ret; @@ -332,5 +371,11 @@ int main(int argc, char *argv[]) return T_EXIT_FAIL; } + ret = test_drain(); + if (ret) { + fprintf(stderr, "test_drain failed\n"); + return T_EXIT_FAIL; + } + return T_EXIT_PASS; } From patchwork Fri Jan 27 11:11:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 13118377 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 A03A9C38142 for ; Fri, 27 Jan 2023 11:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229679AbjA0LL5 (ORCPT ); Fri, 27 Jan 2023 06:11:57 -0500 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 S232867AbjA0LL4 (ORCPT ); Fri, 27 Jan 2023 06:11:56 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6841E40BE8 for ; Fri, 27 Jan 2023 03:11:54 -0800 (PST) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30RB4Tgm019928 for ; Fri, 27 Jan 2023 03:11:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=AHBZwh9GWpFUht/SNK2qAXMuzUD9D5NQ3XI3a5b6N20=; b=Js0LTDlBbpaYUA1zsSu1XAzh3uoVgDH6A38zxJMtRlRoSqJuSl+ucP7KzDNCya4LPRNl 9G2HF1qLLWXu/ZBTJkV1saX33f7gJ11NS1qHY3tNw4tMGxecsFJ16hMOWZlHcSRxNgRK 42MLEzTFKUSFGjvnm6mLjF0c7FCzRgIgdITx1LnL2sOGuxfdlxEKTEMnvwYy55RVIG/Q O+9LDXAlhm7xkJWEsMYlMunTU26OGYUkHvrGmpBi1w1mCwgtZ8NhP1Ejp5Lxvgtz6Ecm BM6kpHLoRxBLMqxsc+P7BQvCBa57JLb69DiaeGixU0cO1b/Z92ttHLimw/pE5/EQXq3M 0Q== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nb7mbvr29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 27 Jan 2023 03:11:54 -0800 Received: from twshared5320.05.ash8.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 27 Jan 2023 03:11:53 -0800 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id A6E56EA0168A; Fri, 27 Jan 2023 03:11:45 -0800 (PST) From: Dylan Yudaken To: Jens Axboe , Pavel Begunkov CC: , , Dylan Yudaken Subject: [PATCH liburing 2/2] run link_drain test with defer_taskrun too Date: Fri, 27 Jan 2023 03:11:33 -0800 Message-ID: <20230127111133.2551653-3-dylany@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230127111133.2551653-1-dylany@meta.com> References: <20230127111133.2551653-1-dylany@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: YrYBvyguGD8OSv-exErGdL86ZjsGpSLV X-Proofpoint-ORIG-GUID: YrYBvyguGD8OSv-exErGdL86ZjsGpSLV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-27_06,2023-01-27_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Defer_taskrun seems to expose odd codepaths, so also run link_drain tests using it. Signed-off-by: Dylan Yudaken --- test/link_drain.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/test/link_drain.c b/test/link_drain.c index 1a50c10d181d..86b0aa8db7fe 100644 --- a/test/link_drain.c +++ b/test/link_drain.c @@ -198,15 +198,17 @@ err: } -int main(int argc, char *argv[]) +static int test_drain(bool defer) { struct io_uring ring; int i, ret; + unsigned int flags = 0; - if (argc > 1) - return 0; + if (defer) + flags = IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_DEFER_TASKRUN; - ret = io_uring_queue_init(100, &ring, 0); + ret = io_uring_queue_init(100, &ring, flags); if (ret) { printf("ring setup failed\n"); return 1; @@ -227,3 +229,27 @@ int main(int argc, char *argv[]) return ret; } + +int main(int argc, char *argv[]) +{ + int ret; + + if (argc > 1) + return T_EXIT_SKIP; + + ret = test_drain(false); + if (ret) { + fprintf(stderr, "test_drain(false) failed\n"); + return T_EXIT_FAIL; + } + + if (t_probe_defer_taskrun()) { + ret = test_drain(true); + if (ret) { + fprintf(stderr, "test_drain(true) failed\n"); + return T_EXIT_FAIL; + } + } + + return T_EXIT_PASS; +}