From patchwork Tue May 15 21:39:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 10402041 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 E7026601C8 for ; Tue, 15 May 2018 21:40:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D54042862D for ; Tue, 15 May 2018 21:40:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA16D2865F; Tue, 15 May 2018 21:40:54 +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 4B5DA2862D for ; Tue, 15 May 2018 21:40:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F8676B02D2; Tue, 15 May 2018 17:40:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 47E2B6B02D3; Tue, 15 May 2018 17:40:52 -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 2D16D6B02D4; Tue, 15 May 2018 17:40:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f70.google.com (mail-pg0-f70.google.com [74.125.83.70]) by kanga.kvack.org (Postfix) with ESMTP id DAABB6B02D2 for ; Tue, 15 May 2018 17:40:51 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id i10-v6so685458pgo.7 for ; Tue, 15 May 2018 14:40:51 -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=IjsY5Gp/oBDmM1mAe12PJJmqWwNDnQzFreLh/j88Wvs=; b=LetnLv3ET8bysp5vhFTJLJMbkzkxeU6sOBuTQZ12amF5CnCSn1gvEvRMYrr+jdD+T2 InyslnlcGll2VHrENpr/muvYS0n40DsZZJOHQhONXaRGb6wCTBCWR2dY7XWUdtzituwL HyqMAwJEtqY0+TeTvpIkoEqoF3/EJVmaufDdLMfJvNTnz2P2xgmlo1tNOiPSdWR2z6wy GJpGdZQy2dGFhOht4R+w+xepU9qKtwKM5IlZz1hRR0tp0+dsX02MnfYXnUhVENl7xp1d BauZ4M4x9Ow0w5eyWYeBTilQn3YxAZjks+i/NZBCHFTCoW8nY7B8XA+7XZCQKnNWpO1d ZhCw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.233.44.27 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com X-Gm-Message-State: ALKqPwe6QFdOeMhTYiB3pgWBi6K7XXwJ9xnUoYge1t3TjI4N5n5TGbay 0U8853mYKrozYZ+HDMEID1EnHRhoYkrsMaZPDoiospvADSXM8HHEm+lA7TYYjZOYOBB1JseIT9O qH9HxBDzXTElZJ44Zyko4JoALibxq3qX+p/SYoxFDDTtaghqj0S+pftEHYlk7AprUBA== X-Received: by 2002:a17:902:2927:: with SMTP id g36-v6mr15901291plb.303.1526420451561; Tue, 15 May 2018 14:40:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqBVqR6xqfvVCV1Gw2XU0nBNc24OPYgSokJfhLIcPpuw0MbdQF5Ku85Va1XLalqOoI4TeQg X-Received: by 2002:a17:902:2927:: with SMTP id g36-v6mr15901256plb.303.1526420450578; Tue, 15 May 2018 14:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526420450; cv=none; d=google.com; s=arc-20160816; b=gBYtynP6RBOaKQy5Q6pDFmYF3kFlgStQtxsaSgbS+xvzVHdtxFRAahyptvikB6+ecT 8dptwE5vteVK6Ql7zkGhD4eyxKImAxcEItUGa6iwPSlsDr9+HpTiVYmAV1fJR+n6E9PF 1sgQTGKLUt0PRKWu3kKN73+L/x/LByeOCctNBDTzhA82Fw/nyMAuB1CAdMH7HjYF+N9e +9MtpAjxISmBxlZebWzyahs7pxqD47HsywMcUNibKKrDkycsBeIckQDi9bkcpJ4SWKMB MkLv0WQSSxHAlhQUsga7U4yaKVVru176CKTQF57FoWvAJdcAcLIiQax0HecJQs+gKaTF 8FEA== 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=IjsY5Gp/oBDmM1mAe12PJJmqWwNDnQzFreLh/j88Wvs=; b=pkjOt2yyaxtZrrIMd5rK+WKfOAJ0sPbLm1w7BdIyBUP88jicUHjZkLlj9YdBFWHtru 6gKCoz/BY4itcgPCcTVrxdjgqxGjaoWHzv3MWDaPNYHzcYux6ye8O+NcvChVenfGh7Ge 39/kNsoqTBABMoECak5Sqe8h2MVu39cQeqP0roirj5Z7C4nPJtEi8WKVpOX2c8sc9Km0 u65tFa3MCao/58nhoYLAdCQaU58Qc7ROSwEOXY5X4QeWmc8A/qGMC2wEPufka9tSQP4l fgoHOh9QgQwxU3dWjG//TGMk0SsvrElkB7XAkbJXwtkNAlZl/NLoW069u8NrfBfEvMxc GwiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.233.44.27 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com. [15.233.44.27]) by mx.google.com with ESMTPS id y8-v6si1006055pfd.47.2018.05.15.14.40.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 14:40:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.233.44.27 as permitted sender) client-ip=15.233.44.27; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of toshi.kani@hpe.com designates 15.233.44.27 as permitted sender) smtp.mailfrom=toshi.kani@hpe.com Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id B43E791; Tue, 15 May 2018 21:40:49 +0000 (UTC) Received: from misato.americas.hpqcorp.net (unknown [10.34.81.122]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 1D49736; Tue, 15 May 2018 21:40:49 +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 , stable@vger.kernel.org Subject: [PATCH v2 2/3] ioremap: Update pgtable free interfaces with addr Date: Tue, 15 May 2018 15:39:30 -0600 Message-Id: <20180515213931.23885-3-toshi.kani@hpe.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180515213931.23885-1-toshi.kani@hpe.com> References: <20180515213931.23885-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 From: Chintan Pandya This patch ("mm/vmalloc: Add interfaces to free unmapped page table") adds following 2 interfaces to free the page table in case we implement huge mapping. pud_free_pmd_page() and pmd_free_pte_page() Some architectures (like arm64) needs to do proper TLB maintanance after updating pagetable entry even in map. Why ? Read this, https://patchwork.kernel.org/patch/10134581/ Pass 'addr' in these interfaces so that proper TLB ops can be performed. Fixes: 28ee90fe6048 ("x86/mm: implement free pmd/pte page interfaces") Signed-off-by: Chintan Pandya Signed-off-by: Toshi Kani Cc: --- arch/arm64/mm/mmu.c | 4 ++-- arch/x86/mm/pgtable.c | 8 +++++--- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 2dbb2c9f1ec1..da98828609a1 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -973,12 +973,12 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 08cdd7c13619..f60fdf411103 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -719,11 +719,12 @@ int pmd_clear_huge(pmd_t *pmd) /** * pud_free_pmd_page - Clear pud entry and free pmd page. * @pud: Pointer to a PUD. + * @addr: Virtual address associated with pud. * * Context: The pud range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { pmd_t *pmd; int i; @@ -734,7 +735,7 @@ int pud_free_pmd_page(pud_t *pud) pmd = (pmd_t *)pud_page_vaddr(*pud); for (i = 0; i < PTRS_PER_PMD; i++) - if (!pmd_free_pte_page(&pmd[i])) + if (!pmd_free_pte_page(&pmd[i], addr + (i * PMD_SIZE))) return 0; pud_clear(pud); @@ -746,11 +747,12 @@ int pud_free_pmd_page(pud_t *pud) /** * pmd_free_pte_page - Clear pmd entry and free pte page. * @pmd: Pointer to a PMD. + * @addr: Virtual address associated with pmd. * * Context: The pmd range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { pte_t *pte; diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f59639afaa39..b081794ba135 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1019,8 +1019,8 @@ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); int pud_clear_huge(pud_t *pud); int pmd_clear_huge(pmd_t *pmd); -int pud_free_pmd_page(pud_t *pud); -int pmd_free_pte_page(pmd_t *pmd); +int pud_free_pmd_page(pud_t *pud, unsigned long addr); +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) { @@ -1046,11 +1046,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } -static inline int pud_free_pmd_page(pud_t *pud) +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return 0; } -static inline int pmd_free_pte_page(pmd_t *pmd) +static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return 0; } diff --git a/lib/ioremap.c b/lib/ioremap.c index 54e5bbaa3200..517f5853ffed 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, if (ioremap_pmd_enabled() && ((next - addr) == PMD_SIZE) && IS_ALIGNED(phys_addr + addr, PMD_SIZE) && - pmd_free_pte_page(pmd)) { + pmd_free_pte_page(pmd, addr)) { if (pmd_set_huge(pmd, phys_addr + addr, prot)) continue; } @@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, if (ioremap_pud_enabled() && ((next - addr) == PUD_SIZE) && IS_ALIGNED(phys_addr + addr, PUD_SIZE) && - pud_free_pmd_page(pud)) { + pud_free_pmd_page(pud, addr)) { if (pud_set_huge(pud, phys_addr + addr, prot)) continue; }