Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2613458lqp; Mon, 25 Mar 2024 04:34:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWIN+lHiGyfa275HX+8h5/JCPqSnGJjIrqa47dvjR7dWtdm5abLZfvGzqAqRCgW046/U5pQ1JQNltNIhkU9UbXKZK67BRi/4uSPlY789g== X-Google-Smtp-Source: AGHT+IGIAQMlDwGk/IXaKzkZWrjJKaCS4mjIMKSXr7TR2hANS6NrUZ2TWTQ1HoJdx4T5oUKs/83B X-Received: by 2002:a05:6a20:c220:b0:1a3:463d:e6f1 with SMTP id bt32-20020a056a20c22000b001a3463de6f1mr4968435pzb.22.1711366485762; Mon, 25 Mar 2024 04:34:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711366485; cv=pass; d=google.com; s=arc-20160816; b=ir974qJfYt6s0L7bRrkkVs+K5yW9tgGna/H6+QAbNueGZBTmjO+AoU0NBsnxIAqfOR HkrnwMYVGm6TZcTuWTuh6MC1mzm9ZfrX0BBtkiOjf+y+muM54bfmcwc1VQ26r/LwkcMP PEmGjkkfttbrdlHmHoKmBrhX/havn9lSwWxJMJWevn1rCyileKBkguNTdvIfYeNGwaQg IUjbahUHC5g95qLif/HIVi/tyI0q6asUMv95myDrZVpKYLeNGxr9WQ3t8Ucdz+NbOLLJ H9uv+rdXOBkXRkceKeHmD/IvWSW78hR/yPdKYsDARpKji19o3I1v2wN0d9XDSq8hrWl7 G67Q== 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=6CGb2hOwba3cTvbwsN6koXPfnbRks8BTa0i+C+8Qx9Y=; fh=wZ5E9nZmxwfOn7SQAnLaAUH39Jwnoo51Vqzo1KBF6l4=; b=J1OQhSwFxu7LZOlvVAehlaN3V/uug85xkf17g6ZuhlKZeNNZrPLNCo9ljWjScJpG7m +5rppuxadMHio6n1bPx6SvJ+VQ/WHOIh9XxeSCBSZHVnqfhxJUHAeuFjv5yBWCb7/RF2 4l2oY5ZVTTilTvxnepMzhpVKDY7HfAmlqiawDwyQVYlJuJ/8vGt1lVlSEPFmWiRxFnaW 7kgwxoyAsDoM122mWNIDRE3jd6WIrmYXgvnMhx32v6G+WCPagbIqoMnr0h+0XK8nLLcB x7miBBTV4oAV6Ib9jbKGNTh3jNa3+E5vBwCX+2EGsLEmmVE8S14OA+lpKi9qwteTB5ax vNxw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KcsUsNiU; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115597-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115597-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e12-20020a17090a77cc00b002a058af4c68si3927644pjs.59.2024.03.25.04.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:34:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115597-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KcsUsNiU; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115597-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115597-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id B47A82A4E98 for ; Mon, 25 Mar 2024 11:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1F1B20A064; Mon, 25 Mar 2024 02:47:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KcsUsNiU" 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 00B5514EC55; Sun, 24 Mar 2024 23:02:00 +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=1711321322; cv=none; b=VimhvElY90I+lJYIX6OIghhghvzTJpk+fgLrSEEB7cEZAHsYsjBM+KWFCioDLGQox7Pmzgnw4jz5goev95frJfQLNG8U38CU0XcEnHTTU9Mn5T2WLTUASsgR8NsFgwSWJ6Ipu3VzBfdAF/F9ht8wbU97Pnz8o9UOezkvIdJe+uw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321322; c=relaxed/simple; bh=Ci9riVZbxJ14AJQUWZVd75cjZHMBm4hSSB/4WuT7fmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QD2YvMcGNW6u35P9P0WoHHjz5dAskHNDageHUX8fQ6BU4WFksD1II6xWITC27JiFh3OLwLNVLhmjZiXs0pF9c+pnGXaj/+7Sl0/72xLKChVni5KqxoHPssnB+2Up80B4dbeXaFMqfS7kpP+y+iJZOHVFNJVPVWNzjKqxBQuYLw4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KcsUsNiU; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E57A7C433F1; Sun, 24 Mar 2024 23:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321320; bh=Ci9riVZbxJ14AJQUWZVd75cjZHMBm4hSSB/4WuT7fmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KcsUsNiUg3XmMlwMtNvMAQp4hbhWQ23Ei1BTSN+j5KX0nyRhZTo87yD7xf9XSLzob ovtMOV5RKgvIEfYOFc2/FLso0rE4xxShjBoCGonbnuOgUiFZeD71UfvG/t/kJ7Umvk +UBBawPBIXR5eICh1yESgrv5GjNXOWnhRAlsT9kW+4yc6WSzNnTEk7idcmdtosMAlK OZbR7/AN8CwoJnaUuYyda1kQdLE/lUd8Fk+B/0SIDNN6O3uWtKV/0fMrvSS5PTIulO iZF4ggRXxkik974mq+0wZO6BSK5k3+h5UyzH5XPq9nOyMLscEVa+qtLa63aAScyQfm CRcYkMvWniMvQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.6 043/638] btrfs: fix data races when accessing the reserved amount of block reserves Date: Sun, 24 Mar 2024 18:51:20 -0400 Message-ID: <20240324230116.1348576-44-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-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 b0bd12b8652f4..fb440a074700a 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 d7e8cd4f140cf..3f7a9605e2d3a 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -837,7 +837,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 thresh; u64 used; @@ -937,8 +937,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; @@ -1153,7 +1153,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++; @@ -1165,9 +1165,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; @@ -1187,16 +1187,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