[PATCH] nvme: reject the ns when the block size is smaller than a sector

[Sagi Grimberg]

>> The nvme spec(1.4a, figure 248) says:
>> "A value smaller than 9 (i.e., 512 bytes) is not supported."
>>
>> Signed-off-by: Li Feng <fengli at smartx.com>
>> ---
>>   drivers/nvme/host/core.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>> index f320273fc672..1f02e6e49a05 100644
>> --- a/drivers/nvme/host/core.c
>> +++ b/drivers/nvme/host/core.c
>> @@ -2161,6 +2161,12 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
>>   
>>   	blk_mq_freeze_queue(ns->disk->queue);
>>   	ns->lba_shift = id->lbaf[lbaf].ds;
>> +	if (ns->lba_shift < 9) {
>> +		pr_warn("%s: bad lba_shift(%d)\n", ns->disk->disk_name, ns->lba_shift);
>> +		ret = -1;

Meaningful errno would be useful. Also better to use dev_warn

>> +		goto out_unfreeze;
>> +	}
>> +
>>   	nvme_set_queue_limits(ns->ctrl, ns->queue);
>>   
>>   	if (ns->head->ids.csi == NVME_CSI_ZNS) {
>>
> 
> 
> But this only catches a physical block size < 512 for NVMe, not any other block device.
> 
> Please fix it for the general case in blk_queue_physical_block_size().

We actually call that later and would probably be better to check here..