Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1689978ybz; Thu, 16 Apr 2020 13:45:47 -0700 (PDT) X-Google-Smtp-Source: APiQypIyjw9Uin3psgfI3TaVHBgHMipOUIexjdfD7dG38NypxUT6BE/OTvW2sq2xtxJDla2Lznp6 X-Received: by 2002:aa7:cf15:: with SMTP id a21mr30795edy.349.1587069946999; Thu, 16 Apr 2020 13:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587069946; cv=none; d=google.com; s=arc-20160816; b=iaabR2avNGkozh87nL7VGN9wnmWb+miog9z6xvIbz+5M9GwEOOF1fIEnqLktvlG4Hj ZEChfeuMFG+t3NN9/suiS6QSVvcFDL9CxuybUYRJyYQmSuQsGfyo/uwToJ5+Caq3C+vB Irt3eoBzo24e8+HPT0ilZ+aSFnVcmYMWz8bVIKTFMULqYgEvCrf2oOc6BPd1iRmjLyfz vdSXOpK6LNCSbzXrKBaCzFmzw8dE4fADd+Zg/ZEfkIPPh5sRRs+WBtGc2TmuJnutvMHM 9TgY1tQA1q0soCl7n9UzDeqIblhQeeFnx8aaQrvlmDWh3lvXRxOp/wQNNNTqSHCezXFR vVsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=+btxPmgkx56YlSv8RXp065G8LXA6Wf5Fx6WJDiptvj4=; b=EOyGyrWWtJYWwwDmPn/CTXiRQbgXCeDHIMrK2s6yfrl2sTOjt1vo20YV9r4BZDEh/1 GhcPNwBpE7qcwwHQTLt8DALqcMrMTkZ+obFx8c3VnucvlPVixUy/of8RIen9eG78136T vt5Nn1sKgrHSG3iccj7TZmE+3gJQT60g07Z/BnzRNGcOPT9cJu+XyZAydNMKs+2Pfc/7 3ge7QnThYJYpYogSRmdkxgwDJ18x0ooZ0nJKabd6du9IHGjnRED4iWdrkqblJKX4cQJq TAzmHrmPI+4hAWfyk+ufDTeszj3vkFyY8Mn4HYyNmecOPMG5zXMLxiqQxHp1SgY3J35c CULA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t24si1157977ejr.291.2020.04.16.13.45.24; Thu, 16 Apr 2020 13:45:46 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730088AbgDPSWt (ORCPT + 99 others); Thu, 16 Apr 2020 14:22:49 -0400 Received: from out30-133.freemail.mail.aliyun.com ([115.124.30.133]:35428 "EHLO out30-133.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729376AbgDPSWs (ORCPT ); Thu, 16 Apr 2020 14:22:48 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04428;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0TvjuKCW_1587061357; Received: from localhost(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0TvjuKCW_1587061357) by smtp.aliyun-inc.com(127.0.0.1); Fri, 17 Apr 2020 02:22:45 +0800 From: Yang Shi To: hughd@google.com, aarcange@redhat.com, akpm@linux-foundation.org Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path Date: Fri, 17 Apr 2020 02:22:37 +0800 Message-Id: <1587061357-122619-1-git-send-email-yang.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Syzbot reported the below lockdep splat: WARNING: possible irq lock inversion dependency detected 5.6.0-rc7-syzkaller #0 Not tainted -------------------------------------------------------- syz-executor.0/10317 just changed the state of lock: ffff888021d16568 (&(&info->lock)->rlock){+.+.}, at: spin_lock include/linux/spinlock.h:338 [inline] ffff888021d16568 (&(&info->lock)->rlock){+.+.}, at: shmem_mfill_atomic_pte+0x1012/0x21c0 mm/shmem.c:2407 but this lock was taken by another, SOFTIRQ-safe lock in the past: (&(&xa->xa_lock)->rlock#5){..-.} and interrupts could create inverse lock ordering between them. other info that might help us debug this: Possible interrupt unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&(&info->lock)->rlock); local_irq_disable(); lock(&(&xa->xa_lock)->rlock#5); lock(&(&info->lock)->rlock); lock(&(&xa->xa_lock)->rlock#5); *** DEADLOCK *** The full report is quite lengthy, please see: https://lore.kernel.org/linux-mm/alpine.LSU.2.11.2004152007370.13597@eggly.anvils/T/#m813b412c5f78e25ca8c6c7734886ed4de43f241d It is because CPU 0 held info->lock with IRQ enabled in userfaultfd_copy path, then CPU 1 is splitting a THP which held xa_lock and info->lock in IRQ disabled context at the same time. If softirq comes in to acquire xa_lock, the deadlock would be triggered. The fix is to acquire/release info->lock with *_irq version instead of plain spin_{lock,unlock} to make it softirq safe. Fixes: 4c27fe4c4c84 ("userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support") Reported-and-tested-by: syzbot+e27980339d305f2dbfd9@syzkaller.appspotmail.com Acked-by: Hugh Dickins Cc: Andrea Arcangeli Signed-off-by: Yang Shi --- mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index d722eb8..762da6a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2399,11 +2399,11 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, lru_cache_add_anon(page); - spin_lock(&info->lock); + spin_lock_irq(&info->lock); info->alloced++; inode->i_blocks += BLOCKS_PER_PAGE; shmem_recalc_inode(inode); - spin_unlock(&info->lock); + spin_unlock_irq(&info->lock); inc_mm_counter(dst_mm, mm_counter_file(page)); page_add_file_rmap(page, false); -- 1.8.3.1