diff options
author | Dave Hansen <dave.hansen@linux.intel.com> | 2019-02-25 13:57:33 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2019-02-28 13:41:23 -0500 |
commit | b926b7f3baecb2a855db629e6822e1a85212e91c (patch) | |
tree | 617f873b72fc87d2cbbac2d267b570abc30ddf58 /kernel/resource.c | |
parent | 5cd401ace914dc68556c6d2fcae0c349444d5f86 (diff) |
mm/resource: Move HMM pr_debug() deeper into resource code
HMM consumes physical address space for its own use, even
though nothing is mapped or accessible there. It uses a
special resource description (IORES_DESC_DEVICE_PRIVATE_MEMORY)
to uniquely identify these areas.
When HMM consumes address space, it makes a best guess about
what to consume. However, it is possible that a future memory
or device hotplug can collide with the reserved area. In the
case of these conflicts, there is an error message in
register_memory_resource().
Later patches in this series move register_memory_resource()
from using request_resource_conflict() to __request_region().
Unfortunately, __request_region() does not return the conflict
like the previous function did, which makes it impossible to
check for IORES_DESC_DEVICE_PRIVATE_MEMORY in a conflicting
resource.
Instead of warning in register_memory_resource(), move the
check into the core resource code itself (__request_region())
where the conflicting resource _is_ available. This has the
added bonus of producing a warning in case of HMM conflicts
with devices *or* RAM address space, as opposed to the RAM-
only warnings that were there previously.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: linux-nvdimm@lists.01.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: Huang Ying <ying.huang@intel.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'kernel/resource.c')
-rw-r--r-- | kernel/resource.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index ca7ed5158cff..35fe105d581e 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -1132,6 +1132,15 @@ struct resource * __request_region(struct resource *parent, | |||
1132 | conflict = __request_resource(parent, res); | 1132 | conflict = __request_resource(parent, res); |
1133 | if (!conflict) | 1133 | if (!conflict) |
1134 | break; | 1134 | break; |
1135 | /* | ||
1136 | * mm/hmm.c reserves physical addresses which then | ||
1137 | * become unavailable to other users. Conflicts are | ||
1138 | * not expected. Warn to aid debugging if encountered. | ||
1139 | */ | ||
1140 | if (conflict->desc == IORES_DESC_DEVICE_PRIVATE_MEMORY) { | ||
1141 | pr_warn("Unaddressable device %s %pR conflicts with %pR", | ||
1142 | conflict->name, conflict, res); | ||
1143 | } | ||
1135 | if (conflict != parent) { | 1144 | if (conflict != parent) { |
1136 | if (!(conflict->flags & IORESOURCE_BUSY)) { | 1145 | if (!(conflict->flags & IORESOURCE_BUSY)) { |
1137 | parent = conflict; | 1146 | parent = conflict; |