From patchwork Wed Jul 25 14:06:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 10544065 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 923CB1805 for ; Wed, 25 Jul 2018 14:07:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 819E620408 for ; Wed, 25 Jul 2018 14:07:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75A1B206E2; Wed, 25 Jul 2018 14:07:02 +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=-0.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SUSPICIOUS_RECIPS autolearn=no 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 22FD820408 for ; Wed, 25 Jul 2018 14:07:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 898E26B02B8; Wed, 25 Jul 2018 10:07:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 849AD6B02BA; Wed, 25 Jul 2018 10:07:00 -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 6C5E86B02BB; Wed, 25 Jul 2018 10:07:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 2467A6B02B8 for ; Wed, 25 Jul 2018 10:07:00 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id 70-v6so5506978plc.1 for ; Wed, 25 Jul 2018 07:07:00 -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:from:to:cc:subject:date :message-id:in-reply-to:references; bh=7UxphlsljR+NlBYsTH8Esis+vxdkqmrjRFhGi68hhJU=; b=VvEzi+pEzbXEYp5MvZR9hOwMRe08AfGLyo+XLEC+sUUiJ7G0chXYJ1WGMZ/MStomKQ kfINbGvdzGvCvoO0/5Zl+qdkuEep2FH9lcK8KcuYx8t5WsfRCy8lWe7XHJiAAeo4e0ZD F1y+/BpNSQrL9uLrgWYI5OK7qwft3sCvaIcLZxIthcEbmL5neLGoHUVXq61FU9NgMVUK fjP26nwpaIZYXpJmmrbw4OY++gE4v9ZCtHD5aqWfTIGY+HNCmLcHesXSkq89mK4GJZaV o8UyF3tSstCsHRjpIdOPFxjQ8djTQIYRHTBToBeYBTYruy/PRRoeiDE445CrT9V7CtZz qokg== X-Gm-Message-State: AOUpUlE25sm1QZDksTxFfKgXZ7Q3hHsGIO5GpTbVwVQuJmVEsOU6b2Yb r6URswyzC+37uqJ9cXF1qezBQTq+kolXAB6e2XP2Bon3+NU1K+UZoFAj3MOWR4Dr/FV4qzf0etw zufAZFCKn9NMPR3aZieAniCr38cFq/qSkl9dj9Iu8BOedhqor361Il0wAtp620LqpjcQeph/e5L u/w2FJeXgEmOeUV+pfvN1voXWq3yK407wZ0NS1mqolavOqBHl4UZrlofW8oiF+czVuPl4jZIHf7 MkiR0VXCaKxmSN5/MHwiRrw3cRA3qNczj+tPYvemo0JhN4YE3JM/ZgVSVbuqITRCA18PQy+Sb7y y2tzZGy2PlnbZ0o9pmUQHOXL2zuDvW2zQcfX1/eS1fd0hPMtPExLdH+3ng4EKiVnadl3+AhMGao 0 X-Received: by 2002:a62:da07:: with SMTP id c7-v6mr22246100pfh.106.1532527619844; Wed, 25 Jul 2018 07:06:59 -0700 (PDT) X-Received: by 2002:a62:da07:: with SMTP id c7-v6mr22246066pfh.106.1532527619236; Wed, 25 Jul 2018 07:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532527619; cv=none; d=google.com; s=arc-20160816; b=ap7gfHnGsVnC5T+xr7lxFMETqlSwMZnff22RoNyu8JxPs8ExDfAAGOIPPjhU9Ox+0l oP3W07yl0avdHCsT0A7lYhJMDpgNjuDaLzEt9V+ewegZs6IWpaSznw/1c9SfvpSQf8XR 6amoSf4EbmLUMsc2WJcgURNqLS0NVo+eaTrJtv9nYBysIWc0TUSp4LTAngRRNHwhcXt/ x0eAivP9H9NUUGGFNQF6XX+il1aDCj5wLk6mSI2DsQeahtkqISXjW6yXPGdkS58JcGTn C+BO1m0i8ph4O1wS4JSfdFk/6W4RtvIAr7/XB+Iza/Zfb05znWEKCYfib+E+2KHwuBzj 1qQA== 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 :dkim-signature:arc-authentication-results; bh=7UxphlsljR+NlBYsTH8Esis+vxdkqmrjRFhGi68hhJU=; b=tsLqynORoUm+5cewHhroQFKzbCjxwsevL3Fnsw2lTlxbVLBDi/LTREH1N67VbkPK8G v1BBnlBbeUt1AKn47uI+rTgN+0DnEUKRzzeG8TLbh8rUcp8CKu7IvFPuXFQAkG+LqMkT xbtGZeubXis7i3Soh/p1fIAJEW86XNrO663D/vT+ttZTs0QzLmjoktqvEt78gwskeQGi sVHeaM32heUDAswqOQDXIg/jw8syI+4YxBXc0/1qikiuRymy19bC2RbfJXhwiAHu6z5K K5es/n9sZ+GiVqsLMtZDrNywdDa8qNkiEjgOAucBF1gYt+Z2cAgMb8M2Fr1iV5fH8sxe VTiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XYwUKztU; spf=pass (google.com: domain of npiggin@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=npiggin@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r9-v6sor4829619pls.43.2018.07.25.07.06.59 for (Google Transport Security); Wed, 25 Jul 2018 07:06:59 -0700 (PDT) Received-SPF: pass (google.com: domain of npiggin@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XYwUKztU; spf=pass (google.com: domain of npiggin@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=npiggin@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7UxphlsljR+NlBYsTH8Esis+vxdkqmrjRFhGi68hhJU=; b=XYwUKztUXh78GoFkh5YY9kJxt1SDxMMuG1PsEcnsnNXBRKhePtsbFe3AnAfT9CnG3F 76/aXAEa+jKfRKzD3EGLQyJIfLNGmBxyLEU0g26pqCCN/WXJp6Lujfr1lcShyyN7SPG0 qjVS9IbZDC422uQn8tJgc3XkOhmB2XNE/iJPkLuBI8+/Rt/gEfGPYhVpzTYms+vjMJ9s QYzif4mG6CltSruM3MlDSCP5mE/r+BLYQGDtpyb/sflG1t/JHyat7zeoRQ/rC8gaq3cg onN8GAHAJnDbEckhAAw0JxwVqJKWGpbISgM0TewXOwIdXnNuIJkzCEMnnPSzUa7SNFd0 G6LQ== X-Google-Smtp-Source: AAOMgpdCqh7xbrmOwc7Mb7NkJWlmmf0rHmvB7dgvBNPoBO+OeJs5vUqKg07Ng8VHsiopNqqLXn0+RA== X-Received: by 2002:a17:902:2f43:: with SMTP id s61-v6mr20949070plb.274.1532527618840; Wed, 25 Jul 2018 07:06:58 -0700 (PDT) Received: from roar.au.ibm.com ([61.69.188.107]) by smtp.gmail.com with ESMTPSA id d132-v6sm20923421pga.10.2018.07.25.07.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 07:06:57 -0700 (PDT) From: Nicholas Piggin To: linux-mm@kvack.org Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 2/4] mm: mmu_notifier fix for tlb_end_vma Date: Thu, 26 Jul 2018 00:06:39 +1000 Message-Id: <20180725140641.30372-3-npiggin@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180725140641.30372-1-npiggin@gmail.com> References: <20180725140641.30372-1-npiggin@gmail.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 The generic tlb_end_vma does not call invalidate_range mmu notifier, and it resets resets the mmu_gather range, which means the notifier won't be called on part of the range in case of an unmap that spans multiple vmas. ARM64 seems to be the only arch I could see that has notifiers and uses the generic tlb_end_vma. I have not actually tested it. --- include/asm-generic/tlb.h | 17 +++++++++++++---- mm/memory.c | 10 ---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 3063125197ad..b3353e21f3b3 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -15,6 +15,7 @@ #ifndef _ASM_GENERIC__TLB_H #define _ASM_GENERIC__TLB_H +#include #include #include #include @@ -138,6 +139,16 @@ static inline void __tlb_reset_range(struct mmu_gather *tlb) } } +static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) +{ + if (!tlb->end) + return; + + tlb_flush(tlb); + mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end); + __tlb_reset_range(tlb); +} + static inline void tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_size) { @@ -186,10 +197,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define __tlb_end_vma(tlb, vma) \ do { \ - if (!tlb->fullmm && tlb->end) { \ - tlb_flush(tlb); \ - __tlb_reset_range(tlb); \ - } \ + if (!tlb->fullmm) \ + tlb_flush_mmu_tlbonly(tlb); \ } while (0) #ifndef tlb_end_vma diff --git a/mm/memory.c b/mm/memory.c index bc053d5e9d41..135d18b31e44 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -238,16 +238,6 @@ void arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, __tlb_reset_range(tlb); } -static void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) -{ - if (!tlb->end) - return; - - tlb_flush(tlb); - mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end); - __tlb_reset_range(tlb); -} - static void tlb_flush_mmu_free(struct mmu_gather *tlb) { struct mmu_gather_batch *batch;