-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hv_netvsc-minor-enhancements'
Stephen Hemminger says: ==================== hv_netvsc: minor enhancements A couple of small things for net-next ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
5 changed files
with
223 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o | ||
|
|
||
| hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o | ||
| hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o netvsc_trace.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0 */ | ||
| #include <linux/netdevice.h> | ||
|
|
||
| #include "hyperv_net.h" | ||
|
|
||
| #define CREATE_TRACE_POINTS | ||
| #include "netvsc_trace.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0 */ | ||
|
|
||
| #if !defined(_NETVSC_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | ||
| #define _NETVSC_TRACE_H | ||
|
|
||
| #include <linux/tracepoint.h> | ||
|
|
||
| #undef TRACE_SYSTEM | ||
| #define TRACE_SYSTEM netvsc | ||
| #define TRACE_INCLUDE_FILE netvsc_trace | ||
|
|
||
| TRACE_DEFINE_ENUM(RNDIS_MSG_PACKET); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_INDICATE); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_INIT); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_INIT_C); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_HALT); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_QUERY); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_QUERY_C); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_SET); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_SET_C); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_RESET); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_RESET_C); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_KEEPALIVE); | ||
| TRACE_DEFINE_ENUM(RNDIS_MSG_KEEPALIVE_C); | ||
|
|
||
| #define show_rndis_type(type) \ | ||
| __print_symbolic(type, \ | ||
| { RNDIS_MSG_PACKET, "PACKET" }, \ | ||
| { RNDIS_MSG_INDICATE, "INDICATE", }, \ | ||
| { RNDIS_MSG_INIT, "INIT", }, \ | ||
| { RNDIS_MSG_INIT_C, "INIT_C", }, \ | ||
| { RNDIS_MSG_HALT, "HALT", }, \ | ||
| { RNDIS_MSG_QUERY, "QUERY", }, \ | ||
| { RNDIS_MSG_QUERY_C, "QUERY_C", }, \ | ||
| { RNDIS_MSG_SET, "SET", }, \ | ||
| { RNDIS_MSG_SET_C, "SET_C", }, \ | ||
| { RNDIS_MSG_RESET, "RESET", }, \ | ||
| { RNDIS_MSG_RESET_C, "RESET_C", }, \ | ||
| { RNDIS_MSG_KEEPALIVE, "KEEPALIVE", }, \ | ||
| { RNDIS_MSG_KEEPALIVE_C, "KEEPALIVE_C", }) | ||
|
|
||
| DECLARE_EVENT_CLASS(rndis_msg_class, | ||
| TP_PROTO(const struct net_device *ndev, u16 q, | ||
| const struct rndis_message *msg), | ||
| TP_ARGS(ndev, q, msg), | ||
| TP_STRUCT__entry( | ||
| __string( name, ndev->name ) | ||
| __field( u16, queue ) | ||
| __field( u32, req_id ) | ||
| __field( u32, msg_type ) | ||
| __field( u32, msg_len ) | ||
| ), | ||
| TP_fast_assign( | ||
| __assign_str(name, ndev->name); | ||
| __entry->queue = q; | ||
| __entry->req_id = msg->msg.init_req.req_id; | ||
| __entry->msg_type = msg->ndis_msg_type; | ||
| __entry->msg_len = msg->msg_len; | ||
| ), | ||
| TP_printk("dev=%s q=%u req=%#x type=%s msg_len=%u", | ||
| __get_str(name), __entry->queue, __entry->req_id, | ||
| show_rndis_type(__entry->msg_type), __entry->msg_len) | ||
| ); | ||
|
|
||
| DEFINE_EVENT(rndis_msg_class, rndis_send, | ||
| TP_PROTO(const struct net_device *ndev, u16 q, | ||
| const struct rndis_message *msg), | ||
| TP_ARGS(ndev, q, msg) | ||
| ); | ||
|
|
||
| DEFINE_EVENT(rndis_msg_class, rndis_recv, | ||
| TP_PROTO(const struct net_device *ndev, u16 q, | ||
| const struct rndis_message *msg), | ||
| TP_ARGS(ndev, q, msg) | ||
| ); | ||
|
|
||
| TRACE_DEFINE_ENUM(NVSP_MSG_TYPE_INIT); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG_TYPE_INIT_COMPLETE); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_NDIS_VER); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RECV_BUF); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_REVOKE_RECV_BUF); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_SEND_BUF); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_REVOKE_SEND_BUF); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RNDIS_PKT); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG2_TYPE_SEND_NDIS_CONFIG); | ||
|
|
||
| TRACE_DEFINE_ENUM(NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG4_TYPE_SWITCH_DATA_PATH); | ||
|
|
||
| TRACE_DEFINE_ENUM(NVSP_MSG5_TYPE_SUBCHANNEL); | ||
| TRACE_DEFINE_ENUM(NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE); | ||
|
|
||
| #define show_nvsp_type(type) \ | ||
| __print_symbolic(type, \ | ||
| { NVSP_MSG_TYPE_INIT, "INIT" }, \ | ||
| { NVSP_MSG_TYPE_INIT_COMPLETE, "INIT_COMPLETE" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_NDIS_VER, "SEND_NDIS_VER" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_RECV_BUF, "SEND_RECV_BUF" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE, "SEND_RECV_BUF_COMPLETE" }, \ | ||
| { NVSP_MSG1_TYPE_REVOKE_RECV_BUF, "REVOKE_RECV_BUF" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_SEND_BUF, "SEND_SEND_BUF" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE, "SEND_SEND_BUF_COMPLETE" }, \ | ||
| { NVSP_MSG1_TYPE_REVOKE_SEND_BUF, "REVOKE_SEND_BUF" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_RNDIS_PKT, "SEND_RNDIS_PKT" }, \ | ||
| { NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE, "SEND_RNDIS_PKT_COMPLETE" },\ | ||
| { NVSP_MSG2_TYPE_SEND_NDIS_CONFIG, "SEND_NDIS_CONFIG" }, \ | ||
| { NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION, "SEND_VF_ASSOCIATION" }, \ | ||
| { NVSP_MSG4_TYPE_SWITCH_DATA_PATH, "SWITCH_DATA_PATH" }, \ | ||
| { NVSP_MSG5_TYPE_SUBCHANNEL, "SUBCHANNEL" }, \ | ||
| { NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE, "SEND_INDIRECTION_TABLE" }) | ||
|
|
||
| TRACE_EVENT(nvsp_send, | ||
| TP_PROTO(const struct net_device *ndev, | ||
| const struct nvsp_message *msg), | ||
| TP_ARGS(ndev, msg), | ||
| TP_STRUCT__entry( | ||
| __string( name, ndev->name ) | ||
| __field( u32, msg_type ) | ||
| ), | ||
| TP_fast_assign( | ||
| __assign_str(name, ndev->name); | ||
| __entry->msg_type = msg->hdr.msg_type; | ||
| ), | ||
| TP_printk("dev=%s type=%s", | ||
| __get_str(name), | ||
| show_nvsp_type(__entry->msg_type)) | ||
| ); | ||
|
|
||
| TRACE_EVENT(nvsp_send_pkt, | ||
| TP_PROTO(const struct net_device *ndev, | ||
| const struct vmbus_channel *chan, | ||
| const struct nvsp_1_message_send_rndis_packet *rpkt), | ||
| TP_ARGS(ndev, chan, rpkt), | ||
| TP_STRUCT__entry( | ||
| __string( name, ndev->name ) | ||
| __field( u16, qid ) | ||
| __field( u32, channel_type ) | ||
| __field( u32, section_index ) | ||
| __field( u32, section_size ) | ||
| ), | ||
| TP_fast_assign( | ||
| __assign_str(name, ndev->name); | ||
| __entry->qid = chan->offermsg.offer.sub_channel_index; | ||
| __entry->channel_type = rpkt->channel_type; | ||
| __entry->section_index = rpkt->send_buf_section_index; | ||
| __entry->section_size = rpkt->send_buf_section_size; | ||
| ), | ||
| TP_printk("dev=%s qid=%u type=%s section=%u size=%d", | ||
| __get_str(name), __entry->qid, | ||
| __entry->channel_type ? "CONTROL" : "DATA", | ||
| __entry->section_index, __entry->section_size) | ||
| ); | ||
|
|
||
| TRACE_EVENT(nvsp_recv, | ||
| TP_PROTO(const struct net_device *ndev, | ||
| const struct vmbus_channel *chan, | ||
| const struct nvsp_message *msg), | ||
| TP_ARGS(ndev, chan, msg), | ||
| TP_STRUCT__entry( | ||
| __string( name, ndev->name ) | ||
| __field( u16, qid ) | ||
| __field( u32, msg_type ) | ||
| ), | ||
| TP_fast_assign( | ||
| __assign_str(name, ndev->name); | ||
| __entry->qid = chan->offermsg.offer.sub_channel_index; | ||
| __entry->msg_type = msg->hdr.msg_type; | ||
| ), | ||
| TP_printk("dev=%s qid=%u type=%s", | ||
| __get_str(name), __entry->qid, | ||
| show_nvsp_type(__entry->msg_type)) | ||
| ); | ||
|
|
||
| #endif /* _NETVSC_TRACE_H */ | ||
|
|
||
| /* This part must be outside protection */ | ||
| #undef TRACE_INCLUDE_PATH | ||
| #define TRACE_INCLUDE_PATH ../../drivers/net/hyperv | ||
| #include <trace/define_trace.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters