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;
Message-ID: <cebfe83b-138a-4bca-c37a-bcb5b25f580d@intel.com>
Date:   Fri, 18 Nov 2022 13:34:25 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.5.0
Subject: Re: [PATCH 3/3] mmc: block: Requeue on block size restrictions
Content-Language: en-US
To:     =?UTF-8?Q?Christian_L=c3=b6hle?= <CLoehle@hyperstone.com>,
        "axboe@kernel.dk" <axboe@kernel.dk>,
        "ulf.hansson@linaro.org" <ulf.hansson@linaro.org>,
        "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Cc:     Avri Altman <Avri.Altman@wdc.com>,
        "vincent.whitchurch@axis.com" <vincent.whitchurch@axis.com>
References: <f3b05a9103ba4c46ae78a96f8cdc700d@hyperstone.com>
From:   Adrian Hunter <adrian.hunter@intel.com>
Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki,
 Business Identity Code: 0357606 - 4, Domiciled in Helsinki
In-Reply-To: <f3b05a9103ba4c46ae78a96f8cdc700d@hyperstone.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 26/10/22 10:30, Christian Löhle wrote:
> The block layer does not conform to all our sector count restrictions, so
> requeue in case we had to modify the number of blocks sent instead of
> going through the normal completion.
> 
> Note that the normal completion used before does not lead to a bug,
> this change is just the nicer thing to do.

Can you elaborate on why it is "nicer"?

> An example of such a restriction is max_blk_count = 1 and 512 blksz,
> but the block layer continues to use requests of size PAGE_SIZE.
> 
> Signed-off-by: Christian Loehle <cloehle@hyperstone.com>
> ---
>  drivers/mmc/core/block.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
> index 54cd009aee50..c434d3964880 100644
> --- a/drivers/mmc/core/block.c
> +++ b/drivers/mmc/core/block.c
> @@ -1519,8 +1519,10 @@ static void mmc_blk_cqe_req_done(struct mmc_request *mrq)
>  	/*
>  	 * Block layer timeouts race with completions which means the normal
>  	 * completion path cannot be used during recovery.
> +	 * Also do not use it if we had to modify the block count to satisfy
> +	 * host controller needs.
>  	 */
> -	if (mq->in_recovery)
> +	if (mq->in_recovery || mrq->data->blocks != blk_rq_sectors(req))
>  		mmc_blk_cqe_complete_rq(mq, req);
>  	else if (likely(!blk_should_fake_timeout(req->q)))
>  		blk_mq_complete_request(req);
> @@ -2051,8 +2053,10 @@ static void mmc_blk_hsq_req_done(struct mmc_request *mrq)
>  	/*
>  	 * Block layer timeouts race with completions which means the normal
>  	 * completion path cannot be used during recovery.
> +	 * Also do not use it if we had to modify the block count to satisfy
> +	 * host controller needs.
>  	 */
> -	if (mq->in_recovery)
> +	if (mq->in_recovery || mrq->data->blocks != blk_rq_sectors(req))
>  		mmc_blk_cqe_complete_rq(mq, req);
>  	else if (likely(!blk_should_fake_timeout(req->q)))
>  		blk_mq_complete_request(req);
> @@ -2115,8 +2119,10 @@ static void mmc_blk_mq_post_req(struct mmc_queue *mq, struct request *req,
>  	/*
>  	 * Block layer timeouts race with completions which means the normal
>  	 * completion path cannot be used during recovery.
> +	 * Also do not use it if we had to modify the block count to satisfy
> +	 * host controller needs.
>  	 */
> -	if (mq->in_recovery) {
> +	if (mq->in_recovery || mrq->data->blocks != blk_rq_sectors(req)) {
>  		mmc_blk_mq_complete_rq(mq, req);
>  	} else if (likely(!blk_should_fake_timeout(req->q))) {
>  		if (can_sleep)