dm integrity: Use %*ph for printing hexdump of a small buffer
PATCH 1/1 dm integrity: Use %*ph for printing hexdump of a small buffer
The kernel already has a helper to print a hexdump of a small buffer via pointer extension. Use that instead of open coded variant.
In long term it helps to kill pr_cont() or at least narrow down its use.
Note, the format is slightly changed, i.e. the colon is not printed before the buffer dump and the trailing space is always printed. These are not a problem since it's a debug message. Also the IV dump is limited by 64 bytes which seems fine.
--- drivers/md/dm-integrity.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
drivers/md/dm-integrity.c +4 -19
@@ -342,24 +342,8 @@ static struct kmem_cache *journal_io_cache;#define JOURNAL_IO_MEMPOOL 32#ifdef DEBUG_PRINT -#define DEBUG_print (x, ...) printk(KERN_DEBUG x, ##__VA_ARGS__) -static void __DEBUG_bytes (__u8 *bytes,size_t len,const char *msg, ...) -{ -va_list args; - -va_start (args, msg); -vprintk (msg, args); -va_end (args); -if (len) -pr_cont (":" ); -while (len) { -pr_cont (" %02x" , *bytes); - bytes++; - len--; - } -pr_cont ("\n" ); -} -#define DEBUG_bytes (bytes, len, msg, ...) __DEBUG_bytes(bytes, len, KERN_DEBUG msg, ##__VA_ARGS__) +#define DEBUG_print (x, ...) printk(KERN_DEBUG x, ##__VA_ARGS__) +#define DEBUG_bytes (bytes, len, msg, ...) printk(KERN_DEBUG msg " %*ph\n", ##__VA_ARGS__, len, bytes)#else #define DEBUG_print (x, ...) do { } while (0)#define DEBUG_bytes (bytes, len, msg, ...) do { } while (0)
@@ -3781,8 +3765,9 @@ static int create_journal(struct dm_integrity_c *ic, char **error) goto bad; }if (ic->journal_crypt_alg.alg_string) { -unsigned int ivsize, blocksize;struct journal_completion comp; +unsigned int blocksize; +int ivsize; comp.ic = ic; ic->journal_crypt =crypto_alloc_skcipher (ic->journal_crypt_alg.alg_string,0 ,CRYPTO_ALG_ALLOCATES_MEMORY );
Signature · 1 line
2.40.0.1.gaa8946217a0b
From: Andy Shevchenko
Quoted 13 lines
Sent: 12 June 2023 22:48
The kernel already has a helper to print a hexdump of a small buffer via pointer extension. Use that instead of open coded variant.
In long term it helps to kill
pr_cont()or at least narrow down its use.Note, the format is slightly changed, i.e. the colon is not printed before the buffer dump and the trailing space is always printed. These are not a problem since it's a debug message. Also the IV dump is limited by 64 bytes which seems fine.
...
Quoted 2 lines
+#define
DEBUG_bytes(bytes, len, msg, ...)printk(KERN_DEBUG msg " %*ph\n", ##__VA_ARGS__, len,
bytes)
Using:
printf(KERN_DEBUG msg "%s%*ph\n", ##__VA_ARGS__, len ? ": " : "", len, bytes)
would add back the optional ':'.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Quoted 14 lines · David Laight
From: Andy Shevchenko
Quoted 6 lines
Sent: 12 June 2023 22:48
The kernel already has a helper to print a hexdump of a small buffer via pointer extension. Use that instead of open coded variant.
Quoted 7 lines
In long term it helps to kill
pr_cont()or at least narrow down its use.Note, the format is slightly changed, i.e. the colon is not printed before the buffer dump and the trailing space is always printed. These are not a problem since it's a debug message. Also the IV dump is limited by 64 bytes which seems fine.
Quoted 7 lines
...
Quoted 2 lines
+#define
DEBUG_bytes(bytes, len, msg, ...)printk(KERN_DEBUG msg " %*ph\n", ##__VA_ARGS__, len,
bytes)Using:
printf(KERN_DEBUG msg "%s%*ph\n", ##__VA_ARGS__, len ? ": " : "", len, bytes)would add back the optional ':'.
Yes, I considered that and decided to avoid. This is debug and hence the format may vary anyway. That said, up to maintainers.
Signature · 2 lines
With Best Regards, Andy Shevchenko