From patchwork Thu Aug 16 11:57:18 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: 10567355 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 DB53713B4 for ; Thu, 16 Aug 2018 11:57:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C947E28A71 for ; Thu, 16 Aug 2018 11:57:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB9532AC0B; Thu, 16 Aug 2018 11:57:24 +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 8840428A71 for ; Thu, 16 Aug 2018 11:57:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0F4A6B000A; Thu, 16 Aug 2018 07:57:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ABF1D6B000C; Thu, 16 Aug 2018 07:57:22 -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 9D5EE6B000D; Thu, 16 Aug 2018 07:57:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 54A196B000A for ; Thu, 16 Aug 2018 07:57:22 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id e15-v6so2007035pfi.5 for ; Thu, 16 Aug 2018 04:57:22 -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=cq6ZepA+m/EIW7vgv1bY+fOYJEWn3nyYHQsargkPM7U=; b=I74WA8z85Yguy4r73gFK1xjgycDhVKSuhhiMf0d50DocE0UBXYxtlyJXE1ntMUUyYp pf2F+l6ku2+xI4zos8MNssc32Gso401L0aMBUuMN0TnMpAX+4cUkR0eMGCwNjGVD0FSg Ui3iami8rFMEk6L4JSUiALZZObbewotATKlJs5BZNzkMf41iGyu+Bf69StTVAnq6wrUZ xp/ejpJiyDV0G7ji0t3rL54iF5fFC8+UFJMZRdn2N4uNj2uN01jH2+4oPasMNzUzLWgd LggGE2E9sfaUj2MJbhuicw9tjLnsbX/biqXo2SRb5aDGaPufB6nCwy7U/GPbrqoqfzId 7NQQ== 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: AOUpUlFL2LqOnVGd2SO3g+fSiQ4uj/upV4YtnjjPzEZjryzAb8If6Pon +9xpdkvAWLIILCkOKHydaQgZsjRQ1L1iwOL2prfSX3fO6R3XgNjEbcQw6ilSEEeQZADbEH+iyAg xRyOmdKgXGHv7tYOLA0VWYt0yjh6GCPs+CZub8Nd90xNe6NfS3eAwjtOCBB5v6qRQAA== X-Received: by 2002:a65:5545:: with SMTP id t5-v6mr28945307pgr.157.1534420642000; Thu, 16 Aug 2018 04:57:22 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyPy3x0Jf40GoApSole/k7PHLgmBj/xj4mBf8jIHpXgl+KtNC48RjdrFo0hSX+6p1rlhhQU X-Received: by 2002:a65:5545:: with SMTP id t5-v6mr28945266pgr.157.1534420641368; Thu, 16 Aug 2018 04:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534420641; cv=none; d=google.com; s=arc-20160816; b=apyamdVSEez6CZEty53wtZFz7Jw+k7BdvKTHypS4lA3M/q6YySMmb/fTpunqjR5hQD ynT8Job3bRwefr4z6rZi4ZAQnMZIYNs9OBOUcA2yTa/dxIaPp+ksjMOKFiq33JqQi2c5 0s0IWcMmEWFcEg4/BHbpT3FbHQYi+gzAlBlD0+o9DHtRn2m4vRIariwLa/MC0FzZnffu DPDWyKDy11P1+v+tY0KroXufxSuJS3MkBIY4mZr0mCGVDalljEpI/AoosPuBgfaf0kzb l7NMtkEO+OecFx0uv8JUGuNoLaNGKsk9BMaK2wVTiVSPEAimdrHGx6RCFnKZgDPcV8or JHLQ== 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=cq6ZepA+m/EIW7vgv1bY+fOYJEWn3nyYHQsargkPM7U=; b=k8GeI6MOaf26VjAyckPl187uXHDUieLSctVRIQ83cMsVtf/895dJDE+aWL5TXj0sOx LrVWCJgH6ZzYABJ8Ok3498SYcPq2vWMLWwiGwDS5kVaFs0zTCsFluEdh7q9iIQjKde/3 tXSP6dwQ52Z30z683X8p3zZ5aVbjgbos/UlbQs2GCT6Tl37/LzA5cFLz3qgCYFbb/vpd 7Kzox8w/TkEW703s/0QtplKcq4xkgoH4pSfj44oMPicqFLyd9i1CaoOfDGcY8pTOkePq 7zQkTL1KoA/TAHZa2enxOVWirfiHsYqEhgNJcLn2fTmonPTz25iEd3upEecLTbuvM3Yd IApw== 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 t66-v6si27428344pgt.181.2018.08.16.04.57.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 04:57:21 -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 A8238BAE; Thu, 16 Aug 2018 11:57:20 +0000 (UTC) Subject: Patch "x86/mm: Disable ioremap free page handling on x86-PAE" has been added to the 4.17-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:57:18 +0200 Message-ID: <1534420638227188@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.17-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.17 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.17/x86-mm-disable-ioremap-free-page-handling-on-x86-pae.patch --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -715,6 +715,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. @@ -762,4 +763,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 */