From: Benjamin Marzinski <bmarzins@redhat.com>
To: mwilck@suse.com
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>,
dm-devel@lists.linux.dev, Hannes Reinecke <hare@suse.de>
Subject: Re: [PATCH v2 02/14] libmultipath: directio: don't reset ct->running after io_cancel()
Date: Fri, 27 Oct 2023 14:54:03 -0400 [thread overview]
Message-ID: <ZTwHS4skemthKY9w@bmarzins-01.fast.rdu2.eng.redhat.com> (raw)
In-Reply-To: <20231026174153.1133-3-mwilck@suse.com>
On Thu, Oct 26, 2023 at 07:41:41PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
>
> io_cancel() never succeeds, and even if it did, io_getevents() must
> still be called to reclaim the IO resources from the kernel.
> Don't pretend the opposite by resetting ct->running, or freeing the
> memory, before io_getevents() has indicated that the request is finished.
>
> In the test code, don't bother about the return value of __wrap_io_cancel().
>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> ---
> libmultipath/checkers/directio.c | 14 ++++----------
> tests/directio.c | 27 ++-------------------------
> 2 files changed, 6 insertions(+), 35 deletions(-)
>
> diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c
> index 25b2383..83ab29f 100644
> --- a/libmultipath/checkers/directio.c
> +++ b/libmultipath/checkers/directio.c
> @@ -232,15 +232,15 @@ void libcheck_free (struct checker * c)
> }
> }
>
> - if (ct->running &&
> - (ct->req->state != PATH_PENDING ||
> - io_cancel(ct->aio_grp->ioctx, &ct->req->io, &event) == 0))
> + if (ct->running && ct->req->state != PATH_PENDING)
> ct->running = 0;
> if (!ct->running) {
> free(ct->req->buf);
> free(ct->req);
> ct->aio_grp->holders--;
> } else {
> + /* Currently a no-op */
> + io_cancel(ct->aio_grp->ioctx, &ct->req->io, &event);
> ct->req->state = PATH_REMOVED;
> list_add(&ct->req->node, &ct->aio_grp->orphans);
> check_orphaned_group(ct->aio_grp);
> @@ -351,13 +351,7 @@ check_state(int fd, struct directio_context *ct, int sync, int timeout_secs)
>
> LOG(3, "abort check on timeout");
>
> - r = io_cancel(ct->aio_grp->ioctx, &ct->req->io, &event);
> - /*
> - * Only reset ct->running if we really
> - * could abort the pending I/O
> - */
> - if (!r)
> - ct->running = 0;
> + io_cancel(ct->aio_grp->ioctx, &ct->req->io, &event);
> rc = PATH_DOWN;
> } else {
> LOG(4, "async io pending");
> diff --git a/tests/directio.c b/tests/directio.c
> index db9643e..5201d21 100644
> --- a/tests/directio.c
> +++ b/tests/directio.c
> @@ -141,10 +141,9 @@ int __real_io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt);
> int __wrap_io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt)
> {
> #ifdef DIO_TEST_DEV
> - mock_type(int);
> return __real_io_cancel(ctx, iocb, evt);
> #else
> - return mock_type(int);
> + return 0;
> #endif
> }
>
> @@ -439,14 +438,8 @@ static void test_check_state_timeout(void **state)
> do_libcheck_init(&c, 4096, NULL);
> aio_grp = get_aio_grp(&c);
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, 0);
> do_check_state(&c, 1, 30, PATH_DOWN);
> check_aio_grp(aio_grp, 1, 0);
> -#ifdef DIO_TEST_DEV
> - /* io_cancel will return negative value on timeout, so it happens again
> - * when freeing the checker */
> - will_return(__wrap_io_cancel, 0);
> -#endif
> libcheck_free(&c);
> do_libcheck_reset(1);
> }
> @@ -468,12 +461,8 @@ static void test_check_state_async_timeout(void **state)
> return_io_getevents_none();
> do_check_state(&c, 0, 3, PATH_PENDING);
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, 0);
> do_check_state(&c, 0, 3, PATH_DOWN);
> check_aio_grp(aio_grp, 1, 0);
> -#ifdef DIO_TEST_DEV
> - will_return(__wrap_io_cancel, 0);
> -#endif
> libcheck_free(&c);
> do_libcheck_reset(1);
> }
> @@ -501,13 +490,8 @@ static void test_free_with_pending(void **state)
> check_aio_grp(aio_grp, 2, 0);
> libcheck_free(&c[0]);
> check_aio_grp(aio_grp, 1, 0);
> - will_return(__wrap_io_cancel, 0);
> libcheck_free(&c[1]);
> -#ifdef DIO_TEST_DEV
> - check_aio_grp(aio_grp, 1, 1); /* real cancel doesn't remove request */
> -#else
> - check_aio_grp(aio_grp, 0, 0);
> -#endif
> + check_aio_grp(aio_grp, 1, 1); /* cancel doesn't remove request */
> do_libcheck_reset(1);
> }
>
> @@ -533,7 +517,6 @@ static void test_orphaned_aio_group(void **state)
> assert_int_equal(i, 1);
> for (i = 0; i < AIO_GROUP_SIZE; i++) {
> assert_true(is_checker_running(&c[i]));
> - will_return(__wrap_io_cancel, -1);
> if (i == AIO_GROUP_SIZE - 1) {
> /* remove the orphaned group and create a new one */
> will_return(__wrap_io_destroy, 0);
> @@ -559,12 +542,10 @@ static void test_timeout_cancel_failed(void **state)
> do_libcheck_init(&c[i], 4096, &reqs[i]);
> aio_grp = get_aio_grp(c);
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, -1);
> do_check_state(&c[0], 1, 30, PATH_DOWN);
> assert_true(is_checker_running(&c[0]));
> check_aio_grp(aio_grp, 2, 0);
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, -1);
> do_check_state(&c[0], 1, 30, PATH_DOWN);
> assert_true(is_checker_running(&c[0]));
> return_io_getevents_nr(NULL, 1, &reqs[0], &res[0]);
> @@ -600,7 +581,6 @@ static void test_async_timeout_cancel_failed(void **state)
> return_io_getevents_none();
> do_check_state(&c[1], 0, 2, PATH_PENDING);
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, -1);
> do_check_state(&c[0], 0, 2, PATH_DOWN);
> #ifndef DIO_TEST_DEV
> /* can't pick which even gets returned on real devices */
> @@ -608,7 +588,6 @@ static void test_async_timeout_cancel_failed(void **state)
> do_check_state(&c[1], 0, 2, PATH_UP);
> #endif
> return_io_getevents_none();
> - will_return(__wrap_io_cancel, -1);
> do_check_state(&c[0], 0, 2, PATH_DOWN);
> assert_true(is_checker_running(&c[0]));
> return_io_getevents_nr(NULL, 2, reqs, res);
> @@ -637,7 +616,6 @@ static void test_orphan_checker_cleanup(void **state)
> aio_grp = get_aio_grp(c);
> return_io_getevents_none();
> do_check_state(&c[0], 0, 30, PATH_PENDING);
> - will_return(__wrap_io_cancel, -1);
> check_aio_grp(aio_grp, 2, 0);
> libcheck_free(&c[0]);
> check_aio_grp(aio_grp, 2, 1);
> @@ -662,7 +640,6 @@ static void test_orphan_reset_cleanup(void **state)
> orphan_aio_grp = get_aio_grp(&c);
> return_io_getevents_none();
> do_check_state(&c, 0, 30, PATH_PENDING);
> - will_return(__wrap_io_cancel, -1);
> check_aio_grp(orphan_aio_grp, 1, 0);
> libcheck_free(&c);
> check_aio_grp(orphan_aio_grp, 1, 1);
> --
> 2.42.0
next prev parent reply other threads:[~2023-10-27 18:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 17:41 [PATCH v2 00/14] multipath: aio, systemd, and documentation improvements mwilck
2023-10-26 17:41 ` [PATCH v2 01/14] libmultipath: reduce log level of directio messages mwilck
2023-10-26 17:41 ` [PATCH v2 02/14] libmultipath: directio: don't reset ct->running after io_cancel() mwilck
2023-10-27 18:54 ` Benjamin Marzinski [this message]
2023-10-26 17:41 ` [PATCH v2 03/14] libmultipath: directio: fix error handling mwilck
2023-10-27 18:54 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 04/14] libmultipath: io_err_stat: don't free aio memory before completion mwilck
2023-10-27 18:55 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 05/14] libmultipath: io_err_stat: call io_destroy() inside free_io_err_pathvec() mwilck
2023-10-27 18:55 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 06/14] libmultipath: io_err_stat: use higher number of aio slots mwilck
2023-10-27 18:56 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 07/14] libmultipath: io_err_stat: fix error handling mwilck
2023-10-27 19:09 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 08/14] multipathd.service: require modprobe@dm_multipath.service if available mwilck
2023-10-27 19:09 ` Benjamin Marzinski
2023-10-27 20:05 ` Benjamin Marzinski
2023-10-30 11:45 ` Martin Wilck
2023-10-26 17:41 ` [PATCH v2 09/14] libmpathutil: remove systemd_service_enabled() mwilck
2023-10-26 17:41 ` [PATCH v2 10/14] multipath.conf.5: fix typo mwilck
2023-10-27 19:10 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 11/14] Makefile.inc, README.md: fix docs for prefix in split-usr case mwilck
2023-10-27 19:27 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 12/14] README.md: update mailing list and contributing information mwilck
2023-10-27 19:29 ` Benjamin Marzinski
2023-10-30 11:41 ` Martin Wilck
2023-10-26 17:41 ` [PATCH v2 13/14] README.md: Extend the section about NVMe mwilck
2023-10-27 19:34 ` Benjamin Marzinski
2023-10-26 17:41 ` [PATCH v2 14/14] README.md: fix formatting of Changelog section mwilck
2023-10-27 19:35 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZTwHS4skemthKY9w@bmarzins-01.fast.rdu2.eng.redhat.com \
--to=bmarzins@redhat.com \
--cc=christophe.varoqui@opensvc.com \
--cc=dm-devel@lists.linux.dev \
--cc=hare@suse.de \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.