From patchwork Mon Nov 26 17:07:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 10698787 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 D86C313AD for ; Mon, 26 Nov 2018 17:07:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2431286B6 for ; Mon, 26 Nov 2018 17:07:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3BCE2896F; Mon, 26 Nov 2018 17:07:34 +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 29287286B6 for ; Mon, 26 Nov 2018 17:07:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AC7D6B42C9; Mon, 26 Nov 2018 12:07:33 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 15A3D6B42CA; Mon, 26 Nov 2018 12:07:33 -0500 (EST) 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 F175E6B42CB; Mon, 26 Nov 2018 12:07:32 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by kanga.kvack.org (Postfix) with ESMTP id C37BA6B42C9 for ; Mon, 26 Nov 2018 12:07:32 -0500 (EST) Received: by mail-ot1-f70.google.com with SMTP id t13so6694613otk.4 for ; Mon, 26 Nov 2018 09:07:32 -0800 (PST) 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=Ka6oXZu8DJRXSCZkb2TermywvttDv1cohIKM9nr4o2s=; b=UwvA2fDusmuOLgmwSK2WqVT36zVRPOKyyfzBpXo94V9AwfIai+bsc010d65WjZba1h egWiMfCBKLYX5hCXI0mYZ5pCxtoPBhaW2PRvpFE9iI4DJZCUNWkuBKcqnuJRfSFYth/T X07UoSwa6nc2gxrgqrvMCf8BNZiPk50b+OWcszso947/ChknLDWEdQ+aXQRd3JCCheAv DSUOqfE92UBMPNZTxVUjBktQOPJjEfT5xfgtrzY42SPDZJuMklcF27rXsYgKwvCTTCcu EgYGgYl/ONB/BSRsrni2WMtrMZKxJI1ZONtRuy5mJrmrFUEZYtZScu/TUXGOVY883qu3 3GgQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of will.deacon@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=will.deacon@arm.com X-Gm-Message-State: AGRZ1gLqXkTaMsd0IY7mE+mM4hcrzwgJaZcjPMy5FdqNign2cwOVdk8s RBszdhQ/oDtiNLKonegB8+yUmVHvbAz2/SR8G3kp7fJ3rPgf67TttzflnIkPjif5CIh7qfeqZ94 J9Owe3Www1JuRw6os0ptBC4CXb+0/tjoxPv2nKoiGq2sbV26T7yPdhDcW+JIegzo/HA== X-Received: by 2002:aca:6a02:: with SMTP id f2mr16624825oic.260.1543252052487; Mon, 26 Nov 2018 09:07:32 -0800 (PST) X-Google-Smtp-Source: AJdET5e77e1pBAhRSXm91adOJtXnZ80XE2pBnCMXVMfh2QFm5dyPNWmk/FxZiV6gSqaavh317jgb X-Received: by 2002:aca:6a02:: with SMTP id f2mr16624779oic.260.1543252051607; Mon, 26 Nov 2018 09:07:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543252051; cv=none; d=google.com; s=arc-20160816; b=MYr4+K1GnOXI3Uv6hYcpUBZtwL6szGNjW1wqEJLbolbtWoh8h5QOmjHjdsdx+/TH/f Lu49IK8CdoMb88iqsPe7GO0tcsuAbGHQlrIBnuRvSCsR6MWTiefsDY6D0HP5xQXm4E1a urYiZwNqyJ/7YV4SD+NNhevzEh0qqxZfVlFFJ7ctBxNumxP0dFrdr4Jh4xEYhpVNB7U3 hZ6F6BbNyNjiBvLXTXGfR623uhk+WU6TS8kalRdSFzBp8N71Vp3DP3fROuO2aUZcLwkT P5Jt6oWdLNOeI2AhZwwoB+bK6HUnFqnhWezNeM9NxbEPjvXvCnD12YKizbAShTO0OFY0 p3nA== 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; bh=Ka6oXZu8DJRXSCZkb2TermywvttDv1cohIKM9nr4o2s=; b=SDsHhL7xSIGkWDPvOGwyYFKgSq/g2ehUpeqD5+apbh3n752QJP+joaUSi2r+83fzW8 Zh3LU1IZZrHCQRRir8KTql4gdKYZkcgpAbvRbBqOf+Q5stOoA0VJvFa/Kqz01ck1FrqW Z6sT9+rHJfqYAd0rjD7zUN876CB+LttBByMSNeR+gqHPOrkIkDtfcR4mXc/o5QO7xHRk SIqwvY+ncC+v1yQNzKIbOAWo0ehUQJUNOr1eodiMls1D1eRPRcLaM3PiwGlIV2GmAnk1 X7JqODWwzVoRCiNTU503DA3ZAfDNfH3BHEieNKAUms8QEevr+d6bDCRqV3c9V+RLlqUd H5+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of will.deacon@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=will.deacon@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id 4si345997ote.30.2018.11.26.09.07.31 for ; Mon, 26 Nov 2018 09:07:31 -0800 (PST) Received-SPF: pass (google.com: domain of will.deacon@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of will.deacon@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=will.deacon@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA76115AD; Mon, 26 Nov 2018 09:07:30 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9A9353F71D; Mon, 26 Nov 2018 09:07:30 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 178121AE0776; Mon, 26 Nov 2018 17:07:48 +0000 (GMT) From: Will Deacon To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: cpandya@codeaurora.org, toshi.kani@hpe.com, tglx@linutronix.de, mhocko@suse.com, akpm@linux-foundation.org, sean.j.christopherson@intel.com, Will Deacon Subject: [PATCH v4 1/5] ioremap: Rework pXd_free_pYd_page() API Date: Mon, 26 Nov 2018 17:07:43 +0000 Message-Id: <1543252067-30831-2-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1543252067-30831-1-git-send-email-will.deacon@arm.com> References: <1543252067-30831-1-git-send-email-will.deacon@arm.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 The recently merged API for ensuring break-before-make on page-table entries when installing huge mappings in the vmalloc/ioremap region is fairly counter-intuitive, resulting in the arch freeing functions (e.g. pmd_free_pte_page()) being called even on entries that aren't present. This resulted in a minor bug in the arm64 implementation, giving rise to spurious VM_WARN messages. This patch moves the pXd_present() checks out into the core code, refactoring the callsites at the same time so that we avoid the complex conjunctions when determining whether or not we can put down a huge mapping. Cc: Chintan Pandya Cc: Toshi Kani Cc: Thomas Gleixner Cc: Michal Hocko Cc: Andrew Morton Suggested-by: Linus Torvalds Reviewed-by: Toshi Kani Signed-off-by: Will Deacon --- lib/ioremap.c | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/lib/ioremap.c b/lib/ioremap.c index 517f5853ffed..6c72764af19c 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -76,6 +76,25 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, return 0; } +static int ioremap_try_huge_pmd(pmd_t *pmd, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, + pgprot_t prot) +{ + if (!ioremap_pmd_enabled()) + return 0; + + if ((end - addr) != PMD_SIZE) + return 0; + + if (!IS_ALIGNED(phys_addr, PMD_SIZE)) + return 0; + + if (pmd_present(*pmd) && !pmd_free_pte_page(pmd, addr)) + return 0; + + return pmd_set_huge(pmd, phys_addr, prot); +} + static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { @@ -89,13 +108,8 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, do { next = pmd_addr_end(addr, end); - if (ioremap_pmd_enabled() && - ((next - addr) == PMD_SIZE) && - IS_ALIGNED(phys_addr + addr, PMD_SIZE) && - pmd_free_pte_page(pmd, addr)) { - if (pmd_set_huge(pmd, phys_addr + addr, prot)) - continue; - } + if (ioremap_try_huge_pmd(pmd, addr, next, phys_addr + addr, prot)) + continue; if (ioremap_pte_range(pmd, addr, next, phys_addr + addr, prot)) return -ENOMEM; @@ -103,6 +117,25 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, return 0; } +static int ioremap_try_huge_pud(pud_t *pud, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, + pgprot_t prot) +{ + if (!ioremap_pud_enabled()) + return 0; + + if ((end - addr) != PUD_SIZE) + return 0; + + if (!IS_ALIGNED(phys_addr, PUD_SIZE)) + return 0; + + if (pud_present(*pud) && !pud_free_pmd_page(pud, addr)) + return 0; + + return pud_set_huge(pud, phys_addr, prot); +} + static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { @@ -116,13 +149,8 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, do { next = pud_addr_end(addr, end); - if (ioremap_pud_enabled() && - ((next - addr) == PUD_SIZE) && - IS_ALIGNED(phys_addr + addr, PUD_SIZE) && - pud_free_pmd_page(pud, addr)) { - if (pud_set_huge(pud, phys_addr + addr, prot)) - continue; - } + if (ioremap_try_huge_pud(pud, addr, next, phys_addr + addr, prot)) + continue; if (ioremap_pmd_range(pud, addr, next, phys_addr + addr, prot)) return -ENOMEM;