From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755227AbcEBV6I (ORCPT ); Mon, 2 May 2016 17:58:08 -0400 Received: from mga14.intel.com ([192.55.52.115]:18169 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754953AbcEBV6G (ORCPT ); Mon, 2 May 2016 17:58:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,569,1455004800"; d="scan'208";a="797236880" Subject: Re: [PATCH v2 2/4] x86, boot: PUD VA support for physical mapping (x86_64) To: Thomas Garnier , "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Andy Lutomirski , Dmitry Vyukov , Paolo Bonzini , Dan Williams , Kees Cook , Stephen Smalley , Kefeng Wang , Jonathan Corbet , Matt Fleming , Toshi Kani , Alexander Kuleshov , Alexander Popov , Joerg Roedel , Dave Young , Baoquan He , Mark Salter , Boris Ostrovsky References: <1462225276-106993-1-git-send-email-thgarnie@google.com> <1462225276-106993-3-git-send-email-thgarnie@google.com> Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, gthelen@google.com, kernel-hardening@lists.openwall.com From: Dave Hansen Message-ID: <5727CD69.7040901@linux.intel.com> Date: Mon, 2 May 2016 14:58:01 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1462225276-106993-3-git-send-email-thgarnie@google.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/02/2016 02:41 PM, Thomas Garnier wrote: > Minor change that allows early boot physical mapping of PUD level virtual > addresses. This change prepares usage of different virtual addresses for > KASLR memory randomization. It has no impact on default usage. ... > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 89d9747..6adfbce 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -526,10 +526,10 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end, > { > unsigned long pages = 0, next; > unsigned long last_map_addr = end; > - int i = pud_index(addr); > + int i = pud_index((unsigned long)__va(addr)); > > for (; i < PTRS_PER_PUD; i++, addr = next) { > - pud_t *pud = pud_page + pud_index(addr); > + pud_t *pud = pud_page + pud_index((unsigned long)__va(addr)); > pmd_t *pmd; > pgprot_t prot = PAGE_KERNEL; pud_index() is supposed to take a virtual address. We were passing a physical address in here, and it all just worked because PAGE_OFFSET is PUD-aligned. Now that you are moving PAGE_OFFSET around a bit and not PUD-aligning it, this breaks. Right? Could you spell this out a bit more the changelog?