Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753103AbdDDIgp (ORCPT ); Tue, 4 Apr 2017 04:36:45 -0400 Received: from terminus.zytor.com ([65.50.211.136]:60047 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075AbdDDIgf (ORCPT ); Tue, 4 Apr 2017 04:36:35 -0400 Date: Tue, 4 Apr 2017 01:29:02 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, akpm@linux-foundation.org, luto@amacapital.net, kirill.shutemov@linux.intel.com, luto@kernel.org, tglx@linutronix.de, hpa@zytor.com, dave.hansen@intel.com, peterz@infradead.org, bp@alien8.de, dvlasenk@redhat.com, mingo@kernel.org Reply-To: kirill.shutemov@linux.intel.com, brgerst@gmail.com, torvalds@linux-foundation.org, akpm@linux-foundation.org, luto@amacapital.net, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, luto@kernel.org, peterz@infradead.org, bp@alien8.de, hpa@zytor.com, dave.hansen@intel.com, tglx@linutronix.de, mingo@kernel.org, dvlasenk@redhat.com In-Reply-To: <20170330080731.65421-3-kirill.shutemov@linux.intel.com> References: <20170330080731.65421-3-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/asm: Remove __VIRTUAL_MASK_SHIFT==47 assert Git-Commit-ID: 361b4b58ec4cf123e12a773909c6454dbd5e6dbc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2084 Lines: 55 Commit-ID: 361b4b58ec4cf123e12a773909c6454dbd5e6dbc Gitweb: http://git.kernel.org/tip/361b4b58ec4cf123e12a773909c6454dbd5e6dbc Author: Kirill A. Shutemov AuthorDate: Thu, 30 Mar 2017 11:07:26 +0300 Committer: Ingo Molnar CommitDate: Tue, 4 Apr 2017 08:22:33 +0200 x86/asm: Remove __VIRTUAL_MASK_SHIFT==47 assert We don't need the assert anymore, as: 17be0aec74fb ("x86/asm/entry/64: Implement better check for canonical addresses") made canonical address checks generic wrt. address width. Signed-off-by: Kirill A. Shutemov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170330080731.65421-3-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 044d18e..f07b4ef 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -265,12 +265,9 @@ return_from_SYSCALL_64: * * If width of "canonical tail" ever becomes variable, this will need * to be updated to remain correct on both old and new CPUs. + * + * Change top 16 bits to be the sign-extension of 47th bit */ - .ifne __VIRTUAL_MASK_SHIFT - 47 - .error "virtual address width changed -- SYSRET checks need update" - .endif - - /* Change top 16 bits to be the sign-extension of 47th bit */ shl $(64 - (__VIRTUAL_MASK_SHIFT+1)), %rcx sar $(64 - (__VIRTUAL_MASK_SHIFT+1)), %rcx