xfs: fix log CRC mismatches between i386 and other architectures

[ Upstream commit e747883c7d7306acb4d683038d881528fbfbe749 ]

When mounting file systems with a log that was dirtied on i386 on
other architectures or vice versa, log recovery is unhappy:

[   11.068052] XFS (vdb): Torn write (CRC failure) detected at log block 0x2. Truncating head block from 0xc.

This is because the CRCs generated by i386 and other architectures
always diff.  The reason for that is that sizeof(struct xlog_rec_header)
returns different values for i386 vs the rest (324 vs 328), because the
struct is not sizeof(uint64_t) aligned, and i386 has odd struct size
alignment rules.

This issue goes back to commit 13cdc853c519 ("Add log versioning, and new
super block field for the log stripe") in the xfs-import tree, which
adds log v2 support and the h_size field that causes the unaligned size.
At that time it only mattered for the crude debug only log header
checksum, but with commit 0e446be44806 ("xfs: add CRC checks to the log")
it became a real issue for v5 file system, because now there is a proper
CRC, and regular builds actually expect it match.

Fix this by allowing checksums with and without the padding.

Fixes: 0e446be44806 ("xfs: add CRC checks to the log")
Cc: <stable@vger.kernel.org> # v3.8
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
[ Adjust context and filenames ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index b322db523d65c849fc7bee35f0df1f9c37e81126..98f3e267a2933378fd609bb89c0c7f52824dbfce 100644 (file)
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -167,12 +167,40 @@ typedef struct xlog_rec_header {
        __be32    h_prev_block; /* block number to previous LR          :  4 */
        __be32    h_num_logops; /* number of log operations in this LR  :  4 */
        __be32    h_cycle_data[XLOG_HEADER_CYCLE_SIZE / BBSIZE];
-       /* new fields */
+
+       /* fields added by the Linux port: */
        __be32    h_fmt;        /* format of log record                 :  4 */
        uuid_t    h_fs_uuid;    /* uuid of FS                           : 16 */
+
+       /* fields added for log v2: */
        __be32    h_size;       /* iclog size                           :  4 */
+
+       /*
+        * When h_size added for log v2 support, it caused structure to have
+        * a different size on i386 vs all other architectures because the
+        * sum of the size ofthe  member is not aligned by that of the largest
+        * __be64-sized member, and i386 has really odd struct alignment rules.
+        *
+        * Due to the way the log headers are placed out on-disk that alone is
+        * not a problem becaue the xlog_rec_header always sits alone in a
+        * BBSIZEs area, and the rest of that area is padded with zeroes.
+        * But xlog_cksum used to calculate the checksum based on the structure
+        * size, and thus gives different checksums for i386 vs the rest.
+        * We now do two checksum validation passes for both sizes to allow
+        * moving v5 file systems with unclean logs between i386 and other
+        * (little-endian) architectures.
+        */
+       __u32     h_pad0;
 } xlog_rec_header_t;
 
+#ifdef __i386__
+#define XLOG_REC_SIZE          offsetofend(struct xlog_rec_header, h_size)
+#define XLOG_REC_SIZE_OTHER    sizeof(struct xlog_rec_header)
+#else
+#define XLOG_REC_SIZE          sizeof(struct xlog_rec_header)
+#define XLOG_REC_SIZE_OTHER    offsetofend(struct xlog_rec_header, h_size)
+#endif /* __i386__ */
+
 typedef struct xlog_rec_ext_header {
        __be32    xh_cycle;     /* write cycle of log                   : 4 */
        __be32    xh_cycle_data[XLOG_HEADER_CYCLE_SIZE / BBSIZE]; /*    : 256 */

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index be2f714d1553af06738b92a4fff4505cf8f69ab4..4090f4a679afe3f3dad28cb5430ad4d1d1624af5 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1761,13 +1761,13 @@ xlog_cksum(
        struct xlog             *log,
        struct xlog_rec_header  *rhead,
        char                    *dp,
-       int                     size)
+       unsigned int            hdrsize,
+       unsigned int            size)
 {
        uint32_t                crc;
 
        /* first generate the crc for the record header ... */
-       crc = xfs_start_cksum_update((char *)rhead,
-                             sizeof(struct xlog_rec_header),
+       crc = xfs_start_cksum_update((char *)rhead, hdrsize,
                              offsetof(struct xlog_rec_header, h_crc));
 
        /* ... then for additional cycle data for v2 logs ... */
@@ -2013,7 +2013,7 @@ xlog_sync(
 
        /* calculcate the checksum */
        iclog->ic_header.h_crc = xlog_cksum(log, &iclog->ic_header,
-                                           iclog->ic_datap, size);
+                       iclog->ic_datap, XLOG_REC_SIZE, size);
        /*
         * Intentionally corrupt the log record CRC based on the error injection
         * frequency, if defined. This facilitates testing log recovery in the

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 03393595676f4ce931ce4aa5c4110c80d69265d5..0bd09650db410d1b6d8e92cad8f1d76ac785d6e0 100644 (file)
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -491,8 +491,8 @@ xlog_recover_finish(
 extern void
 xlog_recover_cancel(struct xlog *);
 
-extern __le32   xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,
-                           char *dp, int size);
+__le32  xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,
+               char *dp, unsigned int hdrsize, unsigned int size);
 
 extern kmem_zone_t *xfs_log_ticket_zone;
 struct xlog_ticket *

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 899fd45ee1552e9870844012f5c4e109c7a4b163..825e585758bb08f7a8d569d553a3c842806a5e1d 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2864,9 +2864,24 @@ xlog_recover_process(
        int                     pass,
        struct list_head        *buffer_list)
 {
-       __le32                  expected_crc = rhead->h_crc, crc;
+       __le32                  expected_crc = rhead->h_crc, crc, other_crc;
 
-       crc = xlog_cksum(log, rhead, dp, be32_to_cpu(rhead->h_len));
+       crc = xlog_cksum(log, rhead, dp, XLOG_REC_SIZE,
+                       be32_to_cpu(rhead->h_len));
+
+       /*
+        * Look at the end of the struct xlog_rec_header definition in
+        * xfs_log_format.h for the glory details.
+        */
+       if (expected_crc && crc != expected_crc) {
+               other_crc = xlog_cksum(log, rhead, dp, XLOG_REC_SIZE_OTHER,
+                               be32_to_cpu(rhead->h_len));
+               if (other_crc == expected_crc) {
+                       xfs_notice_once(log->l_mp,
+       "Fixing up incorrect CRC due to padding.");
+                       crc = other_crc;
+               }
+       }
 
        /*
         * Nothing else to do if this is a CRC verification pass. Just return

diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
index 25991923c1a8aa837ccf45c90922f486a0520726..2ffc12024e9d302785e6cce19b8199f2d28c6b0a 100644 (file)
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@ -132,6 +132,8 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format,      56);
        XFS_CHECK_STRUCT_SIZE(struct xfs_qoff_logformat,        20);
        XFS_CHECK_STRUCT_SIZE(struct xfs_trans_header,          16);
+       XFS_CHECK_STRUCT_SIZE(struct xlog_rec_header,           328);
+       XFS_CHECK_STRUCT_SIZE(struct xlog_rec_ext_header,       260);
 
        /*
         * The v5 superblock format extended several v4 header structures with