From mboxrd@z Thu Jan 1 00:00:00 1970 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 CE3ADECAAD2 for ; Mon, 29 Aug 2022 19:59:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbiH2T7C (ORCPT ); Mon, 29 Aug 2022 15:59:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbiH2T6r (ORCPT ); Mon, 29 Aug 2022 15:58:47 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D87293234 for ; Mon, 29 Aug 2022 12:58:25 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id se27so10138570ejb.8 for ; Mon, 29 Aug 2022 12:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=0eUgge8fObALLT/oqBDxAAESIQTQekgE8ipOFO6AlCI=; b=JGCxuLMtkRolR1OzKajXocleDKOPt/436jX49HdwYFYr2FL2ojT+fNDM5y+XdgLRPc RtDJEMfyJocFjJ2r0m6EziquAKD94A56xPLlm2DSOWMGtfyj7x9//iNNIrSrOl0UpeGq +La41ZM5eqd1yB+LDqXoxIMVS+ixOKSGtRUHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=0eUgge8fObALLT/oqBDxAAESIQTQekgE8ipOFO6AlCI=; b=TNQARvR3MVMwxfSbX3gH9FHao9HbOLDAx9vhb+wYwpvq1uGjuyD1HFmWZyFTOO+dd9 LXyv7ra4MD9EEXO88OcLqVT7YHva4XGrZ7UUbaokMeOdjT9+XdyfiHEsr/bJdMib+gYz AQA0gpDdZAIKdM0swnASSYS134HS+OhExqHnEwxeLeEXNIE7kBD2ft3l8usOc21XWWTV vCyKniXLaN+2QTkuLDLiknZSYUTL+OhuV0sdlmBVeRunAVjHwlv04VWmAQSgHtwJW4Y6 E4K0vM149WsaUQvXQ1FrjmgLPee0S9Vyx6XmEvqJWitvNQ9MAQhgouuqPXaF3rka/oYr OQ5Q== X-Gm-Message-State: ACgBeo0fzkWGjIjoQllEQ0KnirP2SaWCwj0rEA5CTaNkxOLbPlUm9WIq peA6Dd7RZW1bf0/deuB9uT/6on7WuJC7t4Q7y5JTsw== X-Google-Smtp-Source: AA6agR7maY2CqZI8ejdFf4IrwNzOu6f6hhmOH5OOdBnO2J7WwjsccLB0lPk9J5l3KWYPWy/cx1dvFJ/TgCu0Slm1/zc= X-Received: by 2002:a17:907:2d92:b0:731:3310:418d with SMTP id gt18-20020a1709072d9200b007313310418dmr14540772ejc.379.1661803103860; Mon, 29 Aug 2022 12:58:23 -0700 (PDT) MIME-Version: 1.0 References: <20220829030521.3373516-1-ammar.faizi@intel.com> <20220829030521.3373516-5-ammar.faizi@intel.com> In-Reply-To: <20220829030521.3373516-5-ammar.faizi@intel.com> From: Caleb Sander Date: Mon, 29 Aug 2022 12:58:12 -0700 Message-ID: Subject: Re: [RFC PATCH liburing v1 4/4] test/io_uring_{enter,setup,register}: Use the exported syscall functions To: Ammar Faizi Cc: Jens Axboe , Muhammad Rizki , Kanna Scarlet , io-uring Mailing List , Linux Kernel Mailing List , "GNU/Weeb Mailing List" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Reviewed-by: Caleb Sander On Sun, Aug 28, 2022 at 8:08 PM Ammar Faizi wrote: > > From: Ammar Faizi > > These tests use the internal definition of __sys_io_uring* functions. > A previous commit exported new functions that do the same thing with > those __sys_io_uring* functions. Test the exported functions instead of > the internal functions. > > No functional change is intended. > > Cc: Caleb Sander > Signed-off-by: Ammar Faizi > --- > test/io_uring_enter.c | 10 +++++----- > test/io_uring_register.c | 34 ++++++++++++++++------------------ > test/io_uring_setup.c | 4 ++-- > 3 files changed, 23 insertions(+), 25 deletions(-) > > diff --git a/test/io_uring_enter.c b/test/io_uring_enter.c > index 67cc8c5..ecd54ff 100644 > --- a/test/io_uring_enter.c > +++ b/test/io_uring_enter.c > @@ -38,7 +38,7 @@ static int expect_fail(int fd, unsigned int to_submit, > { > int ret; > > - ret = __sys_io_uring_enter(fd, to_submit, min_complete, flags, sig); > + ret = io_uring_enter(fd, to_submit, min_complete, flags, sig); > if (ret >= 0) { > fprintf(stderr, "expected %s, but call succeeded\n", strerror(-error)); > return 1; > @@ -62,7 +62,7 @@ static int try_io_uring_enter(int fd, unsigned int to_submit, > return expect_fail(fd, to_submit, min_complete, flags, sig, > expect); > > - ret = __sys_io_uring_enter(fd, to_submit, min_complete, flags, sig); > + ret = io_uring_enter(fd, to_submit, min_complete, flags, sig); > if (ret != expect) { > fprintf(stderr, "Expected %d, got %d\n", expect, ret); > return 1; > @@ -211,8 +211,8 @@ int main(int argc, char **argv) > /* fill the sq ring */ > sq_entries = ring.sq.ring_entries; > submit_io(&ring, sq_entries); > - ret = __sys_io_uring_enter(ring.ring_fd, 0, sq_entries, > - IORING_ENTER_GETEVENTS, NULL); > + ret = io_uring_enter(ring.ring_fd, 0, sq_entries, > + IORING_ENTER_GETEVENTS, NULL); > if (ret < 0) { > fprintf(stderr, "io_uring_enter: %s\n", strerror(-ret)); > status = 1; > @@ -246,7 +246,7 @@ int main(int argc, char **argv) > */ > io_uring_smp_store_release(sq->ktail, ktail); > > - ret = __sys_io_uring_enter(ring.ring_fd, 1, 0, 0, NULL); > + ret = io_uring_enter(ring.ring_fd, 1, 0, 0, NULL); > /* now check to see if our sqe was dropped */ > if (*sq->kdropped == dropped) { > fprintf(stderr, "dropped counter did not increase\n"); > diff --git a/test/io_uring_register.c b/test/io_uring_register.c > index 4609354..dd4af7c 100644 > --- a/test/io_uring_register.c > +++ b/test/io_uring_register.c > @@ -36,17 +36,17 @@ static int expect_fail(int fd, unsigned int opcode, void *arg, > { > int ret; > > - ret = __sys_io_uring_register(fd, opcode, arg, nr_args); > + ret = io_uring_register(fd, opcode, arg, nr_args); > if (ret >= 0) { > int ret2 = 0; > > fprintf(stderr, "expected %s, but call succeeded\n", strerror(error)); > if (opcode == IORING_REGISTER_BUFFERS) { > - ret2 = __sys_io_uring_register(fd, > - IORING_UNREGISTER_BUFFERS, 0, 0); > + ret2 = io_uring_register(fd, IORING_UNREGISTER_BUFFERS, > + 0, 0); > } else if (opcode == IORING_REGISTER_FILES) { > - ret2 = __sys_io_uring_register(fd, > - IORING_UNREGISTER_FILES, 0, 0); > + ret2 = io_uring_register(fd, IORING_UNREGISTER_FILES, 0, > + 0); > } > if (ret2) { > fprintf(stderr, "internal error: failed to unregister\n"); > @@ -66,7 +66,7 @@ static int new_io_uring(int entries, struct io_uring_params *p) > { > int fd; > > - fd = __sys_io_uring_setup(entries, p); > + fd = io_uring_setup(entries, p); > if (fd < 0) { > perror("io_uring_setup"); > exit(1); > @@ -186,15 +186,14 @@ static int test_max_fds(int uring_fd) > */ > nr_fds = UINT_MAX; > while (nr_fds) { > - ret = __sys_io_uring_register(uring_fd, IORING_REGISTER_FILES, > - fd_as, nr_fds); > + ret = io_uring_register(uring_fd, IORING_REGISTER_FILES, fd_as, > + nr_fds); > if (ret != 0) { > nr_fds /= 2; > continue; > } > status = 0; > - ret = __sys_io_uring_register(uring_fd, IORING_UNREGISTER_FILES, > - 0, 0); > + ret = io_uring_register(uring_fd, IORING_UNREGISTER_FILES, 0, 0); > if (ret < 0) { > ret = errno; > errno = ret; > @@ -230,7 +229,7 @@ static int test_memlock_exceeded(int fd) > iov.iov_base = buf; > > while (iov.iov_len) { > - ret = __sys_io_uring_register(fd, IORING_REGISTER_BUFFERS, &iov, 1); > + ret = io_uring_register(fd, IORING_REGISTER_BUFFERS, &iov, 1); > if (ret < 0) { > if (errno == ENOMEM) { > iov.iov_len /= 2; > @@ -244,8 +243,7 @@ static int test_memlock_exceeded(int fd) > free(buf); > return 1; > } > - ret = __sys_io_uring_register(fd, IORING_UNREGISTER_BUFFERS, > - NULL, 0); > + ret = io_uring_register(fd, IORING_UNREGISTER_BUFFERS, NULL, 0); > if (ret != 0) { > fprintf(stderr, "error: unregister failed with %d\n", errno); > free(buf); > @@ -283,14 +281,14 @@ static int test_iovec_nr(int fd) > > /* reduce to UIO_MAXIOV */ > nr = UIO_MAXIOV; > - ret = __sys_io_uring_register(fd, IORING_REGISTER_BUFFERS, iovs, nr); > + ret = io_uring_register(fd, IORING_REGISTER_BUFFERS, iovs, nr); > if (ret && (errno == ENOMEM || errno == EPERM) && geteuid()) { > fprintf(stderr, "can't register large iovec for regular users, skip\n"); > } else if (ret != 0) { > fprintf(stderr, "expected success, got %d\n", errno); > status = 1; > } else { > - __sys_io_uring_register(fd, IORING_UNREGISTER_BUFFERS, 0, 0); > + io_uring_register(fd, IORING_UNREGISTER_BUFFERS, 0, 0); > } > free(buf); > free(iovs); > @@ -344,7 +342,7 @@ static int test_iovec_size(int fd) > */ > iov.iov_base = buf; > iov.iov_len = 2*1024*1024; > - ret = __sys_io_uring_register(fd, IORING_REGISTER_BUFFERS, &iov, 1); > + ret = io_uring_register(fd, IORING_REGISTER_BUFFERS, &iov, 1); > if (ret < 0) { > if (ret == -ENOMEM) > printf("Unable to test registering of a huge " > @@ -356,8 +354,8 @@ static int test_iovec_size(int fd) > status = 1; > } > } else { > - ret = __sys_io_uring_register(fd, > - IORING_UNREGISTER_BUFFERS, 0, 0); > + ret = io_uring_register(fd, IORING_UNREGISTER_BUFFERS, > + 0, 0); > if (ret < 0) { > fprintf(stderr, "io_uring_unregister: %s\n", > strerror(-ret)); > diff --git a/test/io_uring_setup.c b/test/io_uring_setup.c > index 67d5f4f..d945421 100644 > --- a/test/io_uring_setup.c > +++ b/test/io_uring_setup.c > @@ -102,7 +102,7 @@ try_io_uring_setup(unsigned entries, struct io_uring_params *p, int expect) > { > int ret; > > - ret = __sys_io_uring_setup(entries, p); > + ret = io_uring_setup(entries, p); > if (ret != expect) { > fprintf(stderr, "expected %d, got %d\n", expect, ret); > /* if we got a valid uring, close it */ > @@ -164,7 +164,7 @@ main(int argc, char **argv) > > /* read/write on io_uring_fd */ > memset(&p, 0, sizeof(p)); > - fd = __sys_io_uring_setup(1, &p); > + fd = io_uring_setup(1, &p); > if (fd < 0) { > fprintf(stderr, "io_uring_setup failed with %d, expected success\n", > -fd); > -- > Ammar Faizi >