From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751817AbdGRK5o (ORCPT ); Tue, 18 Jul 2017 06:57:44 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57767 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbdGRK5m (ORCPT ); Tue, 18 Jul 2017 06:57:42 -0400 Date: Tue, 18 Jul 2017 03:49:43 -0700 From: tip-bot for Tom Lendacky Message-ID: Cc: lwoodman@redhat.com, corbet@lwn.net, dvyukov@google.com, glider@google.com, hpa@zytor.com, rkrcmar@redhat.com, thomas.lendacky@amd.com, pbonzini@redhat.com, torvalds@linux-foundation.org, aryabinin@virtuozzo.com, dyoung@redhat.com, matt@codeblueprint.co.uk, luto@kernel.org, konrad.wilk@oracle.com, riel@redhat.com, bp@alien8.de, mingo@kernel.org, toshi.kani@hpe.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, arnd@arndb.de, mst@redhat.com, brijesh.singh@amd.com Reply-To: luto@kernel.org, aryabinin@virtuozzo.com, matt@codeblueprint.co.uk, dyoung@redhat.com, thomas.lendacky@amd.com, torvalds@linux-foundation.org, pbonzini@redhat.com, corbet@lwn.net, lwoodman@redhat.com, hpa@zytor.com, rkrcmar@redhat.com, dvyukov@google.com, glider@google.com, brijesh.singh@amd.com, mst@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, arnd@arndb.de, tglx@linutronix.de, toshi.kani@hpe.com, mingo@kernel.org, bp@alien8.de, riel@redhat.com, konrad.wilk@oracle.com In-Reply-To: <88ada7b09c6568c61cd696351eb59fb15a82ce1a.1500319216.git.thomas.lendacky@amd.com> References: <88ada7b09c6568c61cd696351eb59fb15a82ce1a.1500319216.git.thomas.lendacky@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Remove phys_to_virt() usage in ioremap() Git-Commit-ID: 33c2b803edd13487518a2c7d5002d84d7e9c878f 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 Commit-ID: 33c2b803edd13487518a2c7d5002d84d7e9c878f Gitweb: http://git.kernel.org/tip/33c2b803edd13487518a2c7d5002d84d7e9c878f Author: Tom Lendacky AuthorDate: Mon, 17 Jul 2017 16:10:04 -0500 Committer: Ingo Molnar CommitDate: Tue, 18 Jul 2017 11:37:59 +0200 x86/mm: Remove phys_to_virt() usage in ioremap() Currently there is a check if the address being mapped is in the ISA range (is_ISA_range()), and if it is, then phys_to_virt() is used to perform the mapping. When SME is active, the default is to add pagetable mappings with the encryption bit set unless specifically overridden. The resulting pagetable mapping from phys_to_virt() will result in a mapping that has the encryption bit set. With SME, the use of ioremap() is intended to generate pagetable mappings that do not have the encryption bit set through the use of the PAGE_KERNEL_IO protection value. Rather than special case the SME scenario, remove the ISA range check and usage of phys_to_virt() and have ISA range mappings continue through the remaining ioremap() path. Signed-off-by: Tom Lendacky Reviewed-by: Thomas Gleixner Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Brijesh Singh Cc: Dave Young Cc: Dmitry Vyukov Cc: Jonathan Corbet Cc: Konrad Rzeszutek Wilk Cc: Larry Woodman Cc: Linus Torvalds Cc: Matt Fleming Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Radim Krčmář Cc: Rik van Riel Cc: Toshimitsu Kani Cc: kasan-dev@googlegroups.com Cc: kvm@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-efi@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/88ada7b09c6568c61cd696351eb59fb15a82ce1a.1500319216.git.thomas.lendacky@amd.com Signed-off-by: Ingo Molnar --- arch/x86/mm/ioremap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 4c1b5fd..66ddf5e 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -106,12 +106,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, } /* - * Don't remap the low PCI/ISA area, it's always mapped.. - */ - if (is_ISA_range(phys_addr, last_addr)) - return (__force void __iomem *)phys_to_virt(phys_addr); - - /* * Don't allow anybody to remap normal RAM that we're using.. */ pfn = phys_addr >> PAGE_SHIFT; @@ -340,13 +334,17 @@ void iounmap(volatile void __iomem *addr) return; /* - * __ioremap special-cases the PCI/ISA range by not instantiating a - * vm_area and by simply returning an address into the kernel mapping - * of ISA space. So handle that here. + * The PCI/ISA range special-casing was removed from __ioremap() + * so this check, in theory, can be removed. However, there are + * cases where iounmap() is called for addresses not obtained via + * ioremap() (vga16fb for example). Add a warning so that these + * cases can be caught and fixed. */ if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) && - (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) + (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) { + WARN(1, "iounmap() called for ISA range not obtained using ioremap()\n"); return; + } addr = (volatile void __iomem *) (PAGE_MASK & (unsigned long __force)addr);