Re: [RFC PATCH v5 19/19] virtio/vsock: update trace event for SEQPACKET

2021-03-03 Thread Arseny Krasnov 


On 03.03.2021 01:25, Steven Rostedt wrote:
> On Thu, 18 Feb 2021 08:42:15 +0300
> Arseny Krasnov  wrote:
>
> Not sure if this was pulled in yet, but I do have a small issue with this
> patch.
No, it is in RFC state.
>
>> @@ -69,14 +82,19 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
>>  __entry->type = type;
>>  __entry->op = op;
>>  __entry->flags = flags;
>> +__entry->msg_len = msg_len;
>> +__entry->msg_cnt = msg_cnt;
>>  ),
>> -TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x",
>> +TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x "
>> +  "msg_len=%u msg_cnt=%u",
> It's considered poor formatting to split strings like the above. This is
> one of the exceptions for the 80 character limit. Do not break strings just
> to keep it within 80 characters.
>
> -- Steve
Ok, will fix in next version, Thank You
>
>
>>__entry->src_cid, __entry->src_port,
>>__entry->dst_cid, __entry->dst_port,
>>__entry->len,
>>show_type(__entry->type),
>>show_op(__entry->op),
>> -  __entry->flags)
>> +  __entry->flags,
>> +  __entry->msg_len,
>> +  __entry->msg_cnt)
>>  );

Re: [RFC PATCH v5 19/19] virtio/vsock: update trace event for SEQPACKET

2021-03-02 Thread Steven Rostedt 
On Thu, 18 Feb 2021 08:42:15 +0300
Arseny Krasnov  wrote:

Not sure if this was pulled in yet, but I do have a small issue with this
patch.

> @@ -69,14 +82,19 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
>   __entry->type = type;
>   __entry->op = op;
>   __entry->flags = flags;
> + __entry->msg_len = msg_len;
> + __entry->msg_cnt = msg_cnt;
>   ),
> - TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x",
> + TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x "
> +   "msg_len=%u msg_cnt=%u",

It's considered poor formatting to split strings like the above. This is
one of the exceptions for the 80 character limit. Do not break strings just
to keep it within 80 characters.

-- Steve


> __entry->src_cid, __entry->src_port,
> __entry->dst_cid, __entry->dst_port,
> __entry->len,
> show_type(__entry->type),
> show_op(__entry->op),
> -   __entry->flags)
> +   __entry->flags,
> +   __entry->msg_len,
> +   __entry->msg_cnt)
>  );

[RFC PATCH v5 19/19] virtio/vsock: update trace event for SEQPACKET

2021-02-17 Thread Arseny Krasnov 
This updates current implementation for trace event of virtio vsock:
SEQPACKET socket's type, SEQPACKET specific ops and SEQPACKET 'msg_len'
and 'msg_cnt' fields are added.

Signed-off-by: Arseny Krasnov 
---
 .../events/vsock_virtio_transport_common.h| 48 +++
 net/vmw_vsock/virtio_transport_common.c   | 25 +-
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/include/trace/events/vsock_virtio_transport_common.h 
b/include/trace/events/vsock_virtio_transport_common.h
index 6782213778be..23bc0f39c450 100644
--- a/include/trace/events/vsock_virtio_transport_common.h
+++ b/include/trace/events/vsock_virtio_transport_common.h
@@ -9,9 +9,12 @@
 #include 
 
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_TYPE_STREAM);
+TRACE_DEFINE_ENUM(VIRTIO_VSOCK_TYPE_SEQPACKET);
 
 #define show_type(val) \
-   __print_symbolic(val, { VIRTIO_VSOCK_TYPE_STREAM, "STREAM" })
+   __print_symbolic(val, \
+   { VIRTIO_VSOCK_TYPE_STREAM, "STREAM" }, \
+   { VIRTIO_VSOCK_TYPE_SEQPACKET, "SEQPACKET" })
 
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_INVALID);
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_REQUEST);
@@ -21,6 +24,8 @@ TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_SHUTDOWN);
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_RW);
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_CREDIT_UPDATE);
 TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_CREDIT_REQUEST);
+TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_SEQ_BEGIN);
+TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_SEQ_END);
 
 #define show_op(val) \
__print_symbolic(val, \
@@ -31,7 +36,9 @@ TRACE_DEFINE_ENUM(VIRTIO_VSOCK_OP_CREDIT_REQUEST);
 { VIRTIO_VSOCK_OP_SHUTDOWN, "SHUTDOWN" }, \
 { VIRTIO_VSOCK_OP_RW, "RW" }, \
 { VIRTIO_VSOCK_OP_CREDIT_UPDATE, "CREDIT_UPDATE" }, \
-{ VIRTIO_VSOCK_OP_CREDIT_REQUEST, "CREDIT_REQUEST" })
+{ VIRTIO_VSOCK_OP_CREDIT_REQUEST, "CREDIT_REQUEST" }, \
+{ VIRTIO_VSOCK_OP_SEQ_BEGIN, "SEQ_BEGIN" }, \
+{ VIRTIO_VSOCK_OP_SEQ_END, "SEQ_END" })
 
 TRACE_EVENT(virtio_transport_alloc_pkt,
TP_PROTO(
@@ -40,7 +47,9 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
 __u32 len,
 __u16 type,
 __u16 op,
-__u32 flags
+__u32 flags,
+__u32 msg_len,
+__u32 msg_cnt
),
TP_ARGS(
src_cid, src_port,
@@ -48,7 +57,9 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
len,
type,
op,
-   flags
+   flags,
+   msg_len,
+   msg_cnt
),
TP_STRUCT__entry(
__field(__u32, src_cid)
@@ -59,6 +70,8 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
__field(__u16, type)
__field(__u16, op)
__field(__u32, flags)
+   __field(__u32, msg_len)
+   __field(__u32, msg_cnt)
),
TP_fast_assign(
__entry->src_cid = src_cid;
@@ -69,14 +82,19 @@ TRACE_EVENT(virtio_transport_alloc_pkt,
__entry->type = type;
__entry->op = op;
__entry->flags = flags;
+   __entry->msg_len = msg_len;
+   __entry->msg_cnt = msg_cnt;
),
-   TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x",
+   TP_printk("%u:%u -> %u:%u len=%u type=%s op=%s flags=%#x "
+ "msg_len=%u msg_cnt=%u",
  __entry->src_cid, __entry->src_port,
  __entry->dst_cid, __entry->dst_port,
  __entry->len,
  show_type(__entry->type),
  show_op(__entry->op),
- __entry->flags)
+ __entry->flags,
+ __entry->msg_len,
+ __entry->msg_cnt)
 );
 
 TRACE_EVENT(virtio_transport_recv_pkt,
@@ -88,7 +106,9 @@ TRACE_EVENT(virtio_transport_recv_pkt,
 __u16 op,
 __u32 flags,
 __u32 buf_alloc,
-__u32 fwd_cnt
+__u32 fwd_cnt,
+__u32 msg_len,
+__u32 msg_cnt
),
TP_ARGS(
src_cid, src_port,
@@ -98,7 +118,9 @@ TRACE_EVENT(virtio_transport_recv_pkt,
op,
flags,
buf_alloc,
-   fwd_cnt
+   fwd_cnt,
+   msg_len,
+   msg_cnt
),
TP_STRUCT__entry(
__field(__u32, src_cid)
@@ -111,6 +133,8 @@ TRACE_EVENT(virtio_transport_recv_pkt,
__field(__u32, flags)
__field(__u32, buf_alloc)
__field(__u32, fwd_cnt)
+   __field(__u32, msg_len)
+   __field(__u32, msg_cnt)
),
TP_fast_assign(
__entry->src_cid = src_cid;
@@ -123,9 +147,11 @@