[PATCH] nvmet: avoid queuing keep-alive timer if it is disabled

[Hou Pu]

On 2021/4/16 4:17 AM, Chaitanya Kulkarni wrote:
> Hou,
>
> On 4/15/21 02:07, Hou Pu wrote:
>> ---
>>   drivers/nvme/target/admin-cmd.c | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
>> index f4cc32674edd..b8a33d1506ba 100644
>> --- a/drivers/nvme/target/admin-cmd.c
>> +++ b/drivers/nvme/target/admin-cmd.c
>> @@ -926,8 +926,12 @@ void nvmet_execute_keep_alive(struct nvmet_req *req)
>>   	pr_debug("ctrl %d update keep-alive timer for %d secs\n",
>>   		ctrl->cntlid, ctrl->kato);
>>   
>> -	mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
>> -	nvmet_req_complete(req, 0);
>> +	if (ctrl->kato) {
>> +		mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
>> +		nvmet_req_complete(req, 0);
>> +		return;
>> +	}
>> +	nvmet_req_complete(req, NVME_SC_KA_TIMEOUT_INVALID);
>>   }
>>   
>>   u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
>> -- 2.28.0
> I've validated that this behaviour does exists and this patch
> fixes that.Please add my :-
>
> Tested-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>

Thanks.

>
> Also, please consider following on the top of this patch :-

Thanks. Changed in v2.

>
> diff --git a/drivers/nvme/target/admin-cmd.c
> b/drivers/nvme/target/admin-cmd.c
> index a892cd246783..3422d35b25a1 100644
> --- a/drivers/nvme/target/admin-cmd.c
> +++ b/drivers/nvme/target/admin-cmd.c
> @@ -1010,19 +1010,21 @@ void nvmet_execute_async_event(struct nvmet_req
> *req)
>   void nvmet_execute_keep_alive(struct nvmet_req *req)
>   {
>          struct nvmet_ctrl *ctrl = req->sq->ctrl;
> +       u16 status = 0;
>   
>          if (!nvmet_check_transfer_len(req, 0))
>                  return;
>   
> +       if (!ctrl->kato) {
> +               status = NVME_SC_KA_TIMEOUT_INVALID;
> +               goto out;
> +       }
> +
>          pr_debug("ctrl %d update keep-alive timer for %d secs\n",
>                  ctrl->cntlid, ctrl->kato);
> -
> -       if (ctrl->kato) {
> -               mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato *
> HZ);
> -               nvmet_req_complete(req, 0);
> -               return;
> -       }
> -       nvmet_req_complete(req, NVME_SC_KA_TIMEOUT_INVALID);
> +       mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
> +out:
> +       nvmet_req_complete(req, status);
>   }
>   
>   u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
>   
>
Thanks,

Hou