Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2542426lqp; Mon, 25 Mar 2024 01:53:05 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXQ85BWvL4V8iC+tmnQfedYAnO/wS+hBMcUKziVNs4TSAzVocrLIaQCOnaXrETbsQnBaHk+jcbIHXfvlI0ckt0plOQ8MrsWOnQPI9CM4A== X-Google-Smtp-Source: AGHT+IHIfYtxo9GvpY03FbC4VFqpMNIAVkglOPyGKoMr+FuyCV0u8TVp3FAWVZqgldo3wg/UNlZW X-Received: by 2002:a05:622a:5:b0:431:231f:d101 with SMTP id x5-20020a05622a000500b00431231fd101mr7000837qtw.63.1711356785569; Mon, 25 Mar 2024 01:53:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711356785; cv=pass; d=google.com; s=arc-20160816; b=jXLuXcVz+UtJ/U3ezIrnkWlz/bzjethMKl3y1TUdgGG2c7cFzKqnn/c92BnhuPXtYQ tW25O15ZZGQRmV4/UcT50ZTJqL2G9+C5G0HTQVd2OQuPT+MvwinGhgJBynOxPjaxwKN6 K+OEOx1YI23iqei4HT+UCOyD9vhRay9WpHyD9+ursn2u1clVnC1TgcfQMExgFnOeN+/0 6Fvps/dOHmGoTrx9rXbPtqPeHK6VG1XonbPuhwE/9X+tUnfxbHPapklqE/4nfxtvtndO 2F41QUglrWev48cb4oC7UBgGgrrGyZOwb+bJkwn+mq/T0+9eVeM0wLTeTi90qO/JyYfK PnTg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=pp08HGit0GzQVz/BwpYCaEgKZieQqu5mHreSQkOLFnw=; fh=wZ5E9nZmxwfOn7SQAnLaAUH39Jwnoo51Vqzo1KBF6l4=; b=WNZu14z4/FJQeFy6eZlZzQBehitdXedbY1s7U3K6O1RNstqDd6AlHtT9mh58VMemdT X6CDuqbRAUBsAAHimowZtUpn6fozAgyjgXRFXJSdgxeP0Xenmw78QwHcbb5/HuzeYpx8 acsdeHne2CwLhn7l/soEnpBGUUNg36YW/2GRC6EYgEl9kUeB0G1mWMUu3szSQntUXl1a KQk/t3pASP5j0J2KMunsEsHiQj+E2iXW73Vx6T595ZGO0GGbetVPpp/ey1JQfDI5cZeA 2mdGtcWldcAh5SXT6ap6AgOF5fD7vTbhaHKPLiuemo1JbB5hdCc8C1dw84kPcjrEzOzp BMFg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pTD6I/1M"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115772-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115772-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g18-20020ac87d12000000b0043149b75298si3485862qtb.230.2024.03.25.01.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 01:53:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115772-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pTD6I/1M"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115772-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115772-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4B3221C3033B for ; Mon, 25 Mar 2024 08:53:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3D01336B9F8; Mon, 25 Mar 2024 03:00:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pTD6I/1M" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9F22145324; Sun, 24 Mar 2024 23:12:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321969; cv=none; b=fvnEOfVb6ENTFRD+eaE5wX35ZXklwVx8spVP2g7dWM9wYBJ4TkTKif1cjUilpHkJwnxlfwFrPSDtdWCkUpszBTo2mU8zkH1ILr8+UBs/zh2sO/kSW1NN/Ye1swjdQY5oW1a0s8PdEE7uXibfs8LUgh5s29/KStWJvVLvJF4A7Lk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321969; c=relaxed/simple; bh=GT3E/u8yg22L8PUIE5exbYQ4Ofwl5IkJfHF5ogSkWhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q0rbGQOPLNgCxyZNpyfqqSyFG9dSpXoh3AplEqlKAPNFxQYyMtinz/Lt+uJxki57QdpPBn8Q5hkn+GJ2aYWKXogVl518rsXa0+1Zoeo8nCAFJleXPU94zGs4NRfw6KrSI0srX40LfjCxphc8sXcDsr9AWEUVWifNZJqPxc8V9kE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pTD6I/1M; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00F9DC433C7; Sun, 24 Mar 2024 23:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321968; bh=GT3E/u8yg22L8PUIE5exbYQ4Ofwl5IkJfHF5ogSkWhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pTD6I/1Msl41Nk+JZbcn6KkkqSHhzUvzhfFKg5GwTwsgU65qiG4Ys62sBP6Jq4MSh DCFwVVm5dWETG6vQAH3I4xf3FxCUYH7CWXjlmzEx3ex5ekCJapu8QpvCsZXqlkzmaX WZonlZ7SjDAVsO4CYZmH9nglix0eINYLCZhEQIWmT1kg1fX9ffaeaKTaiF1YGQjtL0 zfyDogd3S/100rK6SuKhD44Oy/vHroUcZQyH0a4jnhtGuItwKF9MtmpUKe0+v/YCbf f0wkImE/jzcmSyZCKjnqPD1h3zcEiB8PIkFzYMnJIFuhjT8KMxXvnFpd3QItiJoX6J gpbSl3jEq21gw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.1 040/451] btrfs: fix data races when accessing the reserved amount of block reserves Date: Sun, 24 Mar 2024 19:05:16 -0400 Message-ID: <20240324231207.1351418-41-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Filipe Manana [ Upstream commit e06cc89475eddc1f3a7a4d471524256152c68166 ] At space_info.c we have several places where we access the ->reserved field of a block reserve without taking the block reserve's spinlock first, which makes KCSAN warn about a data race since that field is always updated while holding the spinlock. The reports from KCSAN are like the following: [117.193526] BUG: KCSAN: data-race in btrfs_block_rsv_release [btrfs] / need_preemptive_reclaim [btrfs] [117.195148] read to 0x000000017f587190 of 8 bytes by task 6303 on cpu 3: [117.195172] need_preemptive_reclaim+0x222/0x2f0 [btrfs] [117.195992] __reserve_bytes+0xbb0/0xdc8 [btrfs] [117.196807] btrfs_reserve_metadata_bytes+0x4c/0x120 [btrfs] [117.197620] btrfs_block_rsv_add+0x78/0xa8 [btrfs] [117.198434] btrfs_delayed_update_inode+0x154/0x368 [btrfs] [117.199300] btrfs_update_inode+0x108/0x1c8 [btrfs] [117.200122] btrfs_dirty_inode+0xb4/0x140 [btrfs] [117.200937] btrfs_update_time+0x8c/0xb0 [btrfs] [117.201754] touch_atime+0x16c/0x1e0 [117.201789] filemap_read+0x674/0x728 [117.201823] btrfs_file_read_iter+0xf8/0x410 [btrfs] [117.202653] vfs_read+0x2b6/0x498 [117.203454] ksys_read+0xa2/0x150 [117.203473] __s390x_sys_read+0x68/0x88 [117.203495] do_syscall+0x1c6/0x210 [117.203517] __do_syscall+0xc8/0xf0 [117.203539] system_call+0x70/0x98 [117.203579] write to 0x000000017f587190 of 8 bytes by task 11 on cpu 0: [117.203604] btrfs_block_rsv_release+0x2e8/0x578 [btrfs] [117.204432] btrfs_delayed_inode_release_metadata+0x7c/0x1d0 [btrfs] [117.205259] __btrfs_update_delayed_inode+0x37c/0x5e0 [btrfs] [117.206093] btrfs_async_run_delayed_root+0x356/0x498 [btrfs] [117.206917] btrfs_work_helper+0x160/0x7a0 [btrfs] [117.207738] process_one_work+0x3b6/0x838 [117.207768] worker_thread+0x75e/0xb10 [117.207797] kthread+0x21a/0x230 [117.207830] __ret_from_fork+0x6c/0xb8 [117.207861] ret_from_fork+0xa/0x30 So add a helper to get the reserved amount of a block reserve while holding the lock. The value may be not be up to date anymore when used by need_preemptive_reclaim() and btrfs_preempt_reclaim_metadata_space(), but that's ok since the worst it can do is cause more reclaim work do be done sooner rather than later. Reading the field while holding the lock instead of using the data_race() annotation is used in order to prevent load tearing. Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/block-rsv.h | 16 ++++++++++++++++ fs/btrfs/space-info.c | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h index 578c3497a455c..cda79d3e0c263 100644 --- a/fs/btrfs/block-rsv.h +++ b/fs/btrfs/block-rsv.h @@ -101,4 +101,20 @@ static inline bool btrfs_block_rsv_full(const struct btrfs_block_rsv *rsv) return data_race(rsv->full); } +/* + * Get the reserved mount of a block reserve in a context where getting a stale + * value is acceptable, instead of accessing it directly and trigger data race + * warning from KCSAN. + */ +static inline u64 btrfs_block_rsv_reserved(struct btrfs_block_rsv *rsv) +{ + u64 ret; + + spin_lock(&rsv->lock); + ret = rsv->reserved; + spin_unlock(&rsv->lock); + + return ret; +} + #endif /* BTRFS_BLOCK_RSV_H */ diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index 2635fb4bffa06..8b75f436a9a3c 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -847,7 +847,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info, static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info, struct btrfs_space_info *space_info) { - u64 global_rsv_size = fs_info->global_block_rsv.reserved; + const u64 global_rsv_size = btrfs_block_rsv_reserved(&fs_info->global_block_rsv); u64 ordered, delalloc; u64 total = writable_total_bytes(fs_info, space_info); u64 thresh; @@ -948,8 +948,8 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info, ordered = percpu_counter_read_positive(&fs_info->ordered_bytes) >> 1; delalloc = percpu_counter_read_positive(&fs_info->delalloc_bytes); if (ordered >= delalloc) - used += fs_info->delayed_refs_rsv.reserved + - fs_info->delayed_block_rsv.reserved; + used += btrfs_block_rsv_reserved(&fs_info->delayed_refs_rsv) + + btrfs_block_rsv_reserved(&fs_info->delayed_block_rsv); else used += space_info->bytes_may_use - global_rsv_size; @@ -1164,7 +1164,7 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work) enum btrfs_flush_state flush; u64 delalloc_size = 0; u64 to_reclaim, block_rsv_size; - u64 global_rsv_size = global_rsv->reserved; + const u64 global_rsv_size = btrfs_block_rsv_reserved(global_rsv); loops++; @@ -1176,9 +1176,9 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work) * assume it's tied up in delalloc reservations. */ block_rsv_size = global_rsv_size + - delayed_block_rsv->reserved + - delayed_refs_rsv->reserved + - trans_rsv->reserved; + btrfs_block_rsv_reserved(delayed_block_rsv) + + btrfs_block_rsv_reserved(delayed_refs_rsv) + + btrfs_block_rsv_reserved(trans_rsv); if (block_rsv_size < space_info->bytes_may_use) delalloc_size = space_info->bytes_may_use - block_rsv_size; @@ -1198,16 +1198,16 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work) to_reclaim = delalloc_size; flush = FLUSH_DELALLOC; } else if (space_info->bytes_pinned > - (delayed_block_rsv->reserved + - delayed_refs_rsv->reserved)) { + (btrfs_block_rsv_reserved(delayed_block_rsv) + + btrfs_block_rsv_reserved(delayed_refs_rsv))) { to_reclaim = space_info->bytes_pinned; flush = COMMIT_TRANS; - } else if (delayed_block_rsv->reserved > - delayed_refs_rsv->reserved) { - to_reclaim = delayed_block_rsv->reserved; + } else if (btrfs_block_rsv_reserved(delayed_block_rsv) > + btrfs_block_rsv_reserved(delayed_refs_rsv)) { + to_reclaim = btrfs_block_rsv_reserved(delayed_block_rsv); flush = FLUSH_DELAYED_ITEMS_NR; } else { - to_reclaim = delayed_refs_rsv->reserved; + to_reclaim = btrfs_block_rsv_reserved(delayed_refs_rsv); flush = FLUSH_DELAYED_REFS_NR; } -- 2.43.0