From patchwork Wed Sep 18 17:20:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Anees X-Patchwork-Id: 13807039 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F5D31C984E for ; Wed, 18 Sep 2024 17:21:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726680062; cv=none; b=WQ0DlYHwm+QXMWJkMhoutOCfzRdl6OnIQ0jZOSJH/ADOJ9+WuAuJ2S+8EkVjtv2JpEtSDzgLMYrHul2pj1AqOK826jExLbEzX9HkqXHzJSc3xehxsD8JqzDepYwyXyYwCtdMOMMbFfFj+BDgnTgBKl0+Ww5TewnOe2s4D2Pov4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726680062; c=relaxed/simple; bh=dLW7yMaZUHwvr8OqyqLXlmiSaDlBdSZjSstzHtIjIaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lAryid4yFqxPJS+oHmj+kT/JD/tRjIwGE9kOtq6SlIZSu1Z0wcQi8oaK2Zw2POK8VE3ZfF/5PiTZODW+gHNa5ISy48pMohBJZV4/xxxNkQMLfR3U0QFyY4gjCJXi+GctKw0/5JMvUULD/lXKDEeSBHG/Lvnw4lStKLEtktEQG7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KiZ7oGb1; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KiZ7oGb1" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-718e2855479so5257582b3a.1 for ; Wed, 18 Sep 2024 10:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726680060; x=1727284860; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X8x33SOcOiQLrcjzIwPJ+0Uf+LjyFv78ehpo58zIPVY=; b=KiZ7oGb1ehwPWMrsLfq5bFCk2ufgSAWh0s+saJU+EzUrrvo1NamCLZYiSZvEN/lL// 9Hr8bfNdBPL1dOk9bE9BjcaYXVF5ZYjc3VOCWNd5rCzNyRZY0U2E7Psi2tQ1prXkpUPJ oPJGsfH+XyE5uOP64HZvKCoq24S3hC/bCx5Ieu/fe2+iJblp1APGDFk96fLzamqJukbx 1aWVMmfOL2U28ryLSMbHU4y9k5gAhAKrsfo3NVhT2b1KMdN18jTrgMcOgMtR5ptu7jyp tqrrv8bD7M6iffA66V5/jUAwfTdWBMz7Atpn0pyPmg7dLQ7JAC9aAyt8Dxa0ofp+LWjB RhWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726680060; x=1727284860; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X8x33SOcOiQLrcjzIwPJ+0Uf+LjyFv78ehpo58zIPVY=; b=eBKGf7vsWK7mAgIVZmWVAOfixCIDhGmJYZr48bh2gyTt9wdI6tePOM1FebsT2juJv5 zEBg7311asm4bTFGK5IKTWgbzsaXk4Eta92eMg0tGJB7c9aQTF6MV0ohTIt3ySgHewPK ZO3tmUjB48Q9wgVdF28izhTwv8d2pHUnU4bhZwMkIxwST/sm10Mkvo2gjuObJ2I73m/t jklM4fvPJqgRLorCB5as5G8QkbF6hcaFx+nBZE4ZCBhc3lm+rPuoNa2mxubutgFSdkBQ cImSzoXkKJmxan9GfxAHPDp5yslcTWho/FLIPUr8FQRwUZAyHwK69jp63EbsXu+JeDoS Kx3w== X-Gm-Message-State: AOJu0Yy8wo0Jh/emzlahfqc6oel757A1rsJiW4Z9CisbJQkCoWEwWaGG SK74rJcjlJwvRS9bq2JZGQxR+aHpcsnWmHwWOqNTaicNx6PdHkuQ+kA21s5V X-Google-Smtp-Source: AGHT+IHPfFq2ebm0eN6ynBUnxXkvTYH9W9Sr+at5r786BHZM1dzVPHVDEIKanFJrN6wz1+6c++K+Gg== X-Received: by 2002:a05:6a00:1703:b0:706:6c38:31f3 with SMTP id d2e1a72fcca58-71926080509mr33181259b3a.8.1726680059568; Wed, 18 Sep 2024 10:20:59 -0700 (PDT) Received: from archlinux.. ([2405:201:e00c:517f:5e87:9cff:fe63:6000]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-71944b7aeafsm7186476b3a.99.2024.09.18.10.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 10:20:58 -0700 (PDT) From: Mohammed Anees To: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Mark Fasheh , Joel Becker , Joseph Qi , Mohammed Anees , syzbot+18a87160c7d64ba2e2f6@syzkaller.appspotmail.com Subject: [PATCH 1/2] ocfs2: Fix deadlock in ocfs2_read_virt_blocks Date: Wed, 18 Sep 2024 17:20:25 +0000 Message-ID: <20240918172026.2532-2-pvmohammedanees2003@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240918172026.2532-1-pvmohammedanees2003@gmail.com> References: <20240918172026.2532-1-pvmohammedanees2003@gmail.com> Precedence: bulk X-Mailing-List: ocfs2-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 syzbot has found a kernel BUG in ocfs2_write_cluster_by_desc, while the next patch in the series resolves this, another bug has been detected due to a potential deadlock [1]. The scenario is depicted here, CPU0 CPU1 lock(&ocfs2_file_ip_alloc_sem_key); lock(&osb->system_file_mutex); lock(&ocfs2_file_ip_alloc_sem_key); lock(&osb->system_file_mutex); The function calls which could lead to this are: CPU0 ocfs2_write_begin - lock(&ocfs2_file_ip_alloc_sem_key); . . . ocfs2_get_system_file_inode - lock(&osb->system_file_mutex); CPU1 - ocfs2_get_system_file_inode - lock(&osb->system_file_mutex); . . . ocfs2_read_virt_blocks - lock(&ocfs2_file_ip_alloc_sem_key); This issue can be resolved by making the down_read -> down_read_try in the ocfs2_read_virt_blocks. [1] https://syzkaller.appspot.com/bug?extid=18a87160c7d64ba2e2f6 Reported-and-tested-by: syzbot+18a87160c7d64ba2e2f6@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=18a87160c7d64ba2e2f6 Signed-off-by: Mohammed Anees --- fs/ocfs2/extent_map.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 70a768b62..f83d0a3b6 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -961,6 +962,8 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr, int rc = 0; u64 p_block, p_count; int i, count, done = 0; + int retries, max_retries = 5; + int retry_delay_ms = 30; trace_ocfs2_read_virt_blocks( inode, (unsigned long long)v_block, nr, bhs, flags, @@ -973,7 +976,18 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr, } while (done < nr) { - down_read(&OCFS2_I(inode)->ip_alloc_sem); + retries = 0; + while (retries < max_retries) { + if (down_read_trylock(&OCFS2_I(inode)->ip_alloc_sem)) + break; // Lock acquired + msleep(retry_delay_ms); + retries++; + } + if (retries == max_retries) { + rc = -EAGAIN; + mlog(ML_ERROR, "Cannot acquire lock\n"); + break; + } rc = ocfs2_extent_map_get_blocks(inode, v_block + done, &p_block, &p_count, NULL); up_read(&OCFS2_I(inode)->ip_alloc_sem); From patchwork Wed Sep 18 17:20:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Anees X-Patchwork-Id: 13807040 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29EE91C9EAD for ; Wed, 18 Sep 2024 17:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726680066; cv=none; b=p7diODJTEmwNngFbgziHM+1IpZC0hxz8U8R3R+7o1U29VSOgJm0T0DWGq5bVETo/BywpEXaGflzH0c5RjSfY8hFra7iJyxiTeLfknNlSvdhUyEwBeHGUTfWYPvt9VGPy8AseBZf7ekk9IYmqq1r23Kx9e37TWTWHejxqQIymVaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726680066; c=relaxed/simple; bh=wdJOrGs35uZAgenFPyRtZVhdFWiwxgcmCBPZMD7rp68=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WpS/5HpTD/5282WBn6VLZ81OHK8q0umHlO2ZZPSMzf5LTQfAOc8w3WCRxLkihfZnMMW9cq3NG+8eNDDWVkr4nDS0aFTV3ZRMDLTkA2jieUAYb2LkUzY6sP41iE7UJ8u3mhRwFzzKabypcSTYWQdg/74RIjIb/hHF6jx+rDS4ZgQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Cjc+Om3+; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cjc+Om3+" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7db0fb03df5so5234459a12.3 for ; Wed, 18 Sep 2024 10:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726680064; x=1727284864; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7qrVPgtc9pr0MYXVJUam6GnYq72ewYaQxAFUiuA/F6Y=; b=Cjc+Om3+z4avH15BIsFRgU2nDbCltWPYHKhMuI8PaXNVfkoDsuJIkF/CoUA51NVeOG wsES3djw/1u2U1ubp7oij+rJrvB7RVJhrbBKqjRm8st+Xd/u4vWB1CyFAVhMfDd5Q83a N0ds1YBRIHmbKqIu0r7CZpS2g+YIzAfDb9/ZeJx3yvAw3cw9fqM09geXo7i5VHDk108P 4l0hdrKzMJBrvV8YLa8RffnON/fpWXvnACJRA/HRu5r5pHLk8kejuftyCz4ZhFO/aULk VGZ3JQ+s86RYgkQxO268TQ0ovbAP583JeKAXhPlNTX52ywR/zrZnjxW4fc3MlfC56SJY s17A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726680064; x=1727284864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7qrVPgtc9pr0MYXVJUam6GnYq72ewYaQxAFUiuA/F6Y=; b=s7fM3icUDKFLu0VLDepfLNQA6kejrp0WX8jbOvlISo4nH6obvzXxftWZ2cJ2HEpAdZ xtQer2eIYaINZUP3+80GIT0tgiw8E6sGck6KXm/2WPil1S67Dam72a6EtA304vHLKFCK srOFnS0icFewii2ZXCRnpgnVhR9E1LB1IUXBImt62Gpxr6fyvqgfINuPNGd8QQH/kqdL hW4IxqqLYAmHbG53JqG8mAnwbGJ47+FhXduT7vJQkdFoD4b/E/NlqwMO6anGuxHTeYt8 22dY5aiOoD0MvMtgZlll6HIV2xXGtACNUIP/287baOkC8wLMWILGWXYTCT/7ok6MXruq xuOg== X-Gm-Message-State: AOJu0YxxuEhMvoMCwfMQebZDPdwmOG6XezQsNcwV9XcNHGq6XyEmB7Nd tpGaoiE6uHAOnzrVGR2kaJGzMc9Rp9FxDI0oqo8VqEVrd+27OGZCnVzBsTM3 X-Google-Smtp-Source: AGHT+IF04UxO5twV68LGB/UhP/cNf8F9nCgomakgymG/9B3GMBVg5E8jctBNna5xDFm6dp5UHVbAtw== X-Received: by 2002:a05:6a21:4d8a:b0:1cf:2218:1be6 with SMTP id adf61e73a8af0-1cf764b02aemr34176792637.50.1726680063771; Wed, 18 Sep 2024 10:21:03 -0700 (PDT) Received: from archlinux.. ([2405:201:e00c:517f:5e87:9cff:fe63:6000]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-71944b7aeafsm7186476b3a.99.2024.09.18.10.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 10:21:03 -0700 (PDT) From: Mohammed Anees To: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Mark Fasheh , Joel Becker , Joseph Qi , Mohammed Anees , syzbot+18a87160c7d64ba2e2f6@syzkaller.appspotmail.com Subject: [PATCH 2/2] osfs2: Fix kernel BUG in ocfs2_write_cluster Date: Wed, 18 Sep 2024 17:20:26 +0000 Message-ID: <20240918172026.2532-3-pvmohammedanees2003@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240918172026.2532-1-pvmohammedanees2003@gmail.com> References: <20240918172026.2532-1-pvmohammedanees2003@gmail.com> Precedence: bulk X-Mailing-List: ocfs2-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 syzbot has found a kernel BUG in ocfs2_write_cluster_by_desc [1]. The issue arises because ocfs2_insert_extent receives start_blk as 0, which incorrectly maps to a physical address of 0. This occurs when block is 0 after the call to ocfs2_clusters_to_blocks which is invoked inside the ocfs2_add_clusters_in_btree. The block value is then passed to ocfs2_insert_extent, leading to the problem. [1] https://syzkaller.appspot.com/bug?extid=18a87160c7d64ba2e2f6 Reported-and-tested-by: syzbot+18a87160c7d64ba2e2f6@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=18a87160c7d64ba2e2f6 Signed-off-by: Mohammed Anees --- fs/ocfs2/alloc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 395e23920..926ffeed8 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -4843,6 +4843,13 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, } block = ocfs2_clusters_to_blocks(osb->sb, bit_off); + if (block == 0) { + mlog(ML_ERROR, "Conversion resulted in zero block number"); + status = -EIO; + need_free = 1; + goto bail; + } + trace_ocfs2_add_clusters_in_btree( (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), bit_off, num_bits);