Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nvme-pci: Disable Host Memory Buffer usage #6510

Merged
merged 1 commit into from
Dec 4, 2024
Merged

nvme-pci: Disable Host Memory Buffer usage #6510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/nvme/host/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,7 @@
dev->nr_host_mem_descs = 0;
}

#if 0

Check failure on line 1939 in drivers/nvme/host/pci.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: Consider removing the code enclosed by this #if 0 and its #endif

Check failure on line 1939 in drivers/nvme/host/pci.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: Consider removing the code enclosed by this #if 0 and its #endif
static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
u32 chunk_size)
{
Expand Down Expand Up @@ -2003,9 +2004,11 @@
dev->host_mem_descs = NULL;
return -ENOMEM;
}
#endif

static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
{
#if 0

Check failure on line 2011 in drivers/nvme/host/pci.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: Consider removing the code enclosed by this #if 0 and its #endif

Check failure on line 2011 in drivers/nvme/host/pci.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: Consider removing the code enclosed by this #if 0 and its #endif
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
u64 chunk_size;
Expand All @@ -2018,6 +2021,7 @@
nvme_free_host_mem(dev);
}
}
#endif

return -ENOMEM;
}
Expand Down
Loading