From patchwork Thu Aug 16 18:45:23 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: 10568041 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 851195A4 for ; Thu, 16 Aug 2018 18:48:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 832242B7A6 for ; Thu, 16 Aug 2018 18:48:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76A422B80A; Thu, 16 Aug 2018 18:48:57 +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 F09412B7A6 for ; Thu, 16 Aug 2018 18:48:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2F456B0332; Thu, 16 Aug 2018 14:48:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F07546B0333; Thu, 16 Aug 2018 14:48:55 -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 DF69A6B0335; Thu, 16 Aug 2018 14:48:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 9B1BA6B0332 for ; Thu, 16 Aug 2018 14:48:55 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id y16-v6so2383159pgv.23 for ; Thu, 16 Aug 2018 11:48:55 -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=8S7fFVnsAfusdOq+fzIV3V6ki1bJWMUajOirHWuYpnw=; b=oXfk9H0vyxfwNKT+EqUlJxJDdXzQ0F07p8KXSpfvOHVYzX2txYOAR6nHg8T1qrSmUr ArIYqnZnNxrP7Kg9s6jRJIbcEt9QNMEExvqrS20uxGUoCzxZTEKek6BBqjWzNcRHSlRl e2j92nfnQStiCrvcbuJBsTJdL0vWSF2hTh5EB7i/YV+pKR8R0myXvyogKtHE/x3y3dha DpBtz82DKVCLqr9rIOVp/xb9w5LZ51SS7cwj3mak/nWl4I0spzE7/KHDTFhRpoQQ0peL M0v28+3x+6EkUtbVdcC/R3Fc4IFrjNt5NWHPQKbqBRgqgnH8jufvBtDalAo+4S/E6u5h 1DBA== 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: AOUpUlG/QtDisc26BRapKOAQpIi5/bJmSnL33B/IOEC2Bvg+O9oEtfFg B0lb5cm5vHj/W8bbxbhPxWNbbpSiO77qvSdMQC7JOv/G4S2QFIfKhPAjB5Wct4qFQttXK8dgn6m S4OxxvAbiDFT5yp9okFOGWDaYz8fCnCJtpTaDKGUSA+bIjErUlMSoCNoNVP6Ez017rA== X-Received: by 2002:a17:902:a983:: with SMTP id bh3-v6mr30623396plb.245.1534445335330; Thu, 16 Aug 2018 11:48:55 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwiG8Nx8Tw+ynZfffOxa6hFtsd7+yECepxp3BuC31OaSmPIgQNhnH3thfB4a8NoYNtfEoEM X-Received: by 2002:a17:902:a983:: with SMTP id bh3-v6mr30623361plb.245.1534445334666; Thu, 16 Aug 2018 11:48:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534445334; cv=none; d=google.com; s=arc-20160816; b=pnu3Q+NWazrSX2qwQwFXpuufOtgreh1hkJKF4ZPvbrmB/bmgaNYSZL6yaWSZ1sn8Pp duFTuYI6WPEA68Bf8Vmc27IKUEgpeaIfs4Ag7bm8sIUCYNdGQkgnJgJYEWkT6EXxIizp zoTKe6BA9KyPGdeAvBkVn3bSSDmFwqCGr7Jn0FzLl/HCtJEg2dldxu7W90BMsnlP+CVK tCnypG0LVVk+tVPR5zdb5Ed0WRLjuigL15ICrHtEEdG9MvG60ZFLk5xEY/7p9+xzXZJW rWVTmOhnl3ZTfO+9TTBdu9P5FuObNzCRmzvK1lUVBHZWNLIeNlCPDkahBxsmfwHDXDhZ 2FNA== 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=8S7fFVnsAfusdOq+fzIV3V6ki1bJWMUajOirHWuYpnw=; b=zvYOpKCyDR62reSRSkIOyFRC17JqkpG1LF2TGjdd2bYfyCoZ8p8nyQPl6SuqouKMnd xST0MBwT9kjFxQD6LGH0XSD1FRNdSMRega1PeSse5bgHxsVlab3YztpLBhWPr/eNQPHd gdTRD+k4qrDDKdGxdh1HVzGWl6tRcqh6SG45doz6dbFLvu5ve+IgEwSIS7hx+DvcmF6/ nPlj/cWDSXhyOZ/nUTVGgnIJTOFuFvw8Oso/6dN5I7nBTPZS1qwY/9ofNYISf4zRfJLM AsLTrp26y9xJxJWtpdSYJYOPJ3FsaYUfp3Kr3N1hq/NhuFiWUN1nbwGhaXOznKaBD6qo kmUA== 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 o23-v6si58568pgm.170.2018.08.16.11.48.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 11:48:54 -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 C0CAFCB7; Thu, 16 Aug 2018 18:48:53 +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.18 07/22] x86/mm: Disable ioremap free page handling on x86-PAE Date: Thu, 16 Aug 2018 20:45:23 +0200 Message-Id: <20180816171556.786084738@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180816171556.502583508@linuxfoundation.org> References: <20180816171556.502583508@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.18-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 @@ -719,6 +719,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. @@ -766,4 +767,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 */