Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: r1jiRFvI4v8ncL2fNNf9+r+/914OEaJdlyaYjwHzpm8lQPPYupl9UjJcuU8++y3wRnR8OadyMf
 G8lEiz2hQVcvAmCiYpl5tKH8VbKMx3Cnpk/Mjg+xgOrYvxvyN0WORo5BMLePVLkyF+FaOlt9yu
 xXEivl9IIl7LqkgPl/LgF4/bB1eydBqwKgO14bFsWLv6XqqUCZ18UQJAbLfZ4XDcTLH+yYY/aR
 g4wdsQPSPqVfJ/VjXd2lWHGlCqbCbbYmU5n/3P9+SS6fXJTRJsbtNkA02pV+COzYNI3V2907f3
 KNs=
From:   Damien Le Moal <Damien.LeMoal@wdc.com>
To:     Maxim Levitsky <mlevitsk@redhat.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Keith Busch <kbusch@kernel.org>,
        Josef Bacik <josef@toxicpanda.com>,
        "open list:BLOCK LAYER" <linux-block@vger.kernel.org>,
        Sagi Grimberg <sagi@grimberg.me>, Jens Axboe <axboe@kernel.dk>,
        "open list:NVM EXPRESS DRIVER" <linux-nvme@lists.infradead.org>,
        "open list:SCSI CDROM DRIVER" <linux-scsi@vger.kernel.org>,
        Tejun Heo <tj@kernel.org>,
        Bart Van Assche <bvanassche@acm.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Jason Wang <jasowang@redhat.com>,
        Maxim Levitsky <maximlevitsky@gmail.com>,
        Stefan Hajnoczi <stefanha@redhat.com>,
        Colin Ian King <colin.king@canonical.com>,
        "Michael S. Tsirkin" <mst@redhat.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        Ajay Joshi <Ajay.Joshi@wdc.com>,
        Ming Lei <ming.lei@redhat.com>,
        "open list:SONY MEMORYSTICK SUBSYSTEM" <linux-mmc@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>,
        Satya Tangirala <satyat@google.com>,
        "open list:NETWORK BLOCK DEVICE (NBD)" <nbd@other.debian.org>,
        Hou Tao <houtao1@huawei.com>, Jens Axboe <axboe@fb.com>,
        "open list:VIRTIO CORE AND NET DRIVERS" 
        <virtualization@lists.linux-foundation.org>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        Alex Dubov <oakad@yahoo.com>
Subject: Re: [PATCH 08/10] block: nvme: use blk_is_valid_logical_block_size
Thread-Topic: [PATCH 08/10] block: nvme: use blk_is_valid_logical_block_size
Thread-Index: AQHWX01xAJ2+5YNXfk6KyPexD076zw==
Date:   Tue, 21 Jul 2020 11:23:36 +0000
Message-ID: <CY4PR04MB3751AA85412F2B654286ED2BE7780@CY4PR04MB3751.namprd04.prod.outlook.com>
References: <20200721105239.8270-1-mlevitsk@redhat.com>
 <20200721105239.8270-9-mlevitsk@redhat.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: c28b4c65-ddca-4c41-61de-08d82d6882bb
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2020 11:23:36.3663
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: yfUCSIV2mVJUHubWpksR25vNVn6FMZd094hSyp1msgNmVLemSzERq2Aa/zvCMg74/f5Gt9VK0EIAsvIJgtISNQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0969
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2020/07/21 19:55, Maxim Levitsky wrote:=0A=
> This replaces manual checking in the driver=0A=
> =0A=
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>=0A=
> ---=0A=
>  drivers/nvme/host/core.c | 17 ++++++++---------=0A=
>  1 file changed, 8 insertions(+), 9 deletions(-)=0A=
> =0A=
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c=0A=
> index add040168e67e..8014b3046992a 100644=0A=
> --- a/drivers/nvme/host/core.c=0A=
> +++ b/drivers/nvme/host/core.c=0A=
> @@ -1849,10 +1849,16 @@ static void nvme_update_disk_info(struct gendisk =
*disk,=0A=
>  	unsigned short bs =3D 1 << ns->lba_shift;=0A=
>  	u32 atomic_bs, phys_bs, io_opt =3D 0;=0A=
>  =0A=
> -	if (ns->lba_shift > PAGE_SHIFT) {=0A=
> -		/* unsupported block size, set capacity to 0 later */=0A=
> +	/*=0A=
> +	 * The block layer can't support LBA sizes larger than the page size=0A=
> +	 * yet, so catch this early and don't allow block I/O.=0A=
> +	 */=0A=
> +=0A=
=0A=
No need for the blank line here.=0A=
=0A=
> +	if (!blk_is_valid_logical_block_size(bs)) {=0A=
>  		bs =3D (1 << 9);=0A=
> +		capacity =3D 0;>  	}=0A=
> +=0A=
>  	blk_mq_freeze_queue(disk->queue);=0A=
>  	blk_integrity_unregister(disk);=0A=
>  =0A=
> @@ -1887,13 +1893,6 @@ static void nvme_update_disk_info(struct gendisk *=
disk,=0A=
>  	blk_queue_io_min(disk->queue, phys_bs);=0A=
>  	blk_queue_io_opt(disk->queue, io_opt);=0A=
>  =0A=
> -	/*=0A=
> -	 * The block layer can't support LBA sizes larger than the page size=0A=
> -	 * yet, so catch this early and don't allow block I/O.=0A=
> -	 */=0A=
> -	if (ns->lba_shift > PAGE_SHIFT)=0A=
> -		capacity =3D 0;=0A=
> -=0A=
>  	/*=0A=
>  	 * Register a metadata profile for PI, or the plain non-integrity NVMe=
=0A=
>  	 * metadata masquerading as Type 0 if supported, otherwise reject block=
=0A=
> =0A=
=0A=
Apart from the nit above, this looks OK to me.=0A=
=0A=
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>=0A=
=0A=
-- =0A=
Damien Le Moal=0A=
Western Digital Research=0A=