3:46 p.m.
This patch series wires up the gen_nvdimm module to acpi, and adds
in support for use as a generic block device and for use with ext2's
xip. This is not meant to be a final solution. There are no cache
flushes for writes to the device. I'm also not happy with walking
a list of extents to find where a block lives. Also noteworthy is
that this code will not handle multiple FITs. Having said all that,
the code does function.
Comments are welcome.
Cheers,
Jeff
[PATCH|RFC 1/6] nvdimm_acpi: fix signature verification
[PATCH|RFC 2/6] gen_nvdimm: make pmem_dev creation a debug module option
[PATCH|RFC 3/6] gen_nvdimm: plumb the module into the ACPI stack
[PATCH|RFC 4/6] gen_nvdimm: hook up volume creation
[PATCH|RFC 5/6] gen_nvdimm: hook up the I/O path
[PATCH|RFC 6/6] nvdimm: add xip support
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 1/6] nvdimm_acpi: fix signature verification
The NVDIMM_SIG #define was actually in the wrong endinaness for x86.
The real problem, however, is that the ACPI specification has this to
say about signatures:
"All numeric values in ACPI-defined tables, blocks, and structures
are always encoded in little endian format. Signature values are
stored as fixed-length strings."
So, this patch changes NVDIMM_SIG to be the fixed length string "$MEM".
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/nvdimm_acpi.c | 12 +++++++-----
include/linux/nvdimm_acpi.h | 4 ++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/block/nvdimm_acpi.c b/drivers/block/nvdimm_acpi.c
index 42e8190..25f021f 100644
--- a/drivers/block/nvdimm_acpi.c
+++ b/drivers/block/nvdimm_acpi.c
@@ -299,7 +299,7 @@ __u8 get_num_dimms(struct memdev_spa_rng_tbl *memdev_tbls, __u16
num_tbls)
static void print_nvdimm_fit(struct nvdimm_fit *fit)
{
- NVDIMM_VDBG("Signature: %u\n"
+ NVDIMM_VDBG("Signature: %c%c%c%c\n"
"Length: %u\n"
"Revision: %u\n"
"Checksum: %u\n"
@@ -313,7 +313,8 @@ static void print_nvdimm_fit(struct nvdimm_fit *fit)
"Number of Flush Hint TBLS: %u\n"
"Number of Interleave TBLs: %u\n"
"Size of Flush Hint TBLs: %u\n",
- fit->signature,
+ fit->signature[0], fit->signature[1],
+ fit->signature[2], fit->signature[3],
fit->length,
fit->revision,
fit->checksum,
@@ -690,10 +691,11 @@ struct fit_header *create_fit_table(void *nvdimm_fit_ptr)
*(header->fit) = *(struct nvdimm_fit *) (nvdimm_fit_ptr);
- if (header->fit->signature != NVDIMM_SIG) {
+ if (memcmp(header->fit->signature, NVDIMM_SIG, 4)) {
NVDIMM_DBG("NVDIMM FIT Signature does not match\n");
- NVDIMM_DBG("Expected Sig: %u, Actual Sig: %u", NVDIMM_SIG,
- header->fit->signature);
+ NVDIMM_DBG("Expected Sig: %s, Actual Sig: %c%c%c%c", NVDIMM_SIG,
+ header->fit->signature[0], header->fit->signature[1],
+ header->fit->signature[2], header->fit->signature[3]);
ret = ERR_PTR(-ENOTTY);/*No idea what Error Code to return*/
goto after_fit;
}
diff --git a/include/linux/nvdimm_acpi.h b/include/linux/nvdimm_acpi.h
index c2c3f3c..91d2fc4 100644
--- a/include/linux/nvdimm_acpi.h
+++ b/include/linux/nvdimm_acpi.h
@@ -22,7 +22,7 @@
#define NVDIMM_CRTL_RNG_TYPE 2
#define NVDIMM_DATA_RNG_TYPE 3
-#define NVDIMM_SIG 609043789
+#define NVDIMM_SIG "$MEM"
/*Generic NVDIMM FIT R0_8c*/
struct spa_rng_tbl {
@@ -115,7 +115,7 @@ struct flush_hint_tbl {
/*Generic NVDIMM FIT R0_8c*/
struct nvdimm_fit {
- __u32 signature; /*'$MEM' is signature for this table*/
+ __u8 signature[4]; /*'$MEM' is signature for this table*/
__u32 length; /*Length in bytes of the entire table*/
__u8 revision; /*1*/
__u8 checksum; /*entire table sums to 0*/
--
1.8.3.1
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 2/6] gen_nvdimm: make pmem_dev creation a debug module option
For testing, it is useful to create the pmem_dev and related misc
device. However, for real hardware we want the creation of the
device tied to discovery. This patch adds a 'debug' module option
that, when set, will create the pmem_dev when the module is loaded.
In the following patch, the pmem_dev will be created when the device
is found in the ACPI tables.
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/nvdimm_core.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/block/nvdimm_core.c b/drivers/block/nvdimm_core.c
index 8b7c5d3..4d2eabd 100644
--- a/drivers/block/nvdimm_core.c
+++ b/drivers/block/nvdimm_core.c
@@ -37,6 +37,8 @@
#include <linux/gen_nvdimm.h>
#include <linux/gen_nvm_volumes.h>
+static int debug;
+
static int pmem_major;
static struct pmem_dev *dev;
@@ -620,6 +622,7 @@ static void pmem_free_dev(struct kref *kref)
gen_nvdimm_exit(dev);
free_fit_table(dev->fit_head);
+ misc_deregister(&dev->miscdev);
kfree(dev);
}
@@ -724,11 +727,12 @@ static int __init nvdimm_init(void)
else if (ret > 0)
pmem_major = ret;
- ret = pmem_dev_init();
-
- if (ret) {
- NVDIMM_ERR("Failed to create pmem_dev");
- goto unregister_blkdev;
+ if (debug) {
+ ret = pmem_dev_init();
+ if (ret) {
+ NVDIMM_ERR("Failed to create pmem_dev");
+ goto unregister_blkdev;
+ }
}
return ret;
@@ -742,13 +746,17 @@ module_init(nvdimm_init);
static void __exit nvdimm_exit(void)
{
- misc_deregister(&dev->miscdev);
- kref_put(&dev->kref, pmem_free_dev);
+ if (debug)
+ kref_put(&dev->kref, pmem_free_dev);
+
unregister_blkdev(pmem_major, "pmem");
}
module_exit(nvdimm_exit);
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,
+ "create misc device even when there are no real devices present");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("Generic NVDIMM Block Driver");
MODULE_AUTHOR("Intel Corporation");
--
1.8.3.1
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 3/6] gen_nvdimm: plumb the module into the ACPI stack
This patch registers an acpi driver and adds code to find the fit
pointer in acpi memory. It then hands the fit pointer off to the
fit parsing code and creates the pmem misc device in /dev.
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/nvdimm_acpi.c | 126 ++++++++++++++++++++++++++++++++++++++++++++
drivers/block/nvdimm_core.c | 24 +++++----
include/linux/nvdimm_acpi.h | 2 +
include/linux/nvdimm_core.h | 3 ++
4 files changed, 146 insertions(+), 9 deletions(-)
diff --git a/drivers/block/nvdimm_acpi.c b/drivers/block/nvdimm_acpi.c
index 25f021f..b92a5ab 100644
--- a/drivers/block/nvdimm_acpi.c
+++ b/drivers/block/nvdimm_acpi.c
@@ -14,10 +14,35 @@
#include <linux/sort.h>
#include <linux/nvdimm_core.h>
#include <linux/nvdimm_acpi.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
/* TODO: Change all sizeof(struct type) to sizeof(*variable)*/
/* TODO: Change all casting such as (__u64 *) to typeof(variable_name)*/
+#define ACPI_MEMORY_DEVICE_HID "ACPI0010"
+#undef PREFIX
+#define PREFIX "ACPI:nvdimm:"
+ACPI_MODULE_NAME("nvdimm-acpi");
+
+static const struct acpi_device_id nvdimm_device_ids[] = {
+ {ACPI_MEMORY_DEVICE_HID, 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, nvdimm_device_ids);
+
+static int nvdimm_acpi_device_add(struct acpi_device *device);
+static int nvdimm_acpi_device_remove(struct acpi_device *device);
+
+static struct acpi_driver nvdimm_acpi_driver = {
+ .name = "NVDIMM ACPI Driver",
+ .class = "persistent memory",
+ .ids = nvdimm_device_ids,
+ .ops = {
+ .add = nvdimm_acpi_device_add,
+ .remove = nvdimm_acpi_device_remove,
+ },
+};
/**
* spa_to_rdpa() - Convert System Physical Address to Device Region Physical
@@ -774,3 +799,104 @@ void free_fit_table(struct fit_header *fit_head)
kfree(fit_head->fit);
kfree(fit_head);
}
+
+static acpi_status
+nvdimm_acpi_get_resource(struct acpi_resource *resource, void *context)
+{
+ struct acpi_resource_address64 addr64;
+ acpi_physical_address fitpp_phys, fitp_phys;
+ void *fitpp_virt, *fitp_virt;
+ acpi_status status;
+ unsigned long long sta;
+ struct pmem_dev *pmdev = context;
+
+ if (!pmdev)
+ return AE_OK;
+
+ status = acpi_resource_to_address64(resource, &addr64);
+ if (ACPI_FAILURE(status))
+ return AE_OK;
+
+ status = acpi_evaluate_integer(pmdev->acpi_device->handle,
+ "_STA", NULL, &sta);
+ if (ACPI_FAILURE(status))
+ return AE_OK;
+
+ /* XXX
+ * We should evaluate the bits in the result from _STA to
+ * determine the state of the dimm.
+ */
+
+ fitpp_phys = addr64.minimum;
+ fitpp_virt = acpi_os_map_memory(fitpp_phys, PAGE_SIZE);
+ if (!fitpp_virt)
+ return AE_BAD_ADDRESS;
+ fitp_phys = *(u64 *)fitpp_virt;
+ fitp_virt = acpi_os_map_memory(fitp_phys, PAGE_SIZE);
+ if (!fitp_virt) {
+ acpi_os_unmap_memory(fitpp_virt, PAGE_SIZE);
+ return AE_BAD_ADDRESS;
+ }
+
+ pmdev->fit_head = create_fit_table(fitp_virt);
+
+ acpi_os_unmap_memory(fitp_virt, PAGE_SIZE);
+ acpi_os_unmap_memory(fitpp_virt, PAGE_SIZE);
+
+ return AE_OK;
+}
+
+static int nvdimm_acpi_device_add(struct acpi_device *device)
+{
+ acpi_status status;
+ struct pmem_dev *pmdev;
+
+ if (!device)
+ return -EINVAL;
+
+ pmdev = pmem_dev_init();
+ if (IS_ERR(pmdev))
+ return PTR_ERR(pmdev);
+
+ device->driver_data = pmdev;
+ pmdev->acpi_device = device;
+ status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+ nvdimm_acpi_get_resource, pmdev);
+ if (ACPI_FAILURE(status)) {
+ kref_put(&pmdev->kref, pmem_free_dev);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int nvdimm_acpi_device_remove(struct acpi_device *device)
+{
+ struct pmem_dev *pmdev;
+
+ if (!device)
+ return -EINVAL;
+
+ pmdev = device->driver_data;
+ kref_put(&pmdev->kref, pmem_free_dev);
+ return 0;
+}
+
+int __init nvdimm_acpi_init(void)
+{
+ int result;
+
+ result = acpi_bus_register_driver(&nvdimm_acpi_driver);
+ if (result < 0) {
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Error registering driver\n"));
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+void __exit nvdimm_acpi_exit(void)
+{
+ acpi_bus_unregister_driver(&nvdimm_acpi_driver);
+}
diff --git a/drivers/block/nvdimm_core.c b/drivers/block/nvdimm_core.c
index 4d2eabd..500baa4 100644
--- a/drivers/block/nvdimm_core.c
+++ b/drivers/block/nvdimm_core.c
@@ -616,7 +616,7 @@ static void pmem_free_volumes(struct pmem_dev *dev)
}
-static void pmem_free_dev(struct kref *kref)
+void pmem_free_dev(struct kref *kref)
{
struct pmem_dev *dev = container_of(kref, struct pmem_dev, kref);
@@ -641,14 +641,14 @@ static const struct file_operations pmem_dev_fops = {
.compat_ioctl = pmem_dev_ioctl,
};
-static int pmem_dev_init(void)
+struct pmem_dev *pmem_dev_init(void)
{
int ret;
+ struct pmem_dev *dev;
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-
if (!dev)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&dev->volumes);
INIT_LIST_HEAD(&dev->nvdimms);
@@ -663,16 +663,14 @@ static int pmem_dev_init(void)
dev->miscdev.fops = &pmem_dev_fops;
ret = misc_register(&dev->miscdev);
-
if (ret)
goto out;
kref_init(&dev->kref);
- return 0;
+ return dev;
out:
- kfree(dev);
- return ret;
+ return ERR_PTR(ret);
}
/**
@@ -728,11 +726,17 @@ static int __init nvdimm_init(void)
pmem_major = ret;
if (debug) {
- ret = pmem_dev_init();
+ dev = pmem_dev_init();
if (ret) {
NVDIMM_ERR("Failed to create pmem_dev");
goto unregister_blkdev;
}
+ } else {
+ ret = nvdimm_acpi_init();
+ if (ret) {
+ NVDIMM_ERR("Failed to initialize acpi subsystem");
+ goto unregister_blkdev;
+ }
}
return ret;
@@ -748,6 +752,8 @@ static void __exit nvdimm_exit(void)
{
if (debug)
kref_put(&dev->kref, pmem_free_dev);
+ else
+ nvdimm_acpi_exit();
unregister_blkdev(pmem_major, "pmem");
}
diff --git a/include/linux/nvdimm_acpi.h b/include/linux/nvdimm_acpi.h
index 91d2fc4..9bf0783 100644
--- a/include/linux/nvdimm_acpi.h
+++ b/include/linux/nvdimm_acpi.h
@@ -154,6 +154,8 @@ struct fit_header {
* ACPI Related Functions
*****************************************************************************/
+extern void __exit nvdimm_acpi_exit(void);
+extern int __init nvdimm_acpi_init(void);
struct fit_header *create_fit_table(void *nvdimm_fit_ptr);
void free_fit_table(struct fit_header *fit_head);
struct memdev_spa_rng_tbl *__get_memdev_spa_tbl(struct fit_header *fit_head,
diff --git a/include/linux/nvdimm_core.h b/include/linux/nvdimm_core.h
index 714466d..5b3c473 100644
--- a/include/linux/nvdimm_core.h
+++ b/include/linux/nvdimm_core.h
@@ -256,6 +256,7 @@ struct pmem_dev {
struct fit_header *fit_head;
struct miscdevice miscdev;
+ struct acpi_device *acpi_device;
struct kref kref;
};
@@ -295,6 +296,8 @@ struct nvdimm_driver {
const struct nvdimm_ioctl_ops *ioctl_ops;
};
+struct pmem_dev *pmem_dev_init(void);
+void pmem_free_dev(struct kref *kref);
int get_dmi_memdev(struct nvdimm *dimm);
int gen_nvdimm_init(struct pmem_dev *dev);
void gen_nvdimm_exit(struct pmem_dev *dev);
--
1.8.3.1
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 4/6] gen_nvdimm: hook up volume creation
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/nvdimm_acpi.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/block/nvdimm_acpi.c b/drivers/block/nvdimm_acpi.c
index b92a5ab..404beb4 100644
--- a/drivers/block/nvdimm_acpi.c
+++ b/drivers/block/nvdimm_acpi.c
@@ -850,6 +850,7 @@ static int nvdimm_acpi_device_add(struct acpi_device *device)
{
acpi_status status;
struct pmem_dev *pmdev;
+ int ret;
if (!device)
return -EINVAL;
@@ -867,6 +868,12 @@ static int nvdimm_acpi_device_add(struct acpi_device *device)
return -EINVAL;
}
+ ret = gen_nvdimm_init(pmdev);
+ if (ret < 0) {
+ kref_put(&pmdev->kref, pmem_free_dev);
+ return ret;
+ }
+
return 0;
}
--
1.8.3.1
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 5/6] gen_nvdimm: hook up the I/O path
This patch maps the nvdimm memory and hooks up a make_request function
to map bio-s to memory addresses. This is just a proof of concept, and
not meant to be the final solution.
There will likely need to be an architecture specific uncached memcpy
routine and/or optimized cache flush helper for a range of pages added.
This patch does not do the cache flushing.
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/gen_nvm_volumes.c | 10 +++++++
drivers/block/nvdimm_core.c | 59 ++++++++++++++++++++++++++++++++++++++++-
include/linux/nvdimm_core.h | 1 +
3 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/drivers/block/gen_nvm_volumes.c b/drivers/block/gen_nvm_volumes.c
index a7259d7..da80f0d 100644
--- a/drivers/block/gen_nvm_volumes.c
+++ b/drivers/block/gen_nvm_volumes.c
@@ -89,6 +89,15 @@ static struct extent_set *spa_rng_to_extent(struct fit_header
*fit_head,
}
}
+ /*
+ * Map the memory
+ */
+ mem_extent->virtaddr = ioremap_cache(s_tbl->start_addr, s_tbl->length);
+ if (!mem_extent->virtaddr) {
+ kfree(mem_extent);
+ return ERR_PTR(-EFAULT);
+ }
+
return mem_extent;
}
@@ -100,6 +109,7 @@ static struct extent_set *spa_rng_to_extent(struct fit_header
*fit_head,
*/
static void nvm_replace_extent(struct extent_set *extent)
{
+ iounmap(extent->virtaddr);
/*TODO: remove memory free when pool implemented*/
kfree(extent);
/*TODO: Locate pool extent came from*/
diff --git a/drivers/block/nvdimm_core.c b/drivers/block/nvdimm_core.c
index 500baa4..a3bb248 100644
--- a/drivers/block/nvdimm_core.c
+++ b/drivers/block/nvdimm_core.c
@@ -530,6 +530,63 @@ static void noop_make_request(struct request_queue *q, struct bio
*bio)
bio_endio(bio, -EIO);
}
+static unsigned long long pmem_extent_lookup(struct nvm_volume *volume,
+ struct bio *bio)
+{
+ unsigned long long phys_mem = 0;
+ pgoff_t io_start_offset = bio->bi_iter.bi_sector << 9;
+ struct extent_set *extent;
+
+ /* TODO: Handle I/O spanning extents */
+ /* TODO: mutex? rcu might be better... and a tree... */
+ mutex_lock(&volume->extent_set_lock);
+ list_for_each_entry(extent, &volume->extent_set_list, extent_set_node) {
+ if (io_start_offset < extent->set_size) {
+ phys_mem = (u64)extent->virtaddr + io_start_offset;
+ break;
+ }
+ io_start_offset -= extent->set_size;
+ }
+ mutex_unlock(&volume->extent_set_lock);
+ return phys_mem;
+}
+
+static void pmem_make_request(struct request_queue *q, struct bio *bio)
+{
+ struct nvm_volume *volume = q->queuedata;
+ unsigned long long phys_mem, phys_end;
+ void *user_mem;
+ struct bio_vec vec;
+ struct bvec_iter iter;
+ unsigned int transferred = 0;
+
+ phys_mem = pmem_extent_lookup(volume, bio);
+ if (!phys_mem) {
+ bio_io_error(bio);
+ return;
+ }
+ phys_end = phys_mem + (volume->block_count * volume->block_size);
+
+ bio_for_each_segment(vec, bio, iter) {
+ if (unlikely(phys_mem + vec.bv_len > phys_end)) {
+ bio_io_error(bio);
+ return;
+ }
+
+ user_mem = page_address(vec.bv_page) + vec.bv_offset;
+ if (bio_data_dir(bio) == READ)
+ memcpy(user_mem, (void *)phys_mem, vec.bv_len);
+ else
+ /* XXX: flush caches or use non-temporal insns */
+ memcpy((void *)phys_mem, user_mem, vec.bv_len);
+
+ phys_mem += vec.bv_len;
+ transferred += vec.bv_len;
+ }
+
+ bio_endio(bio, 0);
+}
+
static int pmem_alloc_disk(struct nvm_volume *volume)
{
int ret = 0;
@@ -548,7 +605,7 @@ static int pmem_alloc_disk(struct nvm_volume *volume)
volume->queue->queue_flags = QUEUE_FLAG_DEFAULT;
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, volume->queue);
- blk_queue_make_request(volume->queue, noop_make_request);
+ blk_queue_make_request(volume->queue, pmem_make_request);
volume->queue->queuedata = volume;
diff --git a/include/linux/nvdimm_core.h b/include/linux/nvdimm_core.h
index 5b3c473..ebfef85 100644
--- a/include/linux/nvdimm_core.h
+++ b/include/linux/nvdimm_core.h
@@ -195,6 +195,7 @@ struct extent_set {
struct list_head extent_set_node;
phys_addr_t spa_start;
size_t set_size;
+ void *virtaddr;
__u32 pool_id;
__u8 pm_capable; /*Identifies if the extent set is PM capable*/
__u8 numa_node;
--
1.8.3.1
3:46 p.m.
New subject: [Linux-nvdimm] [PATCH|RFC 6/6] nvdimm: add xip support
Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com>
---
drivers/block/gen_nvm_volumes.c | 4 ++++
drivers/block/nvdimm_core.c | 36 ++++++++++++++++++++++++++++--------
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/drivers/block/gen_nvm_volumes.c b/drivers/block/gen_nvm_volumes.c
index da80f0d..a9a643a 100644
--- a/drivers/block/gen_nvm_volumes.c
+++ b/drivers/block/gen_nvm_volumes.c
@@ -97,6 +97,10 @@ static struct extent_set *spa_rng_to_extent(struct fit_header
*fit_head,
kfree(mem_extent);
return ERR_PTR(-EFAULT);
}
+ if (!set_memory_x((unsigned long)mem_extent->virtaddr,
+ mem_extent->set_size >> PAGE_SHIFT))
+ printk(KERN_INFO
+ "Failed to set PM executable. XIP will not work.\n");
return mem_extent;
}
diff --git a/drivers/block/nvdimm_core.c b/drivers/block/nvdimm_core.c
index a3bb248..0e94ba6 100644
--- a/drivers/block/nvdimm_core.c
+++ b/drivers/block/nvdimm_core.c
@@ -520,21 +520,16 @@ release_mutex:
return ERR_PTR(ret);
}
-static const struct block_device_operations vol_dev_ops = {
-/* .getpmem = nvdimm_getpmem, */
- .owner = THIS_MODULE,
-};
-
static void noop_make_request(struct request_queue *q, struct bio *bio)
{
bio_endio(bio, -EIO);
}
static unsigned long long pmem_extent_lookup(struct nvm_volume *volume,
- struct bio *bio)
+ sector_t sector)
{
unsigned long long phys_mem = 0;
- pgoff_t io_start_offset = bio->bi_iter.bi_sector << 9;
+ pgoff_t io_start_offset = sector << 9;
struct extent_set *extent;
/* TODO: Handle I/O spanning extents */
@@ -560,7 +555,7 @@ static void pmem_make_request(struct request_queue *q, struct bio
*bio)
struct bvec_iter iter;
unsigned int transferred = 0;
- phys_mem = pmem_extent_lookup(volume, bio);
+ phys_mem = pmem_extent_lookup(volume, bio->bi_iter.bi_sector);
if (!phys_mem) {
bio_io_error(bio);
return;
@@ -587,6 +582,31 @@ static void pmem_make_request(struct request_queue *q, struct bio
*bio)
bio_endio(bio, 0);
}
+static int nvdimm_direct_access(struct block_device *bdev, sector_t sector,
+ void **kaddr, unsigned long *pfn)
+{
+ struct nvm_volume *volume = bdev->bd_disk->private_data;
+ loff_t offset;
+
+ offset = sector;
+ if (bdev->bd_part != NULL)
+ offset += bdev->bd_part->start_sect;
+ offset <<= 9;
+ if (offset >= (volume->block_size * volume->block_count))
+ return -ERANGE;
+
+ *kaddr = (void *)pmem_extent_lookup(volume, sector);
+ *pfn = virt_to_phys(kaddr) >> PAGE_SHIFT;
+
+ return 0;
+}
+
+static const struct block_device_operations vol_dev_ops = {
+/* .getpmem = nvdimm_getpmem, */
+ .owner = THIS_MODULE,
+ .direct_access = nvdimm_direct_access,
+};
+
static int pmem_alloc_disk(struct nvm_volume *volume)
{
int ret = 0;
--
1.8.3.1
2972
days inactive
2972
days old
6 comments
1 participants
participants (1)
-
Jeff Moyer