From patchwork Sun May 27 15:59:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10429493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ECF260249 for ; Sun, 27 May 2018 16:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E44728B78 for ; Sun, 27 May 2018 16:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40EB028BC0; Sun, 27 May 2018 16:21:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F0E128B78 for ; Sun, 27 May 2018 16:21:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D68866B0006; Sun, 27 May 2018 12:21:51 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D182A6B0007; Sun, 27 May 2018 12:21:51 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBAB96B0008; Sun, 27 May 2018 12:21:51 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 77C766B0006 for ; Sun, 27 May 2018 12:21:51 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id c3-v6so4928139plz.7 for ; Sun, 27 May 2018 09:21:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:to:cc:from:date :message-id:mime-version:content-transfer-encoding; bh=5+hBlyEu2w0Z6LFKbFCFGn44ctoPwF2DLWjNAkvJtOM=; b=QxL4vOkIfsuRmRcFb5Iwz5jlrMuFRMJ4zdhdTmatHLXcyM16iXB69tgdhab0L6v89o aOWuWnzUJm2Cdzc1gafaBNi1tJQSUmv+72kNgXs4lAj0asZTVgH+9RnzJ4eaE0juxMQY n3FG4H7yzHCxBP3tPvU6I0gAyb17nkcEJZQNnSjYqWAU+oECsb9Rxc7lgO3YsgmBSvF/ wgNACkvFiGmSf9L3SD0S19+DXEoIRqWz10n/fSy4OCumCoAnwYQSAjI9EEmaMesgmbfT vyis/yljDOlQTW4P4wbyfVAvk27oMTf8+hw1hCsi6DzH19H8Gygr+WdwMy66HSLoc4J4 8s4w== X-Gm-Message-State: ALKqPwda2JXFBgP/A/QiVfgcfjeSI2ktofmDNwzFQ5GTh/XglcBwz21u VsjwDhCFFRjvm1TEDQesbY5Jp/oNM7QbYDG1s1nSbPk7BIU+jZ+kyf4L199HY7YzhyYWSSmUph/ nwqaKEp/tmuFU9rbkS4n7iz/mJkYaGl5OX2DtlSgrZQpLYEElgPeo8CAcV1AKj54= X-Received: by 2002:a62:4b16:: with SMTP id y22-v6mr10273239pfa.29.1527438111142; Sun, 27 May 2018 09:21:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoen3hW5AIsRAmPL9GrbhZxMHe3VPk/8HL3HPZE98IfHJbWGI15Kl8X7/W5s8DqksKVQJLv X-Received: by 2002:a62:4b16:: with SMTP id y22-v6mr10273199pfa.29.1527438110262; Sun, 27 May 2018 09:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527438110; cv=none; d=google.com; s=arc-20160816; b=NDpU66JT+J6lkNf4OWPGnQoNIa9k943Yjw2nqv8rtpUqwgum4VF94ea7xS5kk0Wq9S 4tyozKnPL8tOXBi82Dw0LCwrhO5blWOUQT+0ZzSMWESqBE83PsqsrZ+6mQYc3Vr2pawi h1rfxbwMXptoiKrVq647eLOUjfnES7DE/2IZI+5sEllx4JU8sLP6boRMhcLkOuOBf8FC hCUg04tqjPXMQggxEPvuPPo1zpCYWy+T22bHaH+vwAKkleh1teyLP+RwqoKQO9BdEdDq +/WiZaTJdGaqS6JSVUPStHB8N8a7981PkTmm6gK3JlF7ag97Mr2WX+i6WcMPAZzG/8F9 nCew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:from:cc:to :subject:dkim-signature:arc-authentication-results; bh=5+hBlyEu2w0Z6LFKbFCFGn44ctoPwF2DLWjNAkvJtOM=; b=ln5r3UyruD3eVJt8J6xSQ9/nBw+7ycPGQgyzfv/VfeS4qSpgiz3kAPat/IswtSRkMz uxLSJWymmxO2jy2PMM1R+YWByTqGS9u50hPnpqWZ3ykmBLm79lr5RqOQGgxQCrasv5Bt twAYQBfrfp0D+EBRdxUWnzp+HCunB0Yxcinb3BSJFdy0ofAjW5W5Xk6LkTzjYDICJako IvoyP+GNcjI+mgDemKAqvrtNtxtIP7RmOarDfBM3+FXi2jdS5Cd+4HuAv/CstSs1LRbf ObqS7rfElw2cTZwJakY4nqYfBOmax6FWQKVwZ3XBVHicA3O/cpFVeSxAn/bZJ1THBy+T xuog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dBB6GvJe; spf=pass (google.com: domain of srs0=ri55=io=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=rI55=IO=linuxfoundation.org=gregkh@kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id 31-v6si15373312plj.216.2018.05.27.09.21.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 May 2018 09:21:50 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=ri55=io=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dBB6GvJe; spf=pass (google.com: domain of srs0=ri55=io=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=rI55=IO=linuxfoundation.org=gregkh@kernel.org Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A93B208AC; Sun, 27 May 2018 16:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527438109; bh=TYJgfCGf7f7a1CDzwcOSraCQ72fEHMLaQUehY8Cht/s=; h=Subject:To:Cc:From:Date:From; b=dBB6GvJeurhOqxJ7kL588GW3shX/nbxKBXRiZrVhZQoBGDAaslsgJF2O6k/y6JcLQ ojyFRIFi49eBXQI+6pG4qjK4mNyDps1kDRw2XFiiQmmIa6eNDOOli6y+6AjAKD+EP9 NU7yG0HGU+dklFzRA/zGDFfw889tTY+5a3d0/AU0= Subject: Patch "x86/pgtable: Don't set huge PUD/PMD on non-leaf entries" has been added to the 4.9-stable tree To: 20180411152437.GC15462@8bytes.org, David.Laight@aculab.com, aarcange@redhat.com, alexander.levin@microsoft.com, aliguori@amazon.com, boris.ostrovsky@oracle.com, bp@alien8.de, brgerst@gmail.com, daniel.gruss@iaik.tugraz.at, dave.hansen@intel.com, dhgutteridge@sympatico.ca, dvlasenk@redhat.com, eduval@amazon.com, gregkh@linuxfoundation.org, hughd@google.com, jgross@suse.com, jkosina@suse.cz, joro@8bytes.org, jpoimboe@redhat.com, jroedel@suse.de, keescook@google.com, linux-mm@kvack.org, llong@redhat.com, luto@kernel.org, mingo@kernel.org, pavel@ucw.cz, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, will.deacon@arm.com Cc: From: Date: Sun, 27 May 2018 17:59:57 +0200 Message-ID: <1527436797198115@kroah.com> MIME-Version: 1.0 X-stable: commit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I've just added the patch titled x86/pgtable: Don't set huge PUD/PMD on non-leaf entries to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-pgtable-don-t-set-huge-pud-pmd-on-non-leaf-entries.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Sun May 27 17:33:38 CEST 2018 From: Joerg Roedel Date: Wed, 11 Apr 2018 17:24:38 +0200 Subject: x86/pgtable: Don't set huge PUD/PMD on non-leaf entries From: Joerg Roedel [ Upstream commit e3e288121408c3abeed5af60b87b95c847143845 ] The pmd_set_huge() and pud_set_huge() functions are used from the generic ioremap() code to establish large mappings where this is possible. But the generic ioremap() code does not check whether the PMD/PUD entries are already populated with a non-leaf entry, so that any page-table pages these entries point to will be lost. Further, on x86-32 with SHARED_KERNEL_PMD=0, this causes a BUG_ON() in vmalloc_sync_one() when PMD entries are synced from swapper_pg_dir to the current page-table. This happens because the PMD entry from swapper_pg_dir was promoted to a huge-page entry while the current PGD still contains the non-leaf entry. Because both entries are present and point to a different page, the BUG_ON() triggers. This was actually triggered with pti-x32 enabled in a KVM virtual machine by the graphics driver. A real and better fix for that would be to improve the page-table handling in the generic ioremap() code. But that is out-of-scope for this patch-set and left for later work. Reported-by: David H. Gutteridge Signed-off-by: Joerg Roedel Reviewed-by: Thomas Gleixner Cc: Andrea Arcangeli Cc: Andy Lutomirski Cc: Boris Ostrovsky Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: David Laight Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: Greg KH Cc: Jiri Kosina Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Pavel Machek Cc: Peter Zijlstra Cc: Waiman Long Cc: Will Deacon Cc: aliguori@amazon.com Cc: daniel.gruss@iaik.tugraz.at Cc: hughd@google.com Cc: keescook@google.com Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180411152437.GC15462@8bytes.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/pgtable.c | 9 +++++++++ 1 file changed, 9 insertions(+) Patches currently in stable-queue which might be from joro@8bytes.org are queue-4.9/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch queue-4.9/x86-pgtable-don-t-set-huge-pud-pmd-on-non-leaf-entries.patch --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -577,6 +578,10 @@ int pud_set_huge(pud_t *pud, phys_addr_t (mtrr != MTRR_TYPE_WRBACK)) return 0; + /* Bail out if we are we on a populated non-leaf entry: */ + if (pud_present(*pud) && !pud_huge(*pud)) + return 0; + prot = pgprot_4k_2_large(prot); set_pte((pte_t *)pud, pfn_pte( @@ -605,6 +610,10 @@ int pmd_set_huge(pmd_t *pmd, phys_addr_t return 0; } + /* Bail out if we are we on a populated non-leaf entry: */ + if (pmd_present(*pmd) && !pmd_huge(*pmd)) + return 0; + prot = pgprot_4k_2_large(prot); set_pte((pte_t *)pmd, pfn_pte(