From: Tyler Baker <tyler.baker@linaro.org> To: Dan Williams <dan.j.williams@intel.com> Cc: linux-nvdimm@lists.01.org, boaz@plexistor.com, david@fromorbit.com, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, hch@lst.de, linux-mm@kvack.org, hpa@zytor.com, ross.zwisler@linux.intel.com, Ingo Molnar <mingo@kernel.org>, Kevin's boot bot <khilman@kernel.org> Subject: Re: [PATCH v2 2/9] mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h Date: Fri, 18 Sep 2015 16:42:16 -0700 [thread overview] Message-ID: <CANMBJr6xkh1Ciqb_9JF33aPapavxLLZte1BH+rQpdRpwvLO+dA@mail.gmail.com> (raw) In-Reply-To: <20150826012735.8851.49787.stgit@dwillia2-desk3.amr.corp.intel.com> Hi, On 25 August 2015 at 18:27, Dan Williams <dan.j.williams@intel.com> wrote: > From: Christoph Hellwig <hch@lst.de> > > Three architectures already define these, and we'll need them genericly > soon. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > arch/arm/include/asm/memory.h | 6 ------ > arch/arm64/include/asm/memory.h | 6 ------ > arch/unicore32/include/asm/memory.h | 6 ------ > include/asm-generic/memory_model.h | 6 ++++++ > 4 files changed, 6 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h > index b7f6fb462ea0..98d58bb04ac5 100644 > --- a/arch/arm/include/asm/memory.h > +++ b/arch/arm/include/asm/memory.h > @@ -119,12 +119,6 @@ > #endif > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > -#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index f800d45ea226..d808bb688751 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -81,12 +81,6 @@ > #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET)) > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > -#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/arch/unicore32/include/asm/memory.h b/arch/unicore32/include/asm/memory.h > index debafc40200a..3bb0a29fd2d7 100644 > --- a/arch/unicore32/include/asm/memory.h > +++ b/arch/unicore32/include/asm/memory.h > @@ -61,12 +61,6 @@ > #endif > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT) > -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h > index 14909b0b9cae..f20f407ce45d 100644 > --- a/include/asm-generic/memory_model.h > +++ b/include/asm-generic/memory_model.h > @@ -69,6 +69,12 @@ > }) > #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */ > > +/* > + * Convert a physical address to a Page Frame Number and back > + */ > +#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > +#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) The kernelci.org bot has been reporting complete boot failures[1] on ARM platforms with more than 4GB of memory and LPAE enabled. I've bisected[2] the failures down to this commit, and reverting it on top of the latest mainline resolves the boot issue. I took a closer look at this patch and noticed the cast to phys_addr_t was dropped in the generic function. Adding this to the new generic function solves the boot issue I'm reporting. diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index f20f407..db9f5c7 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h @@ -73,7 +73,7 @@ * Convert a physical address to a Page Frame Number and back */ #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) +#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) #define page_to_pfn __page_to_pfn #define pfn_to_page __pfn_to_page If this fix is valid, I can send a formal patch or it can be squashed into the original commit. Cheers, Tyler [1] http://kernelci.org/boot/?d01&LPAE [2] http://hastebin.com/tuhefudage.vhdl -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Tyler Baker <tyler.baker@linaro.org> To: Dan Williams <dan.j.williams@intel.com> Cc: linux-nvdimm@ml01.01.org, boaz@plexistor.com, david@fromorbit.com, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, hch@lst.de, linux-mm@kvack.org, hpa@zytor.com, ross.zwisler@linux.intel.com, Ingo Molnar <mingo@kernel.org>, "Kevin's boot bot" <khilman@kernel.org> Subject: Re: [PATCH v2 2/9] mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h Date: Fri, 18 Sep 2015 16:42:16 -0700 [thread overview] Message-ID: <CANMBJr6xkh1Ciqb_9JF33aPapavxLLZte1BH+rQpdRpwvLO+dA@mail.gmail.com> (raw) In-Reply-To: <20150826012735.8851.49787.stgit@dwillia2-desk3.amr.corp.intel.com> Hi, On 25 August 2015 at 18:27, Dan Williams <dan.j.williams@intel.com> wrote: > From: Christoph Hellwig <hch@lst.de> > > Three architectures already define these, and we'll need them genericly > soon. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > arch/arm/include/asm/memory.h | 6 ------ > arch/arm64/include/asm/memory.h | 6 ------ > arch/unicore32/include/asm/memory.h | 6 ------ > include/asm-generic/memory_model.h | 6 ++++++ > 4 files changed, 6 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h > index b7f6fb462ea0..98d58bb04ac5 100644 > --- a/arch/arm/include/asm/memory.h > +++ b/arch/arm/include/asm/memory.h > @@ -119,12 +119,6 @@ > #endif > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > -#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index f800d45ea226..d808bb688751 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -81,12 +81,6 @@ > #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET)) > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > -#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/arch/unicore32/include/asm/memory.h b/arch/unicore32/include/asm/memory.h > index debafc40200a..3bb0a29fd2d7 100644 > --- a/arch/unicore32/include/asm/memory.h > +++ b/arch/unicore32/include/asm/memory.h > @@ -61,12 +61,6 @@ > #endif > > /* > - * Convert a physical address to a Page Frame Number and back > - */ > -#define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT) > -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) > - > -/* > * Convert a page to/from a physical address > */ > #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) > diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h > index 14909b0b9cae..f20f407ce45d 100644 > --- a/include/asm-generic/memory_model.h > +++ b/include/asm-generic/memory_model.h > @@ -69,6 +69,12 @@ > }) > #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */ > > +/* > + * Convert a physical address to a Page Frame Number and back > + */ > +#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) > +#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) The kernelci.org bot has been reporting complete boot failures[1] on ARM platforms with more than 4GB of memory and LPAE enabled. I've bisected[2] the failures down to this commit, and reverting it on top of the latest mainline resolves the boot issue. I took a closer look at this patch and noticed the cast to phys_addr_t was dropped in the generic function. Adding this to the new generic function solves the boot issue I'm reporting. diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index f20f407..db9f5c7 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h @@ -73,7 +73,7 @@ * Convert a physical address to a Page Frame Number and back */ #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) +#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) #define page_to_pfn __page_to_pfn #define pfn_to_page __pfn_to_page If this fix is valid, I can send a formal patch or it can be squashed into the original commit. Cheers, Tyler [1] http://kernelci.org/boot/?d01&LPAE [2] http://hastebin.com/tuhefudage.vhdl
next prev parent reply other threads:[~2015-09-18 23:42 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-08-26 1:27 [PATCH v2 0/9] initial struct page support for pmem Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 1:27 ` [PATCH v2 1/9] dax: drop size parameter to ->direct_access() Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 1:27 ` [PATCH v2 2/9] mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-09-18 23:42 ` Tyler Baker [this message] 2015-09-18 23:42 ` Tyler Baker 2015-09-18 23:59 ` Dan Williams 2015-09-18 23:59 ` Dan Williams 2015-09-19 6:49 ` Tyler Baker 2015-09-19 6:49 ` Tyler Baker 2015-09-29 19:21 ` Nicolas Pitre 2015-09-29 19:21 ` Nicolas Pitre 2015-09-29 19:36 ` Tyler Baker 2015-09-29 19:36 ` Tyler Baker 2015-09-29 19:36 ` Tyler Baker 2015-09-29 19:47 ` Nicolas Pitre 2015-09-29 19:47 ` Nicolas Pitre 2015-09-29 19:47 ` Nicolas Pitre 2015-08-26 1:27 ` [PATCH v2 3/9] mm: ZONE_DEVICE for "device memory" Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 1:27 ` [PATCH v2 4/9] add devm_memremap_pages Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 1:27 ` [PATCH v2 5/9] x86, pmem: push fallback handling to arch code Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 12:41 ` Christoph Hellwig 2015-08-26 12:41 ` Christoph Hellwig 2015-08-26 21:34 ` Williams, Dan J 2015-08-26 21:34 ` Williams, Dan J 2015-08-27 7:33 ` hch 2015-08-27 7:33 ` hch 2015-08-28 20:22 ` Ross Zwisler 2015-08-28 20:22 ` Ross Zwisler 2015-08-28 21:41 ` Toshi Kani 2015-08-28 21:41 ` Toshi Kani 2015-08-28 21:47 ` Dan Williams 2015-08-28 21:47 ` Dan Williams 2015-08-28 21:48 ` Toshi Kani 2015-08-28 21:48 ` Toshi Kani 2015-08-29 4:04 ` Williams, Dan J 2015-08-29 4:04 ` Williams, Dan J 2015-08-29 13:57 ` hch 2015-08-29 13:57 ` hch 2015-08-26 1:27 ` [PATCH v2 6/9] libnvdimm, pfn: 'struct page' provider infrastructure Dan Williams 2015-08-26 1:27 ` Dan Williams 2015-08-26 1:28 ` [PATCH v2 7/9] libnvdimm, pmem: 'struct page' for pmem Dan Williams 2015-08-26 1:28 ` Dan Williams 2015-08-26 1:28 ` [PATCH v2 8/9] libnvdimm, pmem: direct map legacy pmem by default Dan Williams 2015-08-26 1:28 ` Dan Williams 2015-08-26 1:28 ` [PATCH v2 9/9] devm_memremap_pages: protect against pmem device unbind Dan Williams 2015-08-26 1:28 ` Dan Williams 2015-08-26 12:46 ` Christoph Hellwig 2015-08-26 12:46 ` Christoph Hellwig 2015-08-26 21:39 ` Williams, Dan J 2015-08-26 21:39 ` Williams, Dan J 2015-08-27 7:33 ` hch 2015-08-27 7:33 ` hch
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CANMBJr6xkh1Ciqb_9JF33aPapavxLLZte1BH+rQpdRpwvLO+dA@mail.gmail.com \ --to=tyler.baker@linaro.org \ --cc=boaz@plexistor.com \ --cc=dan.j.williams@intel.com \ --cc=david@fromorbit.com \ --cc=hch@lst.de \ --cc=hpa@zytor.com \ --cc=khilman@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=mingo@kernel.org \ --cc=ross.zwisler@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.