From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2078BC2BD09 for ; Fri, 12 Jul 2024 12:44:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE35A6B0096; Fri, 12 Jul 2024 08:44:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A92F76B0098; Fri, 12 Jul 2024 08:44:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95A816B0099; Fri, 12 Jul 2024 08:44:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 76F136B0096 for ; Fri, 12 Jul 2024 08:44:08 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EF92C1A08D6 for ; Fri, 12 Jul 2024 12:44:07 +0000 (UTC) X-FDA: 82331068134.26.FE3B84C Received: from mout.web.de (mout.web.de [212.227.17.11]) by imf24.hostedemail.com (Postfix) with ESMTP id DAE47180021 for ; Fri, 12 Jul 2024 12:44:05 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=web.de header.s=s29768273 header.b=qbN6Sm+w; dmarc=pass (policy=quarantine) header.from=web.de; spf=pass (imf24.hostedemail.com: domain of spasswolf@web.de designates 212.227.17.11 as permitted sender) smtp.mailfrom=spasswolf@web.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720788220; a=rsa-sha256; cv=none; b=1mn1QxJLuBw8qceTpOSZKBEIEphHrG25bQgUq9NaIGCAo1tDC9/2rwmY7adAyWj+K+cacn hxsZrxShAwVFjJgWUKb2pBxeIljmui1QlRGobfywRXFrmAZse/jhgal046EfOUXZ60wj58 VFSlFpfFi1AVMHkNnkZlcY4OX2wZv+4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=web.de header.s=s29768273 header.b=qbN6Sm+w; dmarc=pass (policy=quarantine) header.from=web.de; spf=pass (imf24.hostedemail.com: domain of spasswolf@web.de designates 212.227.17.11 as permitted sender) smtp.mailfrom=spasswolf@web.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720788220; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o1bGVqOFBjkQcYKjdJ9UbZexqkUKxlvj8kOA0HhkZuw=; b=GAVPTxMPHhVaKyzM5nA7bdzprQGsjs3EneV1M/jwKX4nA/wn0oQ988ryBP0MX4Xws+dfNn 9VzokBzvk8o3/vBRESraxvZesu7RD2JZphsgDnIuc+bxndvHLq+vWdoyfs88jjv5QQq0SW tein5ZXZd8ewMrmgSptp2IFUcjrDLI4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1720788241; x=1721393041; i=spasswolf@web.de; bh=o1bGVqOFBjkQcYKjdJ9UbZexqkUKxlvj8kOA0HhkZuw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=qbN6Sm+wGDGXmrhm3m2cr6WcH5HCyzHvb3YOz5Ez9kD4iDD6747ubTldJUBC5GAF DfUSXzQhINInGrkwa4oIjwJvwnuCluocR5Ew2JOdC1IQUwXREecypRvQ229GS1LaK M9FOhxI4l57bNKZev9YKgFI7eLXG7GNbakdUMIePIEPT9nWvz3zC+IVFGFuuVZYV8 ji65d/1kRRpnsjqta0Y11vC3GsMssLNuaBtxedQNxwXGLfAPiEPAQIO1nw3+CCVlF lZdZUHrsm7VeiMLO7YlGIInmCCqxDRSoWaVTdUQM63RB5yzZWBDmgSPjOgwpNVfvX /EGBQuri780/fuiz8A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from localhost.localdomain ([84.119.92.193]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MNOV6-1siITT2P8M-00N6UL; Fri, 12 Jul 2024 14:44:01 +0200 From: Bert Karwatzki To: Pei Li Cc: Bert Karwatzki , Andrew Morton , Shuah Khan , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, syzbot+35a4414f6e247f515443@syzkaller.appspotmail.com, syzkaller-bugs@googlegroups.com, linux-kernel-mentees@lists.linuxfoundation.org, senozhatsky@chromium.org Subject: Re: [PATCH] mm: Fix mmap_assert_locked() in follow_pte() Date: Fri, 12 Jul 2024 14:43:57 +0200 Message-ID: <20240712124359.3199-1-spasswolf@web.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: 20240712121800.3049-1-spasswolf@web.de References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:QrKMnFDuH2I9+4nVwL03BNGAfmYfTc2RgqzO22r8ATYSy6lJLtr /0WOeyc6NgNxvxO7SoaRYkiolL6QIMXXibAu2RoQg/94Yii+EU8BeFuXe6JTwd5B3hPSWtC plztMw+RINRDzvUUtww3kykFalrpoPVuCQVo8gGNmQCZgeMV0J2ptIjpY2NkAQAlGXjp8mQ suKhrzTp8+id6M8DIUt+A== UI-OutboundReport: notjunk:1;M01:P0:X9mWF1c9VR4=;6V7S6xu/wfZbMJ9yJpqO5GpEcyn 4/gYb00mhpDcIkodseQ0JL8fOPSwJ9Yh7O8yTuGgzoj+EQCGcdGljEEQ4PG4nSOsHZWabsY6A n/wjxOQJyX0a4ugluabwJXDaHVEhxj1TWM/PdVIEfuP3cSlMFenxNtWKCDfx9hgZFKF7SoYgt R0rD0baGO5j6090cN3p0NBjkofdCT60gFO13ZKpa7wg3F79AUuFF5NN/HEs+n32dt5L1mYOxw tJYlzmRhvT2uNNWd75w9Bl99v3vTmCPQCRfzdPFhZiIOYr0gfedqStXr/p8bibXjmFzL9ebtQ 1sYiZigGnj3oGL1/y+jgwIccqu3kgCfSxlM0dNH9ph69U4vO6O795GR2jBp3RY9fQ/jBhn+sg hKwvA2ZalXFW7O69ygdG3wZBPRxkfxOc5gE4d6I7U01KEkf+cJef2GxL+oGu7dBp80LLNX8Ny IO2eBhraPn6+MWTidoS6UWtqIU5WehuxTkeRExInmXYyiQB9U8OaBdRB/5iStMKJaw3bhXm4z SnIQAqo2l46YwI65cn2PTgHex9oX4uzMPp7l9VH4+BOWz5xz91whiZSoXOZQXov5uI4QgMozP NMRQdg1WCCSjNCxNojkoayyuhOZt/LEMnxCNHhp5QfuwNWQL3fLNg6Sjul06hX/tqTrEXXBoK q8uj0gbz5l+VxINsBS/YaD0c7n0X3hGdDXz6ciZd2rQX7SGXO6xR0elJt6r/5OKDB9LKt44HZ CagqBUkgIAtp64gHC/P82wujssLBzx5FOqO7sIPgSNydezgqE2D5IztbOglP2JvIOFAirHigq qlfdUqvgVjmiHDAhj67ckv0Q== X-Rspamd-Queue-Id: DAE47180021 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3g1wugz9ksmcnzkzaywx9moecf55g4af X-HE-Tag: 1720788245-88284 X-HE-Meta: U2FsdGVkX1+xtjFawTKaGAAVXlxjtAgifG8ipjJ2kvhOUx0PMCQdst+G4NyGZQiopU/k3i5tjMG7eO2VeJWxbh3tDbeLcp+DD+e3a3GIruyCOOM7BXFfHdCu1Bq60c1vXtkiQ3ViC54tGvcI0f8tHdUJPEQGGOQD53XRD/GJWyNCDLAdsMgRCVov2AVECQfZUoVJ9zDJ20KNCoa8vq39vX3ZRKLZc8Xu1kk7/2bjxepv+wQGWpcgn71xt1HYHukUqKefvTNsUrZPRwhoQeuJTYN5yjaUykpRwL5+35VeJoBtFWjAeykXcNndtEi30w0Rdvr4MNJT/FnXkGyEbuxPcX0NdHBiL5J3GZtkqjMQ4WTYCPzVG93SFpRshhD14l+McfYjogIO03H4QBYXZNBHJQjUeZuSLoUBzRDNRTDpX55B6wx+BcDUZ9jOgiFzHWbMRvrDziRK251UPM4aw77uNT7/5/qec2EmaS81cDbdu3FIL1sxr/HGBYh7LNrKDxLIWxYVjvmIqft6j2j0PDzM/KHx/JtL8A77gBToDUE2VwwXmWvS9T12a3Yal1yu3P9BCaiCcDLKmf62jXbf7159Z8fO3LKljMPo0cOsb+FLe1k0cOpKRPpTULxKQPquEns+kfOlAxCZyvqGe4asKVQ0ZxPAay0ULCmtvIOj41QVHwYJ6xEP2Be2FEEPpmkSVya3xZoMjyOQ3IRN/cWtGi/YlJJdtrL6crcxQwRska1o4hUmkmlqcG/jID4CSucCxomRg8cttCCJMs7ai756lKdU7I/WHqmNJ8kF3S/kMsbbbfPRue6S8EdZRN/PFWEJ64o1pWJKgFE5ioFg/xRno8MnDILCFcxdjctjArk/jkiF4vPeeoWzqcFhqXHmEZTECktFw4845eXzAeio3r1ZDldcf9M752Mp+/iUsTsbi1p8axx4pgjWPWRzckFIvJ6s60LtWAI2zUgVre62ywz1Z4n rF9h9OyH qf+WdWxAC2bJtXtke2DKjPY7vSKScbN9xDQaK9ZshbzhZQ/ra8GgURSZFWuy+VHk2lkA0Ig1aCcPMpcAKquvAlYELMz2YkMgEmlzjYSIA6IFtyyUOQuhHiva2OXHxqnd5r+6u6YQ1Scc8BYkdUtptwC+K/2kbfg/9UvQCRsGrNPYhP5/iM/k5JNEGPA92Jqc38jfq1GdZaE7HN2f6Q6uG78HgGFgZG5zwJOyOrMrjUs/IibQSb21eyOMSPO9g7qe/hI0t7vWgM1sFloVkJDBv+z6phw2DtdlmXXsvJzR8qJKH8IRFwwkvr9QrjMke4vtUC5hSYt1rG5PsrV0qa6DjPLuPJG/IHe4h96W9LgDJEcgFJZKaQxTPaz/sUIY9axsgbfeiNd/YZEOgQTc= 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: List-Subscribe: List-Unsubscribe: diff --git a/mm/memory.c b/mm/memory.c index 282203363177..2f4b4322ec0e 100644 =2D-- a/mm/memory.c +++ b/mm/memory.c @@ -1817,6 +1817,7 @@ static void unmap_single_vma(struct mmu_gather *tlb, { unsigned long start =3D max(vma->vm_start, start_addr); unsigned long end; + bool mm_read_locked; if (start >=3D vma->vm_end) return; @@ -1829,11 +1830,11 @@ static void unmap_single_vma(struct mmu_gather *tl= b, if (unlikely(vma->vm_flags & VM_PFNMAP)) { if (!mm_wr_locked) - mmap_read_lock(vma->vm_mm); + mm_read_locked =3D !mmap_read_trylock(vma->vm_mm); untrack_pfn(vma, 0, 0, mm_wr_locked); - if (!mm_wr_locked) + if (!mm_wr_locked && !mm_read_locked) mmap_read_unlock(vma->vm_mm); } This seems to fix the issue without completely removing the locking. Bert Karwatzki