Commit f325cf52 authored by Keith Busch's avatar Keith Busch Committed by zhaoxiaoqiang11
Browse files

nvme-pci: fix page size checks 

stable inclusion
from stable-v5.10.163
commit cc512539c44f173c2a5fc967e4feb0043bc5773d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cc512539c44f173c2a5fc967e4feb0043bc5773d



----------------------------------------------------

[ Upstream commit 84173423 ]

The size allocated out of the dma pool is at most NVME_CTRL_PAGE_SIZE,
which may be smaller than the PAGE_SIZE.

Fixes: c61b82c7 ("nvme-pci: fix PRP pool size")
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarzhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>
parent 21889304

drivers/nvme/host/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define SQ_SIZE(q)	((q)->q_depth << (q)->sqes)

#define CQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_completion))



#define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))

#define SGES_PER_PAGE	(NVME_CTRL_PAGE_SIZE / sizeof(struct nvme_sgl_desc))



/*

 * These can be higher, but we need to ensure that any command doesn't
@@ -374,7 +374,7 @@ static int nvme_pci_npages_prp(void) 
{

	unsigned max_bytes = (NVME_MAX_KB_SZ * 1024) + NVME_CTRL_PAGE_SIZE;

	unsigned nprps = DIV_ROUND_UP(max_bytes, NVME_CTRL_PAGE_SIZE);

	return DIV_ROUND_UP(8 * nprps, PAGE_SIZE - 8);

	return DIV_ROUND_UP(8 * nprps, NVME_CTRL_PAGE_SIZE - 8);

}



/*
@@ -384,7 +384,7 @@ static int nvme_pci_npages_prp(void) 
static int nvme_pci_npages_sgl(void)

{

	return DIV_ROUND_UP(NVME_MAX_SEGS * sizeof(struct nvme_sgl_desc),

			PAGE_SIZE);

			NVME_CTRL_PAGE_SIZE);

}



static size_t nvme_pci_iod_alloc_size(void)
@@ -735,7 +735,7 @@ static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc *sge, 
		sge->length = cpu_to_le32(entries * sizeof(*sge));

		sge->type = NVME_SGL_FMT_LAST_SEG_DESC << 4;

	} else {

		sge->length = cpu_to_le32(PAGE_SIZE);

		sge->length = cpu_to_le32(NVME_CTRL_PAGE_SIZE);

		sge->type = NVME_SGL_FMT_SEG_DESC << 4;

	}

}