From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 2/2] ndctl: don't skip bat tests if nfit_test not available
Date: Wed, 23 Mar 2016 18:16:59 -0700 [thread overview]
Message-ID: <20160324011658.20651.86424.stgit@dwillia2-desk3.jf.intel.com> (raw)
In-Reply-To: <20160324011648.20651.33434.stgit@dwillia2-desk3.jf.intel.com>
The 'blk-ns' and 'pmem-ns' tests are meant to fallback to nfit_test, but
not require nfit_test.
Reported-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
test/blk_namespaces.c | 62 +++++++++++++++++++++++-------------------------
test/pmem_namespaces.c | 55 ++++++++++++++++++++-----------------------
2 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/test/blk_namespaces.c b/test/blk_namespaces.c
index b4d677b4d0d6..0ef5b65fd511 100644
--- a/test/blk_namespaces.c
+++ b/test/blk_namespaces.c
@@ -213,9 +213,9 @@ int test_blk_namespaces(int log_level, struct ndctl_test *test)
char bdev[50];
struct ndctl_ctx *ctx;
struct ndctl_bus *bus;
- struct kmod_module *mod;
struct ndctl_dimm *dimm;
- struct kmod_ctx *kmod_ctx;
+ struct kmod_module *mod = NULL;
+ struct kmod_ctx *kmod_ctx = NULL;
struct ndctl_namespace *ndns[2];
struct ndctl_region *region, *blk_region = NULL;
@@ -228,38 +228,34 @@ int test_blk_namespaces(int log_level, struct ndctl_test *test)
ndctl_set_log_priority(ctx, log_level);
- kmod_ctx = kmod_new(NULL, NULL);
- if (!kmod_ctx)
- goto err_kmod;
- kmod_set_log_priority(kmod_ctx, log_level);
-
- rc = kmod_module_new_from_name(kmod_ctx, "nfit_test", &mod);
- if (rc < 0)
- goto err_module;
-
- rc = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST,
- NULL, NULL, NULL, NULL);
- if (rc < 0) {
- rc = 77;
- ndctl_test_skip(test);
- fprintf(stderr, "nfit_test unavailable skipping tests\n");
- goto err_module;
- }
-
bus = ndctl_bus_get_by_provider(ctx, "ACPI.NFIT");
- if (!bus)
- bus = ndctl_bus_get_by_provider(ctx, "nfit_test.0");
-
if (!bus) {
- fprintf(stderr, "%s: failed to find NFIT-provider\n", comm);
- ndctl_test_skip(test);
- rc = 77;
- goto err_cleanup;
- } else {
- fprintf(stderr, "%s: found provider: %s\n", comm,
- ndctl_bus_get_provider(bus));
+ fprintf(stderr, "ACPI.NFIT unavailable falling back to nfit_test\n");
+ kmod_ctx = kmod_new(NULL, NULL);
+ if (!kmod_ctx)
+ goto err_kmod;
+ kmod_set_log_priority(kmod_ctx, log_level);
+
+ rc = kmod_module_new_from_name(kmod_ctx, "nfit_test", &mod);
+ if (rc < 0)
+ goto err_module;
+
+ rc = kmod_module_probe_insert_module(mod,
+ KMOD_PROBE_APPLY_BLACKLIST,
+ NULL, NULL, NULL, NULL);
+ ndctl_invalidate(ctx);
+ bus = ndctl_bus_get_by_provider(ctx, "nfit_test.0");
+ if (rc < 0 || !bus) {
+ rc = 77;
+ ndctl_test_skip(test);
+ fprintf(stderr, "nfit_test unavailable skipping tests\n");
+ goto err_module;
+ }
}
+ fprintf(stderr, "%s: found provider: %s\n", comm,
+ ndctl_bus_get_provider(bus));
+
/* get the system to a clean state */
ndctl_region_foreach(bus, region)
ndctl_region_disable_invalidate(region);
@@ -345,10 +341,12 @@ int test_blk_namespaces(int log_level, struct ndctl_test *test)
if (bus)
ndctl_region_foreach(bus, region)
ndctl_region_disable_invalidate(region);
- kmod_module_remove_module(mod, 0);
+ if (mod)
+ kmod_module_remove_module(mod, 0);
err_module:
- kmod_unref(kmod_ctx);
+ if (kmod_ctx)
+ kmod_unref(kmod_ctx);
err_kmod:
ndctl_unref(ctx);
return rc;
diff --git a/test/pmem_namespaces.c b/test/pmem_namespaces.c
index 198f8ef0cb37..387c5e011f66 100644
--- a/test/pmem_namespaces.c
+++ b/test/pmem_namespaces.c
@@ -173,10 +173,10 @@ static const char *comm = "test-pmem-namespaces";
int test_pmem_namespaces(int log_level, struct ndctl_test *test)
{
struct ndctl_region *region, *pmem_region = NULL;
+ struct kmod_ctx *kmod_ctx = NULL;
+ struct kmod_module *mod = NULL;
struct ndctl_namespace *ndns;
- struct kmod_ctx *kmod_ctx;
struct ndctl_dimm *dimm;
- struct kmod_module *mod;
struct ndctl_ctx *ctx;
struct ndctl_bus *bus;
char bdev[50];
@@ -191,36 +191,33 @@ int test_pmem_namespaces(int log_level, struct ndctl_test *test)
ndctl_set_log_priority(ctx, log_level);
- kmod_ctx = kmod_new(NULL, NULL);
- if (!kmod_ctx)
- goto err_kmod;
- kmod_set_log_priority(kmod_ctx, log_level);
-
- rc = kmod_module_new_from_name(kmod_ctx, "nfit_test", &mod);
- if (rc < 0)
- goto err_module;
-
- rc = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST,
- NULL, NULL, NULL, NULL);
- if (rc < 0) {
- rc = 77;
- ndctl_test_skip(test);
- fprintf(stderr, "nfit_test unavailable skipping tests\n");
- goto err_module;
- }
-
bus = ndctl_bus_get_by_provider(ctx, "ACPI.NFIT");
- if (!bus)
+ if (!bus) {
+ fprintf(stderr, "ACPI.NFIT unavailable falling back to nfit_test\n");
+ kmod_ctx = kmod_new(NULL, NULL);
+ if (!kmod_ctx)
+ goto err_kmod;
+ kmod_set_log_priority(kmod_ctx, log_level);
+
+ rc = kmod_module_new_from_name(kmod_ctx, "nfit_test", &mod);
+ if (rc < 0)
+ goto err_module;
+
+ rc = kmod_module_probe_insert_module(mod,
+ KMOD_PROBE_APPLY_BLACKLIST,
+ NULL, NULL, NULL, NULL);
+ ndctl_invalidate(ctx);
bus = ndctl_bus_get_by_provider(ctx, "nfit_test.0");
+ if (rc < 0 || !bus) {
+ rc = 77;
+ ndctl_test_skip(test);
+ fprintf(stderr, "nfit_test unavailable skipping tests\n");
+ goto err_module;
+ }
+ }
- if (!bus) {
- fprintf(stderr, "%s: failed to find NFIT-provider\n", comm);
- ndctl_test_skip(test);
- rc = 77;
- goto err;
- } else
- fprintf(stderr, "%s: found provider: %s\n", comm,
- ndctl_bus_get_provider(bus));
+ fprintf(stderr, "%s: found provider: %s\n", comm,
+ ndctl_bus_get_provider(bus));
/* get the system to a clean state */
ndctl_region_foreach(bus, region)
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
prev parent reply other threads:[~2016-03-24 1:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 1:16 [ndctl PATCH 0/2] fix the nfit_test fallback for 'ndctl bat' Dan Williams
2016-03-24 1:16 ` [ndctl PATCH 1/2] ndctl: provide a method to invalidate the bus list Dan Williams
2016-03-24 16:04 ` Ross Zwisler
2016-03-24 16:15 ` Dan Williams
2016-03-24 1:16 ` Dan Williams [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160324011658.20651.86424.stgit@dwillia2-desk3.jf.intel.com \
--to=dan.j.williams@intel.com \
--cc=linux-nvdimm@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.