From patchwork Tue Feb 19 10:31:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 10819657 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 2363B6CB for ; Tue, 19 Feb 2019 10:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B2062BA64 for ; Tue, 19 Feb 2019 10:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F12972BA6B; Tue, 19 Feb 2019 10:33:00 +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.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 5FAF62B9C5 for ; Tue, 19 Feb 2019 10:32:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D22598E0006; Tue, 19 Feb 2019 05:32:57 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CAB208E0002; Tue, 19 Feb 2019 05:32:57 -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 AFC1B8E0006; Tue, 19 Feb 2019 05:32:57 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 65BD48E0004 for ; Tue, 19 Feb 2019 05:32:57 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id f10so2413789pgp.13 for ; Tue, 19 Feb 2019 02:32:57 -0800 (PST) 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=qjNJCW9VaWoPUrcjw4ZVmCtKdrbi+jA4eRz3lYRrRV0=; b=fWnNGmgeI1JwW1Chn1xcszOdQ9HU1RU0zIDW5tkVPRoeZGpKr6UdiRzw9QS3s+56ai K6DL59OTtbxcybX5dh4mZYoIMa43+PtqqjapDaTEF2vszJMqmT4KNq1fZVqE41dB7AlO 1lmT6k6AlBiaQNpD6wt2ZAUBdUbQhDJbS3ZwYC9pUU4azIWLLHwyl8WX97OdgcaPZrhp ifwRZNnunKpn9aY5Pl4lcBQLRLseNLGNdFiAWyNGSIF/8/3WuJHfKaj/JTEpjTH3ngR1 m3OFg871FYjnelswgS0bezJPivPTd0hOAl2p607CcCZ5dBKGnVHl58phupWzl9+oaktm amGw== X-Gm-Message-State: AHQUAuYd0e8A6621J6hx2nSGyV4USjYyF1FJYVePnLUBQqWieoVkRtvx 25OgqP0Wttz/qUzKiCV2kkj5qph0xSLYF6T6eiuSTJM/GYZJ1Lh2XfM6NdxNS9fmxK2z3HS4ynv EmNkSKSbE8JgC+6mmbRfQpvJykvIJ1/krXju6SbhnPQxlIHlV+IQPmNoFdkPEY4Ccww== X-Received: by 2002:a17:902:9a9:: with SMTP id 38mr29852641pln.204.1550572376979; Tue, 19 Feb 2019 02:32:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ36CmPfW9o3Df5A+2oeDO/Jx//9RnhzFgZO/EeT5tg+4WjxA3Gf9qR2k34/b1HHeXxR9/p X-Received: by 2002:a17:902:9a9:: with SMTP id 38mr29852570pln.204.1550572375988; Tue, 19 Feb 2019 02:32:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550572375; cv=none; d=google.com; s=arc-20160816; b=z3GzjchyONhh8BF7V6MI9mTem5YXtAxLXC2Wv/ExLNrZcZb/QWYfH2jmVi9XH/qDIE dWjiHF3JQY6yMqUdn5PaXfifrF2QF0Brzhl/U2N7ToyccJHZM4V2iU/Q13mJYIhFwnHT XMvMvd7UE39cC8Eilwv9/6YCXrnvD9TjUKOQtxswldQWzsf8BBztZXtdrGD1990MTCtz w4awmBBfVkvyx1ZmvIygZ5B9WueFUbpG1LVwn6QCs9HA4I9Fm8CFTEP8wyJlq2Vcwp0c rdoKqDD9gdiDU2fOwscSoxpZv0drFVQXKK5mrxX8w2wlCnkLu/K0GRUsnXqtBshoXI+s ukOQ== 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=qjNJCW9VaWoPUrcjw4ZVmCtKdrbi+jA4eRz3lYRrRV0=; b=ctBAbzSTAZANPnqmRmG255FnJdbPnxivy0yiT6AtPxPyByS4W/NnTtBBcMXPh8SfPW 2IAiUuoFUVLYUE6Ts0B9gWGKeJ2TK9V1zjFWqS+S9T2E4UOq3++PI9kMo0q7kn4O9O7U FS6OTPc4gIyLrP74LzHiRi5JpNzYvAYOgV0m7hFLXTZaN/rQsHtC2C35Ru07R0kpyvnP omR1xs28LCUnGoh4czbZdZB4I89hZ7IA3T7PYT69AK+wobdNiSKy7xHbfICDYucB87nS Lsa9Y5ykg/0JDOg45ltFd6Rfj4m7i3PNItA1TPSw7Be16BGBvPip+mCZVhHcfhr3JyPn UkZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GQV+aWWD; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=peterz@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id b5si14740570pgw.377.2019.02.19.02.32.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 02:32:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of peterz@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GQV+aWWD; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 2607:7c80:54:e::133 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=bombadil.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=qjNJCW9VaWoPUrcjw4ZVmCtKdrbi+jA4eRz3lYRrRV0=; b=GQV+aWWD0uF54yBZACk5RksZPH 9j/UOm3no7u1rIP4L99eOppKfF6/v49uIThiUiOjnkE3Ts1yjOi3polOicPbrO9fwrS2ZCeIcpiUj VDkuHhwRKB5m2qSkl4gK0oJBC0eJ8kt+CgFL1wjA95vEjX9M/pyHNGq+TLBVgmfvCp2xvN5v8IcAg t1LgKQt2GWKqPHm7udVvWtvOy3WweALFim0i+q3Cmz0HKsQCUFqVtYUl2Wyp10pCCMTwxlWomdUFH v9jWsggFZMi+xNXrxEizJo5FGXgpcrvrGFQvG80nxsx3wV+1T0IkpOpZCG36le6OevTPypRm36gjA Xsayfeng==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gw2hm-0006ZJ-W6; Tue, 19 Feb 2019 10:32:51 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 53390285202C7; Tue, 19 Feb 2019 11:32:48 +0100 (CET) Message-Id: <20190219103233.090636436@infradead.org> User-Agent: quilt/0.65 Date: Tue, 19 Feb 2019 11:31:52 +0100 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, riel@surriel.com Subject: [PATCH v6 04/18] asm-generic/tlb: Provide generic tlb_flush() based on flush_tlb_range() References: <20190219103148.192029670@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 Provide a generic tlb_flush() implementation that relies on flush_tlb_range(). This is a little awkward because flush_tlb_range() assumes a VMA for range invalidation, but we no longer have one. Audit of all flush_tlb_range() implementations shows only vma->vm_mm and vma->vm_flags are used, and of the latter only VM_EXEC (I-TLB invalidates) and VM_HUGETLB (large TLB invalidate) are used. Therefore, track VM_EXEC and VM_HUGETLB in two more bits, and create a 'fake' VMA. This allows architectures that have a reasonably efficient flush_tlb_range() to not require any additional effort. Cc: Nick Piggin Cc: "Aneesh Kumar K.V" Cc: Andrew Morton Acked-by: Will Deacon Signed-off-by: Peter Zijlstra (Intel) --- arch/arm64/include/asm/tlb.h | 1 arch/powerpc/include/asm/tlb.h | 1 arch/riscv/include/asm/tlb.h | 1 arch/x86/include/asm/tlb.h | 1 include/asm-generic/tlb.h | 95 +++++++++++++++++++++++++++++++++++------ 5 files changed, 87 insertions(+), 12 deletions(-) --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -27,6 +27,7 @@ static inline void __tlb_remove_table(vo free_page_and_swap_cache((struct page *)_table); } +#define tlb_flush tlb_flush static void tlb_flush(struct mmu_gather *tlb); #include --- a/arch/powerpc/include/asm/tlb.h +++ b/arch/powerpc/include/asm/tlb.h @@ -28,6 +28,7 @@ #define tlb_end_vma(tlb, vma) do { } while (0) #define __tlb_remove_tlb_entry __tlb_remove_tlb_entry +#define tlb_flush tlb_flush extern void tlb_flush(struct mmu_gather *tlb); /* Get the generic bits... */ --- a/arch/riscv/include/asm/tlb.h +++ b/arch/riscv/include/asm/tlb.h @@ -18,6 +18,7 @@ struct mmu_gather; static void tlb_flush(struct mmu_gather *tlb); +#define tlb_flush tlb_flush #include static inline void tlb_flush(struct mmu_gather *tlb) --- a/arch/x86/include/asm/tlb.h +++ b/arch/x86/include/asm/tlb.h @@ -6,6 +6,7 @@ #define tlb_end_vma(tlb, vma) do { } while (0) #define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0) +#define tlb_flush tlb_flush static inline void tlb_flush(struct mmu_gather *tlb); #include --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -95,7 +95,7 @@ * flush the entire TLB irrespective of the range. For instance * x86-PAE needs this when changing top-level entries. * - * And requires the architecture to provide and implement tlb_flush(). + * And allows the architecture to provide and implement tlb_flush(): * * tlb_flush() may, in addition to the above mentioned mmu_gather fields, make * use of: @@ -111,7 +111,10 @@ * * - tlb_get_unmap_shift() / tlb_get_unmap_size() * - * returns the smallest TLB entry size unmapped in this range + * returns the smallest TLB entry size unmapped in this range. + * + * If an architecture does not provide tlb_flush() a default implementation + * based on flush_tlb_range() will be used. * * Additionally there are a few opt-in features: * @@ -245,6 +248,12 @@ struct mmu_gather { unsigned int cleared_puds : 1; unsigned int cleared_p4ds : 1; + /* + * tracks VM_EXEC | VM_HUGETLB in tlb_start_vma + */ + unsigned int vma_exec : 1; + unsigned int vma_huge : 1; + unsigned int batch_count; struct mmu_gather_batch *active; @@ -286,8 +295,59 @@ static inline void __tlb_reset_range(str tlb->cleared_pmds = 0; tlb->cleared_puds = 0; tlb->cleared_p4ds = 0; + /* + * Do not reset mmu_gather::vma_* fields here, we do not + * call into tlb_start_vma() again to set them if there is an + * intermediate flush. + */ } +#ifndef tlb_flush + +#if defined(tlb_start_vma) || defined(tlb_end_vma) +#error Default tlb_flush() relies on default tlb_start_vma() and tlb_end_vma() +#endif + +static inline void tlb_flush(struct mmu_gather *tlb) +{ + if (tlb->fullmm || tlb->need_flush_all) { + flush_tlb_mm(tlb->mm); + } else if (tlb->end) { + struct vm_area_struct vma = { + .vm_mm = tlb->mm, + .vm_flags = (tlb->vma_exec ? VM_EXEC : 0) | + (tlb->vma_huge ? VM_HUGETLB : 0), + }; + + flush_tlb_range(&vma, tlb->start, tlb->end); + } +} + +static inline void +tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) +{ + /* + * flush_tlb_range() implementations that look at VM_HUGETLB (tile, + * mips-4k) flush only large pages. + * + * flush_tlb_range() implementations that flush I-TLB also flush D-TLB + * (tile, xtensa, arm), so it's ok to just add VM_EXEC to an existing + * range. + * + * We rely on tlb_end_vma() to issue a flush, such that when we reset + * these values the batch is empty. + */ + tlb->vma_huge = !!(vma->vm_flags & VM_HUGETLB); + tlb->vma_exec = !!(vma->vm_flags & VM_EXEC); +} + +#else + +static inline void +tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } + +#endif + static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) { if (!tlb->end) @@ -357,19 +417,30 @@ static inline unsigned long tlb_get_unma * the vmas are adjusted to only cover the region to be torn down. */ #ifndef tlb_start_vma -#define tlb_start_vma(tlb, vma) \ -do { \ - if (!tlb->fullmm) \ - flush_cache_range(vma, vma->vm_start, vma->vm_end); \ -} while (0) +static inline void tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) +{ + if (tlb->fullmm) + return; + + tlb_update_vma_flags(tlb, vma); + flush_cache_range(vma, vma->vm_start, vma->vm_end); +} #endif #ifndef tlb_end_vma -#define tlb_end_vma(tlb, vma) \ -do { \ - if (!tlb->fullmm) \ - tlb_flush_mmu_tlbonly(tlb); \ -} while (0) +static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) +{ + if (tlb->fullmm) + return; + + /* + * Do a TLB flush and reset the range at VMA boundaries; this avoids + * the ranges growing with the unused space between consecutive VMAs, + * but also the mmu_gather::vma_* flags from tlb_start_vma() rely on + * this. + */ + tlb_flush_mmu_tlbonly(tlb); +} #endif #ifndef __tlb_remove_tlb_entry