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 C14CAC3DA45 for ; Fri, 12 Jul 2024 08:04:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 137856B0089; Fri, 12 Jul 2024 04:04:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C0A96B008C; Fri, 12 Jul 2024 04:04:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA2D06B0092; Fri, 12 Jul 2024 04:04:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CB36E6B0089 for ; Fri, 12 Jul 2024 04:04:22 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 706DEC099F for ; Fri, 12 Jul 2024 08:04:22 +0000 (UTC) X-FDA: 82330363164.05.40A1B05 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf07.hostedemail.com (Postfix) with ESMTP id 8AC204001C for ; Fri, 12 Jul 2024 08:04:20 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=UISf9Atx; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.210.171 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720771434; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CXFOHNmtNejtp8eYqf/wBMdkQCzaaL+gxzG7fKAaJ98=; b=6ZlnxkmUYIfjncU/H+ORUiI9FO75IU2FioyS3Dp6GFxLlJ6bYACDWjjq/+xjuBKAbllS1O Em0hffi4h4nJbza7XL5F8EXez46648uY/hyaXhh6W8YWZRhCrSeYiq4ArN7O3YzEqBJ0mx 6cQWxhwa42dPB6s0VsRzKNvs1uW8Kgk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=UISf9Atx; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.210.171 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720771434; a=rsa-sha256; cv=none; b=IJ/IJ1qaGs7hoUqKII3fxNeiJy2sKjS7Vaq4egLS+xDxA9mzU0oYRvgqewUYbUc2DEi6ws Mj/qaoUonNC5w5YgMNaTWelSx+wftaK4YK7MtGrJ8K9Jc1aboijhsfauxRb/RpVgTPqL9c W4D61on5XJlYZdz65/4AVPE4Euy+Prs= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-706524adf91so1484504b3a.2 for ; Fri, 12 Jul 2024 01:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1720771459; x=1721376259; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=CXFOHNmtNejtp8eYqf/wBMdkQCzaaL+gxzG7fKAaJ98=; b=UISf9AtxTrIrvxnWB2iFy8v4mxYqIKkAYZf4+T4EFjMIJ/c8DMaq6RlKr3R0vsalv0 pn1m+Bnt6DliBBCpCwHDNIykxGySSTYtf2OLT9Q1Z11y/CSd6Lrtto9FCMtnulCMLprS tWEAkrQ4bUwj1O+kd5ooZauLUVW0SiCXDSWGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720771459; x=1721376259; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CXFOHNmtNejtp8eYqf/wBMdkQCzaaL+gxzG7fKAaJ98=; b=RQbe+FLw/eJWfvxlzff5SFgiYexNZ2isKCiGZGsDP3I8sktBs5T+kQ8+d/4o0u8w25 VwBWOD/W7vYcvVOJh2Hx9Si9IFOYkUAZJZ+VShZpvEK9Qd4/3it6ckN8QRZUEQv4dwCC iUplrqJFBiM3AJjpVtmd11aXrIB8BWGSY55ohqgzh4RdrNnOpIDLpGIUr3X5bLEu00N4 Xn/Sv0Ae+3umOGtvMhsYKOkAxyRwd9mpjWAgWx7psu4sh8xFZP2rhlf1++BznEfy9HH2 dIM0EBPXihDAdZBibCk28albL/z1kZP91f0Atcx3osyfoiR2eUp65aJzk8z1aPOiakqk qDlg== X-Gm-Message-State: AOJu0Yz9q4HYecdrZDFIPbjpeIDBOw/deMMjLdnlccEHctlVV5jsohYv R4ml7A23s/0Vf0MByHC74UBQB1C/SMyHq1pPReimKDZU2IFo4yBFslSWgCN8Pg== X-Google-Smtp-Source: AGHT+IH4+oZEOZZ7qKy8fbQavf83lJTLVIUFhOwV7t2v2393WzTooxpV7nuWh1QFdWBbiagy3F208Q== X-Received: by 2002:a05:6a00:6c89:b0:705:be21:f2be with SMTP id d2e1a72fcca58-70b4356dc65mr12461691b3a.18.1720771459178; Fri, 12 Jul 2024 01:04:19 -0700 (PDT) Received: from google.com ([2401:fa00:8f:203:acec:d0e8:b0dd:8593]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438c0996sm6864562b3a.60.2024.07.12.01.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 01:04:18 -0700 (PDT) Date: Fri, 12 Jul 2024 17:04:14 +0900 From: Sergey Senozhatsky To: Pei Li , Andrew Morton , David Hildenbrand Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, syzkaller-bugs@googlegroups.com, linux-kernel-mentees@lists.linuxfoundation.org, syzbot+35a4414f6e247f515443@syzkaller.appspotmail.com Subject: Re: [PATCH] mm: Fix mmap_assert_locked() in follow_pte() Message-ID: <20240712080414.GA47643@google.com> References: <20240710-bug12-v1-1-0e5440f9b8d3@gmail.com> <92a2dc30-6e48-44ea-9cde-693b911f200d@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <92a2dc30-6e48-44ea-9cde-693b911f200d@redhat.com> X-Stat-Signature: t116cqhge6rkk3g6emcua9z8tjkiscne X-Rspam-User: X-Rspamd-Queue-Id: 8AC204001C X-Rspamd-Server: rspam02 X-HE-Tag: 1720771460-861321 X-HE-Meta: U2FsdGVkX19nn81+s98Cs6ymcgYAf8q6KTXf+jvpqHbwRoezWSU/Cf8gx1ZoWo3TDwqcmBIT1Fty8KXRlA9PR+5C9OZBb2KfswGtHR1JzZN1+JYJJ26XSBuUsjtwy9H8w7in7pYlvZeEGmwSFPpXxSybIlZgvTjfJv+y28oe8MFMUNZ6QEDv6wF7vGjNazDcDhoDYAD9Br2nVsHdq2OUpzYC2vZk1Ysl6qi0cWNRDUhJJ7p9+Gqv3vtra9kBGmgksl7zBpduTQyoOJud6iRku2cLvVoPJvCXJwb4PA1ZXVkeJcondDYpOP0DauQO9lXGvry8HhkobQFFCNMoZeQKA7wR/NTqvhLP+NsOdjTDmV8QDQtQSXyl3oFffZUhG85fOeYsJDF9dANoEsD+tBPrahX+/J74JGwEuF8Z8TbtPHNGbhcbK1m+YKwy2GpDpHwKzJe2p5EAgs6wGz6YAKzKeqExNm1KzsrtLKT24m+c8GU0RZ1J84eMGcdFHbMjsWDbYJs0JiuA8F5MtW7YcXbbHQ4OkRdB8VeO/hSNBToPhqyHEuDomfs/4TcXnvVT3FpOiUUFAr5gI96I06wT0JPTugqDsQZijmpgKFfhOsCOqpLv/ILhQWzh4zn+nQ5jhrHGzbSvUwUlgdRzKZ+eApEVJT8s9R+WQwbBZFzH0pbxibvG7BPpfiGvRHtjNmiXtTeLild77234fqiPk5xhz3b0MgKCC+eAYNQMD2qTN2RqEGhqLmVFCMjLr7zMxL9OAeaXyrPeU+QYRwORxVjgq8aDacV7v3+wNvDaXCZN6zqN/3bE7yL1Uq4AU7pRlZOCsA0EdtYThaXpWjMly8g0A/6Hig8hCldLm0MRSICRi8zx9qgaj2LcLDfFKpFSycAVwjrbwcNnWCDwvaC2dh/QVQg8wJx6gg/PsjOosfK4Cifb90L8PEznU9l5qFEMafqDVVig+gzznGiPxFqwjZCHtUq CKLyLIag J/NKe9iqpde7r1d4/mszN7GlOY9j8ppjqZr/XXv3x6h2dyiXUNgbWmP/RRh7Js6PtZ6uzs+9b4fpTMHu+Z31GajxXD+8cXjYOTBh/q9G0dyKUN9uVmFBoufkhj5MpNZG5+g4u+ihpcnYOs/400+FAQKXq5RiVvYfItq2ikr0wmc7po4zKk8LjfCNndTbRV8C7b1cta4evEucnf2xwRanL8WbNPJ/ZobAsbLXPQc62R44fA6QFaSCNDGOUQHdN1NhfBwObnDB9n/RO/j+N2t222ioETjc+dvVs9gXIG/enC3d5D7XDGAKULNS8ddCRV+EUA+SPIz90bEhXQxJ67QpA/CYJEkENRbweHhrFO1CdotQnmaMuA6mdOTt1TvA7Dbvxzt8nDcakzJBWg/RSjDbIBL78LpzvzkVmdz9+HGKTDCdETDoN80Wvyco3yHgB4FDfrhNhYoz2qgClbPYw85xdoARXQOAM9ACOVy4T 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: On (24/07/11 23:33), David Hildenbrand wrote: [..] > > @@ -1815,9 +1815,16 @@ static void unmap_single_vma(struct mmu_gather *tlb, > > if (vma->vm_file) > > uprobe_munmap(vma, start, end); > > - if (unlikely(vma->vm_flags & VM_PFNMAP)) > > + if (unlikely(vma->vm_flags & VM_PFNMAP)) { > > + if (!mm_wr_locked) > > + mmap_read_lock(vma->vm_mm); > > + > > untrack_pfn(vma, 0, 0, mm_wr_locked); > > + if (!mm_wr_locked) > > + mmap_read_unlock(vma->vm_mm); > > + } > > + > > if (start != end) { > > if (unlikely(is_vm_hugetlb_page(vma))) { > > I'm not sure if this is the right fix. I like to understand how we end up > without the mmap lock at least in read mode in that path? I suspect this is causing a deadlock: [ 10.263161] ============================================ [ 10.263165] WARNING: possible recursive locking detected [ 10.263170] 6.10.0-rc7-next-20240712+ #645 Tainted: G N [ 10.263177] -------------------------------------------- [ 10.263179] (direxec)/166 is trying to acquire lock: [ 10.263184] ffff88810b4f0198 (&mm->mmap_lock){++++}-{3:3}, at: mmap_read_lock+0x12/0x40 [ 10.263217] [ 10.263217] but task is already holding lock: [ 10.263219] ffff88810b4f0198 (&mm->mmap_lock){++++}-{3:3}, at: exit_mmap+0x9c/0x830 [ 10.263238] [ 10.263238] other info that might help us debug this: [ 10.263241] Possible unsafe locking scenario: [ 10.263241] [ 10.263243] CPU0 [ 10.263245] ---- [ 10.263247] lock(&mm->mmap_lock); [ 10.263252] lock(&mm->mmap_lock); [ 10.263257] [ 10.263257] *** DEADLOCK *** [ 10.263257] [ 10.263259] May be due to missing lock nesting notation [ 10.263259] [ 10.263262] 3 locks held by (direxec)/166: [ 10.263267] #0: ffff88810b4e8548 (&sig->cred_guard_mutex){+.+.}-{3:3}, at: bprm_execve+0x70/0x1110 [ 10.263286] #1: ffff88810b4e85e0 (&sig->exec_update_lock){+.+.}-{3:3}, at: exec_mmap+0x9f/0x510 [ 10.263302] #2: ffff88810b4f0198 (&mm->mmap_lock){++++}-{3:3}, at: exit_mmap+0x9c/0x830 [ 10.263318] [ 10.263318] stack backtrace: [ 10.263329] CPU: 6 UID: 0 PID: 166 Comm: (direxec) Tainted: G N 6.10.0-rc7-next-20240712+ #645 [ 10.263340] Tainted: [N]=TEST [ 10.263349] Call Trace: [ 10.263355] [ 10.263360] dump_stack_lvl+0xa3/0xeb [ 10.263375] print_deadlock_bug+0x4d5/0x680 [ 10.263387] __lock_acquire+0x65fb/0x7830 [ 10.263408] ? lock_is_held_type+0xdd/0x150 [ 10.263425] lock_acquire+0x14c/0x3e0 [ 10.263433] ? mmap_read_lock+0x12/0x40 [ 10.263445] ? lock_is_held_type+0xdd/0x150 [ 10.263454] down_read+0x58/0x9a0 [ 10.263461] ? mmap_read_lock+0x12/0x40 [ 10.263476] mmap_read_lock+0x12/0x40 [ 10.263485] unmap_single_vma+0x1bf/0x240 [ 10.263497] unmap_vmas+0x146/0x1c0 [ 10.263511] exit_mmap+0x13d/0x830 [ 10.263533] __mmput+0xc2/0x2c0 [ 10.263556] exec_mmap+0x4cb/0x510 [ 10.263580] begin_new_exec+0xfe6/0x1ba0 [ 10.263612] load_elf_binary+0x797/0x22a0 [ 10.263637] ? load_misc_binary+0x53a/0x930 [ 10.263656] ? lock_release+0x50f/0x830 [ 10.263673] ? bprm_execve+0x6d7/0x1110 [ 10.263693] bprm_execve+0x70d/0x1110 [ 10.263730] do_execveat_common+0x44b/0x600 [ 10.263745] __x64_sys_execve+0x8e/0xa0 [ 10.263754] do_syscall_64+0x71/0x110 [ 10.263764] entry_SYSCALL_64_after_hwframe+0x4b/0x53