* [PATCH v2 1/2] xfs: remove duplicate static size checks
@ 2026-02-10 5:59 Wilfred Mallawa
2026-02-10 5:59 ` [PATCH v2 2/2] xfs: add static size checks for ioctl UABI Wilfred Mallawa
2026-02-10 15:34 ` [PATCH v2 1/2] xfs: remove duplicate static size checks Christoph Hellwig
0 siblings, 2 replies; 6+ messages in thread
From: Wilfred Mallawa @ 2026-02-10 5:59 UTC (permalink / raw)
To: Carlos Maiolino, Darrick J . Wong
Cc: linux-xfs, linux-kernel, Christoph Hellwig, Wilfred Mallawa
From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
In libxfs/xfs_ondisk.h, remove some duplicate entries of
XFS_CHECK_STRUCT_SIZE().
Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
---
V1 -> V2 (New patch):
- Split out the deletions into a seperate patch, and only remove
the duplicates under
"/* ondisk dir/attr structures from xfs/122 */" label.
---
fs/xfs/libxfs/xfs_ondisk.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
index 2e9715cc1641..601a8367ced6 100644
--- a/fs/xfs/libxfs/xfs_ondisk.h
+++ b/fs/xfs/libxfs/xfs_ondisk.h
@@ -136,16 +136,7 @@ xfs_check_ondisk_structs(void)
/* ondisk dir/attr structures from xfs/122 */
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_entry, 3);
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free, 4);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr, 16);
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_unused, 6);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free, 16);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free_hdr, 16);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf, 16);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_entry, 8);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_hdr, 16);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_tail, 4);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_entry, 3);
- XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_hdr, 10);
/* log structures */
XFS_CHECK_STRUCT_SIZE(struct xfs_buf_log_format, 88);
--
2.53.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] xfs: add static size checks for ioctl UABI
2026-02-10 5:59 [PATCH v2 1/2] xfs: remove duplicate static size checks Wilfred Mallawa
@ 2026-02-10 5:59 ` Wilfred Mallawa
2026-02-10 6:05 ` Wilfred Mallawa
2026-02-10 15:35 ` Christoph Hellwig
2026-02-10 15:34 ` [PATCH v2 1/2] xfs: remove duplicate static size checks Christoph Hellwig
1 sibling, 2 replies; 6+ messages in thread
From: Wilfred Mallawa @ 2026-02-10 5:59 UTC (permalink / raw)
To: Carlos Maiolino, Darrick J . Wong
Cc: linux-xfs, linux-kernel, Christoph Hellwig, Wilfred Mallawa
From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
The ioctl structures in libxfs/xfs_fs.h are missing static size checks.
It is useful to have static size checks for these structures as adding
new fields to them could cause issues (e.g. extra padding that may be
inserted by the compiler). So add these checks to xfs/xfs_ondisk.h.
Due to different padding/alignment requirements across different
architectures, to avoid build failures, some structures are ommited from
the size checks. For example, structures with "compat_" definitions in
xfs/xfs_ioctl32.h are ommited.
Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
---
V1 -> V2:
- Added inline comment to describe why some ioctl structs
are not addded.
- Keep the new size check coupled under "ioctl UABI".
- Drop size checks for structures that are in xfs/xfs_ioctl32.h
(i.e compat__X) to avoid build failures across different
architectures.
---
fs/xfs/libxfs/xfs_ondisk.h | 40 +++++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
index 601a8367ced6..dced91d281fa 100644
--- a/fs/xfs/libxfs/xfs_ondisk.h
+++ b/fs/xfs/libxfs/xfs_ondisk.h
@@ -208,11 +208,6 @@ xfs_check_ondisk_structs(void)
XFS_CHECK_OFFSET(struct xfs_dir3_free, hdr.hdr.magic, 0);
XFS_CHECK_OFFSET(struct xfs_attr3_leafblock, hdr.info.hdr, 0);
- XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat, 192);
- XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
- XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
- XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
-
/*
* Make sure the incore inode timestamp range corresponds to hand
* converted values based on the ondisk format specification.
@@ -292,6 +287,41 @@ xfs_check_ondisk_structs(void)
XFS_CHECK_SB_OFFSET(sb_pad, 281);
XFS_CHECK_SB_OFFSET(sb_rtstart, 288);
XFS_CHECK_SB_OFFSET(sb_rtreserved, 296);
+
+ /*
+ * ioctl UABI
+ *
+ * Due to different padding/alignment requirements across
+ * different architectures, some structures are ommited from
+ * the size checks. In addition, structures with architecture
+ * dependent size fields are also ommited (e.g. __kernel_long_t).
+ */
+ XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat, 192);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
+ XFS_CHECK_STRUCT_SIZE(struct dioattr, 12);
+ XFS_CHECK_STRUCT_SIZE(struct getbmap, 32);
+ XFS_CHECK_STRUCT_SIZE(struct getbmapx, 48);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_cursor, 16);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_ent, 4);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_ag_geometry, 128);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_rtgroup_geometry, 128);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_error_injection, 8);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom, 256);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom_v4, 112);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_counts, 32);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_resblks, 16);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_growfs_log, 8);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_bulk_ireq, 64);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fs_eofblocks, 128);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_fsid, 8);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_metadata, 64);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec, 16);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec_head, 40);
+
}
#endif /* __XFS_ONDISK_H */
--
2.53.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] xfs: add static size checks for ioctl UABI
2026-02-10 5:59 ` [PATCH v2 2/2] xfs: add static size checks for ioctl UABI Wilfred Mallawa
@ 2026-02-10 6:05 ` Wilfred Mallawa
2026-02-10 15:35 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Wilfred Mallawa @ 2026-02-10 6:05 UTC (permalink / raw)
To: djwong@kernel.org, cem@kernel.org
Cc: hch, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org
On Tue, 2026-02-10 at 15:59 +1000, Wilfred Mallawa wrote:
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
>
> The ioctl structures in libxfs/xfs_fs.h are missing static size
> checks.
> It is useful to have static size checks for these structures as
> adding
> new fields to them could cause issues (e.g. extra padding that may be
> inserted by the compiler). So add these checks to xfs/xfs_ondisk.h.
>
> Due to different padding/alignment requirements across different
> architectures, to avoid build failures, some structures are ommited
> from
> the size checks. For example, structures with "compat_" definitions
> in
> xfs/xfs_ioctl32.h are ommited.
>
> Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
> ---
> V1 -> V2:
> - Added inline comment to describe why some ioctl structs
> are not addded.
>
> - Keep the new size check coupled under "ioctl UABI".
>
> - Drop size checks for structures that are in
> xfs/xfs_ioctl32.h
> (i.e compat__X) to avoid build failures across different
> architectures.
> ---
> fs/xfs/libxfs/xfs_ondisk.h | 40 +++++++++++++++++++++++++++++++++---
> --
> 1 file changed, 35 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
> index 601a8367ced6..dced91d281fa 100644
> --- a/fs/xfs/libxfs/xfs_ondisk.h
> +++ b/fs/xfs/libxfs/xfs_ondisk.h
> @@ -208,11 +208,6 @@ xfs_check_ondisk_structs(void)
> XFS_CHECK_OFFSET(struct xfs_dir3_free, hdr.hdr.magic, 0);
> XFS_CHECK_OFFSET(struct xfs_attr3_leafblock, hdr.info.hdr,
> 0);
>
> - XFS_CHECK_STRUCT_SIZE(struct
> xfs_bulkstat, 192);
> - XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
> - XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
> - XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
> -
> /*
> * Make sure the incore inode timestamp range corresponds to
> hand
> * converted values based on the ondisk format
> specification.
> @@ -292,6 +287,41 @@ xfs_check_ondisk_structs(void)
> XFS_CHECK_SB_OFFSET(sb_pad, 281);
> XFS_CHECK_SB_OFFSET(sb_rtstart, 288)
> ;
> XFS_CHECK_SB_OFFSET(sb_rtreserved, 296);
> +
> + /*
> + * ioctl UABI
> + *
> + * Due to different padding/alignment requirements across
> + * different architectures, some structures are ommited from
> + * the size checks. In addition, structures with
> architecture
> + * dependent size fields are also ommited (e.g.
> __kernel_long_t).
> + */
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_bulkstat, 192);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
> + XFS_CHECK_STRUCT_SIZE(struct dioattr, 12);
> + XFS_CHECK_STRUCT_SIZE(struct getbmap, 32);
> + XFS_CHECK_STRUCT_SIZE(struct getbmapx, 48);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_cursor, 16);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_ent, 4);
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_ag_geometry, 128);
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_rtgroup_geometry, 128);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_error_injection, 8);
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_fsop_geom, 256);
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_fsop_geom_v4, 112);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_counts, 32);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_resblks, 16);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_growfs_log, 8);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_bulk_ireq, 64);
> + XFS_CHECK_STRUCT_SIZE(struct
> xfs_fs_eofblocks, 128);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_fsid, 8);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_metadata, 64);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec, 16);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec_head, 40);
> +
Extra white-space here, my bad! Will fixup for V3.
> }
>
> #endif /* __XFS_ONDISK_H */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] xfs: remove duplicate static size checks
2026-02-10 5:59 [PATCH v2 1/2] xfs: remove duplicate static size checks Wilfred Mallawa
2026-02-10 5:59 ` [PATCH v2 2/2] xfs: add static size checks for ioctl UABI Wilfred Mallawa
@ 2026-02-10 15:34 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2026-02-10 15:34 UTC (permalink / raw)
To: Wilfred Mallawa
Cc: Carlos Maiolino, Darrick J . Wong, linux-xfs, linux-kernel,
Christoph Hellwig, Wilfred Mallawa
On Tue, Feb 10, 2026 at 03:59:41PM +1000, Wilfred Mallawa wrote:
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
>
> In libxfs/xfs_ondisk.h, remove some duplicate entries of
> XFS_CHECK_STRUCT_SIZE().
>
> Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] xfs: add static size checks for ioctl UABI
2026-02-10 5:59 ` [PATCH v2 2/2] xfs: add static size checks for ioctl UABI Wilfred Mallawa
2026-02-10 6:05 ` Wilfred Mallawa
@ 2026-02-10 15:35 ` Christoph Hellwig
2026-02-11 3:31 ` Wilfred Mallawa
1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2026-02-10 15:35 UTC (permalink / raw)
To: Wilfred Mallawa
Cc: Carlos Maiolino, Darrick J . Wong, linux-xfs, linux-kernel,
Christoph Hellwig, Wilfred Mallawa
On Tue, Feb 10, 2026 at 03:59:44PM +1000, Wilfred Mallawa wrote:
> From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
>
> The ioctl structures in libxfs/xfs_fs.h are missing static size checks.
> It is useful to have static size checks for these structures as adding
> new fields to them could cause issues (e.g. extra padding that may be
> inserted by the compiler). So add these checks to xfs/xfs_ondisk.h.
>
> Due to different padding/alignment requirements across different
> architectures, to avoid build failures, some structures are ommited from
> the size checks. For example, structures with "compat_" definitions in
> xfs/xfs_ioctl32.h are ommited.
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
I couldn't spot any whitespace issues either, although I'd personally
drop the last empty line if I had to nitpick.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] xfs: add static size checks for ioctl UABI
2026-02-10 15:35 ` Christoph Hellwig
@ 2026-02-11 3:31 ` Wilfred Mallawa
0 siblings, 0 replies; 6+ messages in thread
From: Wilfred Mallawa @ 2026-02-11 3:31 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Carlos Maiolino, Darrick J . Wong, linux-xfs, linux-kernel
On Tue, 2026-02-10 at 16:35 +0100, Christoph Hellwig wrote:
> On Tue, Feb 10, 2026 at 03:59:44PM +1000, Wilfred Mallawa wrote:
> > From: Wilfred Mallawa <wilfred.mallawa@wdc.com>
> >
> > The ioctl structures in libxfs/xfs_fs.h are missing static size
> > checks.
> > It is useful to have static size checks for these structures as
> > adding
> > new fields to them could cause issues (e.g. extra padding that may
> > be
> > inserted by the compiler). So add these checks to xfs/xfs_ondisk.h.
> >
> > Due to different padding/alignment requirements across different
> > architectures, to avoid build failures, some structures are ommited
> > from
> > the size checks. For example, structures with "compat_" definitions
> > in
> > xfs/xfs_ioctl32.h are ommited.
>
> Looks good:
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
>
> I couldn't spot any whitespace issues either, although I'd personally
> drop the last empty line if I had to nitpick.
Fixed in V3, Thanks for the review!
Wilfred
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-02-11 3:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-10 5:59 [PATCH v2 1/2] xfs: remove duplicate static size checks Wilfred Mallawa
2026-02-10 5:59 ` [PATCH v2 2/2] xfs: add static size checks for ioctl UABI Wilfred Mallawa
2026-02-10 6:05 ` Wilfred Mallawa
2026-02-10 15:35 ` Christoph Hellwig
2026-02-11 3:31 ` Wilfred Mallawa
2026-02-10 15:34 ` [PATCH v2 1/2] xfs: remove duplicate static size checks Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox