On Wed, Apr 16, 2014 at 09:25:04AM -0400, Brian Foster wrote:
> On Tue, Apr 15, 2014 at 06:25:01PM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > Currently the attribute code will not detect and correct errors in
> > the attribute tree. It also fails to validate the CRCs and headers
> > on remote attribute blocks. Ensure that all the attribute blocks are
> > CRC checked and that the processing functions understand the correct
> > block formats for decoding.
> >
> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > ---
> > repair/attr_repair.c | 35 ++++++++++++++++++++++++++++-------
> > 1 file changed, 28 insertions(+), 7 deletions(-)
> >
> > diff --git a/repair/attr_repair.c b/repair/attr_repair.c
> > index ba85ac2..13ec90e 100644
> > --- a/repair/attr_repair.c
> > +++ b/repair/attr_repair.c
> > @@ -611,6 +611,8 @@ verify_da_path(xfs_mount_t *mp,
> > ASSERT(cursor->level[this_level].dirty == 0 ||
> > (cursor->level[this_level].dirty && !no_modify));
> >
> > + if (bp->b_error == EFSBADCRC)
> > + cursor->level[this_level].dirty++;
>
> I was wondering why this wasn't checked closer to the readbuf call, then
> I noticed the assert. Any reason not to be consistent with the other
> changes, move this up closer to the call and nuke the assert?
Because I didn't want to modify the cursor state if the buffer
failed the basic checks (i.e. if (bad) {... return} branch was
taken) as if it is bad we aren't even going to try to repair it.
Hence marking it dirty for writeout when it might not even be an
attr block is probably a bad thing...
> > if (!bp) {
> > do_warn(
> > _("can't read file block %u (fsbno %" PRIu64 ") for attribute fork of inode %" PRIu64 "\n"),
> > da_bno, dev_bno, ino);
> > goto error_out;
> > }
> > + if (bp->b_error == EFSBADCRC)
> > + repair++;
>
> Could you remind me why we only check EFSBADCRC in some places and
> EFSCORRUPTED as well in others?
Here we are checking and repairing the buffer, so EFSCORRUPTED
detection doesn't provide any value - if there is a corruption,
repair will already handle it and fix it. Hence this is here to
catch a buffer with a bad CRC but is otherwise good (e.g. bit error
in usused/unreferenced space in the metadata block).
>
> >
> > leaf = bp->b_addr;
> > xfs_attr3_leaf_hdr_from_disk(&leafhdr, leaf);
> > @@ -1382,9 +1401,9 @@ process_leaf_attr_level(xfs_mount_t *mp,
> >
> > current_hashval = greatest_hashval;
> >
> > - if (repair && !no_modify)
> > + if (repair && !no_modify)
> > libxfs_writebuf(bp, 0);
> > - else
> > + else
> > libxfs_putbuf(bp);
> > } while (da_bno != 0);
> >
> > @@ -1512,6 +1531,8 @@ process_longform_attr(
> > ino);
> > return(1);
> > }
> > + if (bp->b_error == EFSBADCRC)
> > + (*repair)++;
>
> Note that repair is unconditionally reset to 0 at the beginning of
> process_leaf_attr_block() (in the XFS_ATTR_LEAF_MAGIC case further down
> this function).
Oh, so it is. I missed that. Good catch! Will fix.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
