From: Madhusudanan Kandasamy <kmadhu@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mackerras <paulus@samba.org>,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE
Date: Thu, 10 Jul 2014 13:16:35 +0530 [thread overview]
Message-ID: <53BE44DB.8080400@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140710084911.22cb58d4@canb.auug.org.au>
Hi Stephen,
Thanks for the suggestion, I'll send a new patch.
On Thursday 10 July 2014 04:19 AM, Stephen Rothwell wrote:
> Hi Madhusudanan,
>
> On Wed, 09 Jul 2014 21:38:31 +0530 Madhusudanan Kandasamy <kmadhu@linux.vnet.ibm.com> wrote:
>>
>> diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h
>> index d836d94..10af7f1 100644
>> --- a/arch/powerpc/include/asm/pte-hash64-64k.h
>> +++ b/arch/powerpc/include/asm/pte-hash64-64k.h
>> @@ -74,8 +74,15 @@
>> #define pte_pagesize_index(mm, addr, pte) \
>> (((pte) & _PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)
>>
>> +static inline int bad_4k_pfn(void)
>> +{
>> + WARN_ON(1);
>> + return -EINVAL;
>> +}
>> +
>> #define remap_4k_pfn(vma, addr, pfn, prot) \
>> - remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
>> - __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN))
>> + ((pfn >= (1UL << (64 - PTE_RPN_SHIFT))) ? bad_4k_pfn() : \
>> + remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
>> + __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)))
>>
>> #endif /* __ASSEMBLY__ */
>
> WARN_ON() returns the value it is passed, so no helper is needed:
>
> #define remap_4k_pfn(vma, addr, pfn, prot) \
> - remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
> - __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN))
> + WARN_ON(((pfn >= (1UL << (64 - PTE_RPN_SHIFT)))) ? -EINVAL : \
> + remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
> + __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)))
>
WARNING: multiple messages have this Message-ID (diff)
From: Madhusudanan Kandasamy <kmadhu@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE
Date: Thu, 10 Jul 2014 13:16:35 +0530 [thread overview]
Message-ID: <53BE44DB.8080400@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140710084911.22cb58d4@canb.auug.org.au>
Hi Stephen,
Thanks for the suggestion, I'll send a new patch.
On Thursday 10 July 2014 04:19 AM, Stephen Rothwell wrote:
> Hi Madhusudanan,
>
> On Wed, 09 Jul 2014 21:38:31 +0530 Madhusudanan Kandasamy <kmadhu@linux.vnet.ibm.com> wrote:
>>
>> diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h
>> index d836d94..10af7f1 100644
>> --- a/arch/powerpc/include/asm/pte-hash64-64k.h
>> +++ b/arch/powerpc/include/asm/pte-hash64-64k.h
>> @@ -74,8 +74,15 @@
>> #define pte_pagesize_index(mm, addr, pte) \
>> (((pte) & _PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)
>>
>> +static inline int bad_4k_pfn(void)
>> +{
>> + WARN_ON(1);
>> + return -EINVAL;
>> +}
>> +
>> #define remap_4k_pfn(vma, addr, pfn, prot) \
>> - remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
>> - __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN))
>> + ((pfn >= (1UL << (64 - PTE_RPN_SHIFT))) ? bad_4k_pfn() : \
>> + remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
>> + __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)))
>>
>> #endif /* __ASSEMBLY__ */
>
> WARN_ON() returns the value it is passed, so no helper is needed:
>
> #define remap_4k_pfn(vma, addr, pfn, prot) \
> - remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
> - __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN))
> + WARN_ON(((pfn >= (1UL << (64 - PTE_RPN_SHIFT)))) ? -EINVAL : \
> + remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \
> + __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)))
>
next prev parent reply other threads:[~2014-07-10 7:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-09 16:08 [PATCH] powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE Madhusudanan Kandasamy
2014-07-09 22:49 ` Stephen Rothwell
2014-07-09 22:49 ` Stephen Rothwell
2014-07-10 7:46 ` Madhusudanan Kandasamy [this message]
2014-07-10 7:46 ` Madhusudanan Kandasamy
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=53BE44DB.8080400@linux.vnet.ibm.com \
--to=kmadhu@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
/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: link
Be 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.