]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nvme-pci: skip CMB blocks incompatible with PCI P2P DMA
authorIcenowy Zheng <uwu@icenowy.me>
Wed, 12 Feb 2025 17:04:44 +0000 (01:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:33:38 +0000 (14:33 +0200)
commitff0c8508eb4142e7970f5d63b09a1b3bd1637938
tree707d5bf16ff9b7860e740b1d3a854c664b33eeb8
parent159ef31d187c9479963c3a663be992c7e57aa5e2
nvme-pci: skip CMB blocks incompatible with PCI P2P DMA

[ Upstream commit 56cf7ef0d490b28fad8f8629fc135c5ab7c9f54e ]

The PCI P2PDMA code will register the CMB block to the memory
hot-plugging subsystem, which have an alignment requirement. Memory
blocks that do not satisfy this alignment requirement (usually 2MB) will
lead to a WARNING from memory hotplugging.

Verify the CMB block's address and size against the alignment and only
try to send CMB blocks compatible with it to prevent this warning.

Tested on Intel DC D4502 SSD, which has a 512K CMB block that is too
small for memory hotplugging (thus PCI P2PDMA).

Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/pci.c