device-dax/kmem: replace release_resource() with release_mem_region()

Towards removing the mode specific @dax_kmem_res attribute from the
generic 'struct dev_dax', and preparing for multi-range support, change
the kmem driver to use the idiomatic release_mem_region() to pair with the
initial request_mem_region(). This also eliminates the need to open code
the release of the resource allocated by request_mem_region().

As there are no more dax_kmem_res users, delete this struct member.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jia He <justin.he@arm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Hulk Robot <hulkci@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/160106112239.30709.15909567572288425294.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Dan Williams and committed by

Linus Torvalds 5 years ago 0513bd5b 7e6b431a

+7 -16

2 changed files

expand all

drivers

dax

dax-private.h

kmem.c

-3

drivers/dax/dax-private.h

··· 42 42 * @dev - device core 43 43 * @pgmap - pgmap for memmap setup / lifetime (driver owned) 44 44 * @range: resource range for the instance 45 - * @dax_mem_res: physical address range of hotadded DAX memory 46 - * @dax_mem_name: name for hotadded DAX memory via add_memory_driver_managed() 47 45 */ 48 46 struct dev_dax { 49 47 struct dax_region *region; ··· 50 52 struct device dev; 51 53 struct dev_pagemap *pgmap; 52 54 struct range range; 53 - struct resource *dax_kmem_res; 54 55 }; 55 56 56 57 static inline u64 range_len(struct range *range)

+7 -13

drivers/dax/kmem.c

··· 33 33 { 34 34 struct dev_dax *dev_dax = to_dev_dax(dev); 35 35 struct range range = dax_kmem_range(dev_dax); 36 - struct resource *new_res; 36 + struct resource *res; 37 37 char *res_name; 38 38 int numa_node; 39 39 int rc; ··· 56 56 return -ENOMEM; 57 57 58 58 /* Region is permanently reserved if hotremove fails. */ 59 - new_res = request_mem_region(range.start, range_len(&range), res_name); 60 - if (!new_res) { 59 + res = request_mem_region(range.start, range_len(&range), res_name); 60 + if (!res) { 61 61 dev_warn(dev, "could not reserve region [%#llx-%#llx]\n", range.start, range.end); 62 62 kfree(res_name); 63 63 return -EBUSY; ··· 69 69 * inherit flags from the parent since it may set new flags 70 70 * unknown to us that will break add_memory() below. 71 71 */ 72 - new_res->flags = IORESOURCE_SYSTEM_RAM; 72 + res->flags = IORESOURCE_SYSTEM_RAM; 73 73 74 74 /* 75 75 * Ensure that future kexec'd kernels will not treat this as RAM 76 76 * automatically. 77 77 */ 78 - rc = add_memory_driver_managed(numa_node, new_res->start, 79 - resource_size(new_res), kmem_name); 78 + rc = add_memory_driver_managed(numa_node, range.start, range_len(&range), kmem_name); 80 79 if (rc) { 81 - release_resource(new_res); 82 - kfree(new_res); 80 + release_mem_region(range.start, range_len(&range)); 83 81 kfree(res_name); 84 82 return rc; 85 83 } 86 84 87 85 dev_set_drvdata(dev, res_name); 88 - dev_dax->dax_kmem_res = new_res; 89 86 90 87 return 0; 91 88 } ··· 92 95 { 93 96 struct dev_dax *dev_dax = to_dev_dax(dev); 94 97 struct range range = dax_kmem_range(dev_dax); 95 - struct resource *res = dev_dax->dax_kmem_res; 96 98 const char *res_name = dev_get_drvdata(dev); 97 99 int rc; 98 100 ··· 110 114 } 111 115 112 116 /* Release and free dax resources */ 113 - release_resource(res); 114 - kfree(res); 117 + release_mem_region(range.start, range_len(&range)); 115 118 kfree(res_name); 116 - dev_dax->dax_kmem_res = NULL; 117 119 118 120 return 0; 119 121 }

Configure Feed

Configure Feed