From patchwork Sun May 27 14:33:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10429421 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 9F96E602CC for ; Sun, 27 May 2018 14:43:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E46828B16 for ; Sun, 27 May 2018 14:43:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 828DC28B80; Sun, 27 May 2018 14:43:29 +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 B520F28B16 for ; Sun, 27 May 2018 14:43:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2F5F6B0008; Sun, 27 May 2018 10:43:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A06C06B000A; Sun, 27 May 2018 10:43:26 -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 91F5B6B000C; Sun, 27 May 2018 10:43:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 5060D6B0008 for ; Sun, 27 May 2018 10:43:26 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id z1-v6so5889817pfh.3 for ; Sun, 27 May 2018 07:43:26 -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=AWerDAeaT0t7IMHhpoFAKnHDjoujmd35ZEvX7G21swk=; b=N9uDHU4edqVDJRUE+BI+sZu5iS13Gh2d+Fyb5pC68AOX9/ZHxkcJFMIEcpBa2QlUVT FSPmPTfaU3LKiIXJVgLB6ZdZ+avD3S3V0itKMH3mmfmdGzJZznSa3u/wWDgi3Ui+TQMB lbSd70DJ1n/6QiAOSZSByOdflNrGcpDZXRiv8Jt2UFkTZ/s1RGamU+z1bC5RkCTZmy/H F20GTdzm2o7BIWy98sF81bRM0qp/m6VtV38dLih90BQom5HqpiSqOL7iYVSenDG7Wkju OQZzkgple2fM53VRZjMcrqSN0AfDm3msn/g/aZIn3eFNnILfwnQYGCYkZXk3QeUbs/3p 8chg== X-Gm-Message-State: ALKqPwc7kdu4Ow4CIykKPRhqmRpAZPy6proIM5FXclGWztqosbHyP5S3 LEHPO07g8ac6wdK7TPVDreWVEP5vZKGY50OAW87ZK0BdNWIogzyOShmDjWG/QAbC7usW/sKTT5S clp0K2g0tML5XQP5QfDwZfcq2dsD70hMWlQMSpJwT3/zsHRLOgZOZi0z8kfVa68E= X-Received: by 2002:a65:43c9:: with SMTP id n9-v6mr1632953pgp.399.1527432205975; Sun, 27 May 2018 07:43:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKnA987UK38oSSInD8KCQmSr2Gm+Ks42CwVug8TBfKXxZXhg3/+lQdstVeEWOwFtt+0Bf7w X-Received: by 2002:a65:43c9:: with SMTP id n9-v6mr1632934pgp.399.1527432205202; Sun, 27 May 2018 07:43:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527432205; cv=none; d=google.com; s=arc-20160816; b=ISSq82yx7Vb9K5imbdSXH9tvRSkA7jlXK853RQO8Z+GrnrlMAw9mWBdE5M9L3QZagd nxexDKqrOT1GuOZQVBCjjcuiwF3Ls0UMYl3HF0yu2iYynF5r6Rt1zcPiduDjZq5yl65W ARO1Dk6hydXqPcYR88L/TjSHqtF4kpN7zFnjrrd5gENifWt1h8T+X5WrrVw05XPwmvoB WEWxInHSh+AYEP0SQKds85zEGCcLK4GcXBdC05yu9nC3b2QPS4Q1gGiBuBACjQ6SpSUc zJ+JXPvmJEqlRzuK/xr0JlwPTjBNv2mBYhhcKuXk//bNt+SkKjtGE2m23PD5vibi/QAJ 6HBw== 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=AWerDAeaT0t7IMHhpoFAKnHDjoujmd35ZEvX7G21swk=; b=JDhv2wdgJNYcjx5HuCwYqPY8k4//npnSYMpVv5op61WW11HC164hEDmjQTYIWDMW6E GtOa8b58JzOL7LfNcVRNEJD/D7ErsLV9HQ57naQ0KriwHoB8L2Wf1m4S0d2chfTk7irx pi350InU8mIvYOMeISIukU7gIVU+X3lGsDnfjvuz6xks09I7Mz7xHAofgTo53yLsrVvq rLQ+7DSX3WpNC8ObZh6/WBHkMJ2VoJxRKAsRVyocU2rBh5Zz3orKJ4fch/1UE0kyq2Cc Sk+ADjVK6zfNJD34foTq8UNGnCsmLG0GhcN/pBKsCSQDI9/fW4tuPx1l85dByNehao06 4ogw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xC13/awk; 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 u22-v6si5323445pfg.62.2018.05.27.07.43.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 May 2018 07:43:25 -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=xC13/awk; 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 5415120872; Sun, 27 May 2018 14:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527432204; bh=iD0fGzKDsT6+ban4NKxN3DnEosxrpNx/AahnyfdS5hw=; h=Subject:To:Cc:From:Date:From; b=xC13/awkfL7LcMYMFkGGwaIrxI5eAiy2zzCK//VcSBs68+Udq8m9i8PHnPTbbXed2 AoKoQrntS8OYm+fnUOnOTtHF5YQt1ZPVoiNQt7/VrJJIC8tpVR60lK3ILqD6AN8X9a J04ijzMMML5wQD59b3t2AdQLWn6PWzhnieg1ruAk= Subject: Patch "x86/pgtable: Don't set huge PUD/PMD on non-leaf entries" has been added to the 4.16-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 16:33:02 +0200 Message-ID: <152743158216039@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.16-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.16 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 16:10:02 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.16/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch queue-4.16/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,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include #include #include @@ -636,6 +637,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( @@ -664,6 +669,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(