linux-kernel - Re: [PATCH tip v2] x86/mm: Correct fixmap header usage on adaptable MODULES

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJcbSZEgRZ+BVyWHmQ8mVxXmmBNYf7XRHTEByCEvO2TJ8THgpg@mail.gmail.com>
Date:   Tue, 21 Mar 2017 09:01:42 -0700
From:   Thomas Garnier <thgarnie@...gle.com>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H . Peter Anvin" <hpa@...or.com>,
        Andrey Ryabinin <aryabinin@...tuozzo.com>,
        Alexander Potapenko <glider@...gle.com>,
        Dmitry Vyukov <dvyukov@...gle.com>,
        Kees Cook <keescook@...omium.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Dave Hansen <dave.hansen@...ux.intel.com>,
        Borislav Petkov <bp@...e.de>, Hugh Dickins <hughd@...gle.com>,
        Xiao Guangrong <guangrong.xiao@...ux.intel.com>,
        Matthew Wilcox <willy@...ux.intel.com>,
        Boris Ostrovsky <boris.ostrovsky@...cle.com>,
        Andy Lutomirski <luto@...nel.org>,
        Paul Gortmaker <paul.gortmaker@...driver.com>,
        Michal Hocko <mhocko@...e.com>, zijun_hu <zijun_hu@....com>,
        Chris Wilson <chris@...is-wilson.co.uk>,
        "the arch/x86 maintainers" <x86@...nel.org>,
        LKML <linux-kernel@...r.kernel.org>,
        kasan-dev <kasan-dev@...glegroups.com>,
        Linux-MM <linux-mm@...ck.org>,
        Kernel Hardening <kernel-hardening@...ts.openwall.com>,
        Wei Yang <richard.weiyang@...il.com>
Subject: Re: [PATCH tip v2] x86/mm: Correct fixmap header usage on adaptable MODULES_END

On Tue, Mar 21, 2017 at 12:17 AM, Ingo Molnar <mingo@...nel.org> wrote:
>
> * Thomas Garnier <thgarnie@...gle.com> wrote:
>
>> This patch removes fixmap headers on non-x86 code introduced by the
>> adaptable MODULE_END change. It is also removed in the 32-bit pgtable
>> header. Instead, it is added  by default in the pgtable generic header
>> for both architectures.
>>
>> Signed-off-by: Thomas Garnier <thgarnie@...gle.com>
>> ---
>>  arch/x86/include/asm/pgtable.h    | 1 +
>>  arch/x86/include/asm/pgtable_32.h | 1 -
>>  arch/x86/kernel/module.c          | 1 -
>>  arch/x86/mm/dump_pagetables.c     | 1 -
>>  arch/x86/mm/kasan_init_64.c       | 1 -
>>  mm/vmalloc.c                      | 4 ----
>>  6 files changed, 1 insertion(+), 8 deletions(-)
>
> So I already have v1 and there's no explanation about the changes from v1 to v2.
>
> The interdiff between v1 and v2 is below, it only affects x86, presumably it's
> done to simplify the header usage slightly: instead of including fixmap.h in both
> pgtable_32/64.h it's only included in the common pgtable.h file.
>

Correct, simplify the header and explains better.

> That's a sensible cleanup of the original patch and I'd rather not rebase it (as
> tip:x86/mm has other changes as well), so could I've applied the delta cleanup on
> top of the existing changes, with its own changelog.

I understand. Thanks for merging a clean-up version of this patch.

>
> Thanks,
>
>         Ingo
>
> ============>
> diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
> index 84f6ec4d47ec..9f6809545269 100644
> --- a/arch/x86/include/asm/pgtable.h
> +++ b/arch/x86/include/asm/pgtable.h
> @@ -601,6 +601,7 @@ pte_t *populate_extra_pte(unsigned long vaddr);
>  #include <linux/mm_types.h>
>  #include <linux/mmdebug.h>
>  #include <linux/log2.h>
> +#include <asm/fixmap.h>
>
>  static inline int pte_none(pte_t pte)
>  {
> diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
> index fbc73360aea0..bfab55675c16 100644
> --- a/arch/x86/include/asm/pgtable_32.h
> +++ b/arch/x86/include/asm/pgtable_32.h
> @@ -14,7 +14,6 @@
>   */
>  #ifndef __ASSEMBLY__
>  #include <asm/processor.h>
> -#include <asm/fixmap.h>
>  #include <linux/threads.h>
>  #include <asm/paravirt.h>
>
> diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
> index 13709cf74ab6..1a4bc71534d4 100644
> --- a/arch/x86/include/asm/pgtable_64.h
> +++ b/arch/x86/include/asm/pgtable_64.h
> @@ -13,7 +13,6 @@
>  #include <asm/processor.h>
>  #include <linux/bitops.h>
>  #include <linux/threads.h>
> -#include <asm/fixmap.h>
>
>  extern pud_t level3_kernel_pgt[512];
>  extern pud_t level3_ident_pgt[512];
>



-- 
Thomas