Re: [PATCH v1 19/19] xfsprogs: Add log item printing for ATTRI and ATTRD

[Allison Collins <allison.henderson@xxxxxxxxxx>]

On 8/12/19 9:46 AM, Darrick J. Wong wrote:
> On Fri, Aug 09, 2019 at 02:38:04PM -0700, Allison Collins wrote:
> > From: Allison Henderson <allison.henderson@xxxxxxxxxx>
> >
> > This patch implements a new set of log printing functions to
> > print the ATTRI and ATTRD items and vectors in the log.  These
> > will be used during log dump and log recover operations.
> >
> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
> > Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
> > ---
> >   logprint/log_misc.c      |  31 +++++++-
> >   logprint/log_print_all.c |  12 +++
> >   logprint/log_redo.c      | 189 +++++++++++++++++++++++++++++++++++++++++++++++
> >   logprint/logprint.h      |   7 ++
> >   4 files changed, 238 insertions(+), 1 deletion(-)
> >
> > diff --git a/logprint/log_misc.c b/logprint/log_misc.c
> > index c325f04..7b2055d 100644
> > --- a/logprint/log_misc.c
> > +++ b/logprint/log_misc.c
> > @@ -54,11 +54,29 @@ print_stars(void)
> >   	   "***********************************\n");
> >   }	/* print_stars */
> >   
> > +void
> > +print_hex_dump(char *ptr, int len) {
> > +	int i = 0;
> > +
> > +	for (i = 0; i < len; i++) {
> > +		if (i % 16 == 0)
> > +			printf("%08x ", i);
> > +
> > +		printf("%02x", ptr[i]);
> > +
> > +		if ((i+1)%16 == 0)
> > +			printf("\n");
> > +		else if ((i+1)%2 == 0)
> > +			printf(" ");
> > +	}
> > +	printf("\n");
> > +}
>
> Maybe it's time to implement xfs_hex_dump?
I think we have that through libxfs, but it prints it as an alert, and 
this just needs to be printed as part of the log dump.

Once we get to pptrs, we can use the attribute flags to decide when to 
print it as a pptr record instead of this hex dump.  It would be nice to 
have something to indicate when it's a string too, but with out using a 
flag or something similar, I thought it was best not to make assumptions.

Allison

> --D
>
> > +
> >   /*
> >    * Given a pointer to a data segment, print out the data as if it were
> >    * a log operation header.
> >    */
> > -static void
> > +void
> >   xlog_print_op_header(xlog_op_header_t	*op_head,
> >   		     int		i,
> >   		     char		**ptr)
> > @@ -949,6 +967,17 @@ xlog_print_record(
> >   					be32_to_cpu(op_head->oh_len));
> >   			break;
> >   		    }
> > +		    case XFS_LI_ATTRI: {
> > +                        skip = xlog_print_trans_attri(&ptr,
> > +                                        be32_to_cpu(op_head->oh_len),
> > +                                        &i);
> > +                        break;
> > +                    }
> > +                    case XFS_LI_ATTRD: {
> > +                        skip = xlog_print_trans_attrd(&ptr,
> > +                                        be32_to_cpu(op_head->oh_len));
> > +                        break;
> > +                    }
> >   		    case XFS_LI_RUI: {
> >   			skip = xlog_print_trans_rui(&ptr,
> >   					be32_to_cpu(op_head->oh_len),
> > diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
> > index eafffe2..f794a68 100644
> > --- a/logprint/log_print_all.c
> > +++ b/logprint/log_print_all.c
> > @@ -400,6 +400,12 @@ xlog_recover_print_logitem(
> >   	case XFS_LI_EFI:
> >   		xlog_recover_print_efi(item);
> >   		break;
> > +	case XFS_LI_ATTRD:
> > +		xlog_recover_print_attrd(item);
> > +		break;
> > +	case XFS_LI_ATTRI:
> > +		xlog_recover_print_attri(item);
> > +		break;
> >   	case XFS_LI_RUD:
> >   		xlog_recover_print_rud(item);
> >   		break;
> > @@ -452,6 +458,12 @@ xlog_recover_print_item(
> >   	case XFS_LI_EFI:
> >   		printf("EFI");
> >   		break;
> > +	case XFS_LI_ATTRD:
> > +		printf("ATTRD");
> > +		break;
> > +	case XFS_LI_ATTRI:
> > +		printf("ATTRI");
> > +		break;
> >   	case XFS_LI_RUD:
> >   		printf("RUD");
> >   		break;
> > diff --git a/logprint/log_redo.c b/logprint/log_redo.c
> > index f1f690e..005fd84 100644
> > --- a/logprint/log_redo.c
> > +++ b/logprint/log_redo.c
> > @@ -8,6 +8,7 @@
> >   #include "libxlog.h"
> >   
> >   #include "logprint.h"
> > +#include "xfs_attr_item.h"
> >   
> >   /* Extent Free Items */
> >   
> > @@ -653,3 +654,191 @@ xlog_recover_print_bud(
> >   	f = item->ri_buf[0].i_addr;
> >   	xlog_print_trans_bud(&f, sizeof(struct xfs_bud_log_format));
> >   }
> > +
> > +/* Attr Items */
> > +
> > +static int
> > +xfs_attri_copy_log_format(
> > +	char				*buf,
> > +	uint				len,
> > +	struct xfs_attri_log_format	*dst_attri_fmt)
> > +{
> > +	uint dst_len = sizeof(struct xfs_attri_log_format);
> > +
> > +	if (len == dst_len) {
> > +		memcpy((char *)dst_attri_fmt, buf, len);
> > +		return 0;
> > +	}
> > +
> > +	fprintf(stderr, _("%s: bad size of attri format: %u; expected %u\n"),
> > +		progname, len, dst_len);
> > +	return 1;
> > +}
> > +
> > +int
> > +xlog_print_trans_attri(
> > +	char				**ptr,
> > +	uint				src_len,
> > +	int				*i)
> > +{
> > +	struct xfs_attri_log_format	*src_f = NULL;
> > +	xlog_op_header_t		*head = NULL;
> > +	uint				dst_len;
> > +	int				error = 0;
> > +
> > +	dst_len = sizeof(struct xfs_attri_log_format);
> > +	if (src_len != dst_len) {
> > +		fprintf(stderr, _("%s: bad size of attri format: %u; expected %u\n"),
> > +				progname, src_len, dst_len);
> > +		return 1;
> > +	}
> > +
> > +	/*
> > +	 * memmove to ensure 8-byte alignment for the long longs in
> > +	 * xfs_attri_log_format_t structure
> > +	 */
> > +	if ((src_f = (struct xfs_attri_log_format *)malloc(src_len)) == NULL) {
> > +		fprintf(stderr, _("%s: xlog_print_trans_attri: malloc failed\n"),
> > +				progname);
> > +		exit(1);
> > +	}
> > +	memmove((char*)src_f, *ptr, src_len);
> > +	*ptr += src_len;
> > +
> > +	printf(_("ATTRI:  #regs: %d	name_len: %d, value_len: %d  id: 0x%llx\n"),
> > +		src_f->alfi_size, src_f->alfi_name_len, src_f->alfi_value_len,
> > +				(unsigned long long)src_f->alfi_id);
> > +
> > +	if (src_f->alfi_name_len > 0) {
> > +		printf(_("\n"));
> > +		(*i)++;
> > +		head = (xlog_op_header_t *)*ptr;
> > +		xlog_print_op_header(head, *i, ptr);
> > +		error = xlog_print_trans_attri_name(ptr, be32_to_cpu(head->oh_len));
> > +		if (error)
> > +			goto error;
> > +	}
> > +
> > +	if (src_f->alfi_value_len > 0) {
> > +		printf(_("\n"));
> > +		(*i)++;
> > +		head = (xlog_op_header_t *)*ptr;
> > +		xlog_print_op_header(head, *i, ptr);
> > +		error = xlog_print_trans_attri_value(ptr, be32_to_cpu(head->oh_len),
> > +				src_f->alfi_value_len);
> > +	}
> > +error:
> > +	free(src_f);
> > +
> > +	return error;
> > +}	/* xlog_print_trans_attri */
> > +
> > +int
> > +xlog_print_trans_attri_name(
> > +	char				**ptr,
> > +	uint				src_len)
> > +{
> > +
> > +	printf(_("ATTRI:  name len:%u\n"), src_len);
> > +	print_hex_dump(*ptr, src_len);
> > +
> > +	*ptr += src_len;
> > +
> > +	return 0;
> > +}	/* xlog_print_trans_attri */
> > +
> > +int
> > +xlog_print_trans_attri_value(
> > +	char				**ptr,
> > +	uint				src_len,
> > +	int				value_len)
> > +{
> > +	printf(_("ATTRI:  value len:%u\n"), value_len);
> > +	print_hex_dump(*ptr, value_len);
> > +
> > +	*ptr += src_len;
> > +
> > +	return 0;
> > +}	/* xlog_print_trans_attri_value */
> > +
> > +void
> > +xlog_recover_print_attri(
> > +	xlog_recover_item_t	*item)
> > +{
> > +	struct xfs_attri_log_format	*f, *src_f = NULL;
> > +	uint				src_len, dst_len;
> > +
> > +	int				region = 0;
> > +
> > +	src_f = (struct xfs_attri_log_format *)item->ri_buf[0].i_addr;
> > +	src_len = item->ri_buf[region].i_len;
> > +
> > +	/*
> > +	 * An xfs_attri_log_format structure contains a attribute name and
> > +	 * variable length value  as the last field.
> > +	 */
> > +	dst_len = sizeof(struct xfs_attri_log_format);
> > +
> > +	if ((f = ((struct xfs_attri_log_format *)malloc(dst_len))) == NULL) {
> > +		fprintf(stderr, _("%s: xlog_recover_print_attri: malloc failed\n"),
> > +			progname);
> > +		exit(1);
> > +	}
> > +	if (xfs_attri_copy_log_format((char*)src_f, src_len, f))
> > +		goto out;
> > +
> > +	printf(_("ATTRI:  #regs: %d	name_len: %d, value_len: %d  id: 0x%llx\n"),
> > +		f->alfi_size, f->alfi_name_len, f->alfi_value_len, (unsigned long long)f->alfi_id);
> > +
> > +	if (f->alfi_name_len > 0) {
> > +		region++;
> > +		printf(_("ATTRI:  name len:%u\n"), f->alfi_name_len);
> > +		print_hex_dump((char *)item->ri_buf[region].i_addr,
> > +			       f->alfi_name_len);
> > +	}
> > +
> > +	if (f->alfi_value_len > 0) {
> > +		region++;
> > +		printf(_("ATTRI:  value len:%u\n"), f->alfi_value_len);
> > +		print_hex_dump((char *)item->ri_buf[region].i_addr,
> > +			       f->alfi_value_len);
> > +	}
> > +
> > +out:
> > +	free(f);
> > +
> > +}
> > +
> > +int
> > +xlog_print_trans_attrd(char **ptr, uint len)
> > +{
> > +	struct xfs_attrd_log_format *f;
> > +	struct xfs_attrd_log_format lbuf;
> > +	uint core_size = sizeof(struct xfs_attrd_log_format);
> > +
> > +	memcpy(&lbuf, *ptr, MIN(core_size, len));
> > +	f = &lbuf;
> > +	*ptr += len;
> > +	if (len >= core_size) {
> > +		printf(_("ATTRD:  #regs: %d	id: 0x%llx\n"),
> > +			f->alfd_size,
> > +			(unsigned long long)f->alfd_alf_id);
> > +		return 0;
> > +	} else {
> > +		printf(_("ATTRD: Not enough data to decode further\n"));
> > +		return 1;
> > +	}
> > +}	/* xlog_print_trans_attrd */
> > +
> > +void
> > +xlog_recover_print_attrd(
> > +	xlog_recover_item_t		*item)
> > +{
> > +	struct xfs_attrd_log_format	*f;
> > +
> > +	f = (struct xfs_attrd_log_format *)item->ri_buf[0].i_addr;
> > +
> > +	printf(_("	ATTRD:  #regs: %d	id: 0x%llx\n"),
> > +		f->alfd_size,
> > +		(unsigned long long)f->alfd_alf_id);
> > +}
> > diff --git a/logprint/logprint.h b/logprint/logprint.h
> > index 98ac0d4..b76c590 100644
> > --- a/logprint/logprint.h
> > +++ b/logprint/logprint.h
> > @@ -28,6 +28,7 @@ extern void xfs_log_print_trans(struct xlog *, int);
> >   extern void print_xlog_record_line(void);
> >   extern void print_xlog_op_line(void);
> >   extern void print_stars(void);
> > +extern void print_hex_dump(char* ptr, int len);
> >   
> >   extern struct xfs_inode_log_format *
> >   	xfs_inode_item_format_convert(char *, uint, struct xfs_inode_log_format *);
> > @@ -52,4 +53,10 @@ extern void xlog_recover_print_bui(struct xlog_recover_item *item);
> >   extern int xlog_print_trans_bud(char **ptr, uint len);
> >   extern void xlog_recover_print_bud(struct xlog_recover_item *item);
> >   
> > +extern int xlog_print_trans_attri(char **ptr, uint src_len, int *i);
> > +extern int xlog_print_trans_attri_name(char **ptr, uint src_len);
> > +extern int xlog_print_trans_attri_value(char **ptr, uint src_len, int value_len);
> > +extern void xlog_recover_print_attri(xlog_recover_item_t *item);
> > +extern int xlog_print_trans_attrd(char **ptr, uint len);
> > +extern void xlog_recover_print_attrd(xlog_recover_item_t *item);
> >   #endif	/* LOGPRINT_H */
> > --
> > 2.7.4