Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp864908pxx; Tue, 27 Oct 2020 02:20:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwol3gGNyJqEkKUWDryizPQ7/m9yUNoiq6oyHd5FN5YluyqXf2qgC2QmeepDvqiV8Njcpq2 X-Received: by 2002:a05:6402:293:: with SMTP id l19mr1202930edv.227.1603790405287; Tue, 27 Oct 2020 02:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603790405; cv=none; d=google.com; s=arc-20160816; b=wAeUhsfnm/ZRv1Y9wYZipJlkZIQvtVsNbQjqLNcAG9zIYwqN0U1LIj3R001V4tZFw+ Xr1h0LkH5k6QcmXBaeoLoLoKx55HYOEErrmsbt2kIKhEh1KvyW/ReN4cKlUxeZZQUHvz hrg0kHX8iZsprRqsT1KH2SuItIZMD+pt27WrVJmR+S+QpL6ZwZEyhegDUikPsfnxQkjN +BuOJtP+YsBL0KuJbWt1zccplK+ED7S0m7cP2WsK8BkxbR7eIH1rKbmDVX+axJBtbDai WXSx/9TQ56/A6rsV56YF+fqnN4aeZwB5hp9hQNourduWpU/dU+yudcZAtPg7xZPL6GCa cUhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+d1pp8mpQ49QHRSqMztcd1/Pd210OkGI7FqLU5H0cuU=; b=BmBBu1LuDEr2smObRC1Kj0O54rVY5nhSTtjESJNQna0ZTA11ehxPR9vsTBiaarPNJr v6e+7DOH1QLcXPFUR6NCXfvXWMsmIgVQm5ylI1lJpwgfN5vNAMKgHbR4AjrHrbzzyh0H 9IPyTS8reAkyAIPyOBVka2CCSnFck5WWP2IPyPcwndmzQhwitNotwUVTXSDk4atwGwdJ llywIsFTYz4DBvF0GyBb82V2OZdoIUGuDsJlXKqOJYeRzbt8VUQ2pALIDljE8gYBsVub 6/Ei9dRGE/Vi1PIrbURGSoUiisGqD5b8EwjcEdW43plbP+xx3Nx2Rmya/gGrNCRenJrr d13Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mK3XZWbM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y22si422042edq.522.2020.10.27.02.19.43; Tue, 27 Oct 2020 02:20:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mK3XZWbM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408688AbgJZXtX (ORCPT + 99 others); Mon, 26 Oct 2020 19:49:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:46944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408626AbgJZXtO (ORCPT ); Mon, 26 Oct 2020 19:49:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B4E7120773; Mon, 26 Oct 2020 23:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756153; bh=jL/nzThwVE3kIHHUDsWorn8dTrwZ96xtik9XrgKV73s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mK3XZWbMMK1ezoYv3TgesLZcEXwoRbsDq6ZE2vsEcPOKqpB4eI6pToE8deKwxabMK mJAKzoS4SVPuUXnIh9Fer6T4XQHMIglk81D8PYmI6blY/t+cS5MgKXzFUzqRANiJ0p Gouvb6cQHI++NLInbSSjnSCEHDw3ApzrGOk+DLeM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Piggin , Peter Zijlstra , Michael Ellerman , Sasha Levin , linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.9 006/147] mm: fix exec activate_mm vs TLB shootdown and lazy tlb switching race Date: Mon, 26 Oct 2020 19:46:44 -0400 Message-Id: <20201026234905.1022767-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026234905.1022767-1-sashal@kernel.org> References: <20201026234905.1022767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Piggin [ Upstream commit d53c3dfb23c45f7d4f910c3a3ca84bf0a99c6143 ] Reading and modifying current->mm and current->active_mm and switching mm should be done with irqs off, to prevent races seeing an intermediate state. This is similar to commit 38cf307c1f20 ("mm: fix kthread_use_mm() vs TLB invalidate"). At exec-time when the new mm is activated, the old one should usually be single-threaded and no longer used, unless something else is holding an mm_users reference (which may be possible). Absent other mm_users, there is also a race with preemption and lazy tlb switching. Consider the kernel_execve case where the current thread is using a lazy tlb active mm: call_usermodehelper() kernel_execve() old_mm = current->mm; active_mm = current->active_mm; *** preempt *** --------------------> schedule() prev->active_mm = NULL; mmdrop(prev active_mm); ... <-------------------- schedule() current->mm = mm; current->active_mm = mm; if (!old_mm) mmdrop(active_mm); If we switch back to the kernel thread from a different mm, there is a double free of the old active_mm, and a missing free of the new one. Closing this race only requires interrupts to be disabled while ->mm and ->active_mm are being switched, but the TLB problem requires also holding interrupts off over activate_mm. Unfortunately not all archs can do that yet, e.g., arm defers the switch if irqs are disabled and expects finish_arch_post_lock_switch() to be called to complete the flush; um takes a blocking lock in activate_mm(). So as a first step, disable interrupts across the mm/active_mm updates to close the lazy tlb preempt race, and provide an arch option to extend that to activate_mm which allows architectures doing IPI based TLB shootdowns to close the second race. This is a bit ugly, but in the interest of fixing the bug and backporting before all architectures are converted this is a compromise. Signed-off-by: Nicholas Piggin Acked-by: Peter Zijlstra (Intel) Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200914045219.3736466-2-npiggin@gmail.com Signed-off-by: Sasha Levin --- arch/Kconfig | 7 +++++++ fs/exec.c | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index af14a567b493f..94821e3f94d16 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -414,6 +414,13 @@ config MMU_GATHER_NO_GATHER bool depends on MMU_GATHER_TABLE_FREE +config ARCH_WANT_IRQS_OFF_ACTIVATE_MM + bool + help + Temporary select until all architectures can be converted to have + irqs disabled over activate_mm. Architectures that do IPI based TLB + shootdowns should enable this. + config ARCH_HAVE_NMI_SAFE_CMPXCHG bool diff --git a/fs/exec.c b/fs/exec.c index a91003e28eaae..d4fb18baf1fb1 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1130,11 +1130,24 @@ static int exec_mmap(struct mm_struct *mm) } task_lock(tsk); - active_mm = tsk->active_mm; membarrier_exec_mmap(mm); - tsk->mm = mm; + + local_irq_disable(); + active_mm = tsk->active_mm; tsk->active_mm = mm; + tsk->mm = mm; + /* + * This prevents preemption while active_mm is being loaded and + * it and mm are being updated, which could cause problems for + * lazy tlb mm refcounting when these are updated by context + * switches. Not all architectures can handle irqs off over + * activate_mm yet. + */ + if (!IS_ENABLED(CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM)) + local_irq_enable(); activate_mm(active_mm, mm); + if (IS_ENABLED(CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM)) + local_irq_enable(); tsk->mm->vmacache_seqnum = 0; vmacache_flush(tsk); task_unlock(tsk); -- 2.25.1