Re: [RESEND PATCH blktrace v3 06/20] blktrace: support protocol version 8

[Damien Le Moal <dlemoal@kernel.org>]

On 2025/11/24 16:37, Johannes Thumshirn wrote:
> Also support protocol version 8 in conjunction with protocol version 7.

Shouldn't this go last in the series, after enabling the code that deal with
this new version ?

> 
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> ---
>  blktrace.h | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/blktrace.h b/blktrace.h
> index 74dfb48..3305fa0 100644
> --- a/blktrace.h
> +++ b/blktrace.h
> @@ -69,6 +69,7 @@ extern struct timespec abs_start_time;
>  
>  #define CHECK_MAGIC(t)		(((t)->magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
>  #define SUPPORTED_VERSION	(0x07)
> +#define SUPPORTED_VERSION2	(0x08)
>  
>  #if __BYTE_ORDER == __LITTLE_ENDIAN
>  #define be16_to_cpu(x)		__bswap_16(x)
> @@ -90,13 +91,17 @@ extern struct timespec abs_start_time;
>  
>  static inline int verify_trace(struct blk_io_trace *t)
>  {
> +	u8 version;
> +
>  	if (!CHECK_MAGIC(t)) {
>  		fprintf(stderr, "bad trace magic %x\n", t->magic);
>  		return 1;
>  	}
> -	if ((t->magic & 0xff) != SUPPORTED_VERSION) {
> -		fprintf(stderr, "unsupported trace version %x\n", 
> -			t->magic & 0xff);
> +
> +	version = t->magic & 0xff;
> +	if (version != SUPPORTED_VERSION &&
> +	    version != SUPPORTED_VERSION2) {
> +		fprintf(stderr, "unsupported trace version %x\n", version);
>  		return 1;
>  	}
>  


-- 
Damien Le Moal
Western Digital Research