Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EF09C433DF for ; Mon, 10 Aug 2020 02:33:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24306206CD for ; Mon, 10 Aug 2020 02:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597026834; bh=Ht0tdOtQGI9SWE4ZcV9bVWpQm0KNiHHVysILtEkmPLA=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=i1l/fT7kEUbFY6cPPty4q28I37Z0tXBj3IrVbfPnWQVNA5ScppXkcQx/ZNt9tazur cWt2HWdYghrhnKlJMqO3T6QdqaSmj8PjgfEUuJSYKPDN3qnmOdONkWMUG/8g37lXpH 4MYAiH6O0c6yBkrtaXj0eHI5A9qPUfjofzjOrl3Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726389AbgHJCdx (ORCPT ); Sun, 9 Aug 2020 22:33:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:37420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726219AbgHJCdw (ORCPT ); Sun, 9 Aug 2020 22:33:52 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A82A3206C3; Mon, 10 Aug 2020 02:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597026832; bh=Ht0tdOtQGI9SWE4ZcV9bVWpQm0KNiHHVysILtEkmPLA=; h=Date:From:To:Subject:From; b=gW0j0dkPu0O5s8vLgs9MnoXDrggdsBli3LKSR+RWjzh9upZ3X0WYVWfRSLB5N72Sk uJ2PKp5VdxIDRQgaqWZl2Bi8WU5aWb0a3msZaFCWGodduybooEh3FBbc+kRlVQpJHh QuDSCIeAMqMALhSJLVLNaISEp3SBZ5eYOsgXzR0o= Date: Sun, 09 Aug 2020 19:33:51 -0700 From: akpm@linux-foundation.org To: axboe@kernel.dk, hch@lst.de, jannh@google.com, keescook@chromium.org, luto@amacapital.net, mathieu.desnoyers@efficios.com, mm-commits@vger.kernel.org, npiggin@gmail.com, peterz@infradead.org, stable@vger.kernel.org, will@kernel.org Subject: [merged] mm-fix-kthread_use_mm-vs-tlb-invalidate.patch removed from -mm tree Message-ID: <20200810023351.SpZE0POf7%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: fix kthread_use_mm() vs TLB invalidate has been removed from the -mm tree. Its filename was mm-fix-kthread_use_mm-vs-tlb-invalidate.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Peter Zijlstra Subject: mm: fix kthread_use_mm() vs TLB invalidate For SMP systems using IPI based TLB invalidation, looking at current->active_mm is entirely reasonable. This then presents the following race condition: CPU0 CPU1 flush_tlb_mm(mm) use_mm(mm) tsk->active_mm = mm; if (tsk->active_mm == mm) // flush TLBs switch_mm(old_mm,mm,tsk); Where it is possible the IPI flushed the TLBs for @old_mm, not @mm, because the IPI lands before we actually switched. Avoid this by disabling IRQs across changing ->active_mm and switch_mm(). Of the (SMP) architectures that have IPI based TLB invalidate: Alpha - checks active_mm ARC - ASID specific IA64 - checks active_mm MIPS - ASID specific flush OpenRISC - shoots down world PARISC - shoots down world SH - ASID specific SPARC - ASID specific x86 - N/A xtensa - checks active_mm So at the very least Alpha, IA64 and Xtensa are suspect. On top of this, for scheduler consistency we need at least preemption disabled across changing tsk->mm and doing switch_mm(), which is currently provided by task_lock(), but that's not sufficient for PREEMPT_RT. [akpm@linux-foundation.org: add comment] Link: http://lkml.kernel.org/r/20200721154106.GE10769@hirez.programming.kicks-ass.net Signed-off-by: Peter Zijlstra (Intel) Reported-by: Andy Lutomirski Cc: Nicholas Piggin Cc: Jens Axboe Cc: Kees Cook Cc: Jann Horn Cc: Will Deacon Cc: Christoph Hellwig Cc: Nicholas Piggin Cc: Mathieu Desnoyers Cc: Signed-off-by: Andrew Morton --- kernel/kthread.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/kernel/kthread.c~mm-fix-kthread_use_mm-vs-tlb-invalidate +++ a/kernel/kthread.c @@ -1241,13 +1241,16 @@ void kthread_use_mm(struct mm_struct *mm WARN_ON_ONCE(tsk->mm); task_lock(tsk); + /* Hold off tlb flush IPIs while switching mm's */ + local_irq_disable(); active_mm = tsk->active_mm; if (active_mm != mm) { mmgrab(mm); tsk->active_mm = mm; } tsk->mm = mm; - switch_mm(active_mm, mm, tsk); + switch_mm_irqs_off(active_mm, mm, tsk); + local_irq_enable(); task_unlock(tsk); #ifdef finish_arch_post_lock_switch finish_arch_post_lock_switch(); @@ -1276,9 +1279,11 @@ void kthread_unuse_mm(struct mm_struct * task_lock(tsk); sync_mm_rss(mm); + local_irq_disable(); tsk->mm = NULL; /* active_mm is still 'mm' */ enter_lazy_tlb(mm, tsk); + local_irq_enable(); task_unlock(tsk); } EXPORT_SYMBOL_GPL(kthread_unuse_mm); _ Patches currently in -mm which might be from peterz@infradead.org are