| Message ID | 20230523090050.373545-12-chandan.babu@oracle.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Metadump v2 | expand |
On Tue, May 23, 2023 at 02:30:37PM +0530, Chandan Babu R wrote: > Signed-off-by: Chandan Babu R <chandan.babu@oracle.com> > --- > include/xfs_metadump.h | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h > index a4dca25cb..1d8d7008c 100644 > --- a/include/xfs_metadump.h > +++ b/include/xfs_metadump.h > @@ -8,7 +8,9 @@ > #define _XFS_METADUMP_H_ > > #define XFS_MD_MAGIC_V1 0x5846534d /* 'XFSM' */ > +#define XFS_MD_MAGIC_V2 0x584D4432 /* 'XMD2' */ > > +/* Metadump v1 */ > typedef struct xfs_metablock { > __be32 mb_magic; > __be16 mb_count; > @@ -23,4 +25,34 @@ typedef struct xfs_metablock { > #define XFS_METADUMP_FULLBLOCKS (1 << 2) > #define XFS_METADUMP_DIRTYLOG (1 << 3) > > +/* Metadump v2 */ > +struct xfs_metadump_header { > + __be32 xmh_magic; > + __be32 xmh_version; > + __be32 xmh_compat_flags; > + __be32 xmh_incompat_flags; > + __be64 xmh_reserved; __be32 xmh_crc; ? Otherwise there's nothing to check for bitflips in the index blocks themselves. > +} __packed; Does an array of xfs_meta_extent come immediately after xfs_metadump_header, or do they go in a separate block after the header? How big is the index block supposed to be? > + > +#define XFS_MD2_INCOMPAT_OBFUSCATED (1 << 0) > +#define XFS_MD2_INCOMPAT_FULLBLOCKS (1 << 1) > +#define XFS_MD2_INCOMPAT_DIRTYLOG (1 << 2) Should the header declare when some of the xfs_meta_extents will have XME_ADDR_LOG_DEVICE set? > + > +struct xfs_meta_extent { > + /* Tabs not spaces. > + * Lowest 54 bits are used to store 512 byte addresses. > + * Next 2 bits is used for indicating the device. > + * 00 - Data device > + * 01 - External log So if you were to (say) add the realtime device, would that be bit 56, or would you define 0xC0000000000000 (aka DATA|LOG) to mean realtime? > + */ > + __be64 xme_addr; > + /* In units of 512 byte blocks */ > + __be32 xme_len; > +} __packed; > + > +#define XME_ADDR_DATA_DEVICE (1UL << 54) > +#define XME_ADDR_LOG_DEVICE (1UL << 55) 1ULL, because "UL" means unsigned long, which is 32-bits on i386. --D > + > +#define XME_ADDR_DEVICE_MASK (~(XME_ADDR_DATA_DEVICE | XME_ADDR_LOG_DEVICE)) > + > #endif /* _XFS_METADUMP_H_ */ > -- > 2.39.1 >
On Tue, May 23, 2023 at 10:34:35 AM -0700, Darrick J. Wong wrote: > On Tue, May 23, 2023 at 02:30:37PM +0530, Chandan Babu R wrote: >> Signed-off-by: Chandan Babu R <chandan.babu@oracle.com> >> --- >> include/xfs_metadump.h | 32 ++++++++++++++++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h >> index a4dca25cb..1d8d7008c 100644 >> --- a/include/xfs_metadump.h >> +++ b/include/xfs_metadump.h >> @@ -8,7 +8,9 @@ >> #define _XFS_METADUMP_H_ >> >> #define XFS_MD_MAGIC_V1 0x5846534d /* 'XFSM' */ >> +#define XFS_MD_MAGIC_V2 0x584D4432 /* 'XMD2' */ >> >> +/* Metadump v1 */ >> typedef struct xfs_metablock { >> __be32 mb_magic; >> __be16 mb_count; >> @@ -23,4 +25,34 @@ typedef struct xfs_metablock { >> #define XFS_METADUMP_FULLBLOCKS (1 << 2) >> #define XFS_METADUMP_DIRTYLOG (1 << 3) >> >> +/* Metadump v2 */ >> +struct xfs_metadump_header { >> + __be32 xmh_magic; >> + __be32 xmh_version; >> + __be32 xmh_compat_flags; >> + __be32 xmh_incompat_flags; >> + __be64 xmh_reserved; > > __be32 xmh_crc; ? > > Otherwise there's nothing to check for bitflips in the index blocks > themselves. The user could generate a sha1sum of the metadump file and share it with the receiver for verifying the integrity of the metadump file right? > >> +} __packed; > > Does an array of xfs_meta_extent come immediately after > xfs_metadump_header, or do they go in a separate block after the header? > How big is the index block supposed to be? > A metadump file in V2 format is structured as shown below, |------------------------------| | struct xfs_metadump_header | |------------------------------| | struct xfs_meta_extent 0 | | Extent 0's data | | struct xfs_meta_extent 1 | | Extent 1's data | | ... | | struct xfs_meta_extent (n-1) | | Extent (n-1)'s data | |------------------------------| If there are no objections, I will add the above diagram to include/xfs_metadump.h. >> + >> +#define XFS_MD2_INCOMPAT_OBFUSCATED (1 << 0) >> +#define XFS_MD2_INCOMPAT_FULLBLOCKS (1 << 1) >> +#define XFS_MD2_INCOMPAT_DIRTYLOG (1 << 2) > > Should the header declare when some of the xfs_meta_extents will have > XME_ADDR_LOG_DEVICE set? > I will add a comment describing that extents captured from an external log device will have XME_ADDR_LOG_DEVICE set. >> + >> +struct xfs_meta_extent { >> + /* > > Tabs not spaces. > >> + * Lowest 54 bits are used to store 512 byte addresses. >> + * Next 2 bits is used for indicating the device. >> + * 00 - Data device >> + * 01 - External log > > So if you were to (say) add the realtime device, would that be bit 56, > or would you define 0xC0000000000000 (aka DATA|LOG) to mean realtime? > I am sorry, the comment I have written above is incorrect. I forgot to update it before posting the patchset. Realtime device has to be (1ULL << 56). But, Your comments on "[PATCH 22/24] mdrestore: Define mdrestore ops for v2 format" has convinced me that we could use the 2 bits at bit posistions 54 and 55 as a counter. i.e 00 maps to XME_ADDR_DATA_DEVICE and 01 maps to XME_ADDR_LOG_DEVICE. >> + */ >> + __be64 xme_addr; >> + /* In units of 512 byte blocks */ >> + __be32 xme_len; >> +} __packed; >> + >> +#define XME_ADDR_DATA_DEVICE (1UL << 54) >> +#define XME_ADDR_LOG_DEVICE (1UL << 55) > > 1ULL, because "UL" means unsigned long, which is 32-bits on i386. Ok. I will fix that.
On Thu, May 25, 2023 at 02:56:38PM +0530, Chandan Babu R wrote: > On Tue, May 23, 2023 at 10:34:35 AM -0700, Darrick J. Wong wrote: > > On Tue, May 23, 2023 at 02:30:37PM +0530, Chandan Babu R wrote: > >> Signed-off-by: Chandan Babu R <chandan.babu@oracle.com> > >> --- > >> include/xfs_metadump.h | 32 ++++++++++++++++++++++++++++++++ > >> 1 file changed, 32 insertions(+) > >> > >> diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h > >> index a4dca25cb..1d8d7008c 100644 > >> --- a/include/xfs_metadump.h > >> +++ b/include/xfs_metadump.h > >> @@ -8,7 +8,9 @@ > >> #define _XFS_METADUMP_H_ > >> > >> #define XFS_MD_MAGIC_V1 0x5846534d /* 'XFSM' */ > >> +#define XFS_MD_MAGIC_V2 0x584D4432 /* 'XMD2' */ > >> > >> +/* Metadump v1 */ > >> typedef struct xfs_metablock { > >> __be32 mb_magic; > >> __be16 mb_count; > >> @@ -23,4 +25,34 @@ typedef struct xfs_metablock { > >> #define XFS_METADUMP_FULLBLOCKS (1 << 2) > >> #define XFS_METADUMP_DIRTYLOG (1 << 3) > >> > >> +/* Metadump v2 */ > >> +struct xfs_metadump_header { > >> + __be32 xmh_magic; > >> + __be32 xmh_version; > >> + __be32 xmh_compat_flags; > >> + __be32 xmh_incompat_flags; > >> + __be64 xmh_reserved; > > > > __be32 xmh_crc; ? > > > > Otherwise there's nothing to check for bitflips in the index blocks > > themselves. > > The user could generate a sha1sum of the metadump file and share it with the > receiver for verifying the integrity of the metadump file right? Heh, sorry, this is another erroneous comment based on me thinking that xfs_metadump_header would be followed by an array of xfs_meta_extent, like how v1 does things. Question withdrawn. > > > >> +} __packed; > > > > Does an array of xfs_meta_extent come immediately after > > xfs_metadump_header, or do they go in a separate block after the header? > > How big is the index block supposed to be? > > > > A metadump file in V2 format is structured as shown below, > > |------------------------------| > | struct xfs_metadump_header | > |------------------------------| > | struct xfs_meta_extent 0 | > | Extent 0's data | > | struct xfs_meta_extent 1 | > | Extent 1's data | > | ... | > | struct xfs_meta_extent (n-1) | > | Extent (n-1)'s data | > |------------------------------| > > If there are no objections, I will add the above diagram to > include/xfs_metadump.h. Yes, please. > >> + > >> +#define XFS_MD2_INCOMPAT_OBFUSCATED (1 << 0) > >> +#define XFS_MD2_INCOMPAT_FULLBLOCKS (1 << 1) > >> +#define XFS_MD2_INCOMPAT_DIRTYLOG (1 << 2) > > > > Should the header declare when some of the xfs_meta_extents will have > > XME_ADDR_LOG_DEVICE set? > > > > I will add a comment describing that extents captured from an external log > device will have XME_ADDR_LOG_DEVICE set. <nod> I get that, but I'm asking about declaring in the xfs_metadump_header that eventually there will be an xfs_meta_extent with XME_ADDR_LOG_DEVICE in it. The scenario that I'm thinking about is on the mdrestore side of things. mdrestore reads its CLI arguments, but it doesn't know if the log device argument is actually required until it reads the metadump header. Once it has read the metadump header, it ought to be able to tell the user "This metadump has external log contents but you didn't pass in --log-device=/dev/XXX" and error out before actually writing anything. What I think we ought to avoid is the situation where mid-stream we discover a meta_extent with XME_ADDR_LOG_DEVICE set and only /then/ error out, having already written a bunch of stuff to the data device. > >> + > >> +struct xfs_meta_extent { > >> + /* > > > > Tabs not spaces. > > > > >> + * Lowest 54 bits are used to store 512 byte addresses. > >> + * Next 2 bits is used for indicating the device. > >> + * 00 - Data device > >> + * 01 - External log > > > > So if you were to (say) add the realtime device, would that be bit 56, > > or would you define 0xC0000000000000 (aka DATA|LOG) to mean realtime? > > > > I am sorry, the comment I have written above is incorrect. I forgot to update it > before posting the patchset. Realtime device has to be (1ULL << 56). > > But, Your comments on "[PATCH 22/24] mdrestore: Define mdrestore ops for v2 > format" has convinced me that we could use the 2 bits at bit posistions 54 and > 55 as a counter. i.e 00 maps to XME_ADDR_DATA_DEVICE and 01 maps to > XME_ADDR_LOG_DEVICE. <nod> > >> + */ > >> + __be64 xme_addr; > >> + /* In units of 512 byte blocks */ > >> + __be32 xme_len; > >> +} __packed; > >> + > >> +#define XME_ADDR_DATA_DEVICE (1UL << 54) > >> +#define XME_ADDR_LOG_DEVICE (1UL << 55) > > > > 1ULL, because "UL" means unsigned long, which is 32-bits on i386. > > Ok. I will fix that. <nod> --D > > -- > chandan
diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h index a4dca25cb..1d8d7008c 100644 --- a/include/xfs_metadump.h +++ b/include/xfs_metadump.h @@ -8,7 +8,9 @@ #define _XFS_METADUMP_H_ #define XFS_MD_MAGIC_V1 0x5846534d /* 'XFSM' */ +#define XFS_MD_MAGIC_V2 0x584D4432 /* 'XMD2' */ +/* Metadump v1 */ typedef struct xfs_metablock { __be32 mb_magic; __be16 mb_count; @@ -23,4 +25,34 @@ typedef struct xfs_metablock { #define XFS_METADUMP_FULLBLOCKS (1 << 2) #define XFS_METADUMP_DIRTYLOG (1 << 3) +/* Metadump v2 */ +struct xfs_metadump_header { + __be32 xmh_magic; + __be32 xmh_version; + __be32 xmh_compat_flags; + __be32 xmh_incompat_flags; + __be64 xmh_reserved; +} __packed; + +#define XFS_MD2_INCOMPAT_OBFUSCATED (1 << 0) +#define XFS_MD2_INCOMPAT_FULLBLOCKS (1 << 1) +#define XFS_MD2_INCOMPAT_DIRTYLOG (1 << 2) + +struct xfs_meta_extent { + /* + * Lowest 54 bits are used to store 512 byte addresses. + * Next 2 bits is used for indicating the device. + * 00 - Data device + * 01 - External log + */ + __be64 xme_addr; + /* In units of 512 byte blocks */ + __be32 xme_len; +} __packed; + +#define XME_ADDR_DATA_DEVICE (1UL << 54) +#define XME_ADDR_LOG_DEVICE (1UL << 55) + +#define XME_ADDR_DEVICE_MASK (~(XME_ADDR_DATA_DEVICE | XME_ADDR_LOG_DEVICE)) + #endif /* _XFS_METADUMP_H_ */
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com> --- include/xfs_metadump.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)