LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
	Borislav Petkov <bp@suse.de>, Baoquan He <bhe@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jiri Kosina <jkosina@suse.cz>,
	LKML <linux-kernel@vger.kernel.org>,
	"linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>
Subject: Re: [PATCH v3 6/7] x86, boot: Split kernel_ident_mapping_init to another file
Date: Mon, 9 Mar 2015 18:03:04 -0700	[thread overview]
Message-ID: <CAGXu5jLAeqA2+G947SSUGQPRq9Bi4T9qwhMX7_3jbnuOGpH1uA@mail.gmail.com> (raw)
In-Reply-To: <1425766041-6551-7-git-send-email-yinghai@kernel.org>

On Sat, Mar 7, 2015 at 2:07 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> We need to include that in boot::decompress_kernel stage to set new
> ident mapping.
>
> Also add checking for __pa/__va macro definition, as we need to override them
> in boot::decompress_kernel stage.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>

This seems good. :)

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  arch/x86/include/asm/page.h |  5 +++
>  arch/x86/mm/ident_map.c     | 74 +++++++++++++++++++++++++++++++++++++++++++++
>  arch/x86/mm/init_64.c       | 74 +--------------------------------------------
>  3 files changed, 80 insertions(+), 73 deletions(-)
>  create mode 100644 arch/x86/mm/ident_map.c
>
> diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
> index 802dde3..cf8f619 100644
> --- a/arch/x86/include/asm/page.h
> +++ b/arch/x86/include/asm/page.h
> @@ -37,7 +37,10 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
>         alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
>  #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
>
> +#ifndef __pa
>  #define __pa(x)                __phys_addr((unsigned long)(x))
> +#endif
> +
>  #define __pa_nodebug(x)        __phys_addr_nodebug((unsigned long)(x))
>  /* __pa_symbol should be used for C visible symbols.
>     This seems to be the official gcc blessed way to do such arithmetic. */
> @@ -51,7 +54,9 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
>  #define __pa_symbol(x) \
>         __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
>
> +#ifndef __va
>  #define __va(x)                        ((void *)((unsigned long)(x)+PAGE_OFFSET))
> +#endif
>
>  #define __boot_va(x)           __va(x)
>  #define __boot_pa(x)           __pa(x)
> diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c
> new file mode 100644
> index 0000000..751ca92
> --- /dev/null
> +++ b/arch/x86/mm/ident_map.c
> @@ -0,0 +1,74 @@
> +
> +static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
> +                          unsigned long addr, unsigned long end)
> +{
> +       addr &= PMD_MASK;
> +       for (; addr < end; addr += PMD_SIZE) {
> +               pmd_t *pmd = pmd_page + pmd_index(addr);
> +
> +               if (!pmd_present(*pmd))
> +                       set_pmd(pmd, __pmd(addr | pmd_flag));
> +       }
> +}
> +static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
> +                         unsigned long addr, unsigned long end)
> +{
> +       unsigned long next;
> +
> +       for (; addr < end; addr = next) {
> +               pud_t *pud = pud_page + pud_index(addr);
> +               pmd_t *pmd;
> +
> +               next = (addr & PUD_MASK) + PUD_SIZE;
> +               if (next > end)
> +                       next = end;
> +
> +               if (pud_present(*pud)) {
> +                       pmd = pmd_offset(pud, 0);
> +                       ident_pmd_init(info->pmd_flag, pmd, addr, next);
> +                       continue;
> +               }
> +               pmd = (pmd_t *)info->alloc_pgt_page(info->context);
> +               if (!pmd)
> +                       return -ENOMEM;
> +               ident_pmd_init(info->pmd_flag, pmd, addr, next);
> +               set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
> +       }
> +
> +       return 0;
> +}
> +
> +int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
> +                             unsigned long addr, unsigned long end)
> +{
> +       unsigned long next;
> +       int result;
> +       int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
> +
> +       for (; addr < end; addr = next) {
> +               pgd_t *pgd = pgd_page + pgd_index(addr) + off;
> +               pud_t *pud;
> +
> +               next = (addr & PGDIR_MASK) + PGDIR_SIZE;
> +               if (next > end)
> +                       next = end;
> +
> +               if (pgd_present(*pgd)) {
> +                       pud = pud_offset(pgd, 0);
> +                       result = ident_pud_init(info, pud, addr, next);
> +                       if (result)
> +                               return result;
> +                       continue;
> +               }
> +
> +               pud = (pud_t *)info->alloc_pgt_page(info->context);
> +               if (!pud)
> +                       return -ENOMEM;
> +               result = ident_pud_init(info, pud, addr, next);
> +               if (result)
> +                       return result;
> +               set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE));
> +       }
> +
> +       return 0;
> +}
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index 30eb05a..c30efb6 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -56,79 +56,7 @@
>
>  #include "mm_internal.h"
>
> -static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
> -                          unsigned long addr, unsigned long end)
> -{
> -       addr &= PMD_MASK;
> -       for (; addr < end; addr += PMD_SIZE) {
> -               pmd_t *pmd = pmd_page + pmd_index(addr);
> -
> -               if (!pmd_present(*pmd))
> -                       set_pmd(pmd, __pmd(addr | pmd_flag));
> -       }
> -}
> -static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
> -                         unsigned long addr, unsigned long end)
> -{
> -       unsigned long next;
> -
> -       for (; addr < end; addr = next) {
> -               pud_t *pud = pud_page + pud_index(addr);
> -               pmd_t *pmd;
> -
> -               next = (addr & PUD_MASK) + PUD_SIZE;
> -               if (next > end)
> -                       next = end;
> -
> -               if (pud_present(*pud)) {
> -                       pmd = pmd_offset(pud, 0);
> -                       ident_pmd_init(info->pmd_flag, pmd, addr, next);
> -                       continue;
> -               }
> -               pmd = (pmd_t *)info->alloc_pgt_page(info->context);
> -               if (!pmd)
> -                       return -ENOMEM;
> -               ident_pmd_init(info->pmd_flag, pmd, addr, next);
> -               set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
> -       }
> -
> -       return 0;
> -}
> -
> -int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
> -                             unsigned long addr, unsigned long end)
> -{
> -       unsigned long next;
> -       int result;
> -       int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
> -
> -       for (; addr < end; addr = next) {
> -               pgd_t *pgd = pgd_page + pgd_index(addr) + off;
> -               pud_t *pud;
> -
> -               next = (addr & PGDIR_MASK) + PGDIR_SIZE;
> -               if (next > end)
> -                       next = end;
> -
> -               if (pgd_present(*pgd)) {
> -                       pud = pud_offset(pgd, 0);
> -                       result = ident_pud_init(info, pud, addr, next);
> -                       if (result)
> -                               return result;
> -                       continue;
> -               }
> -
> -               pud = (pud_t *)info->alloc_pgt_page(info->context);
> -               if (!pud)
> -                       return -ENOMEM;
> -               result = ident_pud_init(info, pud, addr, next);
> -               if (result)
> -                       return result;
> -               set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE));
> -       }
> -
> -       return 0;
> -}
> +#include "ident_map.c"
>
>  static int __init parse_direct_gbpages_off(char *arg)
>  {
> --
> 1.8.4.5
>



-- 
Kees Cook
Chrome OS Security

  reply	other threads:[~2015-03-10  1:03 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-07 22:07 [PATCH v3 0/7] x86, boot: clean up kasl Yinghai Lu
2015-03-07 22:07 ` [PATCH v3 1/7] x86, kaslr: Use init_size instead of run_size Yinghai Lu
2015-03-09 12:49   ` Borislav Petkov
2015-03-09 15:58     ` Ingo Molnar
2015-03-09 15:58       ` Borislav Petkov
2015-03-09 19:35     ` Yinghai Lu
2015-03-09 20:00       ` Borislav Petkov
2015-03-09 20:06         ` Yinghai Lu
2015-03-09 20:18           ` Borislav Petkov
2015-03-09 21:28             ` Yinghai Lu
2015-03-10  0:42   ` Kees Cook
2015-03-13 12:27   ` Ingo Molnar
2015-03-14  2:47     ` Yinghai Lu
2015-03-14  7:53       ` Ingo Molnar
2015-03-14  9:59         ` Borislav Petkov
2015-03-16 10:06           ` [PATCH] Revert "x86/mm/ASLR: Propagate base load address calculation" Borislav Petkov
2015-03-16 12:11             ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2015-03-16 19:32               ` Yinghai Lu
2015-03-16 13:56             ` [PATCH] " Jiri Kosina
2015-03-16 19:15               ` Yinghai Lu
2015-03-17  8:14                 ` Ingo Molnar
2015-03-07 22:07 ` [PATCH v3 2/7] x86, boot: Move ZO to end of buffer Yinghai Lu
2015-03-10  0:54   ` Kees Cook
2015-03-10  1:04     ` Yinghai Lu
2015-03-10  5:59     ` Borislav Petkov
2015-03-10  8:00   ` Borislav Petkov
2015-03-10  9:34     ` Jiri Kosina
2015-03-10  9:35       ` Borislav Petkov
2015-03-10 15:11     ` Yinghai Lu
2015-03-10 15:13       ` Borislav Petkov
2015-03-10 16:59     ` Kees Cook
2015-03-07 22:07 ` [PATCH v3 3/7] x86, boot: Don't overlap VO with ZO data Yinghai Lu
2015-03-10  9:34   ` Borislav Petkov
2015-03-10 15:05     ` Yinghai Lu
2015-03-10 15:10       ` Borislav Petkov
2015-03-10 15:17         ` Yinghai Lu
2015-03-10 15:21           ` Borislav Petkov
2015-03-10 15:42             ` Yinghai Lu
2015-03-10 15:48               ` Borislav Petkov
2015-03-10 19:29                 ` Yinghai Lu
2015-03-07 22:07 ` [PATCH v3 4/7] x86, kaslr: Access the correct kaslr_enabled variable Yinghai Lu
2015-03-10  0:55   ` Kees Cook
2015-03-07 22:07 ` [PATCH v3 5/7] x86, kaslr: Consolidate mem_avoid array filling Yinghai Lu
2015-03-10  1:00   ` Kees Cook
2015-03-10  1:10     ` Yinghai Lu
2015-03-10  1:26       ` Kees Cook
2015-03-07 22:07 ` [PATCH v3 6/7] x86, boot: Split kernel_ident_mapping_init to another file Yinghai Lu
2015-03-10  1:03   ` Kees Cook [this message]
2015-03-07 22:07 ` [PATCH v3 7/7] x86, kaslr, 64bit: Set new or extra ident_mapping Yinghai Lu
2015-03-10  1:09   ` Kees Cook
2015-03-10  1:14     ` Yinghai Lu
2015-03-10  6:54       ` Yinghai Lu
2015-03-10  0:39 ` [PATCH v3 0/7] x86, boot: clean up kasl Kees Cook
2015-03-10  0:54   ` Yinghai Lu

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=CAGXu5jLAeqA2+G947SSUGQPRq9Bi4T9qwhMX7_3jbnuOGpH1uA@mail.gmail.com \
    --to=keescook@chromium.org \
    --cc=bhe@redhat.com \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=jkosina@suse.cz \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.fleming@intel.com \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=yinghai@kernel.org \
    --subject='Re: [PATCH v3 6/7] x86, boot: Split kernel_ident_mapping_init to another file' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).