Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2582516lqp; Mon, 25 Mar 2024 03:29:44 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXhxdLyTJ36m/3omuEtOvuGLGv0CeySM8qAR3CbJeFTlMt5FMYaOnA27444Nuuc80KuNmRiEhyeKk/5nPV9bkLt0/JWMm2pmYbNweskFw== X-Google-Smtp-Source: AGHT+IGkHjIuSG51MNESJg6jE2QApLMEVBhznTWzM8uac+flM4QGvv61UVGGJu/HtsHwNGxsgjKd X-Received: by 2002:a05:620a:5311:b0:789:d133:1362 with SMTP id oo17-20020a05620a531100b00789d1331362mr6732096qkn.27.1711362584164; Mon, 25 Mar 2024 03:29:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711362584; cv=pass; d=google.com; s=arc-20160816; b=csDRtPl0WG3/wPuoimkhFmAmIKG+p9Jn0TFOu2F7Mf9Wa1JfzUPGmYQucVGbfCQ3yI Soc4JExhYma/Yizle0OwdPf7hJf48EO7rKAgJgWxz+WKYMJTedv3vUbLaqHUKfZXC6Pu Hni7WWseYsOxmYeOvMsDBMw1+pe4i7o0nhnUS44peh3K/O5dFq4xeG8TxboLl85cXEps rzsLtYpGcYIwyGUgW6UutUgQDRy81hwE/LwKs/ou82eFLYEJpBdkZGXpwB5fvmNet3NG zuf/Zujag2D9B2xIJ7jvn1ZjVWGoPVcmEd0QgR+TuB1ASKmtOzan6Wxcd0Zc8+rev8Hr zU5g== 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=zPqQjPcJtG5lWVGBFfq6HDBFL9IRjBm0kbgcFk/o+js=; fh=wZ5E9nZmxwfOn7SQAnLaAUH39Jwnoo51Vqzo1KBF6l4=; b=LuSMeyrtEq0/XBpUQ1Px+DTDc7xZ+x+mBxb1nPiaEpYg8TnvD4mAQgfa/2Etv/6J7M tUSanBe1soPeLSYUmQ8LlfeeatZcEoqt0yHgOB0exu8/Lu3N/Y6J4h+Eb3NonW79JyAo LcYDkVZYzsXd3HcDuQ/bDVKU1EMKWxGJjgM2EGcbVIJakzxz4iKQXCPt58kVvpyG0YtG LiVax1XC7tl7b92hkQefjMumsFcWeP7+Dhf7H56k1zeaS+L8M2a07zUlyp73SpSu29hE l6dGFFGGMD0e1eGKycSVJCIOeV7JnIujzDhxtp790QEsNWII2Pm8/JzyY2NNRrQRJ2G6 7F8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SeUoEN24; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115305-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115305-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 b6-20020a05620a118600b007884370840esi5103172qkk.256.2024.03.25.03.29.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:29:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115305-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=SeUoEN24; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115305-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115305-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 D06311C330FC for ; Mon, 25 Mar 2024 10:29:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B6B81D5F91; Mon, 25 Mar 2024 02:32:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SeUoEN24" 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 99A607FBC6; Sun, 24 Mar 2024 22:48:13 +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=1711320493; cv=none; b=JOsB+waRGN5eKMj0wG4gAZ0rFgq6zYrHeKo+/ZMbpP9UsPWrGdGqyGdYeYeUQsFgYlb7Z2PHox7DLVIxWhH3i1+SnGyxOCOTWQnBvA9XmSsWhw2FKog1qv6zHFafvwTsQxodjMPXCx1wWkFvWiCYoZQE9lOEcOcfvIJFnfbJc70= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320493; c=relaxed/simple; bh=FeLXSRH5MrZXssstwnUB/Rzv8X+nQ2QakxDD8feExpM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ArMDY2a91TEI20DPRgzkrXdlqwc/ATsqszl2VqZIcmPX+nlV+2hdZQddnDzaI3vL1DhY2MbiMkkALqJUHCZ7AsWlNACXy1LmGfUxm75KqJMAfhAG0QVgexl0jtA/Ud2FpX6Ge0Shn4P3UhnFW9q5E73lJGSbGFtwAjn+BwbBTtQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SeUoEN24; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D196C43399; Sun, 24 Mar 2024 22:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320493; bh=FeLXSRH5MrZXssstwnUB/Rzv8X+nQ2QakxDD8feExpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SeUoEN24ZrhsQARANXbQZ/b+jq5iGAZ7VM/mxAUytxHIrcTTo+2knok2IclVYpoKa Y/I1CAOlSIpK9sw4Hfsu1sm97OiDpVQmt+UahmDVGTr1krcgc9mKskTOFk19Lljbws jNGdyMy52vRafgOanxhxsV5VdU/fY18XNoy5gRhLeomrnNmrdW6e0zTJsgYcpjQF+N hMgpj4Nunr19XY6E+YgkDEr0cfpQ0yAyfNkKNrEPjwWXjwkjDEsbZdDuG6TzJI+kJP y2O7kxiTkDvu7o5NC/5Dcve+muMtqqsz+VpFg7B2le8OzT8ihUocOAy6n2APhmOdyb 4SSr46fWKYpgQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.7 052/713] btrfs: fix data races when accessing the reserved amount of block reserves Date: Sun, 24 Mar 2024 18:36:18 -0400 Message-ID: <20240324224720.1345309-53-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-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 571bb13587d5e..3b54eb5834746 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -856,7 +856,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; @@ -956,8 +956,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; @@ -1173,7 +1173,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++; @@ -1185,9 +1185,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; @@ -1207,16 +1207,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