From 83762cb5c7c464af4cbaba5679af31c7fe534979 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 15 Nov 2021 13:20:57 -0800 Subject: dax: Kill DEV_DAX_PMEM_COMPAT The /sys/class/dax compatibility option has shipped in the kernel for 4 years now which should be sufficient time for tools to abandon the old ABI in favor of the /sys/bus/dax device-model. Delete it now and see if anyone screams. Since this compatibility option shipped there has been more reports of users being surprised by the compat ABI than surprised by the "new", so the compat infrastructure has outlived its usefulness. Recall that /sys/bus/dax device-model is required for the dax kmem driver which allows PMEM to be used as "System RAM". The following projects were known to have a dependency on /sys/class/dax and have dropped their dependency as of the listed version: - ndctl (including libndctl, daxctl, and libdaxctl): v64+ - fio: v3.13+ - pmdk: v1.5.2+ As further evidence this option is no longer needed some distributions have already stopped enabling CONFIG_DEV_DAX_PMEM_COMPAT. Cc: Ira Weiny Cc: Dave Jiang Reported-by: Vishal Verma Acked-by: Dave Hansen Reviewed-by: Jane Chu Link: https://lore.kernel.org/r/163701116195.3784476.726128179293466337.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams --- drivers/dax/pmem/core.c | 79 ------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 drivers/dax/pmem/core.c (limited to 'drivers/dax/pmem/core.c') diff --git a/drivers/dax/pmem/core.c b/drivers/dax/pmem/core.c deleted file mode 100644 index 062e8bc14223..000000000000 --- a/drivers/dax/pmem/core.c +++ /dev/null @@ -1,79 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2016 - 2018 Intel Corporation. All rights reserved. */ -#include -#include -#include -#include "../../nvdimm/pfn.h" -#include "../../nvdimm/nd.h" -#include "../bus.h" - -struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys) -{ - struct range range; - int rc, id, region_id; - resource_size_t offset; - struct nd_pfn_sb *pfn_sb; - struct dev_dax *dev_dax; - struct dev_dax_data data; - struct nd_namespace_io *nsio; - struct dax_region *dax_region; - struct dev_pagemap pgmap = { }; - struct nd_namespace_common *ndns; - struct nd_dax *nd_dax = to_nd_dax(dev); - struct nd_pfn *nd_pfn = &nd_dax->nd_pfn; - struct nd_region *nd_region = to_nd_region(dev->parent); - - ndns = nvdimm_namespace_common_probe(dev); - if (IS_ERR(ndns)) - return ERR_CAST(ndns); - - /* parse the 'pfn' info block via ->rw_bytes */ - rc = devm_namespace_enable(dev, ndns, nd_info_block_reserve()); - if (rc) - return ERR_PTR(rc); - rc = nvdimm_setup_pfn(nd_pfn, &pgmap); - if (rc) - return ERR_PTR(rc); - devm_namespace_disable(dev, ndns); - - /* reserve the metadata area, device-dax will reserve the data */ - pfn_sb = nd_pfn->pfn_sb; - offset = le64_to_cpu(pfn_sb->dataoff); - nsio = to_nd_namespace_io(&ndns->dev); - if (!devm_request_mem_region(dev, nsio->res.start, offset, - dev_name(&ndns->dev))) { - dev_warn(dev, "could not reserve metadata\n"); - return ERR_PTR(-EBUSY); - } - - rc = sscanf(dev_name(&ndns->dev), "namespace%d.%d", ®ion_id, &id); - if (rc != 2) - return ERR_PTR(-EINVAL); - - /* adjust the dax_region range to the start of data */ - range = pgmap.range; - range.start += offset; - dax_region = alloc_dax_region(dev, region_id, &range, - nd_region->target_node, le32_to_cpu(pfn_sb->align), - IORESOURCE_DAX_STATIC); - if (!dax_region) - return ERR_PTR(-ENOMEM); - - data = (struct dev_dax_data) { - .dax_region = dax_region, - .id = id, - .pgmap = &pgmap, - .subsys = subsys, - .size = range_len(&range), - }; - dev_dax = devm_create_dev_dax(&data); - - /* child dev_dax instances now own the lifetime of the dax_region */ - dax_region_put(dax_region); - - return dev_dax; -} -EXPORT_SYMBOL_GPL(__dax_pmem_probe); - -MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Intel Corporation"); -- cgit v1.2.3-59-g8ed1b