Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753844AbbKLH6G (ORCPT ); Thu, 12 Nov 2015 02:58:06 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:34154 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753798AbbKLH6B (ORCPT ); Thu, 12 Nov 2015 02:58:01 -0500 Date: Thu, 12 Nov 2015 09:57:58 +0200 From: "Kirill A. Shutemov" To: Ingo Molnar Cc: Borislav Petkov , "Kirill A. Shutemov" , hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, jgross@suse.com, konrad.wilk@oracle.com, elliott@hpe.com, boris.ostrovsky@oracle.com, Toshi Kani , Linus Torvalds Subject: Re: [PATCH] x86/mm: fix regression with huge pages on PAE Message-ID: <20151112075758.GA20702@node.shutemov.name> References: <1447111090-8526-1-git-send-email-kirill.shutemov@linux.intel.com> <20151110123429.GE19187@pd.tnic> <20151110135303.GA11246@node.shutemov.name> <20151110144648.GG19187@pd.tnic> <20151110150713.GA11956@node.shutemov.name> <20151110170447.GH19187@pd.tnic> <20151111095101.GA22512@pd.tnic> <20151112074854.GA5376@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151112074854.GA5376@gmail.com> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1354 Lines: 38 On Thu, Nov 12, 2015 at 08:48:54AM +0100, Ingo Molnar wrote: > > * Borislav Petkov wrote: > > > --- a/arch/x86/include/asm/pgtable_types.h > > +++ b/arch/x86/include/asm/pgtable_types.h > > @@ -279,17 +279,14 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) > > static inline pudval_t pud_pfn_mask(pud_t pud) > > { > > if (native_pud_val(pud) & _PAGE_PSE) > > - return PUD_PAGE_MASK & PHYSICAL_PAGE_MASK; > > + return ~((1ULL << PUD_SHIFT) - 1) & PHYSICAL_PAGE_MASK; > > else > > return PTE_PFN_MASK; > > } > > > static inline pmdval_t pmd_pfn_mask(pmd_t pmd) > > { > > if (native_pmd_val(pmd) & _PAGE_PSE) > > - return PMD_PAGE_MASK & PHYSICAL_PAGE_MASK; > > + return ~((1ULL << PMD_SHIFT) - 1) & PHYSICAL_PAGE_MASK; > > else > > return PTE_PFN_MASK; > > } > > So instead of uglifying the code, why not fix the real bug: change the > PMD_PAGE_MASK/PUD_PAGE_MASK definitions to be 64-bit everywhere? *PAGE_MASK are usually applied to virtual addresses. I don't think it should anything but 'unsigned long'. This is odd use case really. -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/