Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1353454
| Path | csiph.com!feeder.erje.net!2.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Dan Williams <dan.j.williams@intel.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH] mm: fix 'size' alignment in devm_memremap_pages() |
| Date | Tue, 08 Mar 2016 23:40:02 +0100 |
| Message-ID | <raysi-7ex-21@gated-at.bofh.it> (permalink) |
| X-Original-To | akpm@linux-foundation.org |
| X-Extloop1 | 1 |
| X-Ironport-Av | E=Sophos;i="5.22,558,1449561600"; d="scan'208";a="919711822" |
| User-Agent | StGit/0.17.1-9-g687f |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset="utf-8" |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 39 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-mm@kvack.org, linux-kernel@vger.kernel.org, Toshi Kani <toshi.kani@hpe.com> |
| X-Original-Date | Tue, 08 Mar 2016 14:32:25 -0800 |
| X-Original-Message-ID | <20160308222516.16008.22439.stgit@dwillia2-desk3.jf.intel.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1353454 |
Show key headers only | View raw
We need to align the end address, not just the size.
Cc: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
Hi Andrew, one more fixup to devm_memremap_pages(). I was discussing
patch "mm: fix mixed zone detection in devm_memremap_pages" with Toshi
and noticed that it was mishandling the end-of-range alignment. Please
apply or fold this into the existing patch.
kernel/memremap.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/kernel/memremap.c b/kernel/memremap.c
index c0f11a498a5a..60baf4d3401e 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -270,14 +270,16 @@ struct dev_pagemap *find_dev_pagemap(resource_size_t phys)
void *devm_memremap_pages(struct device *dev, struct resource *res,
struct percpu_ref *ref, struct vmem_altmap *altmap)
{
- resource_size_t align_start = res->start & ~(SECTION_SIZE - 1);
- resource_size_t align_size = ALIGN(resource_size(res), SECTION_SIZE);
- int is_ram = region_intersects(align_start, align_size, "System RAM");
- resource_size_t key, align_end;
+ resource_size_t key, align_start, align_size, align_end;
struct dev_pagemap *pgmap;
struct page_map *page_map;
+ int error, nid, is_ram;
unsigned long pfn;
- int error, nid;
+
+ align_start = res->start & ~(SECTION_SIZE - 1);
+ align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
+ - align_start;
+ is_ram = region_intersects(align_start, align_size, "System RAM");
if (is_ram == REGION_MIXED) {
WARN_ONCE(1, "%s attempted on mixed region %pr\n",
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] mm: fix 'size' alignment in devm_memremap_pages() Dan Williams <dan.j.williams@intel.com> - 2016-03-08 23:40 +0100 Re: [PATCH] mm: fix 'size' alignment in devm_memremap_pages() Toshi Kani <toshi.kani@hpe.com> - 2016-03-09 01:30 +0100
csiph-web