From: Jens Axboe <[email protected]>
To: Dmitry Kadashev <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 2/4] io_uring: return error pointer from io_mem_alloc()
Date: Sat, 13 May 2023 20:59:05 -0600 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <CAOKbgA5U_o2igDLfsbmd7NSCSxtNXA=GV+1k3H-F5VF2szb-uQ@mail.gmail.com>
On 5/13/23 8:54?PM, Dmitry Kadashev wrote:
> Hi Jens,
>
> On Sat, May 13, 2023 at 9:19?PM Jens Axboe <[email protected]> wrote:
>>
>> In preparation for having more than one time of ring allocator, make the
>> existing one return valid/error-pointer rather than just NULL.
>>
>> Signed-off-by: Jens Axboe <[email protected]>
>> ---
>> io_uring/io_uring.c | 18 ++++++++++++------
>> 1 file changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
>> index 3695c5e6fbf0..6266a870c89f 100644
>> --- a/io_uring/io_uring.c
>> +++ b/io_uring/io_uring.c
>> @@ -2712,8 +2712,12 @@ static void io_mem_free(void *ptr)
>> static void *io_mem_alloc(size_t size)
>> {
>> gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP;
>> + void *ret;
>>
>> - return (void *) __get_free_pages(gfp, get_order(size));
>> + ret = (void *) __get_free_pages(gfp, get_order(size));
>> + if (ret)
>> + return ret;
>> + return ERR_PTR(-ENOMEM);
>> }
>>
>> static unsigned long rings_size(struct io_ring_ctx *ctx, unsigned int sq_entries,
>> @@ -3673,6 +3677,7 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
>> {
>> struct io_rings *rings;
>> size_t size, sq_array_offset;
>> + void *ptr;
>>
>> /* make sure these are sane, as we already accounted them */
>> ctx->sq_entries = p->sq_entries;
>> @@ -3683,8 +3688,8 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
>> return -EOVERFLOW;
>>
>> rings = io_mem_alloc(size);
>> - if (!rings)
>> - return -ENOMEM;
>> + if (IS_ERR(rings))
>> + return PTR_ERR(rings);
>>
>> ctx->rings = rings;
>> ctx->sq_array = (u32 *)((char *)rings + sq_array_offset);
>> @@ -3703,13 +3708,14 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
>> return -EOVERFLOW;
>> }
>>
>> - ctx->sq_sqes = io_mem_alloc(size);
>> - if (!ctx->sq_sqes) {
>> + ptr = io_mem_alloc(size);
>> + if (IS_ERR(ptr)) {
>> io_mem_free(ctx->rings);
>> ctx->rings = NULL;
>> - return -ENOMEM;
>> + return PTR_ERR(ptr);
>> }
>>
>> + ctx->sq_sqes = io_mem_alloc(size);
>
> Should be 'ptr' rather than 'io_mem_alloc(size)' here.
Indeed, good catch. Patch 4 does correct that so the final result is
correct, must've happened during a split rebase a while back. I'll fix
up patch 2 and 4 so that it's correct after patch 2 as well.
--
Jens Axboe
next prev parent reply other threads:[~2023-05-14 2:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-13 14:16 [PATCHSET 0/4 v2] Support for mapping SQ/CQ rings into huge page Jens Axboe
2023-05-13 14:16 ` [PATCH 1/4] io_uring: remove sq/cq_off memset Jens Axboe
2023-05-13 14:16 ` [PATCH 2/4] io_uring: return error pointer from io_mem_alloc() Jens Axboe
2023-05-14 2:54 ` Dmitry Kadashev
2023-05-14 2:59 ` Jens Axboe [this message]
2023-05-13 14:16 ` [PATCH 3/4] io_uring: add ring freeing helper Jens Axboe
2023-05-13 14:16 ` [PATCH 4/4] io_uring: support for user allocated memory for rings/sqes Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2023-04-19 22:48 [PATCHSET RFC 0/4] Support for mapping SQ/CQ rings into huge page Jens Axboe
2023-04-19 22:48 ` [PATCH 2/4] io_uring: return error pointer from io_mem_alloc() 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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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