From patchwork Fri Dec 2 19:22:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9459035 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 A28566074E for ; Fri, 2 Dec 2016 19:22:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C3212842F for ; Fri, 2 Dec 2016 19:22:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80E6928446; Fri, 2 Dec 2016 19:22:11 +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 4EC132842F for ; Fri, 2 Dec 2016 19:22:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6FD1381F61; Fri, 2 Dec 2016 11:22:11 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mailrelay112.isp.belgacom.be (mailrelay112.isp.belgacom.be [195.238.20.139]) (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 A901181F5E for ; Fri, 2 Dec 2016 11:22:09 -0800 (PST) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AAAwDByEFY/9JLtVtcHQEFAQsBgzgBA?= =?us-ascii?q?QEBAR+BYI1GlzEBkkaCD4IGhiKCHEAUAQIBAQEBAQEBYiiFRSNPSyQTiHOuQIt?= =?us-ascii?q?fhj6PBQWaY5EUApA3kg0fN4EZgwoBURyBXj00iH4BAQE?= X-IPAS-Result: =?us-ascii?q?A2AAAwDByEFY/9JLtVtcHQEFAQsBgzgBAQEBAR+BYI1GlzE?= =?us-ascii?q?BkkaCD4IGhiKCHEAUAQIBAQEBAQEBYiiFRSNPSyQTiHOuQItfhj6PBQWaY5EUA?= =?us-ascii?q?pA3kg0fN4EZgwoBURyBXj00iH4BAQE?= Received: from 210.75-181-91.adsl-dyn.isp.belgacom.be (HELO inkjet2.lan) ([91.181.75.210]) by relay.skynet.be with ESMTP; 02 Dec 2016 20:22:08 +0100 From: Fabian Frederick To: Dan Williams Subject: [PATCH 7/8 linux-next] mm: warn about possible alignment problem Date: Fri, 2 Dec 2016 20:22:07 +0100 Message-Id: <1480706527-21274-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.7.4 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabf@skynet.be, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Commit 5f29a77cd957 ("mm: fix mixed zone detection in devm_memremap_pages") Aligned resource limits before region_intersects() which breaks the following with false assertions on kernel command line: memmap=4M!700M "devm_memremap_pages attempted on mixed region [ mem 0x2bc00000-0x2bfffff flags 0x200]" Memory regions 0x100000-0x2bbfffff: usable 0x2bc000000-0x2bbfffff: persistent 0x2c0000000-0x2bffffff: usable resource start: 0x2bc00000 align start: 0x28000000 resource size: 0x3fffffff align size: 0x80000000 SECTION_SIZE: 0x8000000 Now we need aligned memmap declarations based on 128M in this case eg memmap=128!640M Signed-off-by: Fabian Frederick --- kernel/memremap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index b501e39..1bb5eec 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -296,8 +296,8 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE); if (is_ram == REGION_MIXED) { - WARN_ONCE(1, "%s attempted on mixed region %pr\n", - __func__, res); + WARN_ONCE(1, "%s attempted on mixed region %pr or arguments not aligned to section size: %#lx\n", + __func__, res, SECTION_SIZE); return ERR_PTR(-ENXIO); }