Skip to contentSkip to conversation

xfs_db: more type_f cleanups

PATCH In review Eric Sandeen 3 participants 9 messages Aug 21, 2020 – Aug 24, 2020

lore
Share & tools
lore
#0 lore raw

cover xfs_db: more type_f cleanups

These go on top of Zorro's

"xfs_db: use correct inode to set inode type"

-Eric

#1 lore raw

PATCH 1/2 xfs_db: short circuit type_f if type is unchanged

There's no reason to go through the type change code if the type has not been changed.

---

db/type.c +2 -0
index 3cb1e868..572ac6d6 100644
@@ -216,6 +216,8 @@ type_f(
 		tt = findtyp(argv[1]);
 		if (tt == NULL) {
 			dbprintf(_("no such type %s\n"), argv[1]);
+		} else if (iocur_top->typ == tt) {
+			return 0;
 		} else {
 			if (iocur_top->typ == NULL)
 				dbprintf(_("no current object\n"));
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] xfs_db: short circuit type_f if type is unchanged

Quoted 11 lines · Eric Sandeen

There's no reason to go through the type change code if the type has not been changed.

---

db/type.c +0 -0
index 3cb1e868..572ac6d6 100644

db/type.c type_f( · line 220

Quoted 5 lines
db/type.c +2 -0
@@ -216,6 +216,8 @@ type_f(
 		tt = findtyp(argv[1]);
 		if (tt == NULL) {
 			dbprintf(_("no such type %s\n"), argv[1]);
+		} else if (iocur_top->typ == tt) {
+			return 0;

Doesn't this mean that verifier errors won't be printed if the user asks to set the type to the current type? e.g.

xfs_db> agf 0
xfs_db> addr bnoroot
xfs_db> fuzz -d level random
Allowing fuzz of corrupted data with good CRC
level = 59679
xfs_db> type bnobt
Metadata corruption detected at 0x5586779a7b18, xfs_bnobt block 0x8/0x1000 xfs_db> type bnobt
Metadata corruption detected at 0x5586779a7b18, xfs_bnobt block 0x8/0x1000

<shrug> OTOH, db doesn't consistently have that behavior either -- inodes only behave like that for crc errors, so maybe this is fine.

Eh whatever, it's the debugging tool, you should be paying attention anyways.

--D

Quoted 4 lines
db/type.c +0 -0
 		} else {
 			if (iocur_top->typ == NULL)
 				dbprintf(_("no current object\n"));
#3 lore raw

Re: [PATCH 1/2] xfs_db: short circuit type_f if type is unchanged

Quoted 21 lines · Darrick J. Wong
Quoted 11 lines · Eric Sandeen

There's no reason to go through the type change code if the type has not been changed.

---

db/type.c +0 -0
index 3cb1e868..572ac6d6 100644

db/type.c type_f( · line 220

Quoted 5 lines
db/type.c +2 -0
@@ -216,6 +216,8 @@ type_f(
 		tt = findtyp(argv[1]);
 		if (tt == NULL) {
 			dbprintf(_("no such type %s\n"), argv[1]);
+		} else if (iocur_top->typ == tt) {
+			return 0;

Doesn't this mean that verifier errors won't be printed if the user asks to set the type to the current type? e.g.

Quoted 9 lines

xfs_db> agf 0
xfs_db> addr bnoroot
xfs_db> fuzz -d level random
Allowing fuzz of corrupted data with good CRC
level = 59679
xfs_db> type bnobt
Metadata corruption detected at 0x5586779a7b18, xfs_bnobt block 0x8/0x1000 xfs_db> type bnobt
Metadata corruption detected at 0x5586779a7b18, xfs_bnobt block 0x8/0x1000

Oh, ok, I hadn't thought about how we could change the buffer after the fact, I was thinking "nothing should change"

Honestly this isn't critical, it was a trivially backportable fix for the weird inode thing that Zorro fixed earlier, but with that in place it's not really necessary.

I could go either way here too. If we want to rerun verifiers by resetting the type, that's fine.

-Eric

Quoted 15 lines

<shrug> OTOH, db doesn't consistently have that behavior either -- inodes only behave like that for crc errors, so maybe this is fine.

Eh whatever, it's the debugging tool, you should be paying attention anyways.

--D

Quoted 4 lines
db/type.c +0 -0
 		} else {
 			if (iocur_top->typ == NULL)
 				dbprintf(_("no current object\n"));
#4 lore raw

PATCH 2/2 xfs_db: consolidate set_iocur_type behavior

In reply to Eric Sandeen

Right now there are 3 cases to type_f: inode type, type with fields, and a default. The first two were added to address issues with handling V5 metadata.

The first two already use some version of set_cur, which handles all of the validation etc. There's no reason to leave the open-coded bits at the end, just send every non-inode type through set_cur and be done with it.

---

 io.c |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)
db/io.c +5 -23
index 884da599..235191f5 100644
@@ -603,33 +603,15 @@ set_iocur_type(
 				iocur_top->boff / mp->m_sb.sb_inodesize);
 		ino = XFS_AGINO_TO_INO(mp, xfs_daddr_to_agno(mp, b), agino);
 		set_cur_inode(ino);
-		return;
-	}
-
-	/* adjust buffer size for types with fields & hence fsize() */
-	if (type->fields) {
-		int bb_count;	/* type's size in basic blocks */
+	} else  {
+		int bb_count = 1;	/* type's size in basic blocks */
 
-		bb_count = BTOBB(byteize(fsize(type->fields,
+		/* adjust buffer size for types with fields & hence fsize() */
+		if (type->fields)
+			bb_count = BTOBB(byteize(fsize(type->fields,
 					       iocur_top->data, 0, 0)));
 		set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
 	}
-	iocur_top->typ = type;
-
-	/* verify the buffer if the type has one. */
-	if (!bp)
-		return;
-	if (!type->bops) {
-		bp->b_ops = NULL;
-		bp->b_flags |= LIBXFS_B_UNCHECKED;
-		return;
-	}
-	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
-		return;
-	bp->b_error = 0;
-	bp->b_ops = type->bops;
-	bp->b_ops->verify_read(bp);
-	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
 }
 
 static void
Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] xfs_db: consolidate set_iocur_type behavior

Quoted 20 lines · Eric Sandeen

Right now there are 3 cases to type_f: inode type, type with fields, and a default. The first two were added to address issues with handling V5 metadata.

The first two already use some version of set_cur, which handles all of the validation etc. There's no reason to leave the open-coded bits at the end, just send every non-inode type through set_cur and be done with it.

---

 io.c |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)
db/io.c +0 -0
index 884da599..235191f5 100644

db/io.c set_iocur_type( · line 606

Quoted 10 lines
db/io.c +1 -6
@@ -603,33 +603,15 @@ set_iocur_type(
 				iocur_top->boff / mp->m_sb.sb_inodesize);
 		ino = XFS_AGINO_TO_INO(mp, xfs_daddr_to_agno(mp, b), agino);
 		set_cur_inode(ino);
-		return;
-	}
-
-	/* adjust buffer size for types with fields & hence fsize() */
-	if (type->fields) {
-		int bb_count;	/* type's size in basic blocks */
+	} else  {

Two spaces ^^ between the else and the paren.

I also wonder, why not leave the "return;" at the end of the "if (type->typnm == TYP_INODE)" part and then you can reduce the indenting level of the rest of the function?

<shrug> maintainer's prerogative on that one though.

/me also wonders why dquots don't get the same "save the buffer offset" treatment as inodes, but that's a separate question. :)

--D

Quoted 29 lines
db/io.c +4 -17
+		int bb_count = 1;	/* type's size in basic blocks */
 
-		bb_count = BTOBB(byteize(fsize(type->fields,
+		/* adjust buffer size for types with fields & hence fsize() */
+		if (type->fields)
+			bb_count = BTOBB(byteize(fsize(type->fields,
 					       iocur_top->data, 0, 0)));
 		set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
 	}
-	iocur_top->typ = type;
-
-	/* verify the buffer if the type has one. */
-	if (!bp)
-		return;
-	if (!type->bops) {
-		bp->b_ops = NULL;
-		bp->b_flags |= LIBXFS_B_UNCHECKED;
-		return;
-	}
-	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
-		return;
-	bp->b_error = 0;
-	bp->b_ops = type->bops;
-	bp->b_ops->verify_read(bp);
-	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
 }
 
 static void
#6 lore raw

Re: [PATCH 2/2] xfs_db: consolidate set_iocur_type behavior

Quoted 34 lines · Darrick J. Wong
Quoted 20 lines · Eric Sandeen

Right now there are 3 cases to type_f: inode type, type with fields, and a default. The first two were added to address issues with handling V5 metadata.

The first two already use some version of set_cur, which handles all of the validation etc. There's no reason to leave the open-coded bits at the end, just send every non-inode type through set_cur and be done with it.

---

 io.c |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)
db/io.c +0 -0
index 884da599..235191f5 100644

db/io.c set_iocur_type( · line 606

Quoted 10 lines
db/io.c +1 -6
@@ -603,33 +603,15 @@ set_iocur_type(
 				iocur_top->boff / mp->m_sb.sb_inodesize);
 		ino = XFS_AGINO_TO_INO(mp, xfs_daddr_to_agno(mp, b), agino);
 		set_cur_inode(ino);
-		return;
-	}
-
-	/* adjust buffer size for types with fields & hence fsize() */
-	if (type->fields) {
-		int bb_count;	/* type's size in basic blocks */
+	} else  {

Two spaces ^^ between the else and the paren.

Quoted 3 lines

I also wonder, why not leave the "return;" at the end of the "if (type->typnm == TYP_INODE)" part and then you can reduce the indenting level of the rest of the function?

Oh, that might be nice. I'll see how that looks.

Quoted 5 lines

<shrug> maintainer's prerogative on that one though.

/me also wonders why dquots don't get the same "save the buffer offset" treatment as inodes, but that's a separate question. :)

hmmmm good question tho.

Thanks for the reviews,
-Eric

Quoted 32 lines

--D

Quoted 29 lines
db/io.c +4 -17
+		int bb_count = 1;	/* type's size in basic blocks */
 
-		bb_count = BTOBB(byteize(fsize(type->fields,
+		/* adjust buffer size for types with fields & hence fsize() */
+		if (type->fields)
+			bb_count = BTOBB(byteize(fsize(type->fields,
 					       iocur_top->data, 0, 0)));
 		set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
 	}
-	iocur_top->typ = type;
-
-	/* verify the buffer if the type has one. */
-	if (!bp)
-		return;
-	if (!type->bops) {
-		bp->b_ops = NULL;
-		bp->b_flags |= LIBXFS_B_UNCHECKED;
-		return;
-	}
-	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
-		return;
-	bp->b_error = 0;
-	bp->b_ops = type->bops;
-	bp->b_ops->verify_read(bp);
-	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
 }
 
 static void
#7 lore raw

PATCH v2 2/2 xfs_db: consolidate set_iocur_type() behavior

In reply to Eric Sandeen

Right now there are 3 cases to type_f(): inode type, type with fields, and a default. The first two were added to address issues with handling V5 metadata.

The first two already use some version of set_cur(), which handles all of the validation etc. There's no reason to leave the open-coded bits at the end, just send every non-inode type through set_cur() and be done with it.

---

V2: Drop unused *bp var declaration
un-indent/un-else the non-inode code

db/io.c +4 -23
index 884da599..b8cb767e 100644
@@ -586,7 +586,7 @@ void
 set_iocur_type(
 	const typ_t	*type)
 {
-	struct xfs_buf	*bp = iocur_top->bp;
+	int 		bb_count = 1;	/* type's size in basic blocks */
 
 	/*
 	 * Inodes are special; verifier checks all inodes in the chunk, the
@@ -607,29 +607,10 @@ set_iocur_type(
 	}
 
 	/* adjust buffer size for types with fields & hence fsize() */
-	if (type->fields) {
-		int bb_count;	/* type's size in basic blocks */
-
+	if (type->fields)
 		bb_count = BTOBB(byteize(fsize(type->fields,
-					       iocur_top->data, 0, 0)));
-		set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
-	}
-	iocur_top->typ = type;
-
-	/* verify the buffer if the type has one. */
-	if (!bp)
-		return;
-	if (!type->bops) {
-		bp->b_ops = NULL;
-		bp->b_flags |= LIBXFS_B_UNCHECKED;
-		return;
-	}
-	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
-		return;
-	bp->b_error = 0;
-	bp->b_ops = type->bops;
-	bp->b_ops->verify_read(bp);
-	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
+				       iocur_top->data, 0, 0)));
+	set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
 }
 
 static void
Reviewed-by on v2 2/2
#8 lore raw

Re: [PATCH 2/2 V2] xfs_db: consolidate set_iocur_type() behavior

Quoted 20 lines · Eric Sandeen

Right now there are 3 cases to type_f(): inode type, type with fields, and a default. The first two were added to address issues with handling V5 metadata.

The first two already use some version of set_cur(), which handles all of the validation etc. There's no reason to leave the open-coded bits at the end, just send every non-inode type through set_cur() and be done with it.

---

V2: Drop unused *bp var declaration
un-indent/un-else the non-inode code

db/io.c +0 -0
index 884da599..b8cb767e 100644

db/io.c void · line 589

Quoted 5 lines
db/io.c +1 -1
@@ -586,7 +586,7 @@ void
 set_iocur_type(
 	const typ_t	*type)
 {
-	struct xfs_buf	*bp = iocur_top->bp;
+	int 		bb_count = 1;	/* type's size in basic blocks */

Space after 'int' and before tabs.

With that fixed,

--D

Quoted 38 lines
db/io.c +3 -22
 	/*
 	 * Inodes are special; verifier checks all inodes in the chunk, the
@@ -607,29 +607,10 @@ set_iocur_type(
 	}
 
 	/* adjust buffer size for types with fields & hence fsize() */
-	if (type->fields) {
-		int bb_count;	/* type's size in basic blocks */
-
+	if (type->fields)
 		bb_count = BTOBB(byteize(fsize(type->fields,
-					       iocur_top->data, 0, 0)));
-		set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
-	}
-	iocur_top->typ = type;
-
-	/* verify the buffer if the type has one. */
-	if (!bp)
-		return;
-	if (!type->bops) {
-		bp->b_ops = NULL;
-		bp->b_flags |= LIBXFS_B_UNCHECKED;
-		return;
-	}
-	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
-		return;
-	bp->b_error = 0;
-	bp->b_ops = type->bops;
-	bp->b_ops->verify_read(bp);
-	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
+				       iocur_top->data, 0, 0)));
+	set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
 }
 
 static void