Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30f92d62 authored by Akinobu Mita's avatar Akinobu Mita Committed by Christoph Hellwig
Browse files

nvme-pci: use appropriate initial chunk size for HMB allocation 



The initial chunk size for host memory buffer allocation is currently
PAGE_SIZE << MAX_ORDER.  MAX_ORDER order allocation is usually failed
without CONFIG_DMA_CMA.  So the HMB allocation is retried with chunk size
PAGE_SIZE << (MAX_ORDER - 1) in general, but there is no problem if the
retry allocation works correctly.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
[hch: rebased]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Cc: stable@vger.kernel.org
parent 92dc6895

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred) 
	u32 chunk_size;



	/* start big and work our way down */

	for (chunk_size = min_t(u64, preferred, PAGE_SIZE << MAX_ORDER);

	for (chunk_size = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);

	     chunk_size >= PAGE_SIZE * 2;

	     chunk_size /= 2) {

		if (!__nvme_alloc_host_mem(dev, preferred, chunk_size)) {