From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CE424E1C6 for ; Tue, 26 Dec 2023 11:26:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="oStvdJ88" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1703589992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tmW+UU4R/GQl4t1JifZU8VoKdZXoi50g70i4shR/PeE=; b=oStvdJ882sr/zQDWgATK0OaqOsuColfWSslc7AE53WFU0op9KCkERdWGqDR+UeRsNp58Np 4dyc6gcr7/jbi/eh1TxgbJumKLPgeZCgfI/yNLK2o4mzZV2hnry+v9qT96Y1obQYQr9m3W fNYkjyp2M5K18tHrnSPAT8J+0jCKshc= Date: Tue, 26 Dec 2023 19:26:26 +0800 Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH net-next v1 1/6] virtio_net: introduce device stats feature and structures To: Xuan Zhuo , netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , virtualization@lists.linux.dev References: <20231226073103.116153-1-xuanzhuo@linux.alibaba.com> <20231226073103.116153-2-xuanzhuo@linux.alibaba.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zhu Yanjun In-Reply-To: <20231226073103.116153-2-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 在 2023/12/26 15:30, Xuan Zhuo 写道: > The virtio-net device stats spec: > > https://github.com/oasis-tcs/virtio-spec/commit/42f389989823039724f95bbbd243291ab0064f82 > > This commit introduces the relative feature and structures. > > Signed-off-by: Xuan Zhuo > --- > include/uapi/linux/virtio_net.h | 137 ++++++++++++++++++++++++++++++++ > 1 file changed, 137 insertions(+) > > diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h > index cc65ef0f3c3e..8fca4d1b7635 100644 > --- a/include/uapi/linux/virtio_net.h > +++ b/include/uapi/linux/virtio_net.h > @@ -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,140 @@ 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; Thanks a lot. I have made tests. The mentioned errors are fixed in this patch series. Zhu Yanjun > + __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; > + > + __le64 rx_packets_allowance_exceeded; > + __le64 rx_bytes_allowance_exceeded; > +}; > + > +struct virtio_net_stats_tx_speed { > + struct virtio_net_stats_reply_hdr hdr; > + > + __le64 tx_packets_allowance_exceeded; > + __le64 tx_bytes_allowance_exceeded; > +}; > + > #endif /* _UAPI_LINUX_VIRTIO_NET_H */