From patchwork Thu Aug 16 18:41:56 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: 10567999 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 7267C109C for ; Thu, 16 Aug 2018 18:44:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 757CD28742 for ; Thu, 16 Aug 2018 18:44:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68D1128B2B; Thu, 16 Aug 2018 18:44:35 +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 DD33528742 for ; Thu, 16 Aug 2018 18:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D120C6B031C; Thu, 16 Aug 2018 14:44:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CC0036B031D; Thu, 16 Aug 2018 14:44:33 -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 B89256B031E; Thu, 16 Aug 2018 14:44:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 734E76B031C for ; Thu, 16 Aug 2018 14:44:33 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id w18-v6so3283532plp.3 for ; Thu, 16 Aug 2018 11:44:33 -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:from:to:cc :subject:date:message-id:in-reply-to:references:user-agent :mime-version; bh=KZ+J2/Qiz/EtMRDSgBYVsgv2k8W0nkRKIWF+YW2Vzsg=; b=TQUinQGAwZIeNSYgqS9Zx01sQVX3ub/wHfgcvJY6u/exT67PuSAHdnXlOjg7bnX/wD zkEmMLqV065P/5A03GkcjdF9PI3JNum2VkYMcvQ4Om//8BisGqsID8MePQH61ChfSkOs kb9P1eeH0LQJGNnAYKHK934VTbvvyJpQqj6rx/rdwlCnCYEBh0ra4W8AzRkYPNGMOu3i AK1pZkgHGh+pzxfF2SjEp0x/1/TKsYj6aglirEr8onu3HD27Rln1bsF1TMVhQCD7k2HS sv+VWeShkyX+h8AzoCpJEZhlJTtFF7J/9LwdHILvF5nh8qbPrXzDJXQmMxJcx8tDiaRZ S2Bg== 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: AOUpUlHrJWegkxNRClp1Tt0Hzq49rmqe9+q+VphSnHw+HjGJqFEbNnSt flqLzqmADLpgoh1M7QdZfoKKDsQEMCxjVQHEAUTBnJDrHt2AdkusCZaXSSAbqu8ak0pqDoS/pMC Jr0LHRGWaROu1bh3GrBLShi9LljrdZBtjm2ivJXJ7q29RCZr4Cb+L4pa4c0fCBK0IQQ== X-Received: by 2002:a17:902:2006:: with SMTP id n6-v6mr29879975pla.325.1534445073161; Thu, 16 Aug 2018 11:44:33 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy3Dn1CpEpiXZs+80D9K+Em8j9gtYh7rATga4FOro8sjHPZ4hKdg0cyt1Y3LxVUGjjBx7Kf X-Received: by 2002:a17:902:2006:: with SMTP id n6-v6mr29879952pla.325.1534445072611; Thu, 16 Aug 2018 11:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534445072; cv=none; d=google.com; s=arc-20160816; b=UFbqjLCJ1PPBrBI2xTzVpAlGiu3hCjTdVCWHC1qfcZDn1Gn3kwIkmdiZfEF0A4IIsR LlJleDG1QP5RUSfOZTqWq0bacYfkoaKoF0UP8IUzxyL+UT5kvVfW2TldAnvXzLipIuCX zrC6MyQnymvWu8QKFcfwrvQ7PnqESxgK4Li1tDoLmVll8unOGw6z83FMlyustnq/4+10 IOtGEeW4oDG85whxdNWiUIGnD5oeXE39U+kEVmoDrPYrZlWZKdP7y687isBy35syn9z4 tDJE1zymfamAZrA4FsSq2N239M6SKjVM5y8VCXcB6f7GGlHRk3wMaVa5Wbd49iO9UqVL BODw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=KZ+J2/Qiz/EtMRDSgBYVsgv2k8W0nkRKIWF+YW2Vzsg=; b=GEt5ti7h1DLiqyaUCs6IIokj9Fbd+N4H8YmvkgQuaDcLDF5NhXJqfaysLCOLep+w/B u/HVEVP75zGcS2ZwvaZI3H53ebyrf4TNd2MzFagfE+Uocg/rNp6hZeLqbR0uZdlcacSa O/TMgS84GNHuXhYyDbB48atrbticcTc994hDnOUThxBklyYLNbeBIt0h8gws8G88HYt9 FpscDWAQJ7E/0TnyCu/iAcHbaFJS4NS6LVwWS3LYTRVCfJ7lKdiOmcBdPbQo2NH4d2rL +S26ja5awy0upfTL/Cn2ExplXYTQNrxb9kiYAWKg7dyIsQyeXC2bvOtnsyanKvwF0vJY pukg== 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 y23-v6si43734pll.224.2018.08.16.11.44.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 11:44:32 -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 B7EA6CEB; Thu, 16 Aug 2018 18:44:31 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joerg Roedel , Toshi Kani , Thomas Gleixner , mhocko@suse.com, akpm@linux-foundation.org, hpa@zytor.com, cpandya@codeaurora.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4.9 03/15] x86/mm: Disable ioremap free page handling on x86-PAE Date: Thu, 16 Aug 2018 20:41:56 +0200 Message-Id: <20180816171626.039847305@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180816171625.340082081@linuxfoundation.org> References: <20180816171625.340082081@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ 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(+) --- 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 */