浏览代码

nvme: Fix PRP list calculation for non-4k system page size

PRP list calculation is supposed to be based on device's page size.
Systems with page size larger than device's page size cause corruption
to the name space as well as system memory with out this fix.
Systems like x86 might not experience this issue because it uses
PAGE_SIZE of 4K where as powerpc uses PAGE_SIZE of 64k while NVMe device's
page size varies depending upon the vendor.

Signed-off-by: Murali Iyer <mniyer@us.ibm.com>
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Murali Iyer 10 年之前
父节点
当前提交
f137e0f151
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/block/nvme-core.c

+ 2 - 2
drivers/block/nvme-core.c

@@ -640,12 +640,12 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_iod *iod, int total_len,
 	struct scatterlist *sg = iod->sg;
 	struct scatterlist *sg = iod->sg;
 	int dma_len = sg_dma_len(sg);
 	int dma_len = sg_dma_len(sg);
 	u64 dma_addr = sg_dma_address(sg);
 	u64 dma_addr = sg_dma_address(sg);
-	int offset = offset_in_page(dma_addr);
+	u32 page_size = dev->page_size;
+	int offset = dma_addr & (page_size - 1);
 	__le64 *prp_list;
 	__le64 *prp_list;
 	__le64 **list = iod_list(iod);
 	__le64 **list = iod_list(iod);
 	dma_addr_t prp_dma;
 	dma_addr_t prp_dma;
 	int nprps, i;
 	int nprps, i;
-	u32 page_size = dev->page_size;
 
 
 	length -= (page_size - offset);
 	length -= (page_size - offset);
 	if (length <= 0)
 	if (length <= 0)