From: Jens Axboe <axboe@kernel.dk>
To: Hristo Venev <hristo@venev.name>
Cc: linux-block@vger.kernel.org
Subject: Re: [PATCH 2/2] liburing: Use the single mmap feature
Date: Fri, 6 Sep 2019 13:30:47 -0600 [thread overview]
Message-ID: <8fe8111a-6564-4266-e6ca-443575eb9ca2@kernel.dk> (raw)
In-Reply-To: <20190906191252.30332-2-hristo@venev.name>
On 9/6/19 1:12 PM, Hristo Venev wrote:
> Signed-off-by: Hristo Venev <hristo@venev.name>
> ---
> src/setup.c | 35 ++++++++++++++++++++++++++---------
> 1 file changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/src/setup.c b/src/setup.c
> index 47b0deb..48c96a0 100644
> --- a/src/setup.c
> +++ b/src/setup.c
> @@ -16,10 +16,30 @@ static int io_uring_mmap(int fd, struct io_uring_params *p,
> int ret;
>
> sq->ring_sz = p->sq_off.array + p->sq_entries * sizeof(unsigned);
> + cq->ring_sz = p->cq_off.cqes + p->cq_entries * sizeof(struct io_uring_cqe);
> +
> + if (p->features & IORING_FEAT_SINGLE_MMAP) {
> + if (cq->ring_sz > sq->ring_sz) {
> + sq->ring_sz = cq->ring_sz;
> + }
> + cq->ring_sz = sq->ring_sz;
> + }
> sq->ring_ptr = mmap(0, sq->ring_sz, PROT_READ | PROT_WRITE,
> MAP_SHARED | MAP_POPULATE, fd, IORING_OFF_SQ_RING);
> if (sq->ring_ptr == MAP_FAILED)
> return -errno;
> +
> + if (p->features & IORING_FEAT_SINGLE_MMAP) {
> + cq->ring_ptr = sq->ring_ptr;
> + } else {
> + cq->ring_ptr = mmap(0, cq->ring_sz, PROT_READ | PROT_WRITE,
> + MAP_SHARED | MAP_POPULATE, fd, IORING_OFF_CQ_RING);
> + if (cq->ring_ptr == MAP_FAILED) {
> + ret = -errno;
> + goto err;
> + }
> + }
> +
> sq->khead = sq->ring_ptr + p->sq_off.head;
> sq->ktail = sq->ring_ptr + p->sq_off.tail;
> sq->kring_mask = sq->ring_ptr + p->sq_off.ring_mask;
> @@ -34,19 +54,14 @@ static int io_uring_mmap(int fd, struct io_uring_params *p,
> IORING_OFF_SQES);
> if (sq->sqes == MAP_FAILED) {
> ret = -errno;
> + if (cq->ring_ptr != sq->ring_ptr) {
> + munmap(cq->ring_ptr, cq->ring_sz);
> + }
> err:
> munmap(sq->ring_ptr, sq->ring_sz);
> return ret;
> }
>
> - cq->ring_sz = p->cq_off.cqes + p->cq_entries * sizeof(struct io_uring_cqe);
> - cq->ring_ptr = mmap(0, cq->ring_sz, PROT_READ | PROT_WRITE,
> - MAP_SHARED | MAP_POPULATE, fd, IORING_OFF_CQ_RING);
> - if (cq->ring_ptr == MAP_FAILED) {
> - ret = -errno;
> - munmap(sq->sqes, *sq->kring_entries * sizeof(struct io_uring_sqe));
> - goto err;
> - }
> cq->khead = cq->ring_ptr + p->cq_off.head;
> cq->ktail = cq->ring_ptr + p->cq_off.tail;
> cq->kring_mask = cq->ring_ptr + p->cq_off.ring_mask;
> @@ -105,6 +120,8 @@ void io_uring_queue_exit(struct io_uring *ring)
>
> munmap(sq->sqes, *sq->kring_entries * sizeof(struct io_uring_sqe));
> munmap(sq->ring_ptr, sq->ring_sz);
> - munmap(cq->ring_ptr, cq->ring_sz);
> + if (cq->ring_ptr != sq->ring_ptr) {
> + munmap(cq->ring_ptr, cq->ring_sz);
> + }
> close(ring->ring_fd);
> }
Thanks, applied.
--
Jens Axboe
next prev parent reply other threads:[~2019-09-06 19:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 17:23 [PATCH] io_uring: allocate the two rings together Hristo Venev
2019-08-27 15:50 ` Jens Axboe
2019-08-27 19:35 ` Hristo Venev
2019-08-29 15:04 ` Jens Axboe
2019-09-06 16:26 ` Jens Axboe
2019-09-06 19:12 ` [PATCH 1/2] liburing/test: There are now 4 reserved fields Hristo Venev
2019-09-06 19:12 ` [PATCH 2/2] liburing: Use the single mmap feature Hristo Venev
2019-09-06 19:30 ` Jens Axboe [this message]
2019-09-06 19:24 ` [PATCH 1/2] liburing/test: There are now 4 reserved fields Jens Axboe
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=8fe8111a-6564-4266-e6ca-443575eb9ca2@kernel.dk \
--to=axboe@kernel.dk \
--cc=hristo@venev.name \
--cc=linux-block@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).