All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 3/3] xfs: check sizes of XFS on-disk structures at compile time
Date: Wed, 27 Jan 2016 08:31:17 -0500	[thread overview]
Message-ID: <20160127133117.GD60730@bfoster.bfoster> (raw)
In-Reply-To: <20160123003444.2338.37236.stgit@birch.djwong.org>

On Fri, Jan 22, 2016 at 04:34:44PM -0800, Darrick J. Wong wrote:
> Check the sizes of XFS on-disk structures when compiling the kernel.
> Use this to catch inadvertent changes in structure size due to padding
> and alignment issues, etc.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  fs/xfs/xfs_ondisk.h |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  fs/xfs/xfs_super.c  |    3 +
>  2 files changed, 111 insertions(+)
>  create mode 100644 fs/xfs/xfs_ondisk.h
> 
> 
> diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
> new file mode 100644
> index 0000000..56fab46
> --- /dev/null
> +++ b/fs/xfs/xfs_ondisk.h
> @@ -0,0 +1,108 @@
> +/*
> + * Copyright (c) 2016 Oracle.
> + * All Rights Reserved.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + */
> +#ifndef __XFS_ONDISK_H
> +#define __XFS_ONDISK_H
> +
> +#define XFS_CHECK_STRUCT_SIZE(structname, size) \
> +	BUILD_BUG_ON_MSG(sizeof(structname) != (size), "XFS: sizeof(struct " \

We're printing "struct" in the core message as well as part of the
structname (where appropriate). E.g., "sizeof(struct struct xfs_acl) is
wrong, ..."

It would also be nice to include the current structure size in the
message if it happens to be unexpected. Otherwise, seems fine to me.

Brian

> +		#structname ") is wrong, expected " #size)
> +

> +static inline void __init
> +xfs_check_ondisk_structs(void)
> +{
> +	/* ag/file structures */
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_acl,			4);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_acl_entry,		12);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_agf,			224);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_agfl,			36);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_agi,			336);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_key,		8);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_rec,		16);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_bmdr_block,		4);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block,		72);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dinode,		176);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_disk_dquot,		104);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dqblk,			136);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dsb,			264);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dsymlink_hdr,		56);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_key,		4);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_rec,		16);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_timestamp,		8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_alloc_key_t,			8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_alloc_ptr_t,			4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_alloc_rec_t,			8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_inobt_ptr_t,			4);
> +
> +	/* dir/attr trees */
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_leaf_hdr,	80);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_leafblock,	88);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_rmt_hdr,		56);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_da3_blkinfo,		56);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_da3_intnode,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_da3_node_hdr,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_blk_hdr,		48);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_data_hdr,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_free,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_free_hdr,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf,		64);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf_hdr,		64);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_entry_t,		8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_hdr_t,		32);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_map_t,		4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_local_t,	4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_remote_t,	12);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_leafblock_t,		40);
> +	XFS_CHECK_STRUCT_SIZE(xfs_attr_shortform_t,		8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_da_blkinfo_t,			12);
> +	XFS_CHECK_STRUCT_SIZE(xfs_da_intnode_t,			16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_da_node_entry_t,		8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_da_node_hdr_t,		16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_free_t,		4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_hdr_t,		16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_unused_t,		6);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_hdr_t,		16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_t,			16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_ino4_t,			4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_ino8_t,			8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_inou_t,			8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_entry_t,		8);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_hdr_t,		16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_t,			16);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_tail_t,		4);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_entry_t,		3);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_hdr_t,		10);
> +	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_off_t,		2);
> +
> +	/* log structures */
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_dq_logformat,		24);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_efd_log_format_32,	28);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_efd_log_format_64,	32);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_efi_log_format_32,	28);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_efi_log_format_64,	32);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_extent_32,		12);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_extent_64,		16);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_icdinode,		176);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log,		28);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_ictimestamp,		8);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32,	52);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_64,	56);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_qoff_logformat,	20);
> +	XFS_CHECK_STRUCT_SIZE(struct xfs_trans_header,		16);
> +}
> +
> +#endif /* __XFS_ONDISK_H */
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 36bd882..f63d212 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -45,6 +45,7 @@
>  #include "xfs_filestream.h"
>  #include "xfs_quota.h"
>  #include "xfs_sysfs.h"
> +#include "xfs_ondisk.h"
>  
>  #include <linux/namei.h>
>  #include <linux/init.h>
> @@ -1817,6 +1818,8 @@ init_xfs_fs(void)
>  {
>  	int			error;
>  
> +	xfs_check_ondisk_structs();
> +
>  	printk(KERN_INFO XFS_VERSION_STRING " with "
>  			 XFS_BUILD_OPTIONS " enabled\n");
>  
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2016-01-27 13:31 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-23  0:34 [PATCH 0/3] xfs: miscellaneous bugfixes Darrick J. Wong
2016-01-23  0:34 ` [PATCH 1/3] xfs: use named array initializers for log item dumping Darrick J. Wong
2016-01-27 13:31   ` Brian Foster
2016-01-23  0:34 ` [PATCH 2/3] xfs: move struct xfs_attr_shortform to xfs_da_format.h Darrick J. Wong
2016-01-27 13:31   ` Brian Foster
2016-01-23  0:34 ` [PATCH 3/3] xfs: check sizes of XFS on-disk structures at compile time Darrick J. Wong
2016-01-27 13:31   ` Brian Foster [this message]
2016-02-02 23:27     ` Darrick J. Wong
2016-02-03 12:37       ` Brian Foster

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=20160127133117.GD60730@bfoster.bfoster \
    --to=bfoster@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=xfs@oss.sgi.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.