Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: OSy61GTZd4VWxIi8+RWw2gg+/bdXh93jY2q750sPvkfMvI1s59ktdtzpafcfskZEtBq9fSrYkm
 kwJeKfgl4JJ8S6LK31XJUD5q7tB3RExU5KSstf7VOl3oHpj/3zXMLtIENbTJmjlXl8FF5DO5PD
 +ifW9yP8R9mS8IRNgY63jLT9e0W4AGYtNJjoneBGguOGSquRsQEs/68c8ttFn2hB2Zp/GSZiTs
 KtAmgdsbE059OLiQmmoLnmbE9KnVS1iiH6VeW3mB54kHeXlvdMDUOOlVfDGzBW+fO1ZLuEPxfr
 2XA=
IronPort-SDR: TGiT+cDuhoqcGrlvqC2VOlZgyRccDE0oEujwjQAM37e9X2vOPBbXI8TKO7IKx/3Q1rvUg9GDjc
 g8gR+0FNvdrm5od1uzncdZs6c715qcmmW7s4GbA5BVHDBCeBySVy5fxOPWY61CD3GEd5uX/D1+
 cyaSwDf3FZwcxhHEN3bsr88uVw6iozjq1Yrt68ayUW3strrJhFOklDW8w3yc94q8baqxTS73oh
 kCwAe6O9EoKypgopexD1ZCa1nVK7kgfEYSI+Fqk+dizm3uqzoE2rYxs9wU759wUBrlwGP3TnKc
 8rA=
WDCIronportException: Internal
Message-ID: <d4613092-e29d-574e-9d1e-4f5a3eca8b56@opensource.wdc.com>
Date:   Tue, 3 Jan 2023 11:33:48 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: [PATCH v3 7/8] block, bfq: remove unnecessary goto tag in
 bfq_dispatch_rq_from_bfqq
Content-Language: en-US
To:     Kemeng Shi <shikemeng@huaweicloud.com>, jack@suse.com,
        paolo.valente@linaro.org, axboe@kernel.dk
Cc:     hch@lst.de, linux-block@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20230103095303.2223546-1-shikemeng@huaweicloud.com>
 <20230103095303.2223546-8-shikemeng@huaweicloud.com>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20230103095303.2223546-8-shikemeng@huaweicloud.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/3/23 18:53, Kemeng Shi wrote:
> We jump to tag only for returning current rq. Return directly to
> remove this tag.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
> ---
>  block/bfq-iosched.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index 9ff424c78e9b..a11be312ac77 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -4966,7 +4966,7 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,
>  	bfq_dispatch_remove(bfqd->queue, rq);
>  
>  	if (bfqq != bfqd->in_service_queue)
> -		goto return_rq;
> +		return rq;
>  
>  	/*
>  	 * If weight raising has to terminate for bfqq, then next
> @@ -4986,12 +4986,9 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,
>  	 * belongs to CLASS_IDLE and other queues are waiting for
>  	 * service.
>  	 */
> -	if (!(bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq)))
> -		goto return_rq;
> +	if (bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq))
> +		bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED);
>  
> -	bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED);
> -
> -return_rq:
>  	return rq;
>  }
>  

Looks OK to me.

Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

-- 
Damien Le Moal
Western Digital Research