Skip to content

L
linux
Commit 0b59b42f authored by Nathan Scott's avatar Nathan Scott
Browse files
Options

[XFS] Version 2 log code fixes in recovery. 

SGI Modid: 2.5.x-xfs:slinx:150122a
parent c42eb0cd
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 94 deletions
fs/xfs/xfs_log_recover.c
View file @ 0b59b42f
...@@ -3413,6 +3413,45 @@ xlog_unpack_data( ...@@ -3413,6 +3413,45 @@ xlog_unpack_data(
xlog_unpack_data_checksum(rhead, dp, log); xlog_unpack_data_checksum(rhead, dp, log);
} }
STATIC int
xlog_valid_rec_header(
xlog_t *log,
xlog_rec_header_t *rhead,
xfs_daddr_t blkno)
{
int bblks;
if (unlikely(
(INT_GET(rhead->h_magicno, ARCH_CONVERT) !=
XLOG_HEADER_MAGIC_NUM))) {
XFS_ERROR_REPORT("xlog_valid_rec_header(1)",
XFS_ERRLEVEL_LOW, log->l_mp);
return XFS_ERROR(EFSCORRUPTED);
}
if (unlikely(
(INT_ISZERO(rhead->h_version, ARCH_CONVERT) ||
(INT_GET(rhead->h_version, ARCH_CONVERT) &
(~XLOG_VERSION_OKBITS)) != 0))) {
xlog_warn("XFS: %s: unrecognised log version (%d).",
__FUNCTION__, INT_GET(rhead->h_version, ARCH_CONVERT));
return XFS_ERROR(EIO);
}
/* LR body must have data or it wouldn't have been written */
bblks = INT_GET(rhead->h_len, ARCH_CONVERT);
if (unlikely( bblks <= 0 || bblks > INT_MAX )) {
XFS_ERROR_REPORT("xlog_valid_rec_header(2)",
XFS_ERRLEVEL_LOW, log->l_mp);
return XFS_ERROR(EFSCORRUPTED);
}
if (unlikely( blkno > log->l_logBBsize || blkno > INT_MAX )) {
XFS_ERROR_REPORT("xlog_valid_rec_header(3)",
XFS_ERRLEVEL_LOW, log->l_mp);
return XFS_ERROR(EFSCORRUPTED);
}
return 0;
}
/* /*
* Read the log from tail to head and process the log records found. * Read the log from tail to head and process the log records found.
* Handle the two cases where the tail and head are in the same cycle * Handle the two cases where the tail and head are in the same cycle
...@@ -3437,6 +3476,8 @@ xlog_do_recovery_pass( ...@@ -3437,6 +3476,8 @@ xlog_do_recovery_pass(
int hblks, split_hblks, wrapped_hblks; int hblks, split_hblks, wrapped_hblks;
xlog_recover_t *rhash[XLOG_RHASH_SIZE]; xlog_recover_t *rhash[XLOG_RHASH_SIZE];
ASSERT(head_blk != tail_blk);
/* /*
* Read the header of the tail block and get the iclog buffer size from * Read the header of the tail block and get the iclog buffer size from
* h_size. Use this to tell how many sectors make up the log header. * h_size. Use this to tell how many sectors make up the log header.
...@@ -3454,21 +3495,10 @@ xlog_do_recovery_pass( ...@@ -3454,21 +3495,10 @@ xlog_do_recovery_pass(
goto bread_err1; goto bread_err1;
offset = xlog_align(log, tail_blk, 1, hbp); offset = xlog_align(log, tail_blk, 1, hbp);
rhead = (xlog_rec_header_t *)offset; rhead = (xlog_rec_header_t *)offset;
if (unlikely( error = xlog_valid_rec_header(log, rhead, tail_blk);
(INT_GET(rhead->h_magicno, ARCH_CONVERT) != if (error)
XLOG_HEADER_MAGIC_NUM) ||
(INT_ISZERO(rhead->h_version, ARCH_CONVERT)) ||
(INT_GET(rhead->h_version, ARCH_CONVERT) &
(~XLOG_VERSION_OKBITS)) != 0)) {
xlog_warn("XFS: %s: bad log magic/version (0x%x/%d)",
__FUNCTION__,
INT_GET(rhead->h_magicno, ARCH_CONVERT),
INT_GET(rhead->h_version, ARCH_CONVERT));
error = XFS_ERROR(EIO);
goto bread_err1; goto bread_err1;
}
h_size = INT_GET(rhead->h_size, ARCH_CONVERT); h_size = INT_GET(rhead->h_size, ARCH_CONVERT);
if ((INT_GET(rhead->h_version, ARCH_CONVERT) if ((INT_GET(rhead->h_version, ARCH_CONVERT)
& XLOG_VERSION_2) && & XLOG_VERSION_2) &&
(h_size > XLOG_HEADER_CYCLE_SIZE)) { (h_size > XLOG_HEADER_CYCLE_SIZE)) {
...@@ -3502,47 +3532,21 @@ xlog_do_recovery_pass( ...@@ -3502,47 +3532,21 @@ xlog_do_recovery_pass(
goto bread_err2; goto bread_err2;
offset = xlog_align(log, blk_no, hblks, hbp); offset = xlog_align(log, blk_no, hblks, hbp);
rhead = (xlog_rec_header_t *)offset; rhead = (xlog_rec_header_t *)offset;
ASSERT(INT_GET(rhead->h_magicno, ARCH_CONVERT) == error = xlog_valid_rec_header(log, rhead, blk_no);
XLOG_HEADER_MAGIC_NUM); if (error)
ASSERT(BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT) <=
INT_MAX));
/* blocks in data section */
bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT));
if (unlikely(
(INT_GET(rhead->h_magicno, ARCH_CONVERT) !=
XLOG_HEADER_MAGIC_NUM) ||
(BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT) >
INT_MAX)) ||
(bblks <= 0) ||
(blk_no > log->l_logBBsize))) {
XFS_ERROR_REPORT("xlog_do_recovery_pass(1)",
XFS_ERRLEVEL_LOW, log->l_mp);
error = EFSCORRUPTED;
goto bread_err2; goto bread_err2;
}
if ((INT_GET(rhead->h_version, ARCH_CONVERT) &
(~XLOG_VERSION_OKBITS)) != 0) {
xlog_warn(
"XFS: xlog_do_recovery_pass: unrecognised log version number.");
error = XFS_ERROR(EIO);
goto bread_err2;
}
/* blocks in data section */ /* blocks in data section */
bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT)); bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT));
if (bblks > 0) { error = xlog_bread(log, blk_no + hblks, bblks, dbp);
if ((error = xlog_bread(log, blk_no + hblks, if (error)
bblks, dbp))) goto bread_err2;
goto bread_err2; offset = xlog_align(log, blk_no + hblks, bblks, dbp);
offset = xlog_align(log, blk_no + hblks, xlog_unpack_data(rhead, offset, log);
bblks, dbp); if ((error = xlog_recover_process_data(log,
xlog_unpack_data(rhead, offset, log);
if ((error = xlog_recover_process_data(log,
rhash, rhead, offset, pass))) rhash, rhead, offset, pass)))
goto bread_err2; goto bread_err2;
} blk_no += bblks + hblks;
blk_no += (bblks+hblks);
} }
} else { } else {
/* /*
...@@ -3555,17 +3559,17 @@ xlog_do_recovery_pass( ...@@ -3555,17 +3559,17 @@ xlog_do_recovery_pass(
/* /*
* Check for header wrapping around physical end-of-log * Check for header wrapping around physical end-of-log
*/ */
offset = NULL;
split_hblks = 0;
wrapped_hblks = 0; wrapped_hblks = 0;
if (blk_no+hblks <= log->l_logBBsize) { if (blk_no + hblks <= log->l_logBBsize) {
/* Read header in one read */ /* Read header in one read */
if ((error = xlog_bread(log, blk_no, error = xlog_bread(log, blk_no, hblks, hbp);
hblks, hbp))) if (error)
goto bread_err2; goto bread_err2;
offset = xlog_align(log, blk_no, hblks, hbp); offset = xlog_align(log, blk_no, hblks, hbp);
} else { } else {
/* This LR is split across physical log end */ /* This LR is split across physical log end */
offset = NULL;
split_hblks = 0;
if (blk_no != log->l_logBBsize) { if (blk_no != log->l_logBBsize) {
/* some data before physical log end */ /* some data before physical log end */
ASSERT(blk_no <= INT_MAX); ASSERT(blk_no <= INT_MAX);
...@@ -3594,8 +3598,8 @@ xlog_do_recovery_pass( ...@@ -3594,8 +3598,8 @@ xlog_do_recovery_pass(
bufaddr + BBTOB(split_hblks), bufaddr + BBTOB(split_hblks),
BBTOB(hblks - split_hblks)); BBTOB(hblks - split_hblks));
wrapped_hblks = hblks - split_hblks; wrapped_hblks = hblks - split_hblks;
if ((error = xlog_bread(log, 0, error = xlog_bread(log, 0, wrapped_hblks, hbp);
wrapped_hblks, hbp))) if (error)
goto bread_err2; goto bread_err2;
XFS_BUF_SET_PTR(hbp, bufaddr, hblks); XFS_BUF_SET_PTR(hbp, bufaddr, hblks);
if (!offset) if (!offset)
...@@ -3603,33 +3607,18 @@ xlog_do_recovery_pass( ...@@ -3603,33 +3607,18 @@ xlog_do_recovery_pass(
wrapped_hblks, hbp); wrapped_hblks, hbp);
} }
rhead = (xlog_rec_header_t *)offset; rhead = (xlog_rec_header_t *)offset;
ASSERT(INT_GET(rhead->h_magicno, ARCH_CONVERT) == error = xlog_valid_rec_header(log, rhead,
XLOG_HEADER_MAGIC_NUM); split_hblks ? blk_no : 0);
ASSERT(BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT) <= if (error)
INT_MAX));
bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT));
/* LR body must have data or it wouldn't have been
* written */
ASSERT(bblks > 0);
blk_no += hblks; /* successfully read header */
if (unlikely(
(INT_GET(rhead->h_magicno, ARCH_CONVERT) !=
XLOG_HEADER_MAGIC_NUM) ||
(BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT) >
INT_MAX)) ||
(bblks <= 0))) {
XFS_ERROR_REPORT("xlog_do_recovery_pass(2)",
XFS_ERRLEVEL_LOW, log->l_mp);
error = EFSCORRUPTED;
goto bread_err2; goto bread_err2;
}
bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT));
blk_no += hblks;
/* Read in data for log record */ /* Read in data for log record */
if (blk_no+bblks <= log->l_logBBsize) { if (blk_no + bblks <= log->l_logBBsize) {
if ((error = xlog_bread(log, blk_no, error = xlog_bread(log, blk_no, bblks, dbp);
bblks, dbp))) if (error)
goto bread_err2; goto bread_err2;
offset = xlog_align(log, blk_no, bblks, dbp); offset = xlog_align(log, blk_no, bblks, dbp);
} else { } else {
...@@ -3678,7 +3667,7 @@ xlog_do_recovery_pass( ...@@ -3678,7 +3667,7 @@ xlog_do_recovery_pass(
} }
xlog_unpack_data(rhead, offset, log); xlog_unpack_data(rhead, offset, log);
if ((error = xlog_recover_process_data(log, rhash, if ((error = xlog_recover_process_data(log, rhash,
rhead, offset, pass))) rhead, offset, pass)))
goto bread_err2; goto bread_err2;
blk_no += bblks; blk_no += bblks;
} }
...@@ -3692,20 +3681,18 @@ xlog_do_recovery_pass( ...@@ -3692,20 +3681,18 @@ xlog_do_recovery_pass(
goto bread_err2; goto bread_err2;
offset = xlog_align(log, blk_no, hblks, hbp); offset = xlog_align(log, blk_no, hblks, hbp);
rhead = (xlog_rec_header_t *)offset; rhead = (xlog_rec_header_t *)offset;
ASSERT(INT_GET(rhead->h_magicno, ARCH_CONVERT) == error = xlog_valid_rec_header(log, rhead, blk_no);
XLOG_HEADER_MAGIC_NUM); if (error)
ASSERT(BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT) <= goto bread_err2;
INT_MAX));
bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT)); bblks = (int)BTOBB(INT_GET(rhead->h_len, ARCH_CONVERT));
ASSERT(bblks > 0);
if ((error = xlog_bread(log, blk_no+hblks, bblks, dbp))) if ((error = xlog_bread(log, blk_no+hblks, bblks, dbp)))
goto bread_err2; goto bread_err2;
offset = xlog_align(log, blk_no+hblks, bblks, dbp); offset = xlog_align(log, blk_no+hblks, bblks, dbp);
xlog_unpack_data(rhead, offset, log); xlog_unpack_data(rhead, offset, log);
if ((error = xlog_recover_process_data(log, rhash, if ((error = xlog_recover_process_data(log, rhash,
rhead, offset, pass))) rhead, offset, pass)))
goto bread_err2; goto bread_err2;
blk_no += (bblks+hblks); blk_no += bblks + hblks;
} }
} }
...@@ -3736,9 +3723,9 @@ xlog_do_log_recovery( ...@@ -3736,9 +3723,9 @@ xlog_do_log_recovery(
xfs_daddr_t tail_blk) xfs_daddr_t tail_blk)
{ {
int error; int error;
#ifdef DEBUG
int i; if (head_blk == tail_blk)
#endif return 0;
/* /*
* First do a pass to find all of the cancelled buf log items. * First do a pass to find all of the cancelled buf log items.
...@@ -3762,11 +3749,15 @@ xlog_do_log_recovery( ...@@ -3762,11 +3749,15 @@ xlog_do_log_recovery(
*/ */
error = xlog_do_recovery_pass(log, head_blk, tail_blk, error = xlog_do_recovery_pass(log, head_blk, tail_blk,
XLOG_RECOVER_PASS2); XLOG_RECOVER_PASS2);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < XLOG_BC_TABLE_SIZE; i++) { {
ASSERT(log->l_buf_cancel_table[i] == NULL); int i;
for (i = 0; i < XLOG_BC_TABLE_SIZE; i++)
ASSERT(log->l_buf_cancel_table[i] == NULL);
} }
#endif /* DEBUG */ #endif /* DEBUG */
kmem_free(log->l_buf_cancel_table, kmem_free(log->l_buf_cancel_table,
XLOG_BC_TABLE_SIZE * sizeof(xfs_buf_cancel_t*)); XLOG_BC_TABLE_SIZE * sizeof(xfs_buf_cancel_t*));
log->l_buf_cancel_table = NULL; log->l_buf_cancel_table = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7