[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20221115214036.1571015-1-sammler@google.com>
Date: Tue, 15 Nov 2022 21:40:36 +0000
From: Michael Sammler <sammler@...gle.com>
To: Pankaj Gupta <pankaj.gupta.linux@...il.com>,
Dan Williams <dan.j.williams@...el.com>,
Vishal Verma <vishal.l.verma@...el.com>,
Dave Jiang <dave.jiang@...el.com>,
Ira Weiny <ira.weiny@...el.com>,
Pasha Tatashin <pasha.tatashin@...een.com>,
Mina Almasry <almasrymina@...gle.com>, nvdimm@...ts.linux.dev,
linux-kernel@...r.kernel.org
Cc: Michael Sammler <sammler@...gle.com>,
Pankaj Gupta <pankaj.gupta@....com>
Subject: [PATCH v2] virtio_pmem: populate numa information
Compute the numa information for a virtio_pmem device from the memory
range of the device. Previously, the target_node was always 0 since
the ndr_desc.target_node field was never explicitly set. The code for
computing the numa node is taken from cxl_pmem_region_probe in
drivers/cxl/pmem.c.
Signed-off-by: Michael Sammler <sammler@...gle.com>
Reviewed-by: Pasha Tatashin <pasha.tatashin@...een.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@....com>
Tested-by: Mina Almasry <almasrymina@...gle.com>
---
Changes from v1:
- added Reviewed-by and Tested-by
- synced with mainline
drivers/nvdimm/virtio_pmem.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/nvdimm/virtio_pmem.c b/drivers/nvdimm/virtio_pmem.c
index 20da455d2ef6..a92eb172f0e7 100644
--- a/drivers/nvdimm/virtio_pmem.c
+++ b/drivers/nvdimm/virtio_pmem.c
@@ -32,7 +32,6 @@ static int init_vq(struct virtio_pmem *vpmem)
static int virtio_pmem_probe(struct virtio_device *vdev)
{
struct nd_region_desc ndr_desc = {};
- int nid = dev_to_node(&vdev->dev);
struct nd_region *nd_region;
struct virtio_pmem *vpmem;
struct resource res;
@@ -79,7 +78,15 @@ static int virtio_pmem_probe(struct virtio_device *vdev)
dev_set_drvdata(&vdev->dev, vpmem->nvdimm_bus);
ndr_desc.res = &res;
- ndr_desc.numa_node = nid;
+
+ ndr_desc.numa_node = memory_add_physaddr_to_nid(res.start);
+ ndr_desc.target_node = phys_to_target_node(res.start);
+ if (ndr_desc.target_node == NUMA_NO_NODE) {
+ ndr_desc.target_node = ndr_desc.numa_node;
+ dev_dbg(&vdev->dev, "changing target node from %d to %d",
+ NUMA_NO_NODE, ndr_desc.target_node);
+ }
+
ndr_desc.flush = async_pmem_flush;
ndr_desc.provider_data = vdev;
set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
--
2.38.1.431.g37b22c650d-goog
Powered by blists - more mailing lists