From patchwork Thu Apr 20 20:59:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9691333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79CB6601D4 for ; Thu, 20 Apr 2017 21:05:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67F9E2780C for ; Thu, 20 Apr 2017 21:05:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59E0D28481; Thu, 20 Apr 2017 21:05:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25D572780C for ; Thu, 20 Apr 2017 21:05:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0F1172195407C; Thu, 20 Apr 2017 14:05:04 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6C1EB21954068 for ; Thu, 20 Apr 2017 14:05:02 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2017 14:05:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.37,227,1488873600"; d="scan'208"; a="1121885303" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.125]) by orsmga001.jf.intel.com with ESMTP; 20 Apr 2017 14:05:02 -0700 Subject: [ndctl PATCH 2/5] test, libndctl: gate dax and pfn tests on 4.8 From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 20 Apr 2017 13:59:09 -0700 Message-ID: <149272194976.23427.2063717455117169640.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <149272193912.23427.11500536718990091103.stgit@dwillia2-desk3.amr.corp.intel.com> References: <149272193912.23427.11500536718990091103.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The current tests require the nfit_test conversion from cma to vmalloc. Disable the tests on earlier kernels. Signed-off-by: Dan Williams --- test/libndctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/libndctl.c b/test/libndctl.c index 39822ee71c0e..f5a6abe50edd 100644 --- a/test/libndctl.c +++ b/test/libndctl.c @@ -2405,16 +2405,21 @@ static int do_test0(struct ndctl_ctx *ctx, struct ndctl_test *test) ndctl_region_foreach(bus, region) ndctl_region_enable(region); - if (ndctl_test_attempt(test, KERNEL_VERSION(4, 7, 0))) { + /* pfn and dax tests require vmalloc-enabled nfit_test */ + if (ndctl_test_attempt(test, KERNEL_VERSION(4, 8, 0))) { rc = check_regions(bus, regions0, ARRAY_SIZE(regions0), DAX); if (rc) return rc; reset_bus(bus); } - rc = check_regions(bus, regions0, ARRAY_SIZE(regions0), PFN); - if (rc) - return rc; - reset_bus(bus); + + if (ndctl_test_attempt(test, KERNEL_VERSION(4, 8, 0))) { + rc = check_regions(bus, regions0, ARRAY_SIZE(regions0), PFN); + if (rc) + return rc; + reset_bus(bus); + } + return check_regions(bus, regions0, ARRAY_SIZE(regions0), BTT); } @@ -2464,7 +2469,7 @@ int test_libndctl(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx) daxctl_set_log_priority(daxctl_ctx, loglevel); ndctl_set_private_data(ctx, test); - err = nfit_test_init(&kmod_ctx, &mod, loglevel); + err = nfit_test_init(&kmod_ctx, &mod, loglevel, test); if (err < 0) { ndctl_test_skip(test); fprintf(stderr, "nfit_test unavailable skipping tests\n");