fs/seq_file: introduce seq_hex_dump() helper
Subsystems (6)
v2 cover fs/seq_file: introduce seq_hex_dump() helper
This introduces a new helper and switches current users to use it.
parisc and s390 weren't tested anyhow, the others are compile tested.
Changelog v2:
- append Acked-by and Reviewed-by tags
- update commit messages in patches 3/5. and 5/5
- update line size to be 32 bytes instead of 16 in patch 3/5
- Joe found that output is changed in patch 4/5, thus I update commit message there
Andy Shevchenko (5):
seq_file: provide an analogue of print_hex_dump()
saa7164: convert to seq_hex_dump()
crypto: qat - use seq_hex_dump() to dump buffers
parisc: use seq_hex_dump() to dump buffers [S390] zcrypt: use seq_hex_dump() to dump buffers
.../crypto/qat/qat_common/adf_transport_debug.c | 16 ++-------- drivers/media/pci/saa7164/saa7164-core.c | 31 +++---------------- drivers/parisc/ccio-dma.c | 14 ++------- drivers/parisc/sba_iommu.c | 11 ++----- drivers/s390/crypto/zcrypt_api.c | 10 +------ fs/seq_file.c | 35 ++++++++++++++++++++++ include/linux/seq_file.h | 4 +++ 7 files changed, 52 insertions(+), 69 deletions(-)
Signature · 1 line
2.0.1
PATCH v2 1/5 seq_file: provide an analogue of print_hex_dump()
The new seq_hex_dump() is a complete analogue of print_hex_dump().
We have few users of this functionality already. It allows to reduce their codebase.
--- fs/seq_file.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/seq_file.h | 4 ++++ 2 files changed, 39 insertions(+)
fs/seq_file.c +35 -0
@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/cred.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/page.h>
@@ -782,6 +783,40 @@ void seq_pad(struct seq_file *m, char c) }EXPORT_SYMBOL (seq_pad); +/* Analogue of print_hex_dump() */ +void seq_hex_dump (struct seq_file *m,const char *prefix_str,int prefix_type, +int rowsize,int groupsize,const void *buf,size_t len, +bool ascii) +{ +const u8 *ptr = buf; +int i, linelen, remaining = len; +unsigned char linebuf[32 *3 +2 +32 +1 ]; + +if (rowsize !=16 && rowsize !=32 ) + rowsize =16 ; + +for (i =0 ; i < len; i += rowsize) { + linelen =min (remaining, rowsize); + remaining -= rowsize; + +hex_dump_to_buffer (ptr + i, linelen, rowsize, groupsize, + linebuf,sizeof (linebuf), ascii); + +switch (prefix_type) { +case DUMP_PREFIX_ADDRESS : +seq_printf (m,"%s%p: %s\n" , prefix_str, ptr + i, linebuf); +break ; +case DUMP_PREFIX_OFFSET : +seq_printf (m,"%s%.8x: %s\n" , prefix_str, i, linebuf); +break ; +default : +seq_printf (m,"%s%s\n" , prefix_str, linebuf); +break ; + } + } +} +EXPORT_SYMBOL (seq_hex_dump); +struct list_head *seq_list_start (struct list_head *head,loff_t pos) {struct list_head *lh;
include/linux/seq_file.h +4 -0
@@ -107,6 +107,10 @@ int seq_write(struct seq_file *seq, const void *data, size_t len); __printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); __printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args); +void seq_hex_dump (struct seq_file *m,const char *prefix_str,int prefix_type, +int rowsize,int groupsize,const void *buf,size_t len, +bool ascii); +int seq_path (struct seq_file *,const struct path *,const char *);int seq_dentry (struct seq_file *,struct dentry *,const char *); int seq_path_root(struct seq_file *m, const struct path *path,
Signature · 1 line
2.0.1
PATCH v2 2/5 saa7164: convert to seq_hex_dump()
In reply to Andy ShevchenkoInstead of custom approach let's use recently added seq_hex_dump() helper.
--- drivers/media/pci/saa7164/saa7164-core.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-)
drivers/media/pci/saa7164/saa7164-core.c +4 -27
@@ -1065,7 +1065,6 @@ static int saa7164_proc_show(struct seq_file *m, void *v)struct saa7164_dev *dev;struct tmComResBusInfo *b;struct list_head *list; -int i, c;if (saa7164_devcount ==0 )return 0 ;
@@ -1089,35 +1088,13 @@ static int saa7164_proc_show(struct seq_file *m, void *v)seq_printf (m," .m_pdwGetReadPos = 0x%x (0x%08x)\n" , b->m_dwGetWritePos,saa7164_readl (b->m_dwGetWritePos)); - c =0 ;seq_printf (m,"\n Set Ring:\n" ); -seq_printf (m,"\n addr 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n" ); -for (i =0 ; i < b->m_dwSizeSetRing; i++) { -if (c ==0 ) -seq_printf (m," %04x:" , i); +seq_hex_dump (m," " ,DUMP_PREFIX_OFFSET ,16 ,1 , + b->m_pdwSetRing, b->m_dwSizeSetRing, false); -seq_printf (m," %02x" , *(b->m_pdwSetRing + i)); - -if (++c ==16 ) { -seq_printf (m,"\n" ); - c =0 ; - } - } - - c =0 ;seq_printf (m,"\n Get Ring:\n" ); -seq_printf (m,"\n addr 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n" ); -for (i =0 ; i < b->m_dwSizeGetRing; i++) { -if (c ==0 ) -seq_printf (m," %04x:" , i); - -seq_printf (m," %02x" , *(b->m_pdwGetRing + i)); - -if (++c ==16 ) { -seq_printf (m,"\n" ); - c =0 ; - } - } +seq_hex_dump (m," " ,DUMP_PREFIX_OFFSET ,16 ,1 , + b->m_pdwGetRing, b->m_dwSizeGetRing, false);mutex_unlock (&b->lock);
Signature · 1 line
2.0.1
PATCH v2 3/5 crypto: qat - use seq_hex_dump() to dump buffers
In reply to Andy ShevchenkoInstead of custom approach let's use recently introduced seq_hex_dump() helper.
--- drivers/crypto/qat/qat_common/adf_transport_debug.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/crypto/qat/qat_common/adf_transport_debug.c +2 -14
@@ -86,9 +86,7 @@ static int adf_ring_show(struct seq_file *sfile, void *v) {struct adf_etr_ring_data *ring = sfile->private;struct adf_etr_bank_data *bank = ring->bank; -uint32_t *msg = v;void __iomem *csr = ring->bank->csr_addr; -int i, x;if (v ==SEQ_START_TOKEN ) {int head, tail, empty;
@@ -111,18 +109,8 @@ static int adf_ring_show(struct seq_file *sfile, void *v)seq_puts (sfile,"----------- Ring data ------------\n" );return 0 ; } -seq_printf (sfile,"%p:" , msg); - x =0 ; - i =0 ; -for (; i < (ADF_MSG_SIZE_TO_BYTES (ring->msg_size) >>2 ); i++) { -seq_printf (sfile," %08X" , *(msg + i)); -if ((ADF_MSG_SIZE_TO_BYTES (ring->msg_size) >>2 ) != i +1 && - (++x ==8 )) { -seq_printf (sfile,"\n%p:" , msg + i +1 ); - x =0 ; - } - } -seq_puts (sfile,"\n" ); +seq_hex_dump (sfile,"" ,DUMP_PREFIX_ADDRESS ,32 ,4 , + v,ADF_MSG_SIZE_TO_BYTES (ring->msg_size), false);return 0 ; }
Signature · 1 line
2.0.1
PATCH v2 4/5 parisc: use seq_hex_dump() to dump buffers
In reply to Andy ShevchenkoInstead of custom approach let's use recently introduced seq_hex_dump() helper.
In one case it changes the output from
1111111122222222333333334444444455555555666666667777777788888888 to 11111111 22222222 33333333 44444444 55555555 66666666 77777777 88888888
though it seems it prints same data (by meaning) in both cases. I decide to choose to use the space divided one.
--- drivers/parisc/ccio-dma.c | 14 +++----------- drivers/parisc/sba_iommu.c | 11 +++-------- 2 files changed, 6 insertions(+), 19 deletions(-)
drivers/parisc/ccio-dma.c +3 -11
@@ -1101,20 +1101,12 @@ static const struct file_operations ccio_proc_info_fops = {static int ccio_proc_bitmap_info (struct seq_file *m,void *p) { -int len =0 ;struct ioc *ioc = ioc_list;while (ioc !=NULL ) { -u32 *res_ptr = (u32 *)ioc->res_map; -int j; - -for (j =0 ; j < (ioc->res_size /sizeof (u32)); j++) { -if ((j &7 ) ==0 ) - len +=seq_puts (m,"\n " ); - len +=seq_printf (m,"%08x" , *res_ptr); - res_ptr++; - } - len +=seq_puts (m,"\n\n" ); +seq_hex_dump (m," " ,DUMP_PREFIX_NONE ,32 ,4 , ioc->res_map, + ioc->res_size, false); +seq_putc (m,'\n' ); ioc = ioc->next;break ;/* XXX - remove me */ }
drivers/parisc/sba_iommu.c +3 -8
@@ -1857,15 +1857,10 @@ sba_proc_bitmap_info(struct seq_file *m, void *p) {struct sba_device *sba_dev = sba_list;struct ioc *ioc = &sba_dev->ioc[0 ];/* FIXME: Multi-IOC support! */ -unsigned int *res_ptr = (unsigned int *)ioc->res_map; -int i, len =0 ; -for (i =0 ; i < (ioc->res_size/sizeof (unsigned int )); ++i, ++res_ptr) { -if ((i &7 ) ==0 ) - len +=seq_printf (m,"\n " ); - len +=seq_printf (m," %08x" , *res_ptr); - } - len +=seq_printf (m,"\n" ); +seq_hex_dump (m," " ,DUMP_PREFIX_NONE ,32 ,4 , ioc->res_map, + ioc->res_size, false); +seq_printf (m,"\n" );return 0 ; }
Signature · 1 line
2.0.1
PATCH v2 5/5 zcrypt: use seq_hex_dump() to dump buffers
In reply to Andy ShevchenkoInstead of custom approach let's use recently introduced seq_hex_dump() helper.
--- drivers/s390/crypto/zcrypt_api.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/s390/crypto/zcrypt_api.c +1 -9
@@ -1203,16 +1203,8 @@ static void sprinthx(unsigned char *title, struct seq_file *m,static void sprinthx4 (unsigned char *title,struct seq_file *m,unsigned int *array,unsigned int len) { -int r; -seq_printf (m,"\n%s\n" , title); -for (r =0 ; r < len; r++) { -if ((r %8 ) ==0 ) -seq_printf (m," " ); -seq_printf (m,"%08X " , array[r]); -if ((r %8 ) ==7 ) -seq_putc (m,'\n' ); - } +seq_hex_dump (m," " ,DUMP_PREFIX_NONE ,32 ,4 , array, len, false);seq_putc (m,'\n' ); }
Signature · 1 line
2.0.1