From patchwork Thu Sep 13 09:21:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 10599095 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 6D22214E0 for ; Thu, 13 Sep 2018 09:29:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A9AF2A457 for ; Thu, 13 Sep 2018 09:29:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E4022A491; Thu, 13 Sep 2018 09:29:41 +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 A540B2A457 for ; Thu, 13 Sep 2018 09:29:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D134C8E0001; Thu, 13 Sep 2018 05:29:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B291C8E0008; Thu, 13 Sep 2018 05:29:28 -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 903CB8E0007; Thu, 13 Sep 2018 05:29:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id 288E78E0001 for ; Thu, 13 Sep 2018 05:29:28 -0400 (EDT) Received: by mail-wr1-f70.google.com with SMTP id a37-v6so4400308wrc.5 for ; Thu, 13 Sep 2018 02:29:28 -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=SUb/FsNdk3D3aNn2XSnRfO/6PJM/aNspqX3A3hmuSZY=; b=nGNRsYRydbhGzUzlX6z+rc43t73nJgExK4UxSNJeHR/dyM58T5mv+yZkIOL92FKBMP AWD58o6aSM+FrPU2Hvra0S9DB5YpGv00SbBTWnRN1lC/EcK+//u4ZlgrRJZdjrwE8e3S GSHZSl7MSfpUAPWot4KqtgFl31aU12sin8RRIlpNPcm0ljXGDMmZB+WMK030RyMwjpkh Eb4V9j9knsWScVngDF1nkRSX9JtRVxGZAzVJDH/v3ilqU145erUPnu4H/0hTNBLgiBYU c2Eclo3KnsG4BCE3ZkJXarulAtcAEpEch4Fo1EOFtsheXBfeR1aYPVA+A9h9W3uSQBTK laWg== X-Gm-Message-State: APzg51CfXarETjngend1v3AAy7ws/fm748zTJr/UoDZQZLSMIUGp7/oL CNdwJh9WyQV0dU5e86R2hJRuCYMMCXcRARJkKHvqEtPVBzgEjz3oDQ7Nci2swMqrIOzr6Ebv0UD 6QKTnulOOsqGEVD+zTurpk5KX4tiMysMnvhoNkAUw+YunRY2Pv08ipTQQa/TH4iELRA== X-Received: by 2002:adf:b2b5:: with SMTP id g50-v6mr4398670wrd.218.1536830967508; Thu, 13 Sep 2018 02:29:27 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdao4gN42wkUWz1JTS/qGIY5J4PFsPuV919+rwOrniz3M9rNGOM6Z3g3+w/yhj0ek/GzUQpB X-Received: by 2002:adf:b2b5:: with SMTP id g50-v6mr4398631wrd.218.1536830966787; Thu, 13 Sep 2018 02:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536830966; cv=none; d=google.com; s=arc-20160816; b=Vmj4/FrkHzmyDDZehYATWfXDEu/ER19nDyQ5gqX8HEtjEQEnJ+SuZNls9iKI6BXWrd zAKrP0ucm9/Vsl+FJB1tl8jgf/98RTO0g90ZRPCqsLkROsd6swKmwaZ+6wUDDssxTKYA DcGQZgD4WbNGAexmXjooSymJ2lcqrWvxcQ9u1kpnwOsGUWksHvAQSD/Z59OXipWcqDld 94yFZMzdq1Ni5FfpdPrIv+7OFFVtvZU0xtt5IWHI++KD3NgJY8Xz0n4nC/MXOhzbBEUb T+4hO71bXItmSmAQPc9Ip4OL+Ib1XxNOEl0tQLpWgHhp9obL84LcnMTRy2dVHuWT4f+S RNkQ== 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=SUb/FsNdk3D3aNn2XSnRfO/6PJM/aNspqX3A3hmuSZY=; b=qRCQ56pb0ZrqlSD6dVj91FhlD3TGiYdbrjxc4KNwCAiop9idCkWrnz9D0LQ75rAlo8 frUdSCvb7VRg1EQA8dtAM4KEGA3TDlJNXwc7ghEVIWCwVLDo86QWFRz+XV3U7i5dBzyO LTcD3vWE1o474p8naqFPVmwokgCkQukxfHEXYHKR40voinF6DIiZo4rgSgrMurYXpd8w TDItzWoCKt0U2l/9hKSKPixNh55cLIp7ZK3A0e/glmLQw9EqN4+0VsVQMfb13yheGf5v qTCo3+Ynj5kNVpms8ae3JvnWL74HlSHXbPzSjidX1jyYwWc/iMuOMOXv1m0mjNny7+yi fj3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=DBoSpxOJ; 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 e3-v6si3058152wri.119.2018.09.13.02.29.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Sep 2018 02:29:26 -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=DBoSpxOJ; 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=SUb/FsNdk3D3aNn2XSnRfO/6PJM/aNspqX3A3hmuSZY=; b=DBoSpxOJeBYKM8THNd2Pn+ZGVo QXGQCcqFqsS2V25y1REJiIeW0hQnSVmWOs8ALiLx0r18Q2rSvEURQo0KC+0sogpPFfhejx088CS8w LGjl1GQzmBTcDiIzgLrEf3dpFWaMufxmCLZ2Hlhssd8jcnLTu7WbboMyQE0QK5DYYCgBpOOwWsv2R pEUJQfhPLgCftm2hgZTsZ92WSd65A0RHe86ylnG91s4tq9p+iwysxE6u7krLJzk/usV0hqsRVUTgG 5ik8aqqbn/ytwPE9wLaNOfloKGARJQ+JYoFU8v4IAXZS1n2v9Hup5nVNLgmmgvTq7sTY3NN/7JtY2 +SZD1o9Q==; 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 1g0Nw1-0000yo-Ub; Thu, 13 Sep 2018 09:29:14 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 4B0C620587E52; Thu, 13 Sep 2018 11:29:10 +0200 (CEST) Message-ID: <20180913092812.132208484@infradead.org> User-Agent: quilt/0.65 Date: Thu, 13 Sep 2018 11:21:15 +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 Subject: [RFC][PATCH 05/11] asm-generic/tlb: Provide generic tlb_flush 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 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: Will Deacon Cc: "Aneesh Kumar K.V" Cc: Andrew Morton Cc: Nick Piggin 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 | 80 +++++++++++++++++++++++++++++++++++------ 5 files changed, 74 insertions(+), 10 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 @@ -241,6 +241,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; @@ -282,7 +288,35 @@ 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 + +#define tlb_flush tlb_flush +static inline void tlb_flush(struct mmu_gather *tlb) +{ + if (tlb->fullmm || tlb->need_flush_all) { + flush_tlb_mm(tlb->mm); + } else { + 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); + } } +#endif static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) { @@ -353,19 +387,45 @@ 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) +#define tlb_start_vma tlb_start_vma +static inline void tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) +{ + if (tlb->fullmm) + return; + + /* + * 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); + + 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) +#define tlb_end_vma tlb_end_vma +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