* [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper
@ 2025-11-03 10:14 Christoph Hellwig
2025-11-03 17:01 ` Darrick J. Wong
2025-11-11 11:00 ` Carlos Maiolino
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2025-11-03 10:14 UTC (permalink / raw)
To: cem; +Cc: djwong, linux-xfs
Plus a rtgroup wrapper and use that to avoid overflows when converting
zone/rtg counts to block counts.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
Changes since v1:
- new names
fs/xfs/libxfs/xfs_group.h | 9 +++++++++
fs/xfs/libxfs/xfs_rtgroup.h | 8 ++++++++
fs/xfs/xfs_zone_gc.c | 3 +--
fs/xfs/xfs_zone_space_resv.c | 8 +++-----
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_group.h b/fs/xfs/libxfs/xfs_group.h
index 4423932a2313..4ae638f1c2c5 100644
--- a/fs/xfs/libxfs/xfs_group.h
+++ b/fs/xfs/libxfs/xfs_group.h
@@ -98,6 +98,15 @@ xfs_group_max_blocks(
return xg->xg_mount->m_groups[xg->xg_type].blocks;
}
+static inline xfs_rfsblock_t
+xfs_groups_to_rfsbs(
+ struct xfs_mount *mp,
+ uint32_t nr_groups,
+ enum xfs_group_type type)
+{
+ return (xfs_rfsblock_t)mp->m_groups[type].blocks * nr_groups;
+}
+
static inline xfs_fsblock_t
xfs_group_start_fsb(
struct xfs_group *xg)
diff --git a/fs/xfs/libxfs/xfs_rtgroup.h b/fs/xfs/libxfs/xfs_rtgroup.h
index d4fcf591e63d..a94e925ae67c 100644
--- a/fs/xfs/libxfs/xfs_rtgroup.h
+++ b/fs/xfs/libxfs/xfs_rtgroup.h
@@ -371,4 +371,12 @@ static inline int xfs_initialize_rtgroups(struct xfs_mount *mp,
# define xfs_rtgroup_get_geometry(rtg, rgeo) (-EOPNOTSUPP)
#endif /* CONFIG_XFS_RT */
+static inline xfs_rfsblock_t
+xfs_rtgs_to_rfsbs(
+ struct xfs_mount *mp,
+ uint32_t nr_groups)
+{
+ return xfs_groups_to_rfsbs(mp, nr_groups, XG_TYPE_RTG);
+}
+
#endif /* __LIBXFS_RTGROUP_H */
diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
index 4ade54445532..a98939aba7b9 100644
--- a/fs/xfs/xfs_zone_gc.c
+++ b/fs/xfs/xfs_zone_gc.c
@@ -181,8 +181,7 @@ xfs_zoned_need_gc(
available = xfs_estimate_freecounter(mp, XC_FREE_RTAVAILABLE);
if (available <
- mp->m_groups[XG_TYPE_RTG].blocks *
- (mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
+ xfs_rtgs_to_rfsbs(mp, mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
return true;
free = xfs_estimate_freecounter(mp, XC_FREE_RTEXTENTS);
diff --git a/fs/xfs/xfs_zone_space_resv.c b/fs/xfs/xfs_zone_space_resv.c
index 9cd38716fd25..0e54e557a585 100644
--- a/fs/xfs/xfs_zone_space_resv.c
+++ b/fs/xfs/xfs_zone_space_resv.c
@@ -54,12 +54,10 @@ xfs_zoned_default_resblks(
{
switch (ctr) {
case XC_FREE_RTEXTENTS:
- return (uint64_t)XFS_RESERVED_ZONES *
- mp->m_groups[XG_TYPE_RTG].blocks +
- mp->m_sb.sb_rtreserved;
+ return xfs_rtgs_to_rfsbs(mp, XFS_RESERVED_ZONES) +
+ mp->m_sb.sb_rtreserved;
case XC_FREE_RTAVAILABLE:
- return (uint64_t)XFS_GC_ZONES *
- mp->m_groups[XG_TYPE_RTG].blocks;
+ return xfs_rtgs_to_rfsbs(mp, XFS_GC_ZONES);
default:
ASSERT(0);
return 0;
--
2.47.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper
2025-11-03 10:14 [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper Christoph Hellwig
@ 2025-11-03 17:01 ` Darrick J. Wong
2025-11-11 11:00 ` Carlos Maiolino
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2025-11-03 17:01 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: cem, linux-xfs
On Mon, Nov 03, 2025 at 05:14:09AM -0500, Christoph Hellwig wrote:
> Plus a rtgroup wrapper and use that to avoid overflows when converting
> zone/rtg counts to block counts.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>
> Changes since v1:
> - new names
Woot, thanks for refactoring this!
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
>
> fs/xfs/libxfs/xfs_group.h | 9 +++++++++
> fs/xfs/libxfs/xfs_rtgroup.h | 8 ++++++++
> fs/xfs/xfs_zone_gc.c | 3 +--
> fs/xfs/xfs_zone_space_resv.c | 8 +++-----
> 4 files changed, 21 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_group.h b/fs/xfs/libxfs/xfs_group.h
> index 4423932a2313..4ae638f1c2c5 100644
> --- a/fs/xfs/libxfs/xfs_group.h
> +++ b/fs/xfs/libxfs/xfs_group.h
> @@ -98,6 +98,15 @@ xfs_group_max_blocks(
> return xg->xg_mount->m_groups[xg->xg_type].blocks;
> }
>
> +static inline xfs_rfsblock_t
> +xfs_groups_to_rfsbs(
> + struct xfs_mount *mp,
> + uint32_t nr_groups,
> + enum xfs_group_type type)
> +{
> + return (xfs_rfsblock_t)mp->m_groups[type].blocks * nr_groups;
> +}
> +
> static inline xfs_fsblock_t
> xfs_group_start_fsb(
> struct xfs_group *xg)
> diff --git a/fs/xfs/libxfs/xfs_rtgroup.h b/fs/xfs/libxfs/xfs_rtgroup.h
> index d4fcf591e63d..a94e925ae67c 100644
> --- a/fs/xfs/libxfs/xfs_rtgroup.h
> +++ b/fs/xfs/libxfs/xfs_rtgroup.h
> @@ -371,4 +371,12 @@ static inline int xfs_initialize_rtgroups(struct xfs_mount *mp,
> # define xfs_rtgroup_get_geometry(rtg, rgeo) (-EOPNOTSUPP)
> #endif /* CONFIG_XFS_RT */
>
> +static inline xfs_rfsblock_t
> +xfs_rtgs_to_rfsbs(
> + struct xfs_mount *mp,
> + uint32_t nr_groups)
> +{
> + return xfs_groups_to_rfsbs(mp, nr_groups, XG_TYPE_RTG);
> +}
> +
> #endif /* __LIBXFS_RTGROUP_H */
> diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
> index 4ade54445532..a98939aba7b9 100644
> --- a/fs/xfs/xfs_zone_gc.c
> +++ b/fs/xfs/xfs_zone_gc.c
> @@ -181,8 +181,7 @@ xfs_zoned_need_gc(
> available = xfs_estimate_freecounter(mp, XC_FREE_RTAVAILABLE);
>
> if (available <
> - mp->m_groups[XG_TYPE_RTG].blocks *
> - (mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
> + xfs_rtgs_to_rfsbs(mp, mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
> return true;
>
> free = xfs_estimate_freecounter(mp, XC_FREE_RTEXTENTS);
> diff --git a/fs/xfs/xfs_zone_space_resv.c b/fs/xfs/xfs_zone_space_resv.c
> index 9cd38716fd25..0e54e557a585 100644
> --- a/fs/xfs/xfs_zone_space_resv.c
> +++ b/fs/xfs/xfs_zone_space_resv.c
> @@ -54,12 +54,10 @@ xfs_zoned_default_resblks(
> {
> switch (ctr) {
> case XC_FREE_RTEXTENTS:
> - return (uint64_t)XFS_RESERVED_ZONES *
> - mp->m_groups[XG_TYPE_RTG].blocks +
> - mp->m_sb.sb_rtreserved;
> + return xfs_rtgs_to_rfsbs(mp, XFS_RESERVED_ZONES) +
> + mp->m_sb.sb_rtreserved;
> case XC_FREE_RTAVAILABLE:
> - return (uint64_t)XFS_GC_ZONES *
> - mp->m_groups[XG_TYPE_RTG].blocks;
> + return xfs_rtgs_to_rfsbs(mp, XFS_GC_ZONES);
> default:
> ASSERT(0);
> return 0;
> --
> 2.47.3
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper
2025-11-03 10:14 [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper Christoph Hellwig
2025-11-03 17:01 ` Darrick J. Wong
@ 2025-11-11 11:00 ` Carlos Maiolino
1 sibling, 0 replies; 3+ messages in thread
From: Carlos Maiolino @ 2025-11-11 11:00 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: djwong, linux-xfs
On Mon, 03 Nov 2025 05:14:09 -0500, Christoph Hellwig wrote:
> Plus a rtgroup wrapper and use that to avoid overflows when converting
> zone/rtg counts to block counts.
>
>
Applied to for-next, thanks!
[1/1] xfs: add a xfs_groups_to_rfsbs helper
commit: 0ec73eb3f12350799c4b3fb764225f6e38b42d1e
Best regards,
--
Carlos Maiolino <cem@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-11 11:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-03 10:14 [PATCH v2] xfs: add a xfs_groups_to_rfsbs helper Christoph Hellwig
2025-11-03 17:01 ` Darrick J. Wong
2025-11-11 11:00 ` Carlos Maiolino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).