From: Catalin Marinas <catalin.marinas@arm.com>
To: Will Deacon <will@kernel.org>
Cc: Jia He <justin.he@arm.com>, Mark Rutland <mark.rutland@arm.com>,
James Morse <james.morse@arm.com>,
Christoffer Dall <christoffer.dall@arm.com>,
Punit Agrawal <punitagrawal@gmail.com>, Qian Cai <cai@lca.pw>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Jun Yao <yaojun8558363@gmail.com>,
Alex Van Brunt <avanbrunt@nvidia.com>,
Robin Murphy <robin.murphy@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: mm: add missing PTE_SPECIAL in pte_mkdevmap on arm64
Date: Wed, 7 Aug 2019 10:24:28 +0100 [thread overview]
Message-ID: <20190807092427.GB63492@arrakis.emea.arm.com> (raw)
In-Reply-To: <20190807090929.zsiupxyqop75uzkn@willie-the-truck>
On Wed, Aug 07, 2019 at 10:09:29AM +0100, Will Deacon wrote:
> On Wed, Aug 07, 2019 at 12:58:51PM +0800, Jia He wrote:
> > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> > index 5fdcfe237338..e09760ece844 100644
> > --- a/arch/arm64/include/asm/pgtable.h
> > +++ b/arch/arm64/include/asm/pgtable.h
> > @@ -209,7 +209,7 @@ static inline pmd_t pmd_mkcont(pmd_t pmd)
> >
> > static inline pte_t pte_mkdevmap(pte_t pte)
> > {
> > - return set_pte_bit(pte, __pgprot(PTE_DEVMAP));
> > + return set_pte_bit(pte, __pgprot(PTE_DEVMAP | PTE_SPECIAL));
> > }
> >
> > static inline void set_pte(pte_t *ptep, pte_t pte)
> > @@ -396,7 +396,10 @@ static inline int pmd_protnone(pmd_t pmd)
> > #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> > #define pmd_devmap(pmd) pte_devmap(pmd_pte(pmd))
> > #endif
> > -#define pmd_mkdevmap(pmd) pte_pmd(pte_mkdevmap(pmd_pte(pmd)))
> > +static inline pmd_t pmd_mkdevmap(pmd_t pmd)
> > +{
> > + return pte_pmd(set_pte_bit(pmd_pte(pmd), __pgprot(PTE_DEVMAP)));
> > +}
> >
> > #define __pmd_to_phys(pmd) __pte_to_phys(pmd_pte(pmd))
> > #define __phys_to_pmd_val(phys) __phys_to_pte_val(phys)
>
> Acked-by: Will Deacon <will@kernel.org>
>
> I think Catalin can take this as a fix, although the commit message should
> probably be trimmed down a bit to remove the two call traces etc.
I'll queue this for -rc4 and sort out the commit message. Thanks.
--
Catalin
next prev parent reply other threads:[~2019-08-07 9:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 4:58 Jia He
2019-08-07 9:09 ` Will Deacon
2019-08-07 9:24 ` Catalin Marinas [this message]
2019-08-08 5:18 ` Anshuman Khandual
2019-08-08 6:20 ` Justin He (Arm Technology China)
2019-08-08 6:58 ` Anshuman Khandual
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=20190807092427.GB63492@arrakis.emea.arm.com \
--to=catalin.marinas@arm.com \
--cc=anshuman.khandual@arm.com \
--cc=avanbrunt@nvidia.com \
--cc=cai@lca.pw \
--cc=christoffer.dall@arm.com \
--cc=james.morse@arm.com \
--cc=justin.he@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=punitagrawal@gmail.com \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=yaojun8558363@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®