[PATCH - RESEND] NVMe: Fix the buffer size passed in GetLogPage(CDW10.NUMD)

Vishal Verma vishal.l.verma at linux.intel.com
Thu May 29 09:53:46 PDT 2014


On Thu, 2014-05-29 at 12:02 +0530, Indraneel Mukherjee wrote:
> In GetLogPage the buffer size passed to device is a 0's based value.
> 
> Signed-off-by: Indraneel M <indraneel.m at samsung.com>
> 

This had also been reported by Shiro a couple weeks ago:

Reported-by: Shiro Itou <shiro.itou at outlook.com>
Reviewed-by: Vishal Verma <vishal.l.verma at linux.intel.com>

Thanks,
	-Vishal

> diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
> index da3b252..f29972f 100644
> --- a/drivers/block/nvme-scsi.c
> +++ b/drivers/block/nvme-scsi.c
> @@ -1014,8 +1014,8 @@ static int nvme_trans_log_info_exceptions(struct nvme_ns *ns,
>  	c.common.opcode = nvme_admin_get_log_page;
>  	c.common.nsid = cpu_to_le32(0xFFFFFFFF);
>  	c.common.prp1 = cpu_to_le64(dma_addr);
> -	c.common.cdw10[0] = cpu_to_le32(((sizeof(struct nvme_smart_log) /
> -			BYTES_TO_DWORDS) << 16) | NVME_GET_SMART_LOG_PAGE);
> +	c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) /
> +			BYTES_TO_DWORDS) - 1) << 16) | NVME_GET_SMART_LOG_PAGE);
>  	res = nvme_submit_admin_cmd(dev, &c, NULL);
>  	if (res != NVME_SC_SUCCESS) {
>  		temp_c = LOG_TEMP_UNKNOWN;
> @@ -1082,8 +1082,8 @@ static int nvme_trans_log_temperature(struct nvme_ns *ns, struct sg_io_hdr *hdr,
>  	c.common.opcode = nvme_admin_get_log_page;
>  	c.common.nsid = cpu_to_le32(0xFFFFFFFF);
>  	c.common.prp1 = cpu_to_le64(dma_addr);
> -	c.common.cdw10[0] = cpu_to_le32(((sizeof(struct nvme_smart_log) /
> -			BYTES_TO_DWORDS) << 16) | NVME_GET_SMART_LOG_PAGE);
> +	c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) /
> +			BYTES_TO_DWORDS) - 1) << 16) | NVME_GET_SMART_LOG_PAGE);
>  	res = nvme_submit_admin_cmd(dev, &c, NULL);
>  	if (res != NVME_SC_SUCCESS) {
>  		temp_c_cur = LOG_TEMP_UNKNOWN;





More information about the Linux-nvme mailing list