From patchwork Thu Sep 13 09:21:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 10599087 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 0B55714E0 for ; Thu, 13 Sep 2018 09:29:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDDFE2A457 for ; Thu, 13 Sep 2018 09:29:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0E852A475; Thu, 13 Sep 2018 09:29: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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 319AF2A457 for ; Thu, 13 Sep 2018 09:29:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24F9A8E0005; Thu, 13 Sep 2018 05:29:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1FDB08E0001; Thu, 13 Sep 2018 05:29:27 -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 0EFFF8E0005; Thu, 13 Sep 2018 05:29:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f69.google.com (mail-wm0-f69.google.com [74.125.82.69]) by kanga.kvack.org (Postfix) with ESMTP id A89EA8E0001 for ; Thu, 13 Sep 2018 05:29:26 -0400 (EDT) Received: by mail-wm0-f69.google.com with SMTP id z23-v6so3454043wma.2 for ; Thu, 13 Sep 2018 02:29:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:message-id:user-agent:date:from :to:cc:subject:references:mime-version; bh=d6CMV2hoQm5MnywciM5LER++5NYy5jN9jsJ9wqpDUgs=; b=SnsVZvb5HXf0XehRDTOWWqLtUtPlAz2twD7Qnsf/MuyOHS8VsRGn90irXOC5GKZLQc HQUQbA8AmqP7pmVCqk574m+z8FZ6diUggIhdbm8KR/AHUT6LuczYS/G2nj6bOxJ1tpv5 MMHlkP2Gi87U0fnQ1Du4nnPakHkUDnXcjhx7A6rnt25+iNFrmnybUyNX6+mkowwL4Wzk keGkGOk4a7/wWoogYNYhuDmc3JlaR98HQ/A3KQ0ExCGrm9TmkP29D2AUaXOwMJ4Czium OhCmG53Twxl6/ud82AUGZ+14NYK+Q7OmfgiVXKWoMmmpk8544eBvaLYSLpPgTI3GCpU4 hwFw== X-Gm-Message-State: APzg51BoMQlyQjpZmkx6dqE/tKT9qIrTs3VxzGeXQgT6Z6ngv0+K+A7d 1xl7BU5ynJFXaJjBCjerLmZXEbQa+5d1+QyZfRW+I438tffYc7UL+t5xqSCDEIBWf/xsObtZwLu pF4zu0p9Xkk6Bfi69MSDNf0/b/p6l4i3TCTzMZo7bCCJATC4zHwytRF8qPEtFXcXG1w== X-Received: by 2002:adf:80ea:: with SMTP id 97-v6mr4496735wrl.57.1536830966071; Thu, 13 Sep 2018 02:29:26 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbknN2M3N1JMIjTN9K/OXzGZUQD5tu9n2ZOibsAUG2FzCN62ojSxDJgRXEQgplc1Oe006pG X-Received: by 2002:adf:80ea:: with SMTP id 97-v6mr4496705wrl.57.1536830965269; Thu, 13 Sep 2018 02:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536830965; cv=none; d=google.com; s=arc-20160816; b=TqQw0OUjO0IUhO4ce9ZiwvAITYmMfaUMS4UzRnkJLLs+GI76tvxof++7wkO6N9Pry4 Web44fXayQHnFe+ktRFOmFLY48lMmG2iUfnMFTqKX/m456W54rmwDwSTY6ioCBXouCKi hU852GgkGfUvNjZjskqhh+awYrLCh4yTiCsVqCzOWfReqnw13AfDdeR+2Ms6+yJoASiG XCOxZDheP79kI2MPeAeTlcZKEt+RaAWYR973fTGZHHD3ahLTo4WTsVfxmbWnQVddBvXa CesEM7niL9QjZ94SMhjNlHapgIHIfI/gwdvO6lPQfU6J8V6zjlc/5z2Lrx21HDDha1Uj C3/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:subject:cc:to:from:date:user-agent :message-id:dkim-signature; bh=d6CMV2hoQm5MnywciM5LER++5NYy5jN9jsJ9wqpDUgs=; b=ol6c05YwZAvYZpfN7W/rAFCAjs2Sd5S8hvMGvdDSWMc+vTL5zsrvyjiSJtLiGCtJxO yRiu5jJg3DKxgz8qs5wZm51eezNuXDZGNZr7rQ4vEod5OyrUjM6NDJHUQMMw2oioRiwc tv+YBuN5RciNJHKQitXpqnVumnWM99AiKrembo0CakPGc0GZgjDtdy8dBM6P50PXQAXR QpvYxCMHmmzkIS6+Y9SOvrSDQnefesn4ZrnWSXjQIXQE65V6VZs5yiApXSgGY/bc8JFG a/esaHj+xZb/lgDhbU7ISMQbmDiibuGYJ+W2LLqFVNoqsBVcgWaxsdLW3+RBp9QAJITc 0Llg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=za8rNYRu; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom=peterz@infradead.org Received: from merlin.infradead.org (merlin.infradead.org. [2001:8b0:10b:1231::1]) by mx.google.com with ESMTPS id 17-v6si3124434wmb.123.2018.09.13.02.29.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Sep 2018 02:29:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of peterz@infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) client-ip=2001:8b0:10b:1231::1; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=za8rNYRu; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom=peterz@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=d6CMV2hoQm5MnywciM5LER++5NYy5jN9jsJ9wqpDUgs=; b=za8rNYRunBSGvqdTAjdQd7XChQ 1sPTiUitxErVUHFO/SK6OlzNLeYLp/CM8GJuLGLmRpEqIOyAO1VZnku95dgCl5XDp6dqnF5mHIeDN 7Of6TyqnfXElzokPJYCU1udxWdMOERKJUL0ymUm0VT6jyGNYYvmQFKYBFdkJJ+QK3DbgVsyKQ6h8v xycPSpRuWzFcn1R9JUGZ1NzT0nASEBiyrTeLInRQNeRLHnIYRxFWwdNj025J98Tj10ESvOgV3xHjd k+1SAtXWdD1uW9VMDV+bj6p51fCvq+bTYWZpIgYPjbbLL30HBYj1DeVLov6gK3QIvbXuERxvK0fsA FCzQm29w==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by merlin.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0Nw2-0000yp-5K; Thu, 13 Sep 2018 09:29:14 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 5B54C20587E66; Thu, 13 Sep 2018 11:29:10 +0200 (CEST) Message-ID: <20180913092812.366008016@infradead.org> User-Agent: quilt/0.65 Date: Thu, 13 Sep 2018 11:21:19 +0200 From: Peter Zijlstra To: will.deacon@arm.com, aneesh.kumar@linux.vnet.ibm.com, akpm@linux-foundation.org, npiggin@gmail.com Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, peterz@infradead.org, linux@armlinux.org.uk, heiko.carstens@de.ibm.com, Yoshinori Sato , Rich Felker Subject: [RFC][PATCH 09/11] sh/tlb: Convert SH to generic mmu_gather References: <20180913092110.817204997@infradead.org> 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 Generic mmu_gather provides everything SH needs (range tracking and cache coherency). Cc: Will Deacon Cc: "Aneesh Kumar K.V" Cc: Andrew Morton Cc: Nick Piggin Cc: Yoshinori Sato Cc: Rich Felker Signed-off-by: Peter Zijlstra (Intel) --- arch/sh/include/asm/pgalloc.h | 7 ++ arch/sh/include/asm/tlb.h | 130 ------------------------------------------ 2 files changed, 8 insertions(+), 129 deletions(-) --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h @@ -72,6 +72,15 @@ do { \ tlb_remove_page((tlb), (pte)); \ } while (0) +#if CONFIG_PGTABLE_LEVELS > 2 +#define __pmd_free_tlb(tlb, pmdp, addr) \ +do { \ + struct page *page = virt_to_page(pmdp); \ + pgtable_pmd_page_dtor(page); \ + tlb_remove_page((tlb), page); \ +} while (0); +#endif + static inline void check_pgt_cache(void) { quicklist_trim(QUICK_PT, NULL, 25, 16); --- a/arch/sh/include/asm/tlb.h +++ b/arch/sh/include/asm/tlb.h @@ -11,131 +11,8 @@ #ifdef CONFIG_MMU #include -#include -#include -#include - -/* - * TLB handling. This allows us to remove pages from the page - * tables, and efficiently handle the TLB issues. - */ -struct mmu_gather { - struct mm_struct *mm; - unsigned int fullmm; - unsigned long start, end; -}; -static inline void init_tlb_gather(struct mmu_gather *tlb) -{ - tlb->start = TASK_SIZE; - tlb->end = 0; - - if (tlb->fullmm) { - tlb->start = 0; - tlb->end = TASK_SIZE; - } -} - -static inline void -arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, - unsigned long start, unsigned long end) -{ - tlb->mm = mm; - tlb->start = start; - tlb->end = end; - tlb->fullmm = !(start | (end+1)); - - init_tlb_gather(tlb); -} - -static inline void -arch_tlb_finish_mmu(struct mmu_gather *tlb, - unsigned long start, unsigned long end, bool force) -{ - if (tlb->fullmm || force) - flush_tlb_mm(tlb->mm); - - /* keep the page table cache within bounds */ - check_pgt_cache(); -} - -static inline void -tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address) -{ - if (tlb->start > address) - tlb->start = address; - if (tlb->end < address + PAGE_SIZE) - tlb->end = address + PAGE_SIZE; -} - -#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address) \ - tlb_remove_tlb_entry(tlb, ptep, address) - -/* - * In the case of tlb vma handling, we can optimise these away in the - * case where we're doing a full MM flush. When we're doing a munmap, - * the vmas are adjusted to only cover the region to be torn down. - */ -static inline void -tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) -{ - if (!tlb->fullmm) - flush_cache_range(vma, vma->vm_start, vma->vm_end); -} - -static inline void -tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) -{ - if (!tlb->fullmm && tlb->end) { - flush_tlb_range(vma, tlb->start, tlb->end); - init_tlb_gather(tlb); - } -} - -static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) -{ -} - -static inline void tlb_flush_mmu_free(struct mmu_gather *tlb) -{ -} - -static inline void tlb_flush_mmu(struct mmu_gather *tlb) -{ -} - -static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page) -{ - free_page_and_swap_cache(page); - return false; /* avoid calling tlb_flush_mmu */ -} - -static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page) -{ - __tlb_remove_page(tlb, page); -} - -static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, - struct page *page, int page_size) -{ - return __tlb_remove_page(tlb, page); -} - -static inline void tlb_remove_page_size(struct mmu_gather *tlb, - struct page *page, int page_size) -{ - return tlb_remove_page(tlb, page); -} - -static inline void tlb_change_page_size(struct mmu_gather *tlb, unsigned int page_size) -{ -} - -#define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep) -#define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp) -#define pud_free_tlb(tlb, pudp, addr) pud_free((tlb)->mm, pudp) - -#define tlb_migrate_finish(mm) do { } while (0) +#include #if defined(CONFIG_CPU_SH4) || defined(CONFIG_SUPERH64) extern void tlb_wire_entry(struct vm_area_struct *, unsigned long, pte_t); @@ -155,11 +32,6 @@ static inline void tlb_unwire_entry(void #else /* CONFIG_MMU */ -#define tlb_start_vma(tlb, vma) do { } while (0) -#define tlb_end_vma(tlb, vma) do { } while (0) -#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0) -#define tlb_flush(tlb) do { } while (0) - #include #endif /* CONFIG_MMU */