Commit 9f02bb6d authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'virtio-net-support-device-stats' 

Xuan Zhuo says:

====================
virtio-net: support device stats

https://github.com/oasis-tcs/virtio-spec/commit/42f389989823039724f95bbbd243291ab0064f82

The virtio net supports to get device stats.
====================

Link: https://lore.kernel.org/r/20240426033928.77778-1-xuanzhuo@linux.alibaba.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents dd1941f8 d888f04c

Documentation/netlink/specs/netdev.yaml

+104 −0
Original line number Diff line number Diff line
@@ -335,6 +335,110 @@ attribute-sets: 
          Allocation failure may, or may not result in a packet drop, depending

          on driver implementation and whether system recovers quickly.

        type: uint

      -

        name: rx-hw-drops

        doc: |

          Number of all packets which entered the device, but never left it,

          including but not limited to: packets dropped due to lack of buffer

          space, processing errors, explicit or implicit policies and packet

          filters.

        type: uint

      -

        name: rx-hw-drop-overruns

        doc: |

          Number of packets dropped due to transient lack of resources, such as

          buffer space, host descriptors etc.

        type: uint

      -

        name: rx-csum-unnecessary

        doc: Number of packets that were marked as CHECKSUM_UNNECESSARY.

        type: uint

      -

        name: rx-csum-none

        doc: Number of packets that were not checksummed by device.

        type: uint

      -

        name: rx-csum-bad

        doc: |

          Number of packets with bad checksum. The packets are not discarded,

          but still delivered to the stack.

        type: uint

      -

        name: rx-hw-gro-packets

        doc: |

          Number of packets that were coalesced from smaller packets by the device.

          Counts only packets coalesced with the HW-GRO netdevice feature,

          LRO-coalesced packets are not counted.

        type: uint

      -

        name: rx-hw-gro-bytes

        doc: See `rx-hw-gro-packets`.

        type: uint

      -

        name: rx-hw-gro-wire-packets

        doc: |

          Number of packets that were coalesced to bigger packetss with the HW-GRO

          netdevice feature. LRO-coalesced packets are not counted.

        type: uint

      -

        name: rx-hw-gro-wire-bytes

        doc: See `rx-hw-gro-wire-packets`.

        type: uint

      -

        name: rx-hw-drop-ratelimits

        doc: |

          Number of the packets dropped by the device due to the received

          packets bitrate exceeding the device rate limit.

        type: uint

      -

        name: tx-hw-drops

        doc: |

          Number of packets that arrived at the device but never left it,

          encompassing packets dropped for reasons such as processing errors, as

          well as those affected by explicitly defined policies and packet

          filtering criteria.

        type: uint

      -

        name: tx-hw-drop-errors

        doc: Number of packets dropped because they were invalid or malformed.

        type: uint

      -

        name: tx-csum-none

        doc: |

          Number of packets that did not require the device to calculate the

          checksum.

        type: uint

      -

        name: tx-needs-csum

        doc: |

          Number of packets that required the device to calculate the checksum.

        type: uint

      -

        name: tx-hw-gso-packets

        doc: |

          Number of packets that necessitated segmentation into smaller packets

          by the device.

        type: uint

      -

        name: tx-hw-gso-bytes

        doc: See `tx-hw-gso-packets`.

        type: uint

      -

        name: tx-hw-gso-wire-packets

        doc: |

          Number of wire-sized packets generated by processing

          `tx-hw-gso-packets`

        type: uint

      -

        name: tx-hw-gso-wire-bytes

        doc: See `tx-hw-gso-wire-packets`.

        type: uint

      -

        name: tx-hw-drop-ratelimits

        doc: |

          Number of the packets dropped by the device due to the transmit

          packets bitrate exceeding the device rate limit.

        type: uint



operations:

  list:

drivers/net/virtio_net.c

+951 −59

File changed.

Preview size limit exceeded, changes collapsed.

include/net/netdev_queues.h

+27 −0
Original line number Diff line number Diff line
@@ -9,11 +9,38 @@ struct netdev_queue_stats_rx { 
	u64 bytes;

	u64 packets;

	u64 alloc_fail;



	u64 hw_drops;

	u64 hw_drop_overruns;



	u64 csum_unnecessary;

	u64 csum_none;

	u64 csum_bad;



	u64 hw_gro_packets;

	u64 hw_gro_bytes;

	u64 hw_gro_wire_packets;

	u64 hw_gro_wire_bytes;



	u64 hw_drop_ratelimits;

};



struct netdev_queue_stats_tx {

	u64 bytes;

	u64 packets;



	u64 hw_drops;

	u64 hw_drop_errors;



	u64 csum_none;

	u64 needs_csum;



	u64 hw_gso_packets;

	u64 hw_gso_bytes;

	u64 hw_gso_wire_packets;

	u64 hw_gso_wire_bytes;



	u64 hw_drop_ratelimits;

};



/**

include/uapi/linux/netdev.h

+19 −0
Original line number Diff line number Diff line
@@ -146,6 +146,25 @@ enum { 
	NETDEV_A_QSTATS_TX_PACKETS,

	NETDEV_A_QSTATS_TX_BYTES,

	NETDEV_A_QSTATS_RX_ALLOC_FAIL,

	NETDEV_A_QSTATS_RX_HW_DROPS,

	NETDEV_A_QSTATS_RX_HW_DROP_OVERRUNS,

	NETDEV_A_QSTATS_RX_CSUM_UNNECESSARY,

	NETDEV_A_QSTATS_RX_CSUM_NONE,

	NETDEV_A_QSTATS_RX_CSUM_BAD,

	NETDEV_A_QSTATS_RX_HW_GRO_PACKETS,

	NETDEV_A_QSTATS_RX_HW_GRO_BYTES,

	NETDEV_A_QSTATS_RX_HW_GRO_WIRE_PACKETS,

	NETDEV_A_QSTATS_RX_HW_GRO_WIRE_BYTES,

	NETDEV_A_QSTATS_RX_HW_DROP_RATELIMITS,

	NETDEV_A_QSTATS_TX_HW_DROPS,

	NETDEV_A_QSTATS_TX_HW_DROP_ERRORS,

	NETDEV_A_QSTATS_TX_CSUM_NONE,

	NETDEV_A_QSTATS_TX_NEEDS_CSUM,

	NETDEV_A_QSTATS_TX_HW_GSO_PACKETS,

	NETDEV_A_QSTATS_TX_HW_GSO_BYTES,

	NETDEV_A_QSTATS_TX_HW_GSO_WIRE_PACKETS,

	NETDEV_A_QSTATS_TX_HW_GSO_WIRE_BYTES,

	NETDEV_A_QSTATS_TX_HW_DROP_RATELIMITS,



	__NETDEV_A_QSTATS_MAX,

	NETDEV_A_QSTATS_MAX = (__NETDEV_A_QSTATS_MAX - 1)

include/uapi/linux/virtio_net.h

+143 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define VIRTIO_NET_F_MQ	22	/* Device supports Receive Flow

					 * Steering */

#define VIRTIO_NET_F_CTRL_MAC_ADDR 23	/* Set MAC address */

#define VIRTIO_NET_F_DEVICE_STATS 50	/* Device can provide device-level statistics. */

#define VIRTIO_NET_F_VQ_NOTF_COAL 52	/* Device supports virtqueue notification coalescing */

#define VIRTIO_NET_F_NOTF_COAL	53	/* Device supports notifications coalescing */

#define VIRTIO_NET_F_GUEST_USO4	54	/* Guest can handle USOv4 in. */
@@ -406,4 +407,146 @@ struct virtio_net_ctrl_coal_vq { 
	struct virtio_net_ctrl_coal coal;

};



/*

 * Device Statistics

 */

#define VIRTIO_NET_CTRL_STATS         8

#define VIRTIO_NET_CTRL_STATS_QUERY   0

#define VIRTIO_NET_CTRL_STATS_GET     1



struct virtio_net_stats_capabilities {



#define VIRTIO_NET_STATS_TYPE_CVQ       (1ULL << 32)



#define VIRTIO_NET_STATS_TYPE_RX_BASIC  (1ULL << 0)

#define VIRTIO_NET_STATS_TYPE_RX_CSUM   (1ULL << 1)

#define VIRTIO_NET_STATS_TYPE_RX_GSO    (1ULL << 2)

#define VIRTIO_NET_STATS_TYPE_RX_SPEED  (1ULL << 3)



#define VIRTIO_NET_STATS_TYPE_TX_BASIC  (1ULL << 16)

#define VIRTIO_NET_STATS_TYPE_TX_CSUM   (1ULL << 17)

#define VIRTIO_NET_STATS_TYPE_TX_GSO    (1ULL << 18)

#define VIRTIO_NET_STATS_TYPE_TX_SPEED  (1ULL << 19)



	__le64 supported_stats_types[1];

};



struct virtio_net_ctrl_queue_stats {

	struct {

		__le16 vq_index;

		__le16 reserved[3];

		__le64 types_bitmap[1];

	} stats[1];

};



struct virtio_net_stats_reply_hdr {

#define VIRTIO_NET_STATS_TYPE_REPLY_CVQ       32



#define VIRTIO_NET_STATS_TYPE_REPLY_RX_BASIC  0

#define VIRTIO_NET_STATS_TYPE_REPLY_RX_CSUM   1

#define VIRTIO_NET_STATS_TYPE_REPLY_RX_GSO    2

#define VIRTIO_NET_STATS_TYPE_REPLY_RX_SPEED  3



#define VIRTIO_NET_STATS_TYPE_REPLY_TX_BASIC  16

#define VIRTIO_NET_STATS_TYPE_REPLY_TX_CSUM   17

#define VIRTIO_NET_STATS_TYPE_REPLY_TX_GSO    18

#define VIRTIO_NET_STATS_TYPE_REPLY_TX_SPEED  19

	__u8 type;

	__u8 reserved;

	__le16 vq_index;

	__le16 reserved1;

	__le16 size;

};



struct virtio_net_stats_cvq {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 command_num;

	__le64 ok_num;

};



struct virtio_net_stats_rx_basic {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 rx_notifications;



	__le64 rx_packets;

	__le64 rx_bytes;



	__le64 rx_interrupts;



	__le64 rx_drops;

	__le64 rx_drop_overruns;

};



struct virtio_net_stats_tx_basic {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 tx_notifications;



	__le64 tx_packets;

	__le64 tx_bytes;



	__le64 tx_interrupts;



	__le64 tx_drops;

	__le64 tx_drop_malformed;

};



struct virtio_net_stats_rx_csum {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 rx_csum_valid;

	__le64 rx_needs_csum;

	__le64 rx_csum_none;

	__le64 rx_csum_bad;

};



struct virtio_net_stats_tx_csum {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 tx_csum_none;

	__le64 tx_needs_csum;

};



struct virtio_net_stats_rx_gso {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 rx_gso_packets;

	__le64 rx_gso_bytes;

	__le64 rx_gso_packets_coalesced;

	__le64 rx_gso_bytes_coalesced;

};



struct virtio_net_stats_tx_gso {

	struct virtio_net_stats_reply_hdr hdr;



	__le64 tx_gso_packets;

	__le64 tx_gso_bytes;

	__le64 tx_gso_segments;

	__le64 tx_gso_segments_bytes;

	__le64 tx_gso_packets_noseg;

	__le64 tx_gso_bytes_noseg;

};



struct virtio_net_stats_rx_speed {

	struct virtio_net_stats_reply_hdr hdr;



	/* rx_{packets,bytes}_allowance_exceeded are too long. So rename to

	 * short name.

	 */

	__le64 rx_ratelimit_packets;

	__le64 rx_ratelimit_bytes;

};



struct virtio_net_stats_tx_speed {

	struct virtio_net_stats_reply_hdr hdr;



	/* tx_{packets,bytes}_allowance_exceeded are too long. So rename to

	 * short name.

	 */

	__le64 tx_ratelimit_packets;

	__le64 tx_ratelimit_bytes;

};



#endif /* _UAPI_LINUX_VIRTIO_NET_H */