LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: Hannes Reinecke <hare@suse.de>, <axboe@kernel.dk>
Cc: <linux-kernel@vger.kernel.org>, <linux-block@vger.kernel.org>,
	<ming.lei@redhat.com>, <linux-scsi@vger.kernel.org>
Subject: Re: [PATCH RESEND v3 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}()
Date: Tue, 14 Sep 2021 09:10:47 +0100	[thread overview]
Message-ID: <4a139bf3-d536-4f9c-8cd2-6fbd6da7d6c4@huawei.com> (raw)
In-Reply-To: <bcbc3479-86f9-6d72-44a5-aacd4f03fcc2@suse.de>


>> +static int blk_mq_sched_alloc_map_and_rqs(struct request_queue *q,
>> +                      struct blk_mq_hw_ctx *hctx,
>> +                      unsigned int hctx_idx)
>>   {
>>       struct blk_mq_tag_set *set = q->tag_set;
>>       int ret;
>> @@ -609,15 +609,15 @@ int blk_mq_init_sched(struct request_queue *q, 
>> struct elevator_type *e)
>>                      BLKDEV_DEFAULT_RQ);
>>       queue_for_each_hw_ctx(q, hctx, i) {
>> -        ret = blk_mq_sched_alloc_tags(q, hctx, i);
>> +        ret = blk_mq_sched_alloc_map_and_rqs(q, hctx, i);
>>           if (ret)
>> -            goto err_free_tags;
>> +            goto err_free_map_and_rqs;
>>       }
>>       if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) {
>>           ret = blk_mq_init_sched_shared_sbitmap(q);
>>           if (ret)
>> -            goto err_free_tags;
>> +            goto err_free_map_and_rqs;
>>       }
>>       ret = e->ops.init_sched(q, e);
>> @@ -645,8 +645,8 @@ int blk_mq_init_sched(struct request_queue *q, 
>> struct elevator_type *e)
>>   err_free_sbitmap:
>>       if (blk_mq_is_sbitmap_shared(q->tag_set->flags))
>>           blk_mq_exit_sched_shared_sbitmap(q);
>> -err_free_tags:
>>       blk_mq_sched_free_requests(q);
>> +err_free_map_and_rqs:
>>       blk_mq_sched_tags_teardown(q);
>>       q->elevator = NULL;
>>       return ret;
>>
> This is not only a rename, but it also moves the location of the label.
> Is that intended?
> If so it needs some documentation why this is safe.

Yeah, I think you're right.

The final code in the series looks correct, but this is a transient 
breakage.

I'll fix it.

Thanks,
John

  reply	other threads:[~2021-09-14  8:09 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13 15:12 [PATCH RESEND v3 00/13] blk-mq: Reduce static requests memory footprint for shared sbitmap John Garry
2021-09-13 15:12 ` [PATCH RESEND v3 01/13] blk-mq: Change rqs check in blk_mq_free_rqs() John Garry
2021-09-14  5:35   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ John Garry
2021-09-14  5:36   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 03/13] blk-mq: Relocate shared sbitmap resize in blk_mq_update_nr_requests() John Garry
2021-09-14  5:37   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 04/13] blk-mq: Invert check " John Garry
2021-09-14  5:38   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}() John Garry
2021-09-14  5:40   ` Hannes Reinecke
2021-09-14  8:10     ` John Garry [this message]
2021-09-13 15:12 ` [PATCH RESEND v3 06/13] blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}() John Garry
2021-09-14  5:41   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 07/13] blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() John Garry
2021-09-14  5:44   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 08/13] blk-mq: Don't clear driver tags own mapping John Garry
2021-09-14  5:45   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 09/13] blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() John Garry
2021-09-14  5:46   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 10/13] blk-mq: Add blk_mq_alloc_map_and_rqs() John Garry
2021-09-14  5:48   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}() John Garry
2021-09-14  5:50   ` Hannes Reinecke
2021-09-13 15:12 ` [PATCH RESEND v3 12/13] blk-mq: Use shared tags for shared sbitmap support John Garry
2021-09-14  6:04   ` Hannes Reinecke
2021-09-14  8:27     ` John Garry
2021-09-13 15:12 ` [PATCH RESEND v3 13/13] blk-mq: Stop using pointers for blk_mq_tags bitmap tags John Garry
2021-09-14  6:05   ` Hannes Reinecke
2021-09-20  7:45 ` [PATCH RESEND v3 00/13] blk-mq: Reduce static requests memory footprint for shared sbitmap John Garry

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=4a139bf3-d536-4f9c-8cd2-6fbd6da7d6c4@huawei.com \
    --to=john.garry@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=hare@suse.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=ming.lei@redhat.com \
    --subject='Re: [PATCH RESEND v3 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}()' \
    /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

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).