From nobody Sat Apr 18 10:43:27 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 03FEC3F0743 for ; Sat, 28 Feb 2026 09:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269600; cv=none; b=MEC6dDvEK0mwh3e1qD8GPdMECVJlxHADg+oj/ul4MFsJlFLpcrXHS7hQkqdBujgd5iYjwueBD1DpPMhVn4FMDN2F5NAVgr7UsZEnJG0BamCNjB9xCup0JAecpXzDYakGNVX4lcsnH1A7ZghaW4UmHHJigVY/IgDI9UjEakPlnho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269600; c=relaxed/simple; bh=p8A1Dkwi3C0NzjV0IGFQxl3s0g7d6zP1w1h4b33L508=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B4OGKGO5bYymC5FQJJgNz4j2inK/RRNlOSJRQPCSdd1ahDQO2/+nz+ODti09U9nP2PXAfX5+KDuki0T7wss8qml++kwskMYQNRBH8pRuGux4x3o/NAqs6wEQl0y7ekmZ1d1qh7JPctRFr47lCfNOsWLox3fOwDdJ9HvGKZnse1k= 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=jPBo45MT; arc=none smtp.client-ip=209.85.216.54 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="jPBo45MT" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-358eac0571aso1873137a91.2 for ; Sat, 28 Feb 2026 01:06:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772269598; x=1772874398; darn=vger.kernel.org; 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=iAbrvZKE7mrL9ubvX/4PNKmQLVQgatjwm1rpQ10ifJk=; b=jPBo45MTPZwS9Bw7fdkEO9feP9TqwysHz1xqMJv7BloAwFvTWMjRBl1cjK8hurBGw5 /VlHz4PCOd+b4ETjwfwVWVutDFWrfiIKoI9EhjvO1ZqulT9oQZIaeoEI+WWKD79ZdlwC 6NQJiGKiz0aDmtcrJ9roehZKc1+iis+9jRk+NjWKJ9YzzNCv9rJvxzdDdTj3eWeAlRhS 8f9maeBPgl2KJygGuJcoGU/nFRe521vVTXf+m6I8dGNgqyx98UoXTG+y7CsAQztGkqh7 9ivXpP4tRNni36Ir+4QctplbKHl+uwHJIlyK8rtxo9gm+9Sj4PlJlk9QJ5BEwP+oLzHq HAIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772269598; x=1772874398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iAbrvZKE7mrL9ubvX/4PNKmQLVQgatjwm1rpQ10ifJk=; b=bI9iazajoOMznYgleVgwA6jP8rwgK2tDWrcs8J1ygtIW7jKL6tDrCbhD2uUGVnnmdX gJbbtbzVUO6rTUJ05DX1jz2EevlYwBs7lZQnciOWe8HBj4CMcu5PdvtM34ag64bX9bXB +XS+jGTu1kVTZWwRIcRG3E3oArFcOXkdWHfCyWJYaEeD2Lj9PCipaU0s/keVjPQ7g97Q Xcfbb0vhXZy6lgjvTeEYzH1E3J8clYiwf60DbkT5yVXKdvHOudBAvhj8zErJqQshOkMj TQaANYFXtOrmmFAcXhO/myTsNdzcXcCqvt1ib+i4W89hCkDQomLcE0ENBW/AYld/glQu NPQA== X-Forwarded-Encrypted: i=1; AJvYcCWb46CmOpGawE5vXn5wDMf/MOM2UMpr2SENjBfS/F13dxKUfm72sNqG8XVeBOtK0fbQdK9VzyaDhIMz9Y8=@vger.kernel.org X-Gm-Message-State: AOJu0YxfoqSsH8hUne/wdH+8R73wGR6hU7KMnVYACzYMuIbAbSzHYFyU 1kR773X3K9P9rYNVZ1bC0bkkA8P8fasPTJtq/9TwPKrpSom5XvB2KAT8sNQJ19CviLo= X-Gm-Gg: ATEYQzxJqVCPnqrDF0IuDN+nvJHWCNN4xmP12Ee5vMqdBj+LPyymXFFnj/Zemzc26+Q ZvOEqVJ2+GcrMpWErd3LDxt+OcDM+U5cIN1EHfmW6csZdvBHsRtpSGjU5GwQm0a3by8hcfzyA0n TdDCk5dqp4QC9w7QVuTKg1nVU5baCqVJFQUzFg7hcLQt8wAO4XEgWVe1vCdf/8pA8lxHS57qKIc eUh93I5fg4UJm9ypSvZ5qLDK+P5qmj+eKsa3BKU7m47Pjs8fiddO3roqSuWjVATQVF5NOl4x5Mk aBq/0+bp/aLeU3u5PLs0WhmUBICcn3++PBj2ezDbyvPJpI4bdgO68kP2CByDQAwAwWVjvJeo5iD SgzhKmFL4tVSIdot14I2f0UAonQUD+HN7d08zREIaRZNELxIyvtdTBb46LaXT2dd6mdsStCH8+E KC72aY9Dv/6VIWcFzIv4yj+yX3 X-Received: by 2002:a17:90b:2e0b:b0:358:f0d0:1a19 with SMTP id 98e67ed59e1d1-35965c4965cmr5403279a91.12.1772269598272; Sat, 28 Feb 2026 01:06:38 -0800 (PST) Received: from archlinux ([103.208.68.105]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda5ec8sm7589488a91.12.2026.02.28.01.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 01:06:38 -0800 (PST) From: Adarsh Das To: clm@fb.com, dsterba@suse.com Cc: terrelln@fb.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Adarsh Das Subject: [PATCH v2 1/2] btrfs: replace BUG() with error handling in compression.c Date: Sat, 28 Feb 2026 14:36:20 +0530 Message-ID: <20260228090621.100841-2-adarshdas950@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260228090621.100841-1-adarshdas950@gmail.com> References: <20260228090621.100841-1-adarshdas950@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" v2: - use ASSERT() instead of btrfs_err() + -EUCLEAN - remove default: branches and add upfront ASSERT() for type validation - fold coding style fixes into this patch Signed-off-by: Adarsh Das --- fs/btrfs/compression.c | 74 ++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 49 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 790518a8c803..0d8da8ce5fd3 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -36,9 +36,9 @@ =20 static struct bio_set btrfs_compressed_bioset; =20 -static const char* const btrfs_compress_types[] =3D { "", "zlib", "lzo", "= zstd" }; +static const char * const btrfs_compress_types[] =3D { "", "zlib", "lzo", = "zstd" }; =20 -const char* btrfs_compress_type2str(enum btrfs_compression_type type) +const char *btrfs_compress_type2str(enum btrfs_compression_type type) { switch (type) { case BTRFS_COMPRESS_ZLIB: @@ -89,24 +89,21 @@ bool btrfs_compress_is_valid_type(const char *str, size= _t len) static int compression_decompress_bio(struct list_head *ws, struct compressed_bio *cb) { + ASSERT(cb->compress_type > BTRFS_COMPRESS_NONE && + cb->compress_type < BTRFS_NR_COMPRESS_TYPES); switch (cb->compress_type) { case BTRFS_COMPRESS_ZLIB: return zlib_decompress_bio(ws, cb); case BTRFS_COMPRESS_LZO: return lzo_decompress_bio(ws, cb); case BTRFS_COMPRESS_ZSTD: return zstd_decompress_bio(ws, cb); - case BTRFS_COMPRESS_NONE: - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } + return -EUCLEAN; } =20 static int compression_decompress(int type, struct list_head *ws, const u8 *data_in, struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen, size_t destlen) { + ASSERT(type > BTRFS_COMPRESS_NONE && type < BTRFS_NR_COMPRESS_TYPES); switch (type) { case BTRFS_COMPRESS_ZLIB: return zlib_decompress(ws, data_in, dest_folio, dest_pgoff, srclen, destlen); @@ -114,14 +111,8 @@ static int compression_decompress(int type, struct lis= t_head *ws, dest_pgoff, srclen, destlen); case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, dest_folio, dest_pgoff, srclen, destlen); - case BTRFS_COMPRESS_NONE: - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } + return -EUCLEAN; } =20 static int btrfs_decompress_bio(struct compressed_bio *cb); @@ -484,6 +475,7 @@ static noinline int add_ra_bio_pages(struct inode *inod= e, =20 if (zero_offset) { int zeros; + zeros =3D folio_size(folio) - zero_offset; folio_zero_range(folio, zero_offset, zeros); } @@ -697,33 +689,25 @@ static const struct btrfs_compress_levels * const btr= fs_compress_levels[] =3D { =20 static struct list_head *alloc_workspace(struct btrfs_fs_info *fs_info, in= t type, int level) { + + ASSERT(type >=3D BTRFS_COMPRESS_NONE && type < BTRFS_NR_COMPRESS_TYPES); switch (type) { case BTRFS_COMPRESS_NONE: return alloc_heuristic_ws(fs_info); case BTRFS_COMPRESS_ZLIB: return zlib_alloc_workspace(fs_info, level); case BTRFS_COMPRESS_LZO: return lzo_alloc_workspace(fs_info); case BTRFS_COMPRESS_ZSTD: return zstd_alloc_workspace(fs_info, level); - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } + return ERR_PTR(-EUCLEAN); } =20 static void free_workspace(int type, struct list_head *ws) { + ASSERT(type >=3D BTRFS_COMPRESS_NONE && type < BTRFS_NR_COMPRESS_TYPES); switch (type) { case BTRFS_COMPRESS_NONE: return free_heuristic_ws(ws); case BTRFS_COMPRESS_ZLIB: return zlib_free_workspace(ws); case BTRFS_COMPRESS_LZO: return lzo_free_workspace(ws); case BTRFS_COMPRESS_ZSTD: return zstd_free_workspace(ws); - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } } =20 @@ -792,7 +776,7 @@ struct list_head *btrfs_get_workspace(struct btrfs_fs_i= nfo *fs_info, int type, i struct workspace_manager *wsm =3D fs_info->compr_wsm[type]; struct list_head *workspace; int cpus =3D num_online_cpus(); - unsigned nofs_flag; + unsigned int nofs_flag; struct list_head *idle_ws; spinlock_t *ws_lock; atomic_t *total_ws; @@ -868,18 +852,14 @@ struct list_head *btrfs_get_workspace(struct btrfs_fs= _info *fs_info, int type, i =20 static struct list_head *get_workspace(struct btrfs_fs_info *fs_info, int = type, int level) { + ASSERT(type >=3D BTRFS_COMPRESS_NONE && type < BTRFS_NR_COMPRESS_TYPES); switch (type) { case BTRFS_COMPRESS_NONE: return btrfs_get_workspace(fs_info, type, level= ); case BTRFS_COMPRESS_ZLIB: return zlib_get_workspace(fs_info, level); case BTRFS_COMPRESS_LZO: return btrfs_get_workspace(fs_info, type, level= ); case BTRFS_COMPRESS_ZSTD: return zstd_get_workspace(fs_info, level); - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } + return ERR_PTR(-EUCLEAN); } =20 /* @@ -919,17 +899,12 @@ void btrfs_put_workspace(struct btrfs_fs_info *fs_inf= o, int type, struct list_he =20 static void put_workspace(struct btrfs_fs_info *fs_info, int type, struct = list_head *ws) { + ASSERT(type >=3D BTRFS_COMPRESS_NONE && type < BTRFS_NR_COMPRESS_TYPES); switch (type) { case BTRFS_COMPRESS_NONE: return btrfs_put_workspace(fs_info, type, ws); case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(fs_info, type, ws); case BTRFS_COMPRESS_LZO: return btrfs_put_workspace(fs_info, type, ws); case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(fs_info, ws); - default: - /* - * This can't happen, the type is validated several times - * before we get here. - */ - BUG(); } } =20 @@ -1181,17 +1156,17 @@ static u64 file_offset_from_bvec(const struct bio_v= ec *bvec) * @buf: The decompressed data buffer * @buf_len: The decompressed data length * @decompressed: Number of bytes that are already decompressed inside the - * compressed extent + * compressed extent * @cb: The compressed extent descriptor * @orig_bio: The original bio that the caller wants to read for * * An easier to understand graph is like below: * - * |<- orig_bio ->| |<- orig_bio->| - * |<------- full decompressed extent ----->| - * |<----------- @cb range ---->| - * | |<-- @buf_len -->| - * |<--- @decompressed --->| + * |<- orig_bio ->| |<- orig_bio->| + * |<------- full decompressed extent ----->| + * |<----------- @cb range ---->| + * | |<-- @buf_len -->| + * |<--- @decompressed --->| * * Note that, @cb can be a subpage of the full decompressed extent, but * @cb->start always has the same as the orig_file_offset value of the full @@ -1313,7 +1288,8 @@ static u32 shannon_entropy(struct heuristic_ws *ws) #define RADIX_BASE 4U #define COUNTERS_SIZE (1U << RADIX_BASE) =20 -static u8 get4bits(u64 num, int shift) { +static u8 get4bits(u64 num, int shift) +{ u8 low4bits; =20 num >>=3D shift; @@ -1388,7 +1364,7 @@ static void radix_sort(struct bucket_item *array, str= uct bucket_item *array_buf, */ memset(counters, 0, sizeof(counters)); =20 - for (i =3D 0; i < num; i ++) { + for (i =3D 0; i < num; i++) { buf_num =3D array_buf[i].count; addr =3D get4bits(buf_num, shift); counters[addr]++; --=20 2.53.0 From nobody Sat Apr 18 10:43:27 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 7C0063EFD02 for ; Sat, 28 Feb 2026 09:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269605; cv=none; b=NhsEGVpRNFmyBtOHkFtYRk6do0EwB/NJY6jOE3zpJHgZUMnFPsLsTlQ2ZKPhl2VFdmBFOfyXiJAbYWZwVrVg76xThwIz3fBkrwgeKCZCTY2VS+jc1hF8NdzYyW1Gkt1dHd9v6aKFnCeFN+OuWZKm9sfmApwwrRjzZgFCc8Z0wPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269605; c=relaxed/simple; bh=SDkZ6OnP0DCX/zk8TiUybEOthpnqyryChtxIxiwvmrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YUakKGiDntiStxd/VLEG314T7URIHxcgi491bPUzDEvNfrRbvLrrUe59cnMMLp+HrLvxR7UBGtkFFnQuq9PEjmvbSNlo4LmzEUX09zrduNzUQu7iqCIcRfSrpp/nrYIG5nm5tfXIgtPuAXc1SHB+yoQ35IXGw9QlVwtIk0CngYk= 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=d/ZcHzDq; arc=none smtp.client-ip=209.85.216.52 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="d/ZcHzDq" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-3591cc98871so1229506a91.3 for ; Sat, 28 Feb 2026 01:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772269602; x=1772874402; darn=vger.kernel.org; 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=MMz6t2oyzUaXSrfBCyX2Xr2xba4aqzpY77uNKPyU2yQ=; b=d/ZcHzDqP0IRBM8Brk0rsUc/PegvEc3xAizPbJVCtqLFn9/gdJCZRmsycffSGIxU0g Q5cETySm/tSB3KaNpLsgIP2EU39gwc346eICHf2ci4ctW5K16nYl6jhUwsDyIN4bpJtb VVvxMLl3Df7MUR6PZelg1VFt3QAnSqYlDINraRrbZVVo1Lca20cmTH/nb6EWSrl6SfNj vazIBNSGmf9iePa16wuZCy2f0KwECcj9Sn3svR/e8uSNtLmZIU+W6zn46dshswSrTE4i eMNhHsKpuncYm6XDyJ7AwtDWehiTdWdXMRQ222Z56eG54IYZuIXIuSF3K2bL5PbKPr5z qrYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772269602; x=1772874402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MMz6t2oyzUaXSrfBCyX2Xr2xba4aqzpY77uNKPyU2yQ=; b=jAtfQwKNEN3gAqqm2Ldz+AalczVLsbeTKFLZVd7VtgXYKalvTC8UhF0NeBGbuVixTz 7vq19AJwuzJ9+cd3uXQgY8OcxQwGN4bVW1hgH7ottCFWxh2/54iJzRI/IDZu5HAC9MWt 70Ckbypz0wli49Sq2SCqPNk2ve4nG0Xt+mAKEB9zrjBrOwrtiHehbsq7rYXghrDm3BVD GLdqNKKp3RivT6Bnj7YagwnKosZC/2ivq0tPLoJdKSS0HZ18Bov4fwUwWkPJA1V2D/Ar HHyp5KdBO1zP14bz392q92Nx1kL8Ht7RfFSvxLs8OxrF/MqPifmqLBjpVyvmQpASttBG C0jw== X-Forwarded-Encrypted: i=1; AJvYcCXc52qX4q6ghwTytz17IoG8MDn2fKDAe8aRodhUEhnUtJsFcErC9YdFeym/NSxXgqao3pXp4Sf7XiEYP+g=@vger.kernel.org X-Gm-Message-State: AOJu0YzCyHoD1zMt0OA/aKx2plkbf8lftC0S1Q1b9KanaHavenPivSnd 5P2loO0qsoVkjkv258sSWFsZ4Jkn0B7ch7o/U6JIFZd3ROLRqfEes2Jo X-Gm-Gg: ATEYQzyQHDfAFLm2++/FmDnY66udjogVvkFQznTVPz77U+2u2DjoYZDC6SVhA9zUYh7 FnJPsB8awrlbcj1yxXvLsPqCTkynMMoIN+Ffkt9iO9Nnq5VjQBZ9LVmNgEjc5dMuLJqHQLF4Gi+ zYxrdLmVYhJv5E9thF/KQQgsix0Xcq413pnM2aoJ1qmN0ksAbpkTmntLUqx9L7JC1TDL+Z4q5WK z5Z9ES50qyGuEHvxazKO0Cqn1ewuTMb6RgJBWVRCUqVy8aD0iuc71Y2Ug9VoFpOOv2HsFHirbXp VjplEMPreHeMgaX1BCNL64YN18p8F3wCceBI5g0FgCLmYtFqwMJ5a5rhhmyEOz/xDO3rCOzEPMJ TbrRDSaQgfiELKgb+rPWpWGHcaC0acbvMlc5q0KXQtjF4WSAOE4NBA6hqgPeOsoyLc7fOzycDIT UvhejGiCxr359NzhfGuQ004dA1 X-Received: by 2002:a17:90b:47:b0:354:bf10:e69e with SMTP id 98e67ed59e1d1-35965c4164fmr4955190a91.9.1772269601742; Sat, 28 Feb 2026 01:06:41 -0800 (PST) Received: from archlinux ([103.208.68.105]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda5ec8sm7589488a91.12.2026.02.28.01.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 01:06:41 -0800 (PST) From: Adarsh Das To: clm@fb.com, dsterba@suse.com Cc: terrelln@fb.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Adarsh Das Subject: [PATCH v2 2/2] btrfs: replace BUG() and BUG_ON() with error handling in extent-tree.c Date: Sat, 28 Feb 2026 14:36:21 +0530 Message-ID: <20260228090621.100841-3-adarshdas950@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260228090621.100841-1-adarshdas950@gmail.com> References: <20260228090621.100841-1-adarshdas950@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" v2: - use ASSERT() instead of btrfs_err() + -EUCLEAN - append ASSERTs in btrfs_add_delayed_data_ref() and btrfs_add_delayed_tree= _ref() to validate action at insertion time instead of runtime - fold coding style fixes into this patch Signed-off-by: Adarsh Das --- fs/btrfs/delayed-ref.c | 8 ++++-- fs/btrfs/extent-tree.c | 62 ++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 3766ff29fbbb..d308c70228af 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -1113,7 +1113,9 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_han= dle *trans, struct btrfs_ref *generic_ref, struct btrfs_delayed_extent_op *extent_op) { - ASSERT(generic_ref->type =3D=3D BTRFS_REF_METADATA && generic_ref->action= ); + ASSERT(generic_ref->type =3D=3D BTRFS_REF_METADATA && + (generic_ref->action =3D=3D BTRFS_ADD_DELAYED_REF || + generic_ref->action =3D=3D BTRFS_DROP_DELAYED_REF)); return add_delayed_ref(trans, generic_ref, extent_op, 0); } =20 @@ -1124,7 +1126,9 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_han= dle *trans, struct btrfs_ref *generic_ref, u64 reserved) { - ASSERT(generic_ref->type =3D=3D BTRFS_REF_DATA && generic_ref->action); + ASSERT(generic_ref->type =3D=3D BTRFS_REF_DATA && + (generic_ref->action =3D=3D BTRFS_ADD_DELAYED_REF || + generic_ref->action =3D=3D BTRFS_DROP_DELAYED_REF)); return add_delayed_ref(trans, generic_ref, NULL, reserved); } =20 diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 03cf9f242c70..98bdf51774c4 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -604,7 +604,7 @@ static noinline int remove_extent_data_ref(struct btrfs= _trans_handle *trans, return -EUCLEAN; } =20 - BUG_ON(num_refs < refs_to_drop); + ASSERT(num_refs >=3D refs_to_drop); num_refs -=3D refs_to_drop; =20 if (num_refs =3D=3D 0) { @@ -863,7 +863,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_han= dle *trans, =20 if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK && !skinny_metadata) { ptr +=3D sizeof(struct btrfs_tree_block_info); - BUG_ON(ptr > end); + ASSERT(ptr <=3D end); } =20 if (owner >=3D BTRFS_FIRST_FREE_OBJECTID) @@ -1237,7 +1237,7 @@ static int remove_extent_backref(struct btrfs_trans_h= andle *trans, { int ret =3D 0; =20 - BUG_ON(!is_data && refs_to_drop !=3D 1); + ASSERT(is_data || refs_to_drop =3D=3D 1); if (iref) ret =3D update_inline_extent_backref(trans, path, iref, -refs_to_drop, NULL); @@ -1451,10 +1451,9 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *= trans, struct btrfs_fs_info *fs_info =3D trans->fs_info; int ret; =20 - ASSERT(generic_ref->type !=3D BTRFS_REF_NOT_SET && - generic_ref->action); - BUG_ON(generic_ref->type =3D=3D BTRFS_REF_METADATA && - generic_ref->ref_root =3D=3D BTRFS_TREE_LOG_OBJECTID); + ASSERT(generic_ref->type !=3D BTRFS_REF_NOT_SET && generic_ref->action); + ASSERT(generic_ref->type !=3D BTRFS_REF_METADATA || + generic_ref->ref_root !=3D BTRFS_TREE_LOG_OBJECTID); =20 if (generic_ref->type =3D=3D BTRFS_REF_METADATA) ret =3D btrfs_add_delayed_tree_ref(trans, generic_ref, NULL); @@ -1621,8 +1620,6 @@ static int run_delayed_data_ref(struct btrfs_trans_ha= ndle *trans, ret =3D __btrfs_inc_extent_ref(trans, node, extent_op); } else if (node->action =3D=3D BTRFS_DROP_DELAYED_REF) { ret =3D __btrfs_free_extent(trans, href, node, extent_op); - } else { - BUG(); } return ret; } @@ -1639,7 +1636,7 @@ static void __run_delayed_extent_op(struct btrfs_dela= yed_extent_op *extent_op, =20 if (extent_op->update_key) { struct btrfs_tree_block_info *bi; - BUG_ON(!(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK)); + ASSERT(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK); bi =3D (struct btrfs_tree_block_info *)(ei + 1); btrfs_set_tree_block_key(leaf, bi, &extent_op->key); } @@ -1774,8 +1771,6 @@ static int run_delayed_tree_ref(struct btrfs_trans_ha= ndle *trans, ret =3D drop_remap_tree_ref(trans, node); else ret =3D __btrfs_free_extent(trans, href, node, extent_op); - } else { - BUG(); } return ret; } @@ -2088,7 +2083,7 @@ static noinline int __btrfs_run_delayed_refs(struct b= trfs_trans_handle *trans, * head */ ret =3D cleanup_ref_head(trans, locked_ref, &bytes_processed); - if (ret > 0 ) { + if (ret > 0) { /* We dropped our lock, we need to loop. */ ret =3D 0; continue; @@ -2645,7 +2640,7 @@ int btrfs_pin_extent(struct btrfs_trans_handle *trans= , u64 bytenr, u64 num_bytes struct btrfs_block_group *cache; =20 cache =3D btrfs_lookup_block_group(trans->fs_info, bytenr); - BUG_ON(!cache); /* Logic error */ + ASSERT(cache); =20 pin_down_extent(trans, cache, bytenr, num_bytes, true); =20 @@ -4119,20 +4114,25 @@ static int do_allocation(struct btrfs_block_group *= block_group, struct find_free_extent_ctl *ffe_ctl, struct btrfs_block_group **bg_ret) { + ASSERT(ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return do_allocation_clustered(block_group, ffe_ctl, bg_ret); case BTRFS_EXTENT_ALLOC_ZONED: return do_allocation_zoned(block_group, ffe_ctl, bg_ret); - default: - BUG(); } + return -EUCLEAN; } =20 static void release_block_group(struct btrfs_block_group *block_group, struct find_free_extent_ctl *ffe_ctl, bool delalloc) { + ASSERT(btrfs_bg_flags_to_raid_index(block_group->flags) =3D=3D + ffe_ctl->index); + ASSERT(ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: ffe_ctl->retry_uncached =3D false; @@ -4140,12 +4140,8 @@ static void release_block_group(struct btrfs_block_g= roup *block_group, case BTRFS_EXTENT_ALLOC_ZONED: /* Nothing to do */ break; - default: - BUG(); } =20 - BUG_ON(btrfs_bg_flags_to_raid_index(block_group->flags) !=3D - ffe_ctl->index); btrfs_release_block_group(block_group, delalloc); } =20 @@ -4164,6 +4160,8 @@ static void found_extent_clustered(struct find_free_e= xtent_ctl *ffe_ctl, static void found_extent(struct find_free_extent_ctl *ffe_ctl, struct btrfs_key *ins) { + ASSERT(ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: found_extent_clustered(ffe_ctl, ins); @@ -4171,8 +4169,6 @@ static void found_extent(struct find_free_extent_ctl = *ffe_ctl, case BTRFS_EXTENT_ALLOC_ZONED: /* Nothing to do */ break; - default: - BUG(); } } =20 @@ -4232,14 +4228,15 @@ static int can_allocate_chunk_zoned(struct btrfs_fs= _info *fs_info, static int can_allocate_chunk(struct btrfs_fs_info *fs_info, struct find_free_extent_ctl *ffe_ctl) { + ASSERT(ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return 0; case BTRFS_EXTENT_ALLOC_ZONED: return can_allocate_chunk_zoned(fs_info, ffe_ctl); - default: - BUG(); } + return -EUCLEAN; } =20 /* @@ -4310,8 +4307,7 @@ static int find_free_extent_update_loop(struct btrfs_= fs_info *fs_info, if (ret =3D=3D -ENOSPC) { ret =3D 0; ffe_ctl->loop++; - } - else if (ret < 0) + } else if (ret < 0) btrfs_abort_transaction(trans, ret); else ret =3D 0; @@ -4441,15 +4437,16 @@ static int prepare_allocation(struct btrfs_fs_info = *fs_info, struct btrfs_space_info *space_info, struct btrfs_key *ins) { + ASSERT(ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy =3D=3D BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return prepare_allocation_clustered(fs_info, ffe_ctl, space_info, ins); case BTRFS_EXTENT_ALLOC_ZONED: return prepare_allocation_zoned(fs_info, ffe_ctl, space_info); - default: - BUG(); } + return -EUCLEAN; } =20 /* @@ -5260,6 +5257,8 @@ struct extent_buffer *btrfs_alloc_tree_block(struct b= trfs_trans_handle *trans, bool skinny_metadata =3D btrfs_fs_incompat(fs_info, SKINNY_METADATA); u64 owning_root; =20 + ASSERT(parent <=3D 0); + #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS if (btrfs_is_testing(fs_info)) { buf =3D btrfs_init_new_buffer(trans, root, root->alloc_bytenr, @@ -5292,8 +5291,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct b= trfs_trans_handle *trans, parent =3D ins.objectid; flags |=3D BTRFS_BLOCK_FLAG_FULL_BACKREF; owning_root =3D reloc_src_root; - } else - BUG_ON(parent > 0); + } =20 if (root_objectid !=3D BTRFS_TREE_LOG_OBJECTID) { struct btrfs_delayed_extent_op *extent_op; @@ -5633,7 +5631,7 @@ static int check_ref_exists(struct btrfs_trans_handle= *trans, * If we get 0 then we found our reference, return 1, else * return the error if it's not -ENOENT; */ - return (ret < 0 ) ? ret : 1; + return (ret < 0) ? ret : 1; } =20 /* @@ -6437,7 +6435,7 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *tra= ns, int parent_level; int ret =3D 0; =20 - BUG_ON(btrfs_root_id(root) !=3D BTRFS_TREE_RELOC_OBJECTID); + ASSERT(btrfs_root_id(root) =3D=3D BTRFS_TREE_RELOC_OBJECTID); =20 path =3D btrfs_alloc_path(); if (!path) --=20 2.53.0