tools/testing/nvdimm: libnvdimm unit test infrastructure
'libnvdimm' is the first driver sub-system in the kernel to implement mocking for unit test coverage. The nfit_test module gets built as an external module and arranges for external module replacements of nfit, libnvdimm, nd_pmem, and nd_blk. These replacements use the linker --wrap option to redirect calls to ioremap() + request_mem_region() to custom defined unit test resources. The end result is a fully functional nvdimm_bus, as far as userspace is concerned, but with the capability to perform otherwise destructive tests on emulated resources. Q: Why not use QEMU for this emulation? QEMU is not suitable for unit testing. QEMU's role is to faithfully emulate the platform. A unit test's role is to unfaithfully implement the platform with the goal of triggering bugs in the corners of the sub-system implementation. As bugs are discovered in platforms, or the sub-system itself, the unit tests are extended to backstop a fix with a reproducer unit test. Another problem with QEMU is that it would require coordination of 3 software projects instead of 2 (kernel + libndctl [1]) to maintain and execute the tests. The chances for bit rot and the difficulty of getting the tests running goes up non-linearly the more components involved. Q: Why submit this to the kernel tree instead of external modules in libndctl? Simple, to alleviate the same risk that out-of-tree external modules face. Updates to drivers/nvdimm/ can be immediately evaluated to see if they have any impact on tools/testing/nvdimm/. Q: What are the negative implications of merging this? It is a unique maintenance burden because the purpose of mocking an interface to enable a unit test is to purposefully short circuit the semantics of a routine to enable testing. For example __wrap_ioremap_cache() fakes the pmem driver into "ioremap()'ing" a test resource buffer allocated by dma_alloc_coherent(). The future maintenance burden hits when someone changes the semantics of ioremap_cache() and wonders what the implications are for the unit test. [1]: https://github.com/pmem/ndctl Cc: <linux-acpi@vger.kernel.org> Cc: Lv Zheng <lv.zheng@intel.com> Cc: Robert Moore <robert.moore@intel.com> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Родитель
047fc8a1f9
Коммит
6bc756193f
|
@ -33,10 +33,11 @@ MODULE_PARM_DESC(force_enable_dimms, "Ignore _STA (ACPI DIMM device) status");
|
||||||
|
|
||||||
static u8 nfit_uuid[NFIT_UUID_MAX][16];
|
static u8 nfit_uuid[NFIT_UUID_MAX][16];
|
||||||
|
|
||||||
static const u8 *to_nfit_uuid(enum nfit_uuids id)
|
const u8 *to_nfit_uuid(enum nfit_uuids id)
|
||||||
{
|
{
|
||||||
return nfit_uuid[id];
|
return nfit_uuid[id];
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(to_nfit_uuid);
|
||||||
|
|
||||||
static struct acpi_nfit_desc *to_acpi_nfit_desc(
|
static struct acpi_nfit_desc *to_acpi_nfit_desc(
|
||||||
struct nvdimm_bus_descriptor *nd_desc)
|
struct nvdimm_bus_descriptor *nd_desc)
|
||||||
|
@ -581,11 +582,12 @@ static struct attribute_group acpi_nfit_attribute_group = {
|
||||||
.attrs = acpi_nfit_attributes,
|
.attrs = acpi_nfit_attributes,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct attribute_group *acpi_nfit_attribute_groups[] = {
|
const struct attribute_group *acpi_nfit_attribute_groups[] = {
|
||||||
&nvdimm_bus_attribute_group,
|
&nvdimm_bus_attribute_group,
|
||||||
&acpi_nfit_attribute_group,
|
&acpi_nfit_attribute_group,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
EXPORT_SYMBOL_GPL(acpi_nfit_attribute_groups);
|
||||||
|
|
||||||
static struct acpi_nfit_memory_map *to_nfit_memdev(struct device *dev)
|
static struct acpi_nfit_memory_map *to_nfit_memdev(struct device *dev)
|
||||||
{
|
{
|
||||||
|
@ -1323,7 +1325,7 @@ static int acpi_nfit_init_mapping(struct acpi_nfit_desc *acpi_desc,
|
||||||
ndbr_desc = to_blk_region_desc(ndr_desc);
|
ndbr_desc = to_blk_region_desc(ndr_desc);
|
||||||
ndbr_desc->enable = acpi_nfit_blk_region_enable;
|
ndbr_desc->enable = acpi_nfit_blk_region_enable;
|
||||||
ndbr_desc->disable = acpi_nfit_blk_region_disable;
|
ndbr_desc->disable = acpi_nfit_blk_region_disable;
|
||||||
ndbr_desc->do_io = acpi_nfit_blk_region_do_io;
|
ndbr_desc->do_io = acpi_desc->blk_do_io;
|
||||||
if (!nvdimm_blk_region_create(acpi_desc->nvdimm_bus, ndr_desc))
|
if (!nvdimm_blk_region_create(acpi_desc->nvdimm_bus, ndr_desc))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
break;
|
break;
|
||||||
|
@ -1407,7 +1409,7 @@ static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz)
|
int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz)
|
||||||
{
|
{
|
||||||
struct device *dev = acpi_desc->dev;
|
struct device *dev = acpi_desc->dev;
|
||||||
const void *end;
|
const void *end;
|
||||||
|
@ -1446,6 +1448,7 @@ static int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz)
|
||||||
|
|
||||||
return acpi_nfit_register_regions(acpi_desc);
|
return acpi_nfit_register_regions(acpi_desc);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(acpi_nfit_init);
|
||||||
|
|
||||||
static int acpi_nfit_add(struct acpi_device *adev)
|
static int acpi_nfit_add(struct acpi_device *adev)
|
||||||
{
|
{
|
||||||
|
@ -1470,6 +1473,7 @@ static int acpi_nfit_add(struct acpi_device *adev)
|
||||||
dev_set_drvdata(dev, acpi_desc);
|
dev_set_drvdata(dev, acpi_desc);
|
||||||
acpi_desc->dev = dev;
|
acpi_desc->dev = dev;
|
||||||
acpi_desc->nfit = (struct acpi_table_nfit *) tbl;
|
acpi_desc->nfit = (struct acpi_table_nfit *) tbl;
|
||||||
|
acpi_desc->blk_do_io = acpi_nfit_blk_region_do_io;
|
||||||
nd_desc = &acpi_desc->nd_desc;
|
nd_desc = &acpi_desc->nd_desc;
|
||||||
nd_desc->provider_name = "ACPI.NFIT";
|
nd_desc->provider_name = "ACPI.NFIT";
|
||||||
nd_desc->ndctl = acpi_nfit_ctl;
|
nd_desc->ndctl = acpi_nfit_ctl;
|
||||||
|
|
|
@ -93,6 +93,8 @@ struct acpi_nfit_desc {
|
||||||
struct nvdimm_bus *nvdimm_bus;
|
struct nvdimm_bus *nvdimm_bus;
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
unsigned long dimm_dsm_force_en;
|
unsigned long dimm_dsm_force_en;
|
||||||
|
int (*blk_do_io)(struct nd_blk_region *ndbr, resource_size_t dpa,
|
||||||
|
void *iobuf, u64 len, int rw);
|
||||||
};
|
};
|
||||||
|
|
||||||
enum nd_blk_mmio_selector {
|
enum nd_blk_mmio_selector {
|
||||||
|
@ -146,4 +148,8 @@ static inline struct acpi_nfit_desc *to_acpi_desc(
|
||||||
{
|
{
|
||||||
return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);
|
return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const u8 *to_nfit_uuid(enum nfit_uuids id);
|
||||||
|
int acpi_nfit_init(struct acpi_nfit_desc *nfit, acpi_size sz);
|
||||||
|
extern const struct attribute_group *acpi_nfit_attribute_groups[];
|
||||||
#endif /* __NFIT_H__ */
|
#endif /* __NFIT_H__ */
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
ldflags-y += --wrap=ioremap_cache
|
||||||
|
ldflags-y += --wrap=ioremap_nocache
|
||||||
|
ldflags-y += --wrap=iounmap
|
||||||
|
ldflags-y += --wrap=__request_region
|
||||||
|
ldflags-y += --wrap=__release_region
|
||||||
|
|
||||||
|
DRIVERS := ../../../drivers
|
||||||
|
NVDIMM_SRC := $(DRIVERS)/nvdimm
|
||||||
|
ACPI_SRC := $(DRIVERS)/acpi
|
||||||
|
|
||||||
|
obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
|
||||||
|
obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
|
||||||
|
obj-$(CONFIG_ND_BTT) += nd_btt.o
|
||||||
|
obj-$(CONFIG_ND_BLK) += nd_blk.o
|
||||||
|
obj-$(CONFIG_ACPI_NFIT) += nfit.o
|
||||||
|
|
||||||
|
nfit-y := $(ACPI_SRC)/nfit.o
|
||||||
|
nfit-y += config_check.o
|
||||||
|
|
||||||
|
nd_pmem-y := $(NVDIMM_SRC)/pmem.o
|
||||||
|
nd_pmem-y += config_check.o
|
||||||
|
|
||||||
|
nd_btt-y := $(NVDIMM_SRC)/btt.o
|
||||||
|
nd_btt-y += config_check.o
|
||||||
|
|
||||||
|
nd_blk-y := $(NVDIMM_SRC)/blk.o
|
||||||
|
nd_blk-y += config_check.o
|
||||||
|
|
||||||
|
libnvdimm-y := $(NVDIMM_SRC)/core.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/bus.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/dimm_devs.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/dimm.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/region_devs.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/region.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/namespace_devs.o
|
||||||
|
libnvdimm-y += $(NVDIMM_SRC)/label.o
|
||||||
|
libnvdimm-$(CONFIG_BTT) += $(NVDIMM_SRC)/btt_devs.o
|
||||||
|
libnvdimm-y += config_check.o
|
||||||
|
|
||||||
|
obj-m += test/
|
|
@ -0,0 +1,7 @@
|
||||||
|
KDIR ?= ../../../
|
||||||
|
|
||||||
|
default:
|
||||||
|
$(MAKE) -C $(KDIR) M=$$PWD
|
||||||
|
|
||||||
|
install: default
|
||||||
|
$(MAKE) -C $(KDIR) M=$$PWD modules_install
|
|
@ -0,0 +1,15 @@
|
||||||
|
#include <linux/kconfig.h>
|
||||||
|
#include <linux/bug.h>
|
||||||
|
|
||||||
|
void check(void)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* These kconfig symbols must be set to "m" for nfit_test to
|
||||||
|
* load and operate.
|
||||||
|
*/
|
||||||
|
BUILD_BUG_ON(!IS_MODULE(CONFIG_LIBNVDIMM));
|
||||||
|
BUILD_BUG_ON(!IS_MODULE(CONFIG_BLK_DEV_PMEM));
|
||||||
|
BUILD_BUG_ON(!IS_MODULE(CONFIG_ND_BTT));
|
||||||
|
BUILD_BUG_ON(!IS_MODULE(CONFIG_ND_BLK));
|
||||||
|
BUILD_BUG_ON(!IS_MODULE(CONFIG_ACPI_NFIT));
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
ccflags-y := -I$(src)/../../../../drivers/nvdimm/
|
||||||
|
ccflags-y += -I$(src)/../../../../drivers/acpi/
|
||||||
|
|
||||||
|
obj-m += nfit_test.o
|
||||||
|
obj-m += nfit_test_iomap.o
|
||||||
|
|
||||||
|
nfit_test-y := nfit.o
|
||||||
|
nfit_test_iomap-y := iomap.o
|
|
@ -0,0 +1,151 @@
|
||||||
|
/*
|
||||||
|
* Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of version 2 of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*/
|
||||||
|
#include <linux/rculist.h>
|
||||||
|
#include <linux/export.h>
|
||||||
|
#include <linux/ioport.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
#include "nfit_test.h"
|
||||||
|
|
||||||
|
static LIST_HEAD(iomap_head);
|
||||||
|
|
||||||
|
static struct iomap_ops {
|
||||||
|
nfit_test_lookup_fn nfit_test_lookup;
|
||||||
|
struct list_head list;
|
||||||
|
} iomap_ops = {
|
||||||
|
.list = LIST_HEAD_INIT(iomap_ops.list),
|
||||||
|
};
|
||||||
|
|
||||||
|
void nfit_test_setup(nfit_test_lookup_fn lookup)
|
||||||
|
{
|
||||||
|
iomap_ops.nfit_test_lookup = lookup;
|
||||||
|
list_add_rcu(&iomap_ops.list, &iomap_head);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(nfit_test_setup);
|
||||||
|
|
||||||
|
void nfit_test_teardown(void)
|
||||||
|
{
|
||||||
|
list_del_rcu(&iomap_ops.list);
|
||||||
|
synchronize_rcu();
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(nfit_test_teardown);
|
||||||
|
|
||||||
|
static struct nfit_test_resource *get_nfit_res(resource_size_t resource)
|
||||||
|
{
|
||||||
|
struct iomap_ops *ops;
|
||||||
|
|
||||||
|
ops = list_first_or_null_rcu(&iomap_head, typeof(*ops), list);
|
||||||
|
if (ops)
|
||||||
|
return ops->nfit_test_lookup(resource);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void __iomem *__nfit_test_ioremap(resource_size_t offset, unsigned long size,
|
||||||
|
void __iomem *(*fallback_fn)(resource_size_t, unsigned long))
|
||||||
|
{
|
||||||
|
struct nfit_test_resource *nfit_res;
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
nfit_res = get_nfit_res(offset);
|
||||||
|
rcu_read_unlock();
|
||||||
|
if (nfit_res)
|
||||||
|
return (void __iomem *) nfit_res->buf + offset
|
||||||
|
- nfit_res->res->start;
|
||||||
|
return fallback_fn(offset, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void __iomem *__wrap_ioremap_cache(resource_size_t offset, unsigned long size)
|
||||||
|
{
|
||||||
|
return __nfit_test_ioremap(offset, size, ioremap_cache);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(__wrap_ioremap_cache);
|
||||||
|
|
||||||
|
void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size)
|
||||||
|
{
|
||||||
|
return __nfit_test_ioremap(offset, size, ioremap_nocache);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(__wrap_ioremap_nocache);
|
||||||
|
|
||||||
|
void __wrap_iounmap(volatile void __iomem *addr)
|
||||||
|
{
|
||||||
|
struct nfit_test_resource *nfit_res;
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
nfit_res = get_nfit_res((unsigned long) addr);
|
||||||
|
rcu_read_unlock();
|
||||||
|
if (nfit_res)
|
||||||
|
return;
|
||||||
|
return iounmap(addr);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(__wrap_iounmap);
|
||||||
|
|
||||||
|
struct resource *__wrap___request_region(struct resource *parent,
|
||||||
|
resource_size_t start, resource_size_t n, const char *name,
|
||||||
|
int flags)
|
||||||
|
{
|
||||||
|
struct nfit_test_resource *nfit_res;
|
||||||
|
|
||||||
|
if (parent == &iomem_resource) {
|
||||||
|
rcu_read_lock();
|
||||||
|
nfit_res = get_nfit_res(start);
|
||||||
|
rcu_read_unlock();
|
||||||
|
if (nfit_res) {
|
||||||
|
struct resource *res = nfit_res->res + 1;
|
||||||
|
|
||||||
|
if (start + n > nfit_res->res->start
|
||||||
|
+ resource_size(nfit_res->res)) {
|
||||||
|
pr_debug("%s: start: %llx n: %llx overflow: %pr\n",
|
||||||
|
__func__, start, n,
|
||||||
|
nfit_res->res);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
res->start = start;
|
||||||
|
res->end = start + n - 1;
|
||||||
|
res->name = name;
|
||||||
|
res->flags = resource_type(parent);
|
||||||
|
res->flags |= IORESOURCE_BUSY | flags;
|
||||||
|
pr_debug("%s: %pr\n", __func__, res);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return __request_region(parent, start, n, name, flags);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(__wrap___request_region);
|
||||||
|
|
||||||
|
void __wrap___release_region(struct resource *parent, resource_size_t start,
|
||||||
|
resource_size_t n)
|
||||||
|
{
|
||||||
|
struct nfit_test_resource *nfit_res;
|
||||||
|
|
||||||
|
if (parent == &iomem_resource) {
|
||||||
|
rcu_read_lock();
|
||||||
|
nfit_res = get_nfit_res(start);
|
||||||
|
rcu_read_unlock();
|
||||||
|
if (nfit_res) {
|
||||||
|
struct resource *res = nfit_res->res + 1;
|
||||||
|
|
||||||
|
if (start != res->start || resource_size(res) != n)
|
||||||
|
pr_info("%s: start: %llx n: %llx mismatch: %pr\n",
|
||||||
|
__func__, start, n, res);
|
||||||
|
else
|
||||||
|
memset(res, 0, sizeof(*res));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
__release_region(parent, start, n);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(__wrap___release_region);
|
||||||
|
|
||||||
|
MODULE_LICENSE("GPL v2");
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -0,0 +1,29 @@
|
||||||
|
/*
|
||||||
|
* Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of version 2 of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*/
|
||||||
|
#ifndef __NFIT_TEST_H__
|
||||||
|
#define __NFIT_TEST_H__
|
||||||
|
|
||||||
|
struct nfit_test_resource {
|
||||||
|
struct list_head list;
|
||||||
|
struct resource *res;
|
||||||
|
struct device *dev;
|
||||||
|
void *buf;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t);
|
||||||
|
void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
|
||||||
|
unsigned long size);
|
||||||
|
void __wrap_iounmap(volatile void __iomem *addr);
|
||||||
|
void nfit_test_setup(nfit_test_lookup_fn lookup);
|
||||||
|
void nfit_test_teardown(void);
|
||||||
|
#endif
|
Загрузка…
Ссылка в новой задаче