From patchwork Wed May 16 23:32:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 10405065 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 1C3B6602C2 for ; Wed, 16 May 2018 23:33:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C19728604 for ; Wed, 16 May 2018 23:33:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0041128671; Wed, 16 May 2018 23:33:29 +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 3AF9F28604 for ; Wed, 16 May 2018 23:33:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74AD36B0375; 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 6F9B46B0376; 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 5C31F6B0377; 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-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id 2AC4F6B0376 for ; Wed, 16 May 2018 19:33:26 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id f139-v6so1755271oig.15 for ; Wed, 16 May 2018 16:33:26 -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=qi563sCPL5Gqbe7rtw5JgQQMp2mZkMu2cvUaPYTWOks=; b=g5ul3O3Snpd3fGC/uL3wLC7gJ7nFGL+vjy9WqIzWcUl3UUseSo50uAnIzfJEhgxeeF RLv6Q0Y5bsm6q1bjuFUdn0JnhEajf/jPV1/q7uT9u4TZ+TEGyTxj+mf2d4+MuFc4P1Qg gMxaR5X2kf2oQUlMoZgOw3iep/lsIf+Shefc8WrdbWKNAaXR0jy7hRn8jPdSz5lLRrde /ujoweWGLF+jmPZ3Zh54FTIh0CPHXcbn+sCRby2iKirxcSgcERxRIq2sNEZp5O5p8YRf H6i4OMu4l9VwDKFMwjrAS0cnhFAgy4eB0nNF4qP1SdYeEYo8SN1D+vW2xP6hgskXCdC8 UUhw== 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: ALKqPwdR/q+E3f04DyWAwfZXTUpBGtB/9ZRTX0vn7Ii6N2Uy1YAssdXc M9nSTBVtool8kA52R6RGtTTgOXPNH9YQ5MDdlHY+9cuoLqUFFxRCRj/eRRsdy1bndMNzxwITVLT 85JBUinUQz2bm0zPR5kjub5zFTUuJfM2gVtkJfuZFzS6He3nihD29QoMJFxuXNl+Z3g== X-Received: by 2002:a9d:72c6:: with SMTP id d6-v6mr2151138otk.392.1526513605961; Wed, 16 May 2018 16:33:25 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqp6mekj9OGiJD1cXPaHVtZmJX40PMunAmr6ZKzDSYZ+AIwJ/9xeExJwJjmgRdfUtVcyjmi X-Received: by 2002:a9d:72c6:: with SMTP id d6-v6mr2151116otk.392.1526513605175; Wed, 16 May 2018 16:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526513605; cv=none; d=google.com; s=arc-20160816; b=mNstO0lklIbJg3AZIWlH6spSKF7tbZHh8W7/B5N7ozrep2piTOyFmB4WVRleUAEv3+ VC0BHumgc/l8uCsLy0L2AiKMZzOXEHX6/5B/egPaPoJCPG+9ohVtT2eiHZ2guGxrmBrH r2eG7/5bekSzvUKsIb3Xgn0u0GR99tGA+Ll8+zi/XiLgfJAMhoJ4XXbOcN38LbI+frkk MwExLqF/JRCWOTejNCdcbxZJ5U7IuqGWbv0dAPh1/um3UFcxfKgkU+eDTa2ZxWaVFSN9 D2RybXZQPydKblHKzHkO8DdClxTNqidHd4Wj6IeuCZxxiN2W6DJEqwS5fOE61zw899uf GPfQ== 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=qi563sCPL5Gqbe7rtw5JgQQMp2mZkMu2cvUaPYTWOks=; b=Ya/cmFmWwN4NbWBwmb13h1vsYEE6QM1560Lct6InvDgwnSR2ODd+TAjhPyk3xW1Ue+ vkfFmWMpJYbMZzA+/35jE2MFyxe/DdFRZnuxuIIWYr/tAGkpmcFVExwX0CAHwQHe7G+S PEar8zQxpzN8zuUhLmgD/mvE+anVdY7MakGUN9i+/ALiwIBU+hz8Rj83bCkNLY68Dc8Q zXmtn/5E6DM7AuzX6H81XH92rsHi7HWFxaT0m755CBK+hwGI+f+c3exq2aom+gfw9H8p jZPsFyhN+sBpKsk/6nJq1j4DGek3nVDrpmQnfl1nNby8BEiYFXxSgKRWFgBWwKjofNuJ tfNw== 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 57-v6si1314692otz.379.2018.05.16.16.33.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 May 2018 16:33:25 -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 C5230A8; Wed, 16 May 2018 23:33:24 +0000 (UTC) Received: from misato.americas.hpqcorp.net (unknown [10.34.81.122]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 477C48D6; Wed, 16 May 2018 23:33:24 +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 v3 2/3] ioremap: Update pgtable free interfaces with addr Date: Wed, 16 May 2018 17:32:06 -0600 Message-Id: <20180516233207.1580-3-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 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. [toshi@hpe.com: merge changes] 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 | 12 +++++++----- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 15 insertions(+), 13 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 3f7180bc5f52..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; @@ -766,7 +768,7 @@ int pmd_free_pte_page(pmd_t *pmd) #else /* !CONFIG_X86_64 */ -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } @@ -775,7 +777,7 @@ int pud_free_pmd_page(pud_t *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) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } 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; }