All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 3/8] arm: fixmap: implement __set_fixmap()
Date: Thu, 4 Sep 2014 18:27:48 +0100	[thread overview]
Message-ID: <20140904172748.GO7156@arm.com> (raw)
In-Reply-To: <CAGXu5jKimGaupwyUwt0Zwa3OtjeoED8-uBeMX0MwXjBYP6ssAg@mail.gmail.com>

On Thu, Sep 04, 2014 at 06:23:42PM +0100, Kees Cook wrote:
> On Thu, Sep 4, 2014 at 10:03 AM, Will Deacon <will.deacon@arm.com> wrote:
> > Hi Kees,
> >
> > On Wed, Sep 03, 2014 at 10:57:04PM +0100, Kees Cook wrote:
> >> This is used from set_fixmap() and clear_fixmap() via asm-generic/fixmap.h.
> >> Also makes sure that the fixmap allocation fits into the expected range.
> >>
> >> Based on patch by Rabin Vincent.
> >
> > [...]
> >
> >> +void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
> >> +{
> >> +     unsigned long vaddr = __fix_to_virt(idx);
> >> +     pte_t *pte = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
> >> +
> >> +     /* Make sure fixmap region does not exceed available allocation. */
> >> +     BUILD_BUG_ON(FIXADDR_START + (__end_of_fixed_addresses * PAGE_SIZE) >
> >> +                  FIXADDR_END);
> >> +     BUG_ON(idx >= __end_of_fixed_addresses);
> >> +
> >> +     if (pgprot_val(prot))
> >> +             set_pte_at(NULL, vaddr, pte,
> >> +                     pfn_pte(phys >> PAGE_SHIFT, prot));
> >> +     else
> >> +             pte_clear(NULL, vaddr, pte);
> >> +
> >> +     /*
> >> +      * Given the potential a15 tlbi errata, we can only do tlb flushes
> >> +      * with interrupts disabled. Callers must have taken care of this.
> >> +      */
> >> +     WARN_ON_ONCE(!irqs_disabled());
> >> +     flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);
> >
> > Aha, this explains why we were confusing each other! The issue is that
> > interrupts must be *enabled*, so this code does the exact opposite of
> > what we need.
> >
> > I think this got lost in a sea of double negatives during the last round
> > of review.
> 
> Ah! If this is the case, perhaps we can get away with
> local_flush_tlb_kernel_range() then?

That's a bit tricky, since you need to ensure that preemption is disabled
until the mapping is put back like it was.

Will

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will.deacon@arm.com>
To: Kees Cook <keescook@chromium.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Rabin Vincent <rabin@rab.in>,
	Laura Abbott <lauraa@codeaurora.org>,
	Rob Herring <robh@kernel.org>,
	Leif Lindholm <leif.lindholm@linaro.org>,
	"msalter@redhat.com" <msalter@redhat.com>,
	Liu hua <sdu.liu@huawei.com>,
	Nikolay Borisov <Nikolay.Borisov@arm.com>,
	Nicolas Pitre <nicolas.pitre@linaro.org>,
	Doug Anderson <dianders@google.com>,
	Jason Wessel <jason.wessel@windriver.com>,
	Catalin Marinas <Catalin.Marinas@arm.com>,
	Russell King - ARM Linux <linux@arm.linux.org.uk>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v5 3/8] arm: fixmap: implement __set_fixmap()
Date: Thu, 4 Sep 2014 18:27:48 +0100	[thread overview]
Message-ID: <20140904172748.GO7156@arm.com> (raw)
In-Reply-To: <CAGXu5jKimGaupwyUwt0Zwa3OtjeoED8-uBeMX0MwXjBYP6ssAg@mail.gmail.com>

On Thu, Sep 04, 2014 at 06:23:42PM +0100, Kees Cook wrote:
> On Thu, Sep 4, 2014 at 10:03 AM, Will Deacon <will.deacon@arm.com> wrote:
> > Hi Kees,
> >
> > On Wed, Sep 03, 2014 at 10:57:04PM +0100, Kees Cook wrote:
> >> This is used from set_fixmap() and clear_fixmap() via asm-generic/fixmap.h.
> >> Also makes sure that the fixmap allocation fits into the expected range.
> >>
> >> Based on patch by Rabin Vincent.
> >
> > [...]
> >
> >> +void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
> >> +{
> >> +     unsigned long vaddr = __fix_to_virt(idx);
> >> +     pte_t *pte = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
> >> +
> >> +     /* Make sure fixmap region does not exceed available allocation. */
> >> +     BUILD_BUG_ON(FIXADDR_START + (__end_of_fixed_addresses * PAGE_SIZE) >
> >> +                  FIXADDR_END);
> >> +     BUG_ON(idx >= __end_of_fixed_addresses);
> >> +
> >> +     if (pgprot_val(prot))
> >> +             set_pte_at(NULL, vaddr, pte,
> >> +                     pfn_pte(phys >> PAGE_SHIFT, prot));
> >> +     else
> >> +             pte_clear(NULL, vaddr, pte);
> >> +
> >> +     /*
> >> +      * Given the potential a15 tlbi errata, we can only do tlb flushes
> >> +      * with interrupts disabled. Callers must have taken care of this.
> >> +      */
> >> +     WARN_ON_ONCE(!irqs_disabled());
> >> +     flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);
> >
> > Aha, this explains why we were confusing each other! The issue is that
> > interrupts must be *enabled*, so this code does the exact opposite of
> > what we need.
> >
> > I think this got lost in a sea of double negatives during the last round
> > of review.
> 
> Ah! If this is the case, perhaps we can get away with
> local_flush_tlb_kernel_range() then?

That's a bit tricky, since you need to ensure that preemption is disabled
until the mapping is put back like it was.

Will

  reply	other threads:[~2014-09-04 17:27 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-03 21:57 [PATCH v5 0/8] arm: support CONFIG_RODATA Kees Cook
2014-09-03 21:57 ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 1/8] arm: use generic fixmap.h Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 2/8] ARM: expand fixmap region to 3MB Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 3/8] arm: fixmap: implement __set_fixmap() Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-04 17:03   ` Will Deacon
2014-09-04 17:03     ` Will Deacon
2014-09-04 17:23     ` Kees Cook
2014-09-04 17:23       ` Kees Cook
2014-09-04 17:27       ` Will Deacon [this message]
2014-09-04 17:27         ` Will Deacon
2014-09-05 19:41         ` Kees Cook
2014-09-05 19:41           ` Kees Cook
2014-09-08 10:39           ` Will Deacon
2014-09-08 10:39             ` Will Deacon
2014-09-08 18:38             ` Kees Cook
2014-09-08 18:38               ` Kees Cook
2014-09-08 19:16         ` Kees Cook
2014-09-08 19:16           ` Kees Cook
2014-09-08 21:55           ` Rabin Vincent
2014-09-08 21:55             ` Rabin Vincent
2014-09-08 22:40             ` Kees Cook
2014-09-08 22:40               ` Kees Cook
2014-09-09 12:38               ` Will Deacon
2014-09-09 12:38                 ` Will Deacon
2014-09-09 14:33                 ` Kees Cook
2014-09-09 14:33                   ` Kees Cook
2014-09-10 17:51                   ` Will Deacon
2014-09-10 17:51                     ` Will Deacon
2014-09-11 15:27                     ` Kees Cook
2014-09-11 15:27                       ` Kees Cook
2014-09-11 16:05                       ` Kees Cook
2014-09-11 16:05                         ` Kees Cook
2014-09-11 16:16                         ` Will Deacon
2014-09-11 16:16                           ` Will Deacon
2014-09-11 16:27                           ` Kees Cook
2014-09-11 16:27                             ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 4/8] arm: use fixmap for text patching when text is RO Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 5/8] ARM: kexec: Make .text R/W in machine_kexec Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 6/8] arm: kgdb: Handle read-only text / modules Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 7/8] ARM: mm: allow non-text sections to be non-executable Kees Cook
2014-09-03 21:57   ` Kees Cook
2014-09-03 21:57 ` [PATCH v5 8/8] ARM: mm: allow text and rodata sections to be read-only Kees Cook
2014-09-03 21:57   ` Kees Cook

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=20140904172748.GO7156@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.