From: Will Deacon <will.deacon@arm.com> To: Kees Cook <keescook@chromium.org> Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Rob Herring <robh@kernel.org>, Laura Abbott <lauraa@codeaurora.org>, Leif Lindholm <leif.lindholm@linaro.org>, Stephen Boyd <sboyd@codeaurora.org>, "msalter@redhat.com" <msalter@redhat.com>, Rabin Vincent <rabin@rab.in>, Liu hua <sdu.liu@huawei.com>, Nikolay Borisov <Nikolay.Borisov@arm.com>, Nicolas Pitre <nicolas.pitre@linaro.org>, Tomasz Figa <t.figa@samsung.com>, 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>, "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org> Subject: Re: [PATCH v4 2/8] ARM: expand fixmap region to 3MB Date: Tue, 19 Aug 2014 13:26:53 +0100 [thread overview] Message-ID: <20140819122653.GH23128@arm.com> (raw) In-Reply-To: <1407949593-16121-3-git-send-email-keescook@chromium.org> Hi Kees, Rob, On Wed, Aug 13, 2014 at 06:06:27PM +0100, Kees Cook wrote: > From: Rob Herring <robh@kernel.org> > > With commit a05e54c103b0 ("ARM: 8031/2: change fixmap mapping region to > support 32 CPUs"), the fixmap region was expanded to 2MB, but it > precluded any other uses of the fixmap region. In order to support other > uses the fixmap region needs to be expanded beyond 2MB. Fortunately, the > adjacent 1MB range 0xffe00000-0xfff00000 is availabe. > > Remove fixmap_page_table ptr and lookup the page table via the virtual > address so that the fixmap region can span more that one pmd. The 2nd > pmd is already created since it is shared with the vector page. [...] > diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c > index 45aeaaca9052..81061987ac45 100644 > --- a/arch/arm/mm/highmem.c > +++ b/arch/arm/mm/highmem.c > @@ -18,19 +18,20 @@ > #include <asm/tlbflush.h> > #include "mm.h" > > -pte_t *fixmap_page_table; > - > static inline void set_fixmap_pte(int idx, pte_t pte) > { > unsigned long vaddr = __fix_to_virt(idx); > - set_pte_ext(fixmap_page_table + idx, pte, 0); > + pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); > + > + set_pte_ext(ptep, pte, 0); > local_flush_tlb_kernel_page(vaddr); > } Minor comment, but we can drop the ifx parameter here now, right? It looks a bit weird having a setter/getter pair of functions where the type signatures aren't the inverse. Will
WARNING: multiple messages have this Message-ID (diff)
From: will.deacon@arm.com (Will Deacon) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/8] ARM: expand fixmap region to 3MB Date: Tue, 19 Aug 2014 13:26:53 +0100 [thread overview] Message-ID: <20140819122653.GH23128@arm.com> (raw) In-Reply-To: <1407949593-16121-3-git-send-email-keescook@chromium.org> Hi Kees, Rob, On Wed, Aug 13, 2014 at 06:06:27PM +0100, Kees Cook wrote: > From: Rob Herring <robh@kernel.org> > > With commit a05e54c103b0 ("ARM: 8031/2: change fixmap mapping region to > support 32 CPUs"), the fixmap region was expanded to 2MB, but it > precluded any other uses of the fixmap region. In order to support other > uses the fixmap region needs to be expanded beyond 2MB. Fortunately, the > adjacent 1MB range 0xffe00000-0xfff00000 is availabe. > > Remove fixmap_page_table ptr and lookup the page table via the virtual > address so that the fixmap region can span more that one pmd. The 2nd > pmd is already created since it is shared with the vector page. [...] > diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c > index 45aeaaca9052..81061987ac45 100644 > --- a/arch/arm/mm/highmem.c > +++ b/arch/arm/mm/highmem.c > @@ -18,19 +18,20 @@ > #include <asm/tlbflush.h> > #include "mm.h" > > -pte_t *fixmap_page_table; > - > static inline void set_fixmap_pte(int idx, pte_t pte) > { > unsigned long vaddr = __fix_to_virt(idx); > - set_pte_ext(fixmap_page_table + idx, pte, 0); > + pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); > + > + set_pte_ext(ptep, pte, 0); > local_flush_tlb_kernel_page(vaddr); > } Minor comment, but we can drop the ifx parameter here now, right? It looks a bit weird having a setter/getter pair of functions where the type signatures aren't the inverse. Will
next prev parent reply other threads:[~2014-08-19 12:26 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-13 17:06 [PATCH v4 0/8] arm: support CONFIG_RODATA Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-13 17:06 ` [PATCH v4 1/8] arm: use generic fixmap.h Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-13 17:06 ` [PATCH v4 2/8] ARM: expand fixmap region to 3MB Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-19 12:26 ` Will Deacon [this message] 2014-08-19 12:26 ` Will Deacon 2014-08-20 12:16 ` Kees Cook 2014-08-20 12:16 ` Kees Cook 2014-08-26 14:37 ` Will Deacon 2014-08-26 14:37 ` Will Deacon 2014-08-13 17:06 ` [PATCH v4 3/8] arm: fixmap: implement __set_fixmap() Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-13 17:06 ` [PATCH v4 4/8] arm: use fixmap for text patching when text is RO Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-19 12:29 ` Will Deacon 2014-08-19 12:29 ` Will Deacon 2014-08-20 12:28 ` Kees Cook 2014-08-20 12:28 ` Kees Cook 2014-09-03 21:43 ` Kees Cook 2014-09-03 21:43 ` Kees Cook 2014-09-04 9:27 ` Will Deacon 2014-09-04 9:27 ` Will Deacon 2014-09-04 14:00 ` Kees Cook 2014-09-04 14:00 ` Kees Cook 2014-09-04 14:06 ` Will Deacon 2014-09-04 14:06 ` Will Deacon 2014-08-13 17:06 ` [PATCH v4 5/8] ARM: kexec: Make .text R/W in machine_kexec Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-13 17:06 ` [PATCH v4 6/8] arm: kgdb: Handle read-only text / modules Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-13 17:06 ` [PATCH v4 7/8] ARM: mm: allow non-text sections to be non-executable Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-19 12:33 ` Will Deacon 2014-08-19 12:33 ` Will Deacon 2014-08-20 12:37 ` Kees Cook 2014-08-20 12:37 ` Kees Cook 2014-08-26 14:43 ` Will Deacon 2014-08-26 14:43 ` Will Deacon 2014-08-29 16:04 ` Kees Cook 2014-08-29 16:04 ` Kees Cook 2014-08-31 14:59 ` Rabin Vincent 2014-08-31 14:59 ` Rabin Vincent 2014-08-13 17:06 ` [PATCH v4 8/8] ARM: mm: allow text and rodata sections to be read-only Kees Cook 2014-08-13 17:06 ` Kees Cook 2014-08-19 12:36 ` Will Deacon 2014-08-19 12:36 ` Will Deacon 2014-08-20 12:52 ` Kees Cook 2014-08-20 12:52 ` Kees Cook 2014-08-13 17:38 ` [PATCH v4 0/8] arm: support CONFIG_RODATA Nicolas Pitre 2014-08-13 17:38 ` Nicolas Pitre
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=20140819122653.GH23128@arm.com \ --to=will.deacon@arm.com \ --cc=Catalin.Marinas@arm.com \ --cc=Nikolay.Borisov@arm.com \ --cc=dianders@google.com \ --cc=jason.wessel@windriver.com \ --cc=keescook@chromium.org \ --cc=lauraa@codeaurora.org \ --cc=leif.lindholm@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=msalter@redhat.com \ --cc=nicolas.pitre@linaro.org \ --cc=rabin@rab.in \ --cc=robh@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=sdu.liu@huawei.com \ --cc=t.figa@samsung.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.