misc cleanups
Hi all,
this series has various cleanups developed as part of the data checksum series that should be useful on their own.
Diffstat:
libxfs/xfs_rtbitmap.c | 79 ++++++++++++++++++++++++------------------ libxfs/xfs_rtbitmap.h | 45 +++++++++--------------- scrub/rtbitmap_repair.c | 15 -------- scrub/rtsummary_repair.c | 15 -------- xfs_ioend.c | 81 +++++++++++++++++++++++++------------------ xfs_iomap.c | 53 ++++++++++++++++++---------- xfs_verify_media.c | 87 ++++++++++++++++++----------------------------- 7 files changed, 181 insertions(+), 194 deletions(-)
PATCH 1/9 xfs: centralize setting of buf_ops/buf_type/magic for rtblocks
Add two tables for the buf_ops and buf_type, and derive the magic from the buf_ops to make have a single source of truth for the different RT block variants. This cleans up the existing code and makes adding another type of block/file easier.
--- fs/xfs/libxfs/xfs_rtbitmap.c | 40 +++++++++++++++++++++--------------- fs/xfs/libxfs/xfs_rtbitmap.h | 15 ++------------ 2 files changed, 25 insertions(+), 30 deletions(-)
fs/xfs/libxfs/xfs_rtbitmap.c +23 -17
@@ -125,6 +125,26 @@ const struct xfs_buf_ops xfs_rtsummary_buf_ops = { .verify_struct = xfs_rtbuf_verify, }; +static const struct xfs_buf_ops *xfs_rtblock_buf_ops[XFS_RTGI_MAX ] = { + [XFS_RTGI_SUMMARY ] = &xfs_rtsummary_buf_ops, + [XFS_RTGI_BITMAP ] = &xfs_rtbitmap_buf_ops, +}; + +const struct xfs_buf_ops * +xfs_rtblock_ops ( +struct xfs_mount *mp, +enum xfs_rtg_inodes type) +{ +if (!xfs_has_rtgroups (mp)) +return &xfs_rtbuf_ops; +return xfs_rtblock_buf_ops[type]; +} + +static enum xfs_blft xfs_rtblock_buf_types[XFS_RTGI_MAX ] = { + [XFS_RTGI_SUMMARY ] =XFS_BLFT_RTSUMMARY_BUF , + [XFS_RTGI_BITMAP ] =XFS_BLFT_RTBITMAP_BUF , +}; +/* Release cached rt bitmap and summary buffers. */ void xfs_rtbuf_cache_relse(
@@ -158,7 +178,6 @@ xfs_rtbuf_get(xfs_fileoff_t *coffp;/* cached block number */ struct xfs_buf *bp;/* block buffer, result */ struct xfs_bmbt_irec map; -enum xfs_blft buf_type;int nmap =1 ;int error;
@@ -166,12 +185,10 @@ xfs_rtbuf_get(case XFS_RTGI_SUMMARY : cbpp = &args->sumbp; coffp = &args->sumoff; - buf_type =XFS_BLFT_RTSUMMARY_BUF ;break ;case XFS_RTGI_BITMAP : cbpp = &args->rbmbp; coffp = &args->rbmoff; - buf_type =XFS_BLFT_RTBITMAP_BUF ;break ;default :return -EINVAL ;
@@ -222,7 +239,7 @@ xfs_rtbuf_get( } } -xfs_trans_buf_set_type (args->tp, bp, buf_type); +xfs_trans_buf_set_type (args->tp, bp, xfs_rtblock_buf_types[type]); *cbpp = bp; *coffp = block;return 0 ;
@@ -1375,16 +1392,8 @@ xfs_rtfile_initialize_block(struct xfs_buf *bp;void *bufdata;const size_t copylen = mp->m_blockwsize <<XFS_WORDLOG ; -enum xfs_blft buf_type;int error; -if (type ==XFS_RTGI_BITMAP ) - buf_type =XFS_BLFT_RTBITMAP_BUF ; -else if (type ==XFS_RTGI_SUMMARY ) - buf_type =XFS_BLFT_RTSUMMARY_BUF ; -else -return -EINVAL ; - error =xfs_trans_alloc (mp, &M_RES (mp)->tr_growrtzero,0 ,0 ,0 , &tp);if (error)return error;
@@ -1399,16 +1408,13 @@ xfs_rtfile_initialize_block( } bufdata = bp->b_addr; -xfs_trans_buf_set_type (tp, bp, buf_type); +xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); bp->b_ops =xfs_rtblock_ops (mp, type);if (xfs_has_rtgroups (mp)) {struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; -if (type ==XFS_RTGI_BITMAP ) - hdr->rt_magic =cpu_to_be32 (XFS_RTBITMAP_MAGIC ); -else - hdr->rt_magic =cpu_to_be32 (XFS_RTSUMMARY_MAGIC ); + hdr->rt_magic = bp->b_ops->magic[1 ]; hdr->rt_owner =cpu_to_be64 (I_INO (ip)); hdr->rt_blkno =cpu_to_be64 (XFS_FSB_TO_DADDR (mp, fsbno)); hdr->rt_lsn =0 ;
fs/xfs/libxfs/xfs_rtbitmap.h +2 -13
@@ -354,19 +354,6 @@ xfs_suminfo_add(return info->old; } -static inline const struct xfs_buf_ops * -xfs_rtblock_ops ( -struct xfs_mount *mp, -enum xfs_rtg_inodes type) -{ -if (xfs_has_rtgroups (mp)) { -if (type ==XFS_RTGI_SUMMARY ) -return &xfs_rtsummary_buf_ops; -return &xfs_rtbitmap_buf_ops; - } -return &xfs_rtbuf_ops; -} -/* * Functions for walking free space rtextents in the realtime bitmap. */
@@ -419,6 +406,8 @@ xfs_filblks_t xfs_rtbitmap_blockcount_len(struct xfs_mount *mp,xfs_filblks_t xfs_rtsummary_blockcount (struct xfs_mount *mp,unsigned int *rsumlevels); +const struct xfs_buf_ops *xfs_rtblock_ops (struct xfs_mount *mp, +enum xfs_rtg_inodes type);int xfs_rtfile_initialize_blocks (struct xfs_rtgroup *rtg,enum xfs_rtg_inodes type,xfs_fileoff_t offset_fsb,xfs_fileoff_t end_fsb,void *data);
Signature · 1 line
2.53.0
Re: [PATCH 1/9] xfs: centralize setting of buf_ops/buf_type/magic for rtblocks
Quoted 6 lines · Christoph Hellwig
Add two tables for the
buf_opsandbuf_type, and derive the magic from thebuf_opsto make have a single source of truth for the different RT block variants. This cleans up the existing code and makes adding another type of block/file easier.Signed-off-by Christoph Hellwig <[email protected]>
Seems like a reasonable hoist here.
--D
Quoted 139 lines
--- fs/xfs/libxfs/xfs_rtbitmap.c | 40 +++++++++++++++++++++--------------- fs/xfs/libxfs/xfs_rtbitmap.h | 15 ++------------ 2 files changed, 25 insertions(+), 30 deletions(-)fs/xfs/libxfs/xfs_rtbitmap.c +23
-17@@ -125,6 +125,26 @@ const struct xfs_buf_ops xfs_rtsummary_buf_ops = { .verify_struct = xfs_rtbuf_verify, }; +static const struct xfs_buf_ops *xfs_rtblock_buf_ops[XFS_RTGI_MAX ] = { + [XFS_RTGI_SUMMARY ] = &xfs_rtsummary_buf_ops, + [XFS_RTGI_BITMAP ] = &xfs_rtbitmap_buf_ops, +}; + +const struct xfs_buf_ops * +xfs_rtblock_ops ( +struct xfs_mount *mp, +enum xfs_rtg_inodes type) +{ +if (!xfs_has_rtgroups (mp)) +return &xfs_rtbuf_ops; +return xfs_rtblock_buf_ops[type]; +} + +static enum xfs_blft xfs_rtblock_buf_types[XFS_RTGI_MAX ] = { + [XFS_RTGI_SUMMARY ] =XFS_BLFT_RTSUMMARY_BUF , + [XFS_RTGI_BITMAP ] =XFS_BLFT_RTBITMAP_BUF , +}; +/* Release cached rt bitmap and summary buffers. */ void xfs_rtbuf_cache_relse(@@ -158,7 +178,6 @@ xfs_rtbuf_get(xfs_fileoff_t *coffp;/* cached block number */ struct xfs_buf *bp;/* block buffer, result */ struct xfs_bmbt_irec map; -enum xfs_blft buf_type;int nmap =1 ;int error;@@ -166,12 +185,10 @@ xfs_rtbuf_get(case XFS_RTGI_SUMMARY : cbpp = &args->sumbp; coffp = &args->sumoff; - buf_type =XFS_BLFT_RTSUMMARY_BUF ;break ;case XFS_RTGI_BITMAP : cbpp = &args->rbmbp; coffp = &args->rbmoff; - buf_type =XFS_BLFT_RTBITMAP_BUF ;break ;default :return -EINVAL ;@@ -222,7 +239,7 @@ xfs_rtbuf_get( } } -xfs_trans_buf_set_type (args->tp, bp, buf_type); +xfs_trans_buf_set_type (args->tp, bp, xfs_rtblock_buf_types[type]); *cbpp = bp; *coffp = block;return 0 ;@@ -1375,16 +1392,8 @@ xfs_rtfile_initialize_block(struct xfs_buf *bp;void *bufdata;const size_t copylen = mp->m_blockwsize <<XFS_WORDLOG ; -enum xfs_blft buf_type;int error; -if (type ==XFS_RTGI_BITMAP ) - buf_type =XFS_BLFT_RTBITMAP_BUF ; -else if (type ==XFS_RTGI_SUMMARY ) - buf_type =XFS_BLFT_RTSUMMARY_BUF ; -else -return -EINVAL ; - error =xfs_trans_alloc (mp, &M_RES (mp)->tr_growrtzero,0 ,0 ,0 , &tp);if (error)return error;@@ -1399,16 +1408,13 @@ xfs_rtfile_initialize_block( } bufdata = bp->b_addr; -xfs_trans_buf_set_type (tp, bp, buf_type); +xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); bp->b_ops =xfs_rtblock_ops (mp, type);if (xfs_has_rtgroups (mp)) {struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; -if (type ==XFS_RTGI_BITMAP ) - hdr->rt_magic =cpu_to_be32 (XFS_RTBITMAP_MAGIC ); -else - hdr->rt_magic =cpu_to_be32 (XFS_RTSUMMARY_MAGIC ); + hdr->rt_magic = bp->b_ops->magic[1 ]; hdr->rt_owner =cpu_to_be64 (I_INO (ip)); hdr->rt_blkno =cpu_to_be64 (XFS_FSB_TO_DADDR (mp, fsbno)); hdr->rt_lsn =0 ;fs/xfs/libxfs/xfs_rtbitmap.h +2
-13@@ -354,19 +354,6 @@ xfs_suminfo_add(return info->old; } -static inline const struct xfs_buf_ops * -xfs_rtblock_ops ( -struct xfs_mount *mp, -enum xfs_rtg_inodes type) -{ -if (xfs_has_rtgroups (mp)) { -if (type ==XFS_RTGI_SUMMARY ) -return &xfs_rtsummary_buf_ops; -return &xfs_rtbitmap_buf_ops; - } -return &xfs_rtbuf_ops; -} -/* * Functions for walking free space rtextents in the realtime bitmap. */ @@ -419,6 +406,8 @@ xfs_filblks_t xfs_rtbitmap_blockcount_len(struct xfs_mount *mp,xfs_filblks_t xfs_rtsummary_blockcount (struct xfs_mount *mp,unsigned int *rsumlevels); +const struct xfs_buf_ops *xfs_rtblock_ops (struct xfs_mount *mp, +enum xfs_rtg_inodes type);int xfs_rtfile_initialize_blocks (struct xfs_rtgroup *rtg,enum xfs_rtg_inodes type,xfs_fileoff_t offset_fsb,xfs_fileoff_t end_fsb,void *data);Signature · 1 line
2.53.0
PATCH 2/9 xfs: factor out a xfs_rtfile_initialize_buf helper
In reply to Christoph HellwigShare the code to initialize the header and buf ops for rtfile blocks into a single helper.
--- fs/xfs/libxfs/xfs_rtbitmap.c | 38 +++++++++++++++++++++------------ fs/xfs/libxfs/xfs_rtbitmap.h | 3 +++ fs/xfs/scrub/rtbitmap_repair.c | 15 +------------ fs/xfs/scrub/rtsummary_repair.c | 15 +------------ 4 files changed, 29 insertions(+), 42 deletions(-)
fs/xfs/libxfs/xfs_rtbitmap.c +24 -14
@@ -1378,6 +1378,27 @@ xfs_rtfile_alloc_blocks(return error; } +void +xfs_rtfile_initialize_buf ( +struct xfs_rtgroup *rtg, +enum xfs_rtg_inodes type, +struct xfs_buf *bp, +struct xfs_trans *tp) +{ + bp->b_ops =xfs_rtblock_ops (bp->b_mount, type); +if (tp) +xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); +if (xfs_has_rtgroups (bp->b_mount)) { +struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; + + hdr->rt_magic = bp->b_ops->magic[1 ]; + hdr->rt_owner =cpu_to_be64 (I_INO (rtg->rtg_inodes[type])); + hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); + hdr->rt_lsn =0 ; +uuid_copy (&hdr->rt_uuid, &bp->b_mount->m_sb.sb_meta_uuid); + } +} +/* Get a buffer for the block. */ static int xfs_rtfile_initialize_block(
@@ -1408,21 +1429,10 @@ xfs_rtfile_initialize_block( } bufdata = bp->b_addr; -xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); - bp->b_ops =xfs_rtblock_ops (mp, type); - -if (xfs_has_rtgroups (mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic = bp->b_ops->magic[1 ]; - hdr->rt_owner =cpu_to_be64 (I_INO (ip)); - hdr->rt_blkno =cpu_to_be64 (XFS_FSB_TO_DADDR (mp, fsbno)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &mp->m_sb.sb_meta_uuid); - - bufdata +=sizeof (*hdr); - } +xfs_rtfile_initialize_buf (rtg, type, bp, tp); +if (xfs_has_rtgroups (mp)) + bufdata +=sizeof (struct xfs_rtbuf_blkinfo );if (data)memcpy (bufdata, data, copylen);else
fs/xfs/libxfs/xfs_rtbitmap.h +3 -0
@@ -408,6 +408,9 @@ xfs_filblks_t xfs_rtsummary_blockcount(struct xfs_mount *mp,const struct xfs_buf_ops *xfs_rtblock_ops (struct xfs_mount *mp,enum xfs_rtg_inodes type); +void xfs_rtfile_initialize_buf (struct xfs_rtgroup *rtg, +enum xfs_rtg_inodes type,struct xfs_buf *bp, +struct xfs_trans *tp);int xfs_rtfile_initialize_blocks (struct xfs_rtgroup *rtg,enum xfs_rtg_inodes type,xfs_fileoff_t offset_fsb,xfs_fileoff_t end_fsb,void *data);
fs/xfs/scrub/rtbitmap_repair.c +1 -14
@@ -383,21 +383,8 @@ xrep_rtbitmap_prep_buf(if (error)return error; -if (xfs_has_rtgroups (sc->mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic =cpu_to_be32 (XFS_RTBITMAP_MAGIC ); - hdr->rt_owner =cpu_to_be64 (I_INO (sc->ip)); - hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &sc->mp->m_sb.sb_meta_uuid); - bp->b_ops = &xfs_rtbitmap_buf_ops; - }else { - bp->b_ops = &xfs_rtbuf_ops; - } - +xfs_rtfile_initialize_buf (sc->sr.rtg,XFS_RTGI_BITMAP , bp, sc->tp); rtb->prep_wordoff += mp->m_blockwsize; -xfs_trans_buf_set_type (sc->tp, bp,XFS_BLFT_RTBITMAP_BUF );return 0 ; }
fs/xfs/scrub/rtsummary_repair.c +1 -14
@@ -87,21 +87,8 @@ xrep_rtsummary_prep_buf(if (error)return error; -if (xfs_has_rtgroups (sc->mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic =cpu_to_be32 (XFS_RTSUMMARY_MAGIC ); - hdr->rt_owner =cpu_to_be64 (I_INO (sc->ip)); - hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &sc->mp->m_sb.sb_meta_uuid); - bp->b_ops = &xfs_rtsummary_buf_ops; - }else { - bp->b_ops = &xfs_rtbuf_ops; - } - +xfs_rtfile_initialize_buf (sc->sr.rtg,XFS_RTGI_SUMMARY , bp, sc->tp); rts->prep_wordoff += mp->m_blockwsize; -xfs_trans_buf_set_type (sc->tp, bp,XFS_BLFT_RTSUMMARY_BUF );return 0 ; }
Signature · 1 line
2.53.0
Re: [PATCH 2/9] xfs: factor out a xfs_rtfile_initialize_buf helper
Quoted 10 lines · Christoph Hellwig
Share the code to initialize the header and buf ops for rtfile blocks into a single helper.
Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/libxfs/xfs_rtbitmap.c | 38 +++++++++++++++++++++------------ fs/xfs/libxfs/xfs_rtbitmap.h | 3 +++ fs/xfs/scrub/rtbitmap_repair.c | 15 +------------ fs/xfs/scrub/rtsummary_repair.c | 15 +------------ 4 files changed, 29 insertions(+), 42 deletions(-)
Nice cleanup!
--D
Quoted 130 lines
fs/xfs/libxfs/xfs_rtbitmap.c +24
-14@@ -1378,6 +1378,27 @@ xfs_rtfile_alloc_blocks(return error; } +void +xfs_rtfile_initialize_buf ( +struct xfs_rtgroup *rtg, +enum xfs_rtg_inodes type, +struct xfs_buf *bp, +struct xfs_trans *tp) +{ + bp->b_ops =xfs_rtblock_ops (bp->b_mount, type); +if (tp) +xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); +if (xfs_has_rtgroups (bp->b_mount)) { +struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; + + hdr->rt_magic = bp->b_ops->magic[1 ]; + hdr->rt_owner =cpu_to_be64 (I_INO (rtg->rtg_inodes[type])); + hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); + hdr->rt_lsn =0 ; +uuid_copy (&hdr->rt_uuid, &bp->b_mount->m_sb.sb_meta_uuid); + } +} +/* Get a buffer for the block. */ static int xfs_rtfile_initialize_block(@@ -1408,21 +1429,10 @@ xfs_rtfile_initialize_block( } bufdata = bp->b_addr; -xfs_trans_buf_set_type (tp, bp, xfs_rtblock_buf_types[type]); - bp->b_ops =xfs_rtblock_ops (mp, type); - -if (xfs_has_rtgroups (mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic = bp->b_ops->magic[1 ]; - hdr->rt_owner =cpu_to_be64 (I_INO (ip)); - hdr->rt_blkno =cpu_to_be64 (XFS_FSB_TO_DADDR (mp, fsbno)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &mp->m_sb.sb_meta_uuid); - - bufdata +=sizeof (*hdr); - } +xfs_rtfile_initialize_buf (rtg, type, bp, tp); +if (xfs_has_rtgroups (mp)) + bufdata +=sizeof (struct xfs_rtbuf_blkinfo );if (data)memcpy (bufdata, data, copylen);else fs/xfs/libxfs/xfs_rtbitmap.h +3
-0@@ -408,6 +408,9 @@ xfs_filblks_t xfs_rtsummary_blockcount(struct xfs_mount *mp,const struct xfs_buf_ops *xfs_rtblock_ops (struct xfs_mount *mp,enum xfs_rtg_inodes type); +void xfs_rtfile_initialize_buf (struct xfs_rtgroup *rtg, +enum xfs_rtg_inodes type,struct xfs_buf *bp, +struct xfs_trans *tp);int xfs_rtfile_initialize_blocks (struct xfs_rtgroup *rtg,enum xfs_rtg_inodes type,xfs_fileoff_t offset_fsb,xfs_fileoff_t end_fsb,void *data);fs/xfs/scrub/rtbitmap_repair.c +1
-14@@ -383,21 +383,8 @@ xrep_rtbitmap_prep_buf(if (error)return error; -if (xfs_has_rtgroups (sc->mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic =cpu_to_be32 (XFS_RTBITMAP_MAGIC ); - hdr->rt_owner =cpu_to_be64 (I_INO (sc->ip)); - hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &sc->mp->m_sb.sb_meta_uuid); - bp->b_ops = &xfs_rtbitmap_buf_ops; - }else { - bp->b_ops = &xfs_rtbuf_ops; - } - +xfs_rtfile_initialize_buf (sc->sr.rtg,XFS_RTGI_BITMAP , bp, sc->tp); rtb->prep_wordoff += mp->m_blockwsize; -xfs_trans_buf_set_type (sc->tp, bp,XFS_BLFT_RTBITMAP_BUF );return 0 ; }fs/xfs/scrub/rtsummary_repair.c +1
-14@@ -87,21 +87,8 @@ xrep_rtsummary_prep_buf(if (error)return error; -if (xfs_has_rtgroups (sc->mp)) { -struct xfs_rtbuf_blkinfo *hdr = bp->b_addr; - - hdr->rt_magic =cpu_to_be32 (XFS_RTSUMMARY_MAGIC ); - hdr->rt_owner =cpu_to_be64 (I_INO (sc->ip)); - hdr->rt_blkno =cpu_to_be64 (xfs_buf_daddr (bp)); - hdr->rt_lsn =0 ; -uuid_copy (&hdr->rt_uuid, &sc->mp->m_sb.sb_meta_uuid); - bp->b_ops = &xfs_rtsummary_buf_ops; - }else { - bp->b_ops = &xfs_rtbuf_ops; - } - +xfs_rtfile_initialize_buf (sc->sr.rtg,XFS_RTGI_SUMMARY , bp, sc->tp); rts->prep_wordoff += mp->m_blockwsize; -xfs_trans_buf_set_type (sc->tp, bp,XFS_BLFT_RTSUMMARY_BUF );return 0 ; }Signature · 1 line
2.53.0
PATCH 3/9 xfs: add a xfs_rtblock_payload helper
In reply to Christoph HellwigAdd a helper to calculate the rtblock payload start with or without the self-describing metadata header.
--- fs/xfs/libxfs/xfs_rtbitmap.c | 9 ++------- fs/xfs/libxfs/xfs_rtbitmap.h | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 22 deletions(-)
fs/xfs/libxfs/xfs_rtbitmap.c +2 -7
@@ -1411,7 +1411,6 @@ xfs_rtfile_initialize_block(struct xfs_inode *ip = rtg->rtg_inodes[type];struct xfs_trans *tp;struct xfs_buf *bp; -void *bufdata;const size_t copylen = mp->m_blockwsize <<XFS_WORDLOG ;int error;
@@ -1427,16 +1426,12 @@ xfs_rtfile_initialize_block(xfs_trans_cancel (tp);return error; } - bufdata = bp->b_addr;xfs_rtfile_initialize_buf (rtg, type, bp, tp); - -if (xfs_has_rtgroups (mp)) - bufdata +=sizeof (struct xfs_rtbuf_blkinfo );if (data) -memcpy (bufdata, data, copylen); +memcpy (xfs_rtblock_payload (bp), data, copylen);else -memset (bufdata,0 , copylen); +memset (xfs_rtblock_payload (bp),0 , copylen);xfs_trans_log_buf (tp, bp,0 , mp->m_sb.sb_blocksize -1 );return xfs_trans_commit (tp); }
fs/xfs/libxfs/xfs_rtbitmap.h +12 -15
@@ -20,6 +20,16 @@ struct xfs_rtalloc_args {xfs_fileoff_t sumoff;/* summary block number */ }; +/* Return the payload of the buffer after the optional header. */ +static inline void * +xfs_rtblock_payload ( +struct xfs_buf *bp) +{ +if (!xfs_has_rtgroups (bp->b_mount)) +return bp->b_addr; +return bp->b_addr +sizeof (struct xfs_rtbuf_blkinfo ); +} + static inline xfs_rtblock_t xfs_rtx_to_rtb( struct xfs_rtgroup *rtg,
@@ -221,14 +231,7 @@ xfs_rbmblock_wordptr( struct xfs_rtalloc_args *args, unsigned int index) { -struct xfs_mount *mp = args->mp; -union xfs_rtword_raw *words; -struct xfs_rtbuf_blkinfo *hdr = args->rbmbp->b_addr; - -if (xfs_has_rtgroups (mp)) - words = (union xfs_rtword_raw *)(hdr +1 ); -else - words = args->rbmbp->b_addr; +union xfs_rtword_raw *words =xfs_rtblock_payload (args->rbmbp);return words + index; }
@@ -312,13 +315,7 @@ xfs_rsumblock_infoptr( struct xfs_rtalloc_args *args, unsigned int index) { -union xfs_suminfo_raw *info; -struct xfs_rtbuf_blkinfo *hdr = args->sumbp->b_addr; - -if (xfs_has_rtgroups (args->mp)) - info = (union xfs_suminfo_raw *)(hdr +1 ); -else - info = args->sumbp->b_addr; +union xfs_suminfo_raw *info =xfs_rtblock_payload (args->sumbp);return info + index; }
Signature · 1 line
2.53.0
Re: [PATCH 3/9] xfs: add a xfs_rtblock_payload helper
Quoted 4 lines · Christoph Hellwig
Add a helper to calculate the rtblock payload start with or without the self-describing metadata header.
Signed-off-by Christoph Hellwig <[email protected]>
Nice refactoring!
--D
Quoted 92 lines
--- fs/xfs/libxfs/xfs_rtbitmap.c | 9 ++------- fs/xfs/libxfs/xfs_rtbitmap.h | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 22 deletions(-)fs/xfs/libxfs/xfs_rtbitmap.c +2
-7@@ -1411,7 +1411,6 @@ xfs_rtfile_initialize_block(struct xfs_inode *ip = rtg->rtg_inodes[type];struct xfs_trans *tp;struct xfs_buf *bp; -void *bufdata;const size_t copylen = mp->m_blockwsize <<XFS_WORDLOG ;int error;@@ -1427,16 +1426,12 @@ xfs_rtfile_initialize_block(xfs_trans_cancel (tp);return error; } - bufdata = bp->b_addr;xfs_rtfile_initialize_buf (rtg, type, bp, tp); - -if (xfs_has_rtgroups (mp)) - bufdata +=sizeof (struct xfs_rtbuf_blkinfo );if (data) -memcpy (bufdata, data, copylen); +memcpy (xfs_rtblock_payload (bp), data, copylen);else -memset (bufdata,0 , copylen); +memset (xfs_rtblock_payload (bp),0 , copylen);xfs_trans_log_buf (tp, bp,0 , mp->m_sb.sb_blocksize -1 );return xfs_trans_commit (tp); }fs/xfs/libxfs/xfs_rtbitmap.h +12
-15@@ -20,6 +20,16 @@ struct xfs_rtalloc_args {xfs_fileoff_t sumoff;/* summary block number */ }; +/* Return the payload of the buffer after the optional header. */ +static inline void * +xfs_rtblock_payload ( +struct xfs_buf *bp) +{ +if (!xfs_has_rtgroups (bp->b_mount)) +return bp->b_addr; +return bp->b_addr +sizeof (struct xfs_rtbuf_blkinfo ); +} + static inline xfs_rtblock_t xfs_rtx_to_rtb( struct xfs_rtgroup *rtg,@@ -221,14 +231,7 @@ xfs_rbmblock_wordptr( struct xfs_rtalloc_args *args, unsigned int index) { -struct xfs_mount *mp = args->mp; -union xfs_rtword_raw *words; -struct xfs_rtbuf_blkinfo *hdr = args->rbmbp->b_addr; - -if (xfs_has_rtgroups (mp)) - words = (union xfs_rtword_raw *)(hdr +1 ); -else - words = args->rbmbp->b_addr; +union xfs_rtword_raw *words =xfs_rtblock_payload (args->rbmbp);return words + index; }@@ -312,13 +315,7 @@ xfs_rsumblock_infoptr( struct xfs_rtalloc_args *args, unsigned int index) { -union xfs_suminfo_raw *info; -struct xfs_rtbuf_blkinfo *hdr = args->sumbp->b_addr; - -if (xfs_has_rtgroups (args->mp)) - info = (union xfs_suminfo_raw *)(hdr +1 ); -else - info = args->sumbp->b_addr; +union xfs_suminfo_raw *info =xfs_rtblock_payload (args->sumbp);return info + index; }Signature · 1 line
2.53.0
PATCH 4/9 xfs: cleanup xfs_verify_media_error
In reply to Christoph HellwigMove all the reporting logic into xfs_verify_report_losses, and pass the enum xfs_device instead of the group type to it. This keeps all the reporting related conditions and translation confined to one place.
--- fs/xfs/xfs_verify_media.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
fs/xfs/xfs_verify_media.c +23 -23
@@ -84,11 +84,14 @@ xfs_verify_report_data_lost(return 0 ; } -/* Walk reverse mappings to look for all file data loss */ -static int +/* +* Report data loss on the physical sectors, and if possible, walk the reverse +* mappings to also report the loss to the files mapped to these sectors. +*/ +static void xfs_verify_report_losses (struct xfs_mount *mp, -enum xfs_group_type type, +enum xfs_device dev,xfs_daddr_t daddr,u64 bblen) {
@@ -97,13 +100,25 @@ xfs_verify_report_losses(xfs_fsblock_t start_bno, end_bno;uint32_t start_gno, end_gno;int error; +enum xfs_group_type type; + +xfs_healthmon_report_media (mp, dev, daddr, bblen); +if (!xfs_has_rmapbt (mp)) +return ; -if (type ==XG_TYPE_RTG ) { +switch (dev) { +case XFS_DEV_RT : start_bno =xfs_daddr_to_rtb (mp, daddr); end_bno =xfs_daddr_to_rtb (mp, daddr + bblen -1 ); - }else { + type =XG_TYPE_RTG ; +break ; +case XFS_DEV_DATA : start_bno =XFS_DADDR_TO_FSB (mp, daddr); end_bno =XFS_DADDR_TO_FSB (mp, daddr + bblen -1 ); + type =XG_TYPE_AG ; +break ; +default : +return ; } tp =xfs_trans_alloc_empty (mp);
@@ -164,7 +179,6 @@ xfs_verify_report_losses( }xfs_trans_cancel (tp); -return 0 ; }/*
@@ -236,25 +250,11 @@ xfs_verify_media_error(case BLK_STS_PROTECTION :case BLK_STS_IOERR :case BLK_STS_MEDIUM : +if (me->me_flags &XFS_VERIFY_MEDIA_REPORT ) +xfs_verify_report_losses (mp, me->me_dev, daddr, + bio_bbcount);break ;default : -return ; - } - -if (!(me->me_flags &XFS_VERIFY_MEDIA_REPORT )) -return ; - -xfs_healthmon_report_media (mp, me->me_dev, daddr, bio_bbcount); - -if (!xfs_has_rmapbt (mp)) -return ; - -switch (me->me_dev) { -case XFS_DEV_DATA : -xfs_verify_report_losses (mp,XG_TYPE_AG , daddr, bio_bbcount); -break ; -case XFS_DEV_RT : -xfs_verify_report_losses (mp,XG_TYPE_RTG , daddr, bio_bbcount);break ; } }
Signature · 1 line
2.53.0
Re: [PATCH 4/9] xfs: cleanup xfs_verify_media_error
Quoted 5 lines · Christoph Hellwig
Move all the reporting logic into
xfs_verify_report_losses, and pass the enumxfs_deviceinstead of the group type to it. This keeps all the reporting related conditions and translation confined to one place.Signed-off-by Christoph Hellwig <[email protected]>
Looks good,
--D
Quoted 95 lines
--- fs/xfs/xfs_verify_media.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-)fs/xfs/xfs_verify_media.c +23
-23@@ -84,11 +84,14 @@ xfs_verify_report_data_lost(return 0 ; } -/* Walk reverse mappings to look for all file data loss */ -static int +/* +* Report data loss on the physical sectors, and if possible, walk the reverse +* mappings to also report the loss to the files mapped to these sectors. +*/ +static void xfs_verify_report_losses (struct xfs_mount *mp, -enum xfs_group_type type, +enum xfs_device dev,xfs_daddr_t daddr,u64 bblen) {@@ -97,13 +100,25 @@ xfs_verify_report_losses(xfs_fsblock_t start_bno, end_bno;uint32_t start_gno, end_gno;int error; +enum xfs_group_type type; + +xfs_healthmon_report_media (mp, dev, daddr, bblen); +if (!xfs_has_rmapbt (mp)) +return ; -if (type ==XG_TYPE_RTG ) { +switch (dev) { +case XFS_DEV_RT : start_bno =xfs_daddr_to_rtb (mp, daddr); end_bno =xfs_daddr_to_rtb (mp, daddr + bblen -1 ); - }else { + type =XG_TYPE_RTG ; +break ; +case XFS_DEV_DATA : start_bno =XFS_DADDR_TO_FSB (mp, daddr); end_bno =XFS_DADDR_TO_FSB (mp, daddr + bblen -1 ); + type =XG_TYPE_AG ; +break ; +default : +return ; } tp =xfs_trans_alloc_empty (mp);@@ -164,7 +179,6 @@ xfs_verify_report_losses( }xfs_trans_cancel (tp); -return 0 ; }/* @@ -236,25 +250,11 @@ xfs_verify_media_error(case BLK_STS_PROTECTION :case BLK_STS_IOERR :case BLK_STS_MEDIUM : +if (me->me_flags &XFS_VERIFY_MEDIA_REPORT ) +xfs_verify_report_losses (mp, me->me_dev, daddr, + bio_bbcount);break ;default : -return ; - } - -if (!(me->me_flags &XFS_VERIFY_MEDIA_REPORT )) -return ; - -xfs_healthmon_report_media (mp, me->me_dev, daddr, bio_bbcount); - -if (!xfs_has_rmapbt (mp)) -return ; - -switch (me->me_dev) { -case XFS_DEV_DATA : -xfs_verify_report_losses (mp,XG_TYPE_AG , daddr, bio_bbcount); -break ; -case XFS_DEV_RT : -xfs_verify_report_losses (mp,XG_TYPE_RTG , daddr, bio_bbcount);break ; } }Signature · 1 line
2.53.0
PATCH 5/9 xfs: use bdev_rw_virt in xfs_verify_media
In reply to Christoph HellwigUse bdev_rw_virt for reading data from disk. This simply uses an on-stack bio and bio_vec and removes the need to allocate an bio and reset it for each iteration. Because bdev_rw_virt returns a negative errno, pass that on to xfs_verify_media_error to avoid a double conversion.
--- fs/xfs/xfs_verify_media.c | 41 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 30 deletions(-)
fs/xfs/xfs_verify_media.c +11 -30
@@ -229,8 +229,10 @@ xfs_verify_media_error(struct xfs_buftarg *btp, xfs_daddr_t daddr, unsigned int bio_bbcount, - blk_status_t bio_status) + int error) { + blk_status_t bio_status = errno_to_blk_status(error); +trace_xfs_verify_media_error (mp, me, btp->bt_dev, daddr, bio_bbcount, bio_status);
@@ -239,7 +241,7 @@ xfs_verify_media_error(* successfully verify any bytes at all. */ if (me->me_start_daddr == daddr) - me->me_ioerror = -blk_status_to_errno (bio_status); + me->me_ioerror = -error;/* * PI validation failures, medium errors, or general IO errors are
@@ -266,7 +268,6 @@ xfs_verify_media( struct xfs_verify_media *me) {struct xfs_buftarg *btp =NULL ; -struct bio *bio;struct folio *folio;xfs_daddr_t daddr;uint64_t bbcount;
@@ -332,33 +333,16 @@ xfs_verify_media(trace_xfs_verify_media (mp, me, btp->bt_dev, daddr, bbcount, folio); - bio =bio_alloc (btp->bt_bdev,1 ,REQ_OP_READ ,GFP_KERNEL ); -if (!bio) { - error = -ENOMEM ; - goto out_folio; - } - -while (bbcount >0 ) { +for (;;) {unsigned int bio_bbcount; -blk_status_t bio_status; - -bio_reset (bio, btp->bt_bdev,REQ_OP_READ ); - bio->bi_iter.bi_sector = daddr; -bio_add_folio_nofail (bio, folio, -min (bbcount <<SECTOR_SHIFT ,folio_size (folio)), -0 ); -/* -* Save the length of the bio before we submit it, because we -* need the original daddr and length for reporting IO errors -* if the bio fails. -*/ - bio_bbcount = bio->bi_iter.bi_size >>SECTOR_SHIFT ; -submit_bio_wait (bio); - bio_status = bio->bi_status; -if (bio_status !=BLK_STS_OK ) { + bio_bbcount =min (bbcount,folio_size (folio) >>SECTOR_SHIFT ); + error =bdev_rw_virt (btp->bt_bdev, daddr,folio_address (folio), + bio_bbcount <<SECTOR_SHIFT , +REQ_OP_READ ); +if (error) {xfs_verify_media_error (mp, me, btp, daddr, bio_bbcount, - bio_status); + error); error =0 ;break ; }
@@ -386,10 +370,7 @@ xfs_verify_media(cond_resched (); } -bio_put (bio); -out_folio:folio_put (folio); -if (error)return error;
Signature · 1 line
2.53.0
Re: [PATCH 5/9] xfs: use bdev_rw_virt in xfs_verify_media
Quoted 7 lines · Christoph Hellwig
Use
bdev_rw_virtfor reading data from disk. This simply uses an on-stack bio andbio_vecand removes the need to allocate an bio and reset it for each iteration. Becausebdev_rw_virtreturns a negative errno, pass that on toxfs_verify_media_errorto avoid a double conversion.Signed-off-by Christoph Hellwig <[email protected]>
Nice cleanup!
--D
Quoted 93 lines
--- fs/xfs/xfs_verify_media.c | 41 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 30 deletions(-)fs/xfs/xfs_verify_media.c +11
-30@@ -229,8 +229,10 @@ xfs_verify_media_error(struct xfs_buftarg *btp, xfs_daddr_t daddr, unsigned int bio_bbcount, - blk_status_t bio_status) + int error) { + blk_status_t bio_status = errno_to_blk_status(error); +trace_xfs_verify_media_error (mp, me, btp->bt_dev, daddr, bio_bbcount, bio_status);@@ -239,7 +241,7 @@ xfs_verify_media_error(* successfully verify any bytes at all. */ if (me->me_start_daddr == daddr) - me->me_ioerror = -blk_status_to_errno (bio_status); + me->me_ioerror = -error;/* * PI validation failures, medium errors, or general IO errors are @@ -266,7 +268,6 @@ xfs_verify_media( struct xfs_verify_media *me) {struct xfs_buftarg *btp =NULL ; -struct bio *bio;struct folio *folio;xfs_daddr_t daddr;uint64_t bbcount;@@ -332,33 +333,16 @@ xfs_verify_media(trace_xfs_verify_media (mp, me, btp->bt_dev, daddr, bbcount, folio); - bio =bio_alloc (btp->bt_bdev,1 ,REQ_OP_READ ,GFP_KERNEL ); -if (!bio) { - error = -ENOMEM ; - goto out_folio; - } - -while (bbcount >0 ) { +for (;;) {unsigned int bio_bbcount; -blk_status_t bio_status; - -bio_reset (bio, btp->bt_bdev,REQ_OP_READ ); - bio->bi_iter.bi_sector = daddr; -bio_add_folio_nofail (bio, folio, -min (bbcount <<SECTOR_SHIFT ,folio_size (folio)), -0 ); -/* -* Save the length of the bio before we submit it, because we -* need the original daddr and length for reporting IO errors -* if the bio fails. -*/ - bio_bbcount = bio->bi_iter.bi_size >>SECTOR_SHIFT ; -submit_bio_wait (bio); - bio_status = bio->bi_status; -if (bio_status !=BLK_STS_OK ) { + bio_bbcount =min (bbcount,folio_size (folio) >>SECTOR_SHIFT ); + error =bdev_rw_virt (btp->bt_bdev, daddr,folio_address (folio), + bio_bbcount <<SECTOR_SHIFT , +REQ_OP_READ ); +if (error) {xfs_verify_media_error (mp, me, btp, daddr, bio_bbcount, - bio_status); + error); error =0 ;break ; }@@ -386,10 +370,7 @@ xfs_verify_media(cond_resched (); } -bio_put (bio); -out_folio:folio_put (folio); -if (error)return error;Signature · 1 line
2.53.0
PATCH 6/9 xfs: lift setting the NOFS context to xfs_end_io
In reply to Christoph HellwigNo point in clearing and restoring it for every processed bio.
--- fs/xfs/xfs_ioend.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/xfs/xfs_ioend.c +9 -9
@@ -175,16 +175,8 @@ xfs_end_ioend_write(bool is_zoned =xfs_is_zoned_inode (ip);xfs_off_t offset = ioend->io_offset;size_t size = ioend->io_size; -unsigned int nofs_flag;int error; -/* -* We can allocate memory here while doing writeback on behalf of -* memory reclaim. To avoid memory allocation deadlocks set the -* task-wide nofs context for the following operations. -*/ - nofs_flag =memalloc_nofs_save (); -/* * Just clean up the in-memory structures if the fs has been shut down. */
@@ -241,7 +233,6 @@ xfs_end_ioend_write(if (is_zoned)xfs_ioend_put_open_zones (ioend);iomap_finish_ioends (ioend, error); -memalloc_nofs_restore (nofs_flag); }/*
@@ -266,6 +257,7 @@ xfs_end_io( container_of(work, struct xfs_inode, i_ioend_work);struct iomap_ioend *ioend;struct list_head tmp; +unsigned int nofs_flag;unsigned long flags;spin_lock_irqsave (&ip->i_ioend_lock, flags);
@@ -273,6 +265,13 @@ xfs_end_io(spin_unlock_irqrestore (&ip->i_ioend_lock, flags);iomap_sort_ioends (&tmp); + +/* +* We can allocate memory here while doing writeback on behalf of +* memory reclaim. To avoid memory allocation deadlocks set the +* task-wide nofs context for the following operations. +*/ + nofs_flag =memalloc_nofs_save (); while ((ioend = list_first_entry_or_null(&tmp, struct iomap_ioend, io_list))) {list_del_init (&ioend->io_list);
@@ -280,6 +279,7 @@ xfs_end_io(xfs_end_ioend_write (ioend);cond_resched (); } +memalloc_nofs_restore (nofs_flag); }void
Signature · 1 line
2.53.0
Re: [PATCH 6/9] xfs: lift setting the NOFS context to xfs_end_io
Quoted 3 lines · Christoph Hellwig
No point in clearing and restoring it for every processed bio.
Signed-off-by Christoph Hellwig <[email protected]>
Agreed.
--D
Quoted 67 lines
--- fs/xfs/xfs_ioend.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)fs/xfs/xfs_ioend.c +9
-9@@ -175,16 +175,8 @@ xfs_end_ioend_write(bool is_zoned =xfs_is_zoned_inode (ip);xfs_off_t offset = ioend->io_offset;size_t size = ioend->io_size; -unsigned int nofs_flag;int error; -/* -* We can allocate memory here while doing writeback on behalf of -* memory reclaim. To avoid memory allocation deadlocks set the -* task-wide nofs context for the following operations. -*/ - nofs_flag =memalloc_nofs_save (); -/* * Just clean up the in-memory structures if the fs has been shut down. */ @@ -241,7 +233,6 @@ xfs_end_ioend_write(if (is_zoned)xfs_ioend_put_open_zones (ioend);iomap_finish_ioends (ioend, error); -memalloc_nofs_restore (nofs_flag); }/* @@ -266,6 +257,7 @@ xfs_end_io( container_of(work, struct xfs_inode, i_ioend_work);struct iomap_ioend *ioend;struct list_head tmp; +unsigned int nofs_flag;unsigned long flags;spin_lock_irqsave (&ip->i_ioend_lock, flags);@@ -273,6 +265,13 @@ xfs_end_io(spin_unlock_irqrestore (&ip->i_ioend_lock, flags);iomap_sort_ioends (&tmp); + +/* +* We can allocate memory here while doing writeback on behalf of +* memory reclaim. To avoid memory allocation deadlocks set the +* task-wide nofs context for the following operations. +*/ + nofs_flag =memalloc_nofs_save (); while ((ioend = list_first_entry_or_null(&tmp, struct iomap_ioend, io_list))) {list_del_init (&ioend->io_list);@@ -280,6 +279,7 @@ xfs_end_io(xfs_end_ioend_write (ioend);cond_resched (); } +memalloc_nofs_restore (nofs_flag); }void Signature · 1 line
2.53.0
PATCH 7/9 xfs: split xfs_end_ioend_write
In reply to Christoph HellwigSplit out a separate helper for the zoned I/O completions as the code flow is pretty different already and will become even more so soon.
--- fs/xfs/xfs_ioend.c | 63 ++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 24 deletions(-)
fs/xfs/xfs_ioend.c +39 -24
@@ -147,11 +147,40 @@ xfs_ioend_submit_read( }static void -xfs_ioend_put_open_zones ( +xfs_end_ioend_write_zoned (struct iomap_ioend *ioend) { -struct iomap_ioend *tmp; +struct xfs_inode *ip =XFS_I (ioend->io_inode); +struct xfs_open_zone *oz = ioend->io_private; +struct iomap_ioend *tmp; +int error = -EIO ; + +ASSERT (!(ioend->io_flags &IOMAP_IOEND_SHARED )); + +if (xfs_is_shutdown (ip->i_mount)) + goto done; +/* +* Zoned writes update the in-core open zone accounting before I/O +* submission. A failed write leaves that state inconsistent, so shut +* down the filesystem instead of letting later writers wait forever for +* open zone space to become available. +*/ + error =blk_status_to_errno (ioend->io_bio.bi_status); +if (unlikely (error)) { +xfs_force_shutdown (ip->i_mount,SHUTDOWN_META_IO_ERROR ); + goto done; + } + + error =xfs_zoned_end_io (ip, ioend->io_offset, ioend->io_size, + ioend->io_sector, oz,NULLFSBLOCK ); +if (error) + goto done; + +if (!(ioend->io_flags &IOMAP_IOEND_DIRECT ) && +xfs_ioend_is_append (ioend)) + error =xfs_setfilesize (ip, ioend->io_offset, ioend->io_size); +done:/* * Put the open zone for all ioends merged into this one (if any). */
@@ -162,8 +191,9 @@ xfs_ioend_put_open_zones(* The main ioend might not have an open zone if the submission failed * before xfs_zone_alloc_and_submit got called. */ -if (ioend->io_private) -xfs_open_zone_put (ioend->io_private); +if (oz) +xfs_open_zone_put (oz); +iomap_finish_ioends (ioend, error); } static void
@@ -172,7 +202,6 @@ xfs_end_ioend_write( {struct xfs_inode *ip =XFS_I (ioend->io_inode);struct xfs_mount *mp = ip->i_mount; -bool is_zoned =xfs_is_zoned_inode (ip);xfs_off_t offset = ioend->io_offset;size_t size = ioend->io_size;int error;
@@ -194,19 +223,7 @@ xfs_end_ioend_write(*/ error =blk_status_to_errno (ioend->io_bio.bi_status);if (unlikely (error)) { -/* -* Zoned writes update the in-core open zone accounting before -* I/O submission. A failed write leaves that state -* inconsistent, so shut down the filesystem instead of letting -* later writers wait forever for open zone space to become -* available. -*/ -if (is_zoned) { -xfs_force_shutdown (mp,SHUTDOWN_META_IO_ERROR ); - goto done; - }if (ioend->io_flags &IOMAP_IOEND_SHARED ) { -ASSERT (!is_zoned);xfs_reflink_cancel_cow_range (ip, offset, size, true);xfs_bmap_punch_delalloc_range (ip,XFS_DATA_FORK , offset, offset + size,NULL );
@@ -217,10 +234,7 @@ xfs_end_ioend_write(/* * Success: commit the COW or unwritten blocks if needed. */ -if (is_zoned) - error =xfs_zoned_end_io (ip, offset, size, ioend->io_sector, - ioend->io_private,NULLFSBLOCK ); -else if (ioend->io_flags &IOMAP_IOEND_SHARED ) +if (ioend->io_flags &IOMAP_IOEND_SHARED ) error =xfs_reflink_end_cow (ip, offset, size);else if (ioend->io_flags &IOMAP_IOEND_UNWRITTEN ) error =xfs_iomap_write_unwritten (ip, offset, size, false);
@@ -230,8 +244,6 @@ xfs_end_ioend_write( xfs_ioend_is_append(ioend)) error =xfs_setfilesize (ip, offset, size); done: -if (is_zoned) -xfs_ioend_put_open_zones (ioend);iomap_finish_ioends (ioend, error); }
@@ -276,7 +288,10 @@ xfs_end_io( io_list))) {list_del_init (&ioend->io_list);iomap_ioend_try_merge (ioend, &tmp); -xfs_end_ioend_write (ioend); +if (xfs_is_zoned_inode (ip)) +xfs_end_ioend_write_zoned (ioend); +else +xfs_end_ioend_write (ioend);cond_resched (); }memalloc_nofs_restore (nofs_flag);
Signature · 1 line
2.53.0
Re: [PATCH 7/9] xfs: split xfs_end_ioend_write
Quoted 4 lines · Christoph Hellwig
Split out a separate helper for the zoned I/O completions as the code flow is pretty different already and will become even more so soon.
Signed-off-by Christoph Hellwig <[email protected]>
Looks ok,
--D
Quoted 128 lines
--- fs/xfs/xfs_ioend.c | 63 ++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 24 deletions(-)fs/xfs/xfs_ioend.c +39
-24@@ -147,11 +147,40 @@ xfs_ioend_submit_read( }static void -xfs_ioend_put_open_zones ( +xfs_end_ioend_write_zoned (struct iomap_ioend *ioend) { -struct iomap_ioend *tmp; +struct xfs_inode *ip =XFS_I (ioend->io_inode); +struct xfs_open_zone *oz = ioend->io_private; +struct iomap_ioend *tmp; +int error = -EIO ; + +ASSERT (!(ioend->io_flags &IOMAP_IOEND_SHARED )); + +if (xfs_is_shutdown (ip->i_mount)) + goto done; +/* +* Zoned writes update the in-core open zone accounting before I/O +* submission. A failed write leaves that state inconsistent, so shut +* down the filesystem instead of letting later writers wait forever for +* open zone space to become available. +*/ + error =blk_status_to_errno (ioend->io_bio.bi_status); +if (unlikely (error)) { +xfs_force_shutdown (ip->i_mount,SHUTDOWN_META_IO_ERROR ); + goto done; + } + + error =xfs_zoned_end_io (ip, ioend->io_offset, ioend->io_size, + ioend->io_sector, oz,NULLFSBLOCK ); +if (error) + goto done; + +if (!(ioend->io_flags &IOMAP_IOEND_DIRECT ) && +xfs_ioend_is_append (ioend)) + error =xfs_setfilesize (ip, ioend->io_offset, ioend->io_size); +done:/* * Put the open zone for all ioends merged into this one (if any). */ @@ -162,8 +191,9 @@ xfs_ioend_put_open_zones(* The main ioend might not have an open zone if the submission failed * before xfs_zone_alloc_and_submit got called. */ -if (ioend->io_private) -xfs_open_zone_put (ioend->io_private); +if (oz) +xfs_open_zone_put (oz); +iomap_finish_ioends (ioend, error); } static void@@ -172,7 +202,6 @@ xfs_end_ioend_write( {struct xfs_inode *ip =XFS_I (ioend->io_inode);struct xfs_mount *mp = ip->i_mount; -bool is_zoned =xfs_is_zoned_inode (ip);xfs_off_t offset = ioend->io_offset;size_t size = ioend->io_size;int error;@@ -194,19 +223,7 @@ xfs_end_ioend_write(*/ error =blk_status_to_errno (ioend->io_bio.bi_status);if (unlikely (error)) { -/* -* Zoned writes update the in-core open zone accounting before -* I/O submission. A failed write leaves that state -* inconsistent, so shut down the filesystem instead of letting -* later writers wait forever for open zone space to become -* available. -*/ -if (is_zoned) { -xfs_force_shutdown (mp,SHUTDOWN_META_IO_ERROR ); - goto done; - }if (ioend->io_flags &IOMAP_IOEND_SHARED ) { -ASSERT (!is_zoned);xfs_reflink_cancel_cow_range (ip, offset, size, true);xfs_bmap_punch_delalloc_range (ip,XFS_DATA_FORK , offset, offset + size,NULL );@@ -217,10 +234,7 @@ xfs_end_ioend_write(/* * Success: commit the COW or unwritten blocks if needed. */ -if (is_zoned) - error =xfs_zoned_end_io (ip, offset, size, ioend->io_sector, - ioend->io_private,NULLFSBLOCK ); -else if (ioend->io_flags &IOMAP_IOEND_SHARED ) +if (ioend->io_flags &IOMAP_IOEND_SHARED ) error =xfs_reflink_end_cow (ip, offset, size);else if (ioend->io_flags &IOMAP_IOEND_UNWRITTEN ) error =xfs_iomap_write_unwritten (ip, offset, size, false);@@ -230,8 +244,6 @@ xfs_end_ioend_write( xfs_ioend_is_append(ioend)) error =xfs_setfilesize (ip, offset, size); done: -if (is_zoned) -xfs_ioend_put_open_zones (ioend);iomap_finish_ioends (ioend, error); }@@ -276,7 +288,10 @@ xfs_end_io( io_list))) {list_del_init (&ioend->io_list);iomap_ioend_try_merge (ioend, &tmp); -xfs_end_ioend_write (ioend); +if (xfs_is_zoned_inode (ip)) +xfs_end_ioend_write_zoned (ioend); +else +xfs_end_ioend_write (ioend);cond_resched (); }memalloc_nofs_restore (nofs_flag);Signature · 1 line
2.53.0
Re: [PATCH 7/9] xfs: split xfs_end_ioend_write
FYI, it turns out this actually needs some changes only queued up in the block tree right now. So I'll resend with the bits that actually apply against xfs/for-next after waiting for a few more reviews.
PATCH 8/9 xfs: factor out a xfs_zoned_fill_srcmap helper
In reply to Christoph HellwigThe code filling the srcmap in xfs_zoned_buffered_write_iomap_begin isn't terribly complicated, but fairly deeply indented and will become a bit more complex soon. Factor it into a helper and add some comments.
--- fs/xfs/xfs_iomap.c | 53 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 18 deletions(-)
fs/xfs/xfs_iomap.c +35 -18
@@ -1588,6 +1588,37 @@ xfs_bmapi_reserve_delalloc(return error; } +static int +xfs_zoned_fill_srcmap ( +struct xfs_inode *ip, +xfs_fileoff_t offset_fsb, +xfs_fileoff_t *end_fsb, +unsigned flags, +struct iomap *srcmap) +{ +struct xfs_bmbt_irec smap; +struct xfs_iext_cursor scur; + +if (!xfs_iext_lookup_extent (ip, &ip->i_df, offset_fsb, &scur, &smap)) + smap.br_startoff = *end_fsb;/* fake hole until EOF */ +if (smap.br_startoff > offset_fsb) { +/* +* There is a hole at @offset_fsb. Only map until the end of +* the of it. +*/ + *end_fsb =min (*end_fsb, smap.br_startoff); +return 0 ; + } + +/* +* There is a data fork mapping, only map until the end of it. +*/ + *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount); +xfs_trim_extent (&smap, offset_fsb, *end_fsb - offset_fsb); +return xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 , +xfs_iomap_inode_sequence (ip,0 )); +} + static int xfs_zoned_buffered_write_iomap_begin( struct inode *inode,
@@ -1655,24 +1686,10 @@ xfs_zoned_buffered_write_iomap_begin(if (!IS_ALIGNED (offset, mp->m_sb.sb_blocksize) || !IS_ALIGNED (offset + count, mp->m_sb.sb_blocksize) || (flags &IOMAP_ZERO )) { -struct xfs_bmbt_irec smap; -struct xfs_iext_cursor scur; - -if (!xfs_iext_lookup_extent (ip, &ip->i_df, offset_fsb, &scur, - &smap)) - smap.br_startoff = end_fsb;/* fake hole until EOF */ -if (smap.br_startoff > offset_fsb) { - end_fsb =min (end_fsb, smap.br_startoff); - }else { - end_fsb =min (end_fsb, - smap.br_startoff + smap.br_blockcount); -xfs_trim_extent (&smap, offset_fsb, - end_fsb - offset_fsb); - error =xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 , -xfs_iomap_inode_sequence (ip,0 )); -if (error) - goto out_unlock; - } + error =xfs_zoned_fill_srcmap (ip, offset_fsb, &end_fsb, flags, + srcmap); +if (error) + goto out_unlock; }if (!ip->i_cowfp)
Signature · 1 line
2.53.0
Re: [PATCH 8/9] xfs: factor out a xfs_zoned_fill_srcmap helper
Quoted 5 lines · Christoph Hellwig
The code filling the srcmap in
xfs_zoned_buffered_write_iomap_beginisn't terribly complicated, but fairly deeply indented and will become a bit more complex soon. Factor it into a helper and add some comments.Signed-off-by Christoph Hellwig <[email protected]>
This hoist looks fine. :)
--D
Quoted 79 lines
--- fs/xfs/xfs_iomap.c | 53 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 18 deletions(-)fs/xfs/xfs_iomap.c +35
-18@@ -1588,6 +1588,37 @@ xfs_bmapi_reserve_delalloc(return error; } +static int +xfs_zoned_fill_srcmap ( +struct xfs_inode *ip, +xfs_fileoff_t offset_fsb, +xfs_fileoff_t *end_fsb, +unsigned flags, +struct iomap *srcmap) +{ +struct xfs_bmbt_irec smap; +struct xfs_iext_cursor scur; + +if (!xfs_iext_lookup_extent (ip, &ip->i_df, offset_fsb, &scur, &smap)) + smap.br_startoff = *end_fsb;/* fake hole until EOF */ +if (smap.br_startoff > offset_fsb) { +/* +* There is a hole at @offset_fsb. Only map until the end of +* the of it. +*/ + *end_fsb =min (*end_fsb, smap.br_startoff); +return 0 ; + } + +/* +* There is a data fork mapping, only map until the end of it. +*/ + *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount); +xfs_trim_extent (&smap, offset_fsb, *end_fsb - offset_fsb); +return xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 , +xfs_iomap_inode_sequence (ip,0 )); +} + static int xfs_zoned_buffered_write_iomap_begin( struct inode *inode,@@ -1655,24 +1686,10 @@ xfs_zoned_buffered_write_iomap_begin(if (!IS_ALIGNED (offset, mp->m_sb.sb_blocksize) || !IS_ALIGNED (offset + count, mp->m_sb.sb_blocksize) || (flags &IOMAP_ZERO )) { -struct xfs_bmbt_irec smap; -struct xfs_iext_cursor scur; - -if (!xfs_iext_lookup_extent (ip, &ip->i_df, offset_fsb, &scur, - &smap)) - smap.br_startoff = end_fsb;/* fake hole until EOF */ -if (smap.br_startoff > offset_fsb) { - end_fsb =min (end_fsb, smap.br_startoff); - }else { - end_fsb =min (end_fsb, - smap.br_startoff + smap.br_blockcount); -xfs_trim_extent (&smap, offset_fsb, - end_fsb - offset_fsb); - error =xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 , -xfs_iomap_inode_sequence (ip,0 )); -if (error) - goto out_unlock; - } + error =xfs_zoned_fill_srcmap (ip, offset_fsb, &end_fsb, flags, + srcmap); +if (error) + goto out_unlock; }if (!ip->i_cowfp)Signature · 1 line
2.53.0
PATCH 9/9 xfs: calculate end_fsb later in xfs_zoned_fill_srcmap
In reply to Christoph Hellwigxfs_trim_extent doesn't need the updated end_fsb as it already is limited by the smap range. Move the end_fsb calculation later to prepare additional reasons that could reduce the smap range.
--- fs/xfs/xfs_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_iomap.c +1 -1
@@ -1613,8 +1613,8 @@ xfs_zoned_fill_srcmap(/* * There is a data fork mapping, only map until the end of it. */ - *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount);xfs_trim_extent (&smap, offset_fsb, *end_fsb - offset_fsb); + *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount);return xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 ,xfs_iomap_inode_sequence (ip,0 )); }
Signature · 1 line
2.53.0
Re: [PATCH 9/9] xfs: calculate end_fsb later in xfs_zoned_fill_srcmap
Quoted 5 lines · Christoph Hellwig
xfs_trim_extentdoesn't need the updatedend_fsbas it already is limited by the smap range. Move theend_fsbcalculation later to prepare additional reasons that could reduce the smap range.Signed-off-by Christoph Hellwig <[email protected]>
Make sense. Constricting *end_fsb to the smap and then trimming the smap to *end_fsb is (for now anyway) commutable.
--D
Quoted 22 lines
--- fs/xfs/xfs_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/xfs/xfs_iomap.c +1
-1@@ -1613,8 +1613,8 @@ xfs_zoned_fill_srcmap(/* * There is a data fork mapping, only map until the end of it. */ - *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount);xfs_trim_extent (&smap, offset_fsb, *end_fsb - offset_fsb); + *end_fsb =min (*end_fsb, smap.br_startoff + smap.br_blockcount);return xfs_bmbt_to_iomap (ip, srcmap, &smap, flags,0 ,xfs_iomap_inode_sequence (ip,0 )); }Signature · 1 line
2.53.0
Quoted 14 lines · Christoph Hellwig
this series has various cleanups developed as part of the data checksum series that should be useful on their own.
Diffstat:
libxfs/xfs_rtbitmap.c| 79 ++++++++++++++++++++++++------------------libxfs/xfs_rtbitmap.h | 45 +++++++++--------------- scrub/rtbitmap_repair.c | 15 -------- scrub/rtsummary_repair.c | 15 -------- xfs_ioend.c | 81 +++++++++++++++++++++++++------------------ xfs_iomap.c | 53 ++++++++++++++++++---------- xfs_verify_media.c | 87 ++++++++++++++++++----------------------------- 7 files changed, 181 insertions(+), 194 deletions(-)
Quoted 1 line
[...]
Applied to for-next, thanks!
[1/9] xfs: centralize setting of buf_ops/buf_type/magic for rtblocks
commit: c110639a1c9f36ce5382e9e70fccaa3f922ef35d
[2/9] xfs: factor out a xfs_rtfile_initialize_buf helper
commit: 724b5e3a549233bf71e3ff5a90255e8c04dfed1e
[3/9] xfs: add a xfs_rtblock_payload helper
commit: 46db7dec8bae04b2721c9d3e9e4fc75c14654754
[4/9] xfs: cleanup xfs_verify_media_error
commit: dfe2d2d92df34f6ca9e19548fcc26b2e52a38552
[5/9] xfs: use bdev_rw_virt in xfs_verify_media
commit: 89572b7fdc7bf10806e1bcde0d9aeccc0d8b3fdb
[6/9] xfs: lift setting the NOFS context to xfs_end_io
commit: b5a96a9877a5c7426054ccf82528d5de795cb25a
[7/9] xfs: split xfs_end_ioend_write
commit: 0c94f5499d694a99c2fae3106daaec66971b8b1a
[8/9] xfs: factor out a xfs_zoned_fill_srcmap helper
commit: b74d34fa3cc7e8f35f1b969c68837ae99566749b
[9/9] xfs: calculate end_fsb later in xfs_zoned_fill_srcmap
commit: b942c6919ac39870f8327d3123a2912d96e7e617Best regards,
Signature · 1 line
Carlos Maiolino <[email protected]>