linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Mahoney <jeffm@suse.com>
To: Btrfs List <linux-btrfs@vger.kernel.org>
Subject: [patch 01/99] btrfs: Add btrfs_panic()
Date: Wed, 23 Nov 2011 19:35:34 -0500	[thread overview]
Message-ID: <20111124004219.933819241@suse.com> (raw)
In-Reply-To: 20111124003533.395674389@suse.com

 As part of the effort to eliminate BUG_ON as an error handling
 technique, we need to determine which errors are actual logic errors,
 which are on-disk corruption, and which are normal runtime errors
 e.g. -ENOMEM.

 Annotating these error cases is helpful to understand and report them.

 This patch adds a btrfs_panic() routine that will either panic
 or BUG depending on the new -ofatal_errors={panic,bug} mount option.
 Since there are still so many BUG_ONs, it defaults to BUG for now but I
 expect that to change once the error handling effort has made
 significant progress.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 fs/btrfs/ctree.h |   11 +++++++++++
 fs/btrfs/super.c |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1413,6 +1413,7 @@ struct btrfs_ioctl_defrag_range_args {
 #define BTRFS_MOUNT_AUTO_DEFRAG		(1 << 16)
 #define BTRFS_MOUNT_INODE_MAP_CACHE	(1 << 17)
 #define BTRFS_MOUNT_RECOVERY		(1 << 18)
+#define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	(1 << 19)
 
 #define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)
 #define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
@@ -2771,6 +2772,16 @@ do {								\
 		__btrfs_std_error((fs_info), __func__, __LINE__, (errno));\
 } while (0)
 
+void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
+		   unsigned int line, int errno, const char *fmt, ...);
+
+#define btrfs_panic(fs_info, errno, fmt, args...)			\
+do {									\
+	struct btrfs_fs_info *_i = (fs_info);				\
+	__btrfs_panic(_i, __func__, __LINE__, errno, fmt, ##args);	\
+	BUG_ON(!(_i->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR));	\
+} while (0)
+
 /* acl.c */
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
 struct posix_acl *btrfs_get_acl(struct inode *inode, int type);
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -76,6 +76,9 @@ static const char *btrfs_decode_error(st
 	case -EROFS:
 		errstr = "Readonly filesystem";
 		break;
+	case -EEXIST:
+		errstr = "Object already exists";
+		break;
 	default:
 		if (nbuf) {
 			if (snprintf(nbuf, 16, "error %d", -errno) >= 0)
@@ -145,6 +148,36 @@ void __btrfs_std_error(struct btrfs_fs_i
 	btrfs_handle_error(fs_info);
 }
 
+/*
+ * __btrfs_panic decodes unexpected, fatal errors from the caller,
+ * issues an alert, and either panics or BUGs, depending on mount options.
+ */
+void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
+		   unsigned int line, int errno, const char *fmt, ...)
+{
+	char nbuf[16];
+	char *s_id = "<unknown>";
+	const char *errstr;
+	struct va_format vaf = { .fmt = fmt };
+	va_list args;
+
+	if (fs_info)
+		s_id = fs_info->sb->s_id;
+
+	va_start(args, fmt);
+	vaf.va = &args;
+
+	errstr = btrfs_decode_error(fs_info, errno, nbuf);
+	if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR)
+		panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n",
+			s_id, function, line, &vaf, errstr);
+
+	printk(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n",
+	       s_id, function, line, &vaf, errstr);
+	va_end(args);
+	/* Caller calls BUG() */
+}
+
 static void btrfs_put_super(struct super_block *sb)
 {
 	struct btrfs_root *root = btrfs_sb(sb);
@@ -164,7 +197,8 @@ enum {
 	Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
 	Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
 	Opt_enospc_debug, Opt_subvolrootid, Opt_defrag,
-	Opt_inode_cache, Opt_no_space_cache, Opt_recovery, Opt_err,
+	Opt_inode_cache, Opt_no_space_cache, Opt_recovery, Opt_fatal_errors,
+	Opt_err,
 };
 
 static match_table_t tokens = {
@@ -199,6 +233,7 @@ static match_table_t tokens = {
 	{Opt_inode_cache, "inode_cache"},
 	{Opt_no_space_cache, "nospace_cache"},
 	{Opt_recovery, "recovery"},
+	{Opt_fatal_errors, "fatal_errors=%s"},
 	{Opt_err, NULL},
 };
 
@@ -397,6 +432,18 @@ int btrfs_parse_options(struct btrfs_roo
 			printk(KERN_INFO "btrfs: enabling auto recovery");
 			btrfs_set_opt(info->mount_opt, RECOVERY);
 			break;
+		case Opt_fatal_errors:
+			if (strcmp(args[0].from, "panic") == 0)
+				btrfs_set_opt(info->mount_opt,
+					      PANIC_ON_FATAL_ERROR);
+			else if (strcmp(args[0].from, "bug") == 0)
+				btrfs_clear_opt(info->mount_opt,
+					      PANIC_ON_FATAL_ERROR);
+			else {
+				ret = -EINVAL;
+				goto out;
+			}
+			break;
 		case Opt_err:
 			printk(KERN_INFO "btrfs: unrecognized mount option "
 			       "'%s'\n", p);
@@ -722,6 +769,8 @@ static int btrfs_show_options(struct seq
 		seq_puts(seq, ",autodefrag");
 	if (btrfs_test_opt(root, INODE_MAP_CACHE))
 		seq_puts(seq, ",inode_cache");
+	if (btrfs_test_opt(root, PANIC_ON_FATAL_ERROR))
+		seq_puts(seq, ",fatal_errors=panic");
 	return 0;
 }
 



  reply	other threads:[~2011-11-24  0:35 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-24  0:35 [patch 00/99] Error handling patchset v6 Jeff Mahoney
2011-11-24  0:35 ` Jeff Mahoney [this message]
2011-11-24  2:05   ` [patch 01/99] btrfs: Add btrfs_panic() David Brown
2011-11-24  2:22     ` Jeff Mahoney
2011-11-24  6:37       ` David Brown
2011-11-25  2:36         ` Jeff Mahoney
2011-11-25  5:42           ` David Brown
2011-11-24  0:35 ` [patch 02/99] btrfs: Catch locking failures in {set,clear,convert}_extent_bit Jeff Mahoney
2011-11-24  0:35 ` [patch 03/99] btrfs: Panic on bad rbtree operations Jeff Mahoney
2011-11-24 23:41   ` David Sterba
2011-11-25  2:13     ` Jeff Mahoney
2011-11-24  0:35 ` [patch 04/99] btrfs: Simplify btrfs_insert_root Jeff Mahoney
2011-11-24  0:35 ` [patch 05/99] btrfs: Remove set bits return from clear_extent_bit Jeff Mahoney
2011-11-24  0:35 ` [patch 06/99] btrfs: Add extent_state alloc/free tracing Jeff Mahoney
2011-11-24  0:35 ` [patch 07/99] btrfs: Use mempools for extent_state structures Jeff Mahoney
2011-11-28 23:53   ` Andi Kleen
2011-11-29  0:04     ` Jeff Mahoney
2011-12-01 19:55       ` Jeff Mahoney
2011-12-03  4:53         ` Jeff Mahoney
2011-11-24  0:35 ` [patch 08/99] btrfs: clear_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24  0:35 ` [patch 09/99] btrfs: unlock_extent can return void Jeff Mahoney
2011-11-24  0:35 ` [patch 10/99] btrfs: Split unlock_extent_cached into sleeping and atomic versions Jeff Mahoney
2011-11-24  0:35 ` [patch 11/99] btrfs: unlock_extent can drop gfp_t argument Jeff Mahoney
2011-11-24  0:35 ` [patch 12/99] btrfs: clear_extent_dirty " Jeff Mahoney
2011-11-24  0:35 ` [patch 13/99] btrfs: clear_extent_uptodate can drop gfp_t argumetn Jeff Mahoney
2011-11-24 23:57   ` David Sterba
2011-11-25  2:14     ` Jeff Mahoney
2011-11-24  0:35 ` [patch 14/99] btrfs: clear_extent_bits " Jeff Mahoney
2011-11-24  0:35 ` [patch 15/99] btrfs: try_lock_extent " Jeff Mahoney
2011-11-24  0:35 ` [patch 16/99] btrfs: clear_extent_bit can drop gfp_t argument Jeff Mahoney
2011-11-24  0:35 ` [patch 17/99] btrfs: set_extent_bit: split exclusive mode out Jeff Mahoney
2011-11-24  0:35 ` [patch 18/99] btrfs: set_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24  0:35 ` [patch 19/99] btrfs: lock_extent can drop gfp_t argument Jeff Mahoney
2011-11-24  0:35 ` [patch 20/99] btrfs: set_extent_dirty " Jeff Mahoney
2011-11-24  0:35 ` [patch 21/99] btrfs: set_extent_bits " Jeff Mahoney
2011-11-24  0:35 ` [patch 22/99] btrfs: set_extent_delalloc " Jeff Mahoney
2011-11-24  0:35 ` [patch 23/99] btrfs: set_extent_new " Jeff Mahoney
2011-11-24  0:35 ` [patch 24/99] btrfs: set_extent_uptodate " Jeff Mahoney
2011-11-24  0:35 ` [patch 25/99] btrfs: set_extent_bit " Jeff Mahoney
2011-11-24  0:35 ` [patch 26/99] btrfs: set_extent_buffer_uptodate should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 27/99] btrfs: set_extent_bit should return -ENOMEM on GFP_ATOMIC failures Jeff Mahoney
2011-11-24  0:36 ` [patch 28/99] btrfs: clear_extent_bit error push-up Jeff Mahoney
2011-11-24  0:36 ` [patch 29/99] btrfs: convert_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24  0:36 ` [patch 30/99] btrfs: pin_down_extent should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 31/99] btrfs: btrfs_pin_extent error push-up Jeff Mahoney
2011-11-24  0:36 ` [patch 32/99] btrfs: btrfs_drop_snapshot should return int Jeff Mahoney
2011-11-24  0:36 ` [patch 33/99] btrfs: btrfs_start_transaction non-looped error push-up Jeff Mahoney
2011-11-24  0:36 ` [patch 34/99] btrfs: find_and_setup_root " Jeff Mahoney
2011-11-24  0:36 ` [patch 35/99] btrfs: btrfs_update_root " Jeff Mahoney
2011-11-24  0:36 ` [patch 36/99] btrfs: set_range_writeback should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 37/99] btrfs: wait_on_state " Jeff Mahoney
2011-11-24  0:36 ` [patch 38/99] btrfs: wait_extent_bit " Jeff Mahoney
2011-11-24  0:36 ` [patch 39/99] btrfs: __unlock_for_delalloc " Jeff Mahoney
2011-11-24  0:36 ` [patch 40/99] btrfs: check_page_uptodate " Jeff Mahoney
2011-11-24  0:36 ` [patch 41/99] btrfs: check_page_locked " Jeff Mahoney
2011-11-24  0:36 ` [patch 42/99] btrfs: check_page_writeback " Jeff Mahoney
2011-11-24  0:36 ` [patch 43/99] btrfs: clear_extent_buffer_dirty " Jeff Mahoney
2011-11-24  0:36 ` [patch 44/99] btrfs: btrfs_cleanup_fs_uuids " Jeff Mahoney
2011-11-24  0:36 ` [patch 45/99] btrfs: run_scheduled_bios " Jeff Mahoney
2011-11-24  0:36 ` [patch 46/99] btrfs: btrfs_close_extra_devices " Jeff Mahoney
2011-11-24  0:36 ` [patch 47/99] btrfs: schedule_bio " Jeff Mahoney
2011-11-24  0:36 ` [patch 48/99] btrfs: fill_device_from_item " Jeff Mahoney
2011-11-24  0:36 ` [patch 49/99] btrfs: btrfs_queue_worker " Jeff Mahoney
2011-11-24  0:36 ` [patch 50/99] btrfs: run_ordered_completions " Jeff Mahoney
2011-11-24  0:36 ` [patch 51/99] btrfs: btrfs_stop_workers " Jeff Mahoney
2011-11-24  0:36 ` [patch 52/99] btrfs: btrfs_requeue_work " Jeff Mahoney
2011-11-24  0:36 ` [patch 53/99] btrfs: btrfs_end_log_trans " Jeff Mahoney
2011-11-24  0:36 ` [patch 54/99] btrfs: wait_for_writer " Jeff Mahoney
2011-11-24  0:36 ` [patch 55/99] btrfs: btrfs_init_compress " Jeff Mahoney
2011-11-24  0:36 ` [patch 56/99] btrfs: btrfs_invalidate_inodes " Jeff Mahoney
2011-11-24  0:36 ` [patch 57/99] btrfs: __setup_root " Jeff Mahoney
2011-11-24  0:36 ` [patch 58/99] btrfs: btrfs_destroy_delalloc_inodes " Jeff Mahoney
2011-11-24  0:36 ` [patch 59/99] btrfs: btrfs_prepare_extent_commit " Jeff Mahoney
2011-11-24  0:36 ` [patch 60/99] btrfs: btrfs_set_block_group_rw " Jeff Mahoney
2011-11-24  0:36 ` [patch 61/99] btrfs: setup_inline_extent_backref " Jeff Mahoney
2011-11-24  0:36 ` [patch 62/99] btrfs: btrfs_run_defrag_inodes " Jeff Mahoney
2011-11-24  0:36 ` [patch 63/99] btrfs: Simplify btrfs_submit_bio_hook Jeff Mahoney
2011-11-24  0:36 ` [patch 64/99] btrfs: Factor out tree->ops->merge_bio_hook call Jeff Mahoney
2011-11-24  0:36 ` [patch 65/99] btrfs: ->submit_bio_hook error push-up Jeff Mahoney
2011-11-25  0:46   ` David Sterba
2011-11-25  2:17     ` Jeff Mahoney
2011-11-24  0:36 ` [patch 66/99] btrfs: __add_reloc_root " Jeff Mahoney
2011-11-24  0:36 ` [patch 67/99] btrfs: fixup_low_keys should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 68/99] btrfs: setup_items_for_insert " Jeff Mahoney
2011-11-24  0:36 ` [patch 69/99] btrfs: del_ptr " Jeff Mahoney
2011-11-24  0:36 ` [patch 70/99] btrfs: insert_ptr " Jeff Mahoney
2011-11-24  0:36 ` [patch 71/99] btrfs: add_delayed_ref_head " Jeff Mahoney
2011-11-24  0:36 ` [patch 72/99] btrfs: add_delayed_tree_ref " Jeff Mahoney
2011-11-24  0:36 ` [patch 73/99] btrfs: add_delayed_data_ref " Jeff Mahoney
2011-11-24  0:36 ` [patch 74/99] btrfs: Fix kfree of member instead of structure Jeff Mahoney
2011-11-24  0:36 ` [patch 75/99] btrfs: Use mempools for delayed refs Jeff Mahoney
2011-11-24  0:36 ` [patch 76/99] btrfs: Delayed ref mempool functions should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 77/99] btrfs: btrfs_inc_extent_ref void return prep Jeff Mahoney
2011-11-24  0:36 ` [patch 78/99] btrfs: btrfs_free_extent " Jeff Mahoney
2011-11-24  0:36 ` [patch 79/99] btrfs: __btrfs_mod_refs process_func should return void Jeff Mahoney
2011-11-24  0:36 ` [patch 80/99] btrfs: __btrfs_mod_ref " Jeff Mahoney
2011-11-24  0:36 ` [patch 81/99] btrfs: clean_tree_block " Jeff Mahoney
2011-11-24  0:36 ` [patch 82/99] btrfs: btrfs_truncate_item " Jeff Mahoney
2011-11-24  0:36 ` [patch 83/99] btrfs: btrfs_extend_item " Jeff Mahoney
2011-11-24  0:36 ` [patch 84/99] btrfs: end_compressed_writeback " Jeff Mahoney
2011-11-24  0:36 ` [patch 85/99] btrfs: copy_for_split " Jeff Mahoney
2011-11-24  0:36 ` [patch 86/99] btrfs: update_inline_extent_backref " Jeff Mahoney
2011-11-24  0:37 ` [patch 87/99] btrfs: btrfs_put_ordered_extent " Jeff Mahoney
2011-11-24  0:37 ` [patch 88/99] btrfs: __btrfs_remove_ordered_extent " Jeff Mahoney
2011-11-24  0:37 ` [patch 89/99] btrfs: btrfs_wait_ordered_extents " Jeff Mahoney
2011-11-24  0:37 ` [patch 90/99] btrfs: btrfs_wait_ordered_range " Jeff Mahoney
2011-11-24  0:37 ` [patch 91/99] btrfs: btrfs_run_ordered_operations " Jeff Mahoney
2011-11-24  0:37 ` [patch 92/99] btrfs: btrfs_add_ordered_operation " Jeff Mahoney
2011-11-24  0:37 ` [patch 93/99] btrfs: btrfs_add_ordered_sum " Jeff Mahoney
2011-11-24  0:37 ` [patch 94/99] btrfs: btrfs_free_fs_root " Jeff Mahoney
2011-11-24  0:37 ` [patch 95/99] btrfs: del_fs_roots " Jeff Mahoney
2011-11-24  0:37 ` [patch 96/99] btrfs: btrfs_destroy_ordered_operations " Jeff Mahoney
2011-11-24  0:37 ` [patch 97/99] btrfs: btrfs_destroy_ordered_extents " Jeff Mahoney
2011-11-24  0:37 ` [patch 98/99] btrfs: btrfs_destroy_pending_snapshots " Jeff Mahoney
2011-11-24  0:37 ` [patch 99/99] btrfs: add_excluded_extent " Jeff Mahoney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111124004219.933819241@suse.com \
    --to=jeffm@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).