From patchwork Wed May 16 23:32:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 10405063 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 2743860155 for ; Wed, 16 May 2018 23:33:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 184C228604 for ; Wed, 16 May 2018 23:33:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C73028671; Wed, 16 May 2018 23:33:28 +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 0542528604 for ; Wed, 16 May 2018 23:33:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F4886B0373; Wed, 16 May 2018 19:33:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 17B106B0375; Wed, 16 May 2018 19:33: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 06AC76B0376; Wed, 16 May 2018 19:33:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f200.google.com (mail-ot0-f200.google.com [74.125.82.200]) by kanga.kvack.org (Postfix) with ESMTP id D0D766B0373 for ; Wed, 16 May 2018 19:33:25 -0400 (EDT) Received: by mail-ot0-f200.google.com with SMTP id n25-v6so2105433otf.13 for ; Wed, 16 May 2018 16:33:25 -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; bh=/+BijJleNJp5wlL61lLCuZbbhG+2sBdk3QzTkUb4U+Q=; b=l6WdjdAOCyXtIjiJgTCvzvkCCKMOWKkdGg5ocLtgxxE3YbWW4Z8VBSMTqpqBtn2M2n BUBFoa2vJBWr6/AlXKfx9iVTE4wLN1T6uRWLM9jnslen7EVVh83nymu3b44ntgwsLzS6 URQKa0xfXvkMPOxgMEbMKa8aIB7rvBwaycQB5F/MwkehZd/6xMWoKrZ3Pqg1unS0rmTu qRZOhynC9jUeDc7xfs5d4zhD1nBNOu56+1gTm5NAPy/XYQpWx2AqCm7xoYxfLcHU2lxy LLR7itfXJ43uuRC86d/V7xovx2VBxXqDt00ovairsr4ksCToBvUG+4toYmweA+NFeKJI F9wA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.241.140.78 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com X-Gm-Message-State: ALKqPwf1WsC4/6b7hj2VK3vhIY1hHYwn+r8Ye3W79XH5OaB+Z6j9dFg1 icS3nVugroiLEPCq+nIMqssz2Gb+pRfU6QvGXNhJOtY1CqjRZzJ+7z/hN6qwosxOH+bv9yZhnWb I9XcI6JcmiH8pyPpVM68TWU187Q+Mn8QUc+C5+sOj1b0r8L4nmksZgozXHYnbU2/DZg== X-Received: by 2002:a9d:719a:: with SMTP id o26-v6mr2435576otj.44.1526513605574; Wed, 16 May 2018 16:33:25 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqrXW/dpWYYw12wFs7mHGU59z6SHl6cSHxVrnzK4xFXnx0mWCbkBOw0BwX1Rgat6Lb1V/gy X-Received: by 2002:a9d:719a:: with SMTP id o26-v6mr2435563otj.44.1526513605015; Wed, 16 May 2018 16:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526513604; cv=none; d=google.com; s=arc-20160816; b=Q+4jOGdEhmtGVgImj1+YxDD+j3yYG+PPKW6Yt2qfwN6r1bn+wf8ozWc28Ih4dgrnQ5 hv/j436/oD+pUGyueWtxd4jsLoUZaiuFGbM6kgMyCN5UT6eYJVwG3EYqWlOcbG+Ehip8 r28VRZLLDBvZPlajVbjLafkOamPxSAFWD4Ej6e6smpqgu45WRJcrR8664YsGsHu891w9 PoXQrNRIfRchY9PmiV+w6GkNbOrnF/Y4BupgDl2SrzWVu2cwTG0ECHt8LeIhedW5mxw3 A6CCiDDmdiXY+f5k8/hXaIYpNzEvMjsRkfINVCiaZOLGGIIFkgTEWzhIWWShk5ONh/7Z C8fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/+BijJleNJp5wlL61lLCuZbbhG+2sBdk3QzTkUb4U+Q=; b=kEKKMNXyN51pL0qrenPUhPsSZ5lLWcC7D2WU2tzEbOd7mHEVKmpQXJhaUbWTh4/BGw InyvXvIN815hPqUATQJ4i2g9nFxHwUcwmmxr7WHAT+Mva5Cu9QmiKTLr7EWZHVJd8kq9 fPx4msQBPFhcKG6PNgPBY1AK6UalD2kwFJ7I1xoewuuruqiVddEowhDeUcutiqpx7+lT 3p0lXmXAE9YTRQQ7w0loY02u8igMam0Oy/JwEFewhPAZdZwq9W4aYK6SRv24M4JnOH08 vzeiP62m3MchxDlCHpJFp1g1tMxB3jK8TXhU65plqB1RXNlefJLtfBPDg8u4+fryuP6U 5YQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.241.140.78 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com. [15.241.140.78]) by mx.google.com with ESMTPS id t2-v6si1345458ott.375.2018.05.16.16.33.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 May 2018 16:33:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.241.140.78 as permitted sender) client-ip=15.241.140.78; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.241.140.78 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id 63659AA; Wed, 16 May 2018 23:33:23 +0000 (UTC) Received: from misato.americas.hpqcorp.net (unknown [10.34.81.122]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 7D6578D1; Wed, 16 May 2018 23:33:20 +0000 (UTC) From: Toshi Kani To: mhocko@suse.com, akpm@linux-foundation.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com Cc: cpandya@codeaurora.org, linux-mm@kvack.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Toshi Kani , Joerg Roedel , stable@vger.kernel.org Subject: [PATCH v3 1/3] x86/mm: disable ioremap free page handling on x86-PAE Date: Wed, 16 May 2018 17:32:05 -0600 Message-Id: <20180516233207.1580-2-toshi.kani@hpe.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180516233207.1580-1-toshi.kani@hpe.com> References: <20180516233207.1580-1-toshi.kani@hpe.com> 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 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 Cc: Andrew Morton Cc: Michal Hocko Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Joerg Roedel Cc: --- arch/x86/mm/pgtable.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index ffc8c13c50e4..3f7180bc5f52 100644 --- 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 */