From patchwork Thu Aug 16 11:58:05 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: 10567369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90EC5109C for ; Thu, 16 Aug 2018 11:58:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DC192A5C8 for ; Thu, 16 Aug 2018 11:58:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71B662A803; Thu, 16 Aug 2018 11:58:12 +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,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 2BBCC2A5EA for ; Thu, 16 Aug 2018 11:58:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51D136B0269; Thu, 16 Aug 2018 07:58:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4CAC06B026A; Thu, 16 Aug 2018 07:58:10 -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 3BA366B026B; Thu, 16 Aug 2018 07:58:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id EF8916B0269 for ; Thu, 16 Aug 2018 07:58:09 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id a23-v6so1971753pfo.23 for ; Thu, 16 Aug 2018 04:58:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to:cc :from:date:message-id:mime-version:content-transfer-encoding; bh=gP9yD71E/eiaR3x9Lw7Mm52nWjw+kckzu2HG5YiLRNY=; b=CRmbgLHRXS91KpkMB3O9MgoJI8G1GWMwGdOjktWfYhZd9MBLzIpI317TzINsO+WIzY xL3qkx9EjkNFMRAxGPmhrzTdwKZ3N7cyOWK78ZF5x/EX2yptJqmB3wotJMVzwC4dKrU8 Zthx6FT2OlI/IzpbtrCjWXx8/9p1UF4u3+yefDAu+K3dCoGbi6mFVAYVVauZEPLD8OG9 vY53WCa6ZxOGYkEkXC3JCgP8e0qtGwL1k+/Y9G5jZk/HHf6gTWaiBwwGmlHkSYWO1TR2 RNoU/GnLSsQ7iqa3VUqblyTAggYGR1XLfvw/IcmFKIGIqyUMfewV9eSO91XEF6vaBk5z Z4lw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Gm-Message-State: AOUpUlHfoWJhebvOr8nE3MC5lSOWgRSIYok6nD5ToFGrztTnMFMw8Iqm znln1TpjTEkrC97bfHp9MyGUVZY8G6TvOiAW/OIleCIdf8b/UKeucjWLzD5XsD4AntvCQ/GYIva fo1d1bMqzGjIqemI6beiX3fTdak4e3xqFs84+zzKbRSTlLrSUwypEnEdSFZVbyS+xcQ== X-Received: by 2002:a17:902:20e9:: with SMTP id v38-v6mr28890907plg.107.1534420689660; Thu, 16 Aug 2018 04:58:09 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwZm/Mifc7lbeoy0IJPIWtVgxXLon/aXapNG0liGdTqZB/ut1f3JhYuHREzhaZoazMu1IAr X-Received: by 2002:a17:902:20e9:: with SMTP id v38-v6mr28890876plg.107.1534420689010; Thu, 16 Aug 2018 04:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534420688; cv=none; d=google.com; s=arc-20160816; b=yerEKmFKcb0uz7SUqo8XRuU1w7WOt5FbeqoDfeLyB0aWYGJjdv4pthK8S3DRjyF8JU /RZNo4nxe3uHT0X8HyeJVk5ATaKMTySOK3jW22VhV5PkNDc0pYgGS83YhQBDPEenD34p wM+eQrIvFBqOhZYO32yQKDsUPJ1cL2NPji6qUYBs1NgCqDUpSHDIZNnQVP/dS9ycylZ9 2xAFVX2oHHiyXd1ykpx2H3nhhpWtbH1oobBv5ViRxGz7SDHjPmGi0deK1UHh4pnbLFJu ulmZlneAp44t1EFj1PaMoajTy772M6FiyX9Pg6KXHd/3fXtYuCulZDlZdM8WJ4fyH6+z 1Hjw== 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:arc-authentication-results; bh=gP9yD71E/eiaR3x9Lw7Mm52nWjw+kckzu2HG5YiLRNY=; b=KrayFNILhygv/kXN4y7WPtW8ooArCdhLPRW/sjYbYFu2SyWzjdtNdTjt8KeNFb/e0H 0waTzpT1YR/vOAHImTRYqS3EGMR1Yea7rgCNiD2Z+fCEcrQvJMkPtWIVQqYgmGP2R29y svNfm4FMlSDfMGzgs3cqUT784WfxELQw6HSwuiJPgdoOsYI1sRZtCwc/M3tY6hA3oERJ dhBHg3HZ1ZZQiCd7QsAM6pVLfikLOQnOQ8MZPpbC9QV9YcEYeNh0+NOtMfzwMbr5NI8l tjlJo7EHl6pGo4Nx7qkvjIvECKeJqxPLO9Ht+5nrNZfxFE13q3Wk8+WqOE926HOM+5iq 5jBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id a13-v6si26214083pgj.495.2018.08.16.04.58.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 04:58:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from localhost (unknown [194.244.16.108]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 59DF0BAE; Thu, 16 Aug 2018 11:58:08 +0000 (UTC) Subject: Patch "x86/mm: Disable ioremap free page handling on x86-PAE" has been added to the 4.9-stable tree To: 20180627141348.21777-2-toshi.kani@hpe.com,akpm@linux-foundation.org,cpandya@codeaurora.org,gregkh@linuxfoundation.org,hpa@zytor.com,joro@8bytes.org,linux-arm-kernel@lists.infradead.org,linux-mm@kvack.org,mhocko@suse.com,tglx@linutronix.de,toshi.kani@hpe.com Cc: From: Date: Thu, 16 Aug 2018 13:58:05 +0200 Message-ID: <1534420685211199@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/mm: Disable ioremap free page handling on x86-PAE 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-mm-disable-ioremap-free-page-handling-on-x86-pae.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 f967db0b9ed44ec3057a28f3b28efc51df51b835 Mon Sep 17 00:00:00 2001 From: Toshi Kani Date: Wed, 27 Jun 2018 08:13:46 -0600 Subject: x86/mm: Disable ioremap free page handling on x86-PAE From: Toshi Kani commit f967db0b9ed44ec3057a28f3b28efc51df51b835 upstream. ioremap() supports pmd mappings on x86-PAE. However, kernel's pmd tables are not shared among processes on x86-PAE. Therefore, any update to sync'd pmd entries need re-syncing. Freeing a pte page also leads to a vmalloc fault and hits the BUG_ON in vmalloc_sync_one(). Disable free page handling on x86-PAE. pud_free_pmd_page() and pmd_free_pte_page() simply return 0 if a given pud/pmd entry is present. This assures that ioremap() does not update sync'd pmd entries at the cost of falling back to pte mappings. Fixes: 28ee90fe6048 ("x86/mm: implement free pmd/pte page interfaces") Reported-by: Joerg Roedel Signed-off-by: Toshi Kani Signed-off-by: Thomas Gleixner Cc: mhocko@suse.com Cc: akpm@linux-foundation.org Cc: hpa@zytor.com Cc: cpandya@codeaurora.org Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: stable@vger.kernel.org Cc: Andrew Morton Cc: Michal Hocko Cc: "H. Peter Anvin" Cc: Link: https://lkml.kernel.org/r/20180627141348.21777-2-toshi.kani@hpe.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/pgtable.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) Patches currently in stable-queue which might be from toshi.kani@hpe.com are queue-4.9/x86-mm-disable-ioremap-free-page-handling-on-x86-pae.patch --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -653,6 +653,7 @@ int pmd_clear_huge(pmd_t *pmd) return 0; } +#ifdef CONFIG_X86_64 /** * pud_free_pmd_page - Clear pud entry and free pmd page. * @pud: Pointer to a PUD. @@ -700,4 +701,22 @@ int pmd_free_pte_page(pmd_t *pmd) return 1; } + +#else /* !CONFIG_X86_64 */ + +int pud_free_pmd_page(pud_t *pud) +{ + return pud_none(*pud); +} + +/* + * Disable free page handling on x86-PAE. This assures that ioremap() + * does not update sync'd pmd entries. See vmalloc_sync_one(). + */ +int pmd_free_pte_page(pmd_t *pmd) +{ + return pmd_none(*pmd); +} + +#endif /* CONFIG_X86_64 */ #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */