From nobody Fri May 3 09:51:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492685897162491.17024982407247; Thu, 20 Apr 2017 03:58:17 -0700 (PDT) Received: from localhost ([::1]:52937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d19mx-0002q8-2E for importer@patchew.org; Thu, 20 Apr 2017 06:58:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d19mD-0002Uq-JL for qemu-devel@nongnu.org; Thu, 20 Apr 2017 06:57:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d19mA-0001Zs-Eg for qemu-devel@nongnu.org; Thu, 20 Apr 2017 06:57:29 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:50712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d19m9-0001YO-Jt for qemu-devel@nongnu.org; Thu, 20 Apr 2017 06:57:26 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 20 Apr 2017 10:48:40 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v3KAvDnF061448; Thu, 20 Apr 2017 18:57:13 +0800 (GMT-8) (envelope-from lu.zhipeng@zte.com.cn) Received: from ceshi.localdomain ([10.74.120.130]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017042018571834-1022734 ; Thu, 20 Apr 2017 18:57:18 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170420184840 From: ZhiPeng Lu To: mdroth@linux.vnet.ibm.com Date: Thu, 20 Apr 2017 18:57:31 +0800 Message-Id: <1492685851-27921-1-git-send-email-lu.zhipeng@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-04-20 18:57:18, Serialize by Router on notes_smtp/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-04-20 18:57:12, Serialize complete at 2017-04-20 18:57:12 X-MAIL: mse01.zte.com.cn v3KAvDnF061448 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH] qga: Add support network interface statistics in guest-network-get-interfaces command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ZhiPeng Lu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" we can get the network interface statistics inside a virtual machine by guest-network-get-interfaces command. it is very userful for us to monitor and analyze network traff. Signed-off-by: ZhiPeng Lu Signed-off-by: DanielP.Berrange Reviewed-by: EricBlake --- qga/commands-posix.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++= +++- qga/qapi-schema.json | 28 +++++++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 915df9e..0c48707 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1638,6 +1638,65 @@ guest_find_interface(GuestNetworkInterfaceList *head, return head; } =20 + static int guest_get_network_stats(const char *path, + GuestNetworkInterfaceStat *stats) +{ + int path_len; + char const *devinfo =3D "/proc/net/dev"; + FILE *fp; + char *line =3D NULL, *colon; + size_t n; + fp =3D fopen(devinfo, "r"); + if (!fp) { + return -1; + } + path_len =3D strlen(path); + while (getline(&line, &n, fp) !=3D -1) { + long long dummy; + long long rx_bytes; + long long rx_packets; + long long rx_errs; + long long rx_drop; + long long tx_bytes; + long long tx_packets; + long long tx_errs; + long long tx_drop; + + /* The line looks like: + *" eth0:..." + *Split it at the colon. + */ + colon =3D strchr(line, ':'); + if (!colon) { + continue; + } + *colon =3D '\0'; + if (colon - path_len >=3D line && strcmp(colon - path_len, path) = =3D=3D 0) { + if (sscanf(colon + 1, + "%lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %l= ld %lld %lld %lld %lld", + &rx_bytes, &rx_packets, &rx_errs, &rx_drop, + &dummy, &dummy, &dummy, &dummy, + &tx_bytes, &tx_packets, &tx_errs, &tx_drop, + &dummy, &dummy, &dummy, &dummy) !=3D 16) { + continue; + } + stats->rx_bytes =3D rx_bytes; + stats->rx_packets =3D rx_packets; + stats->rx_errs =3D rx_errs; + stats->rx_drop =3D rx_drop; + stats->tx_bytes =3D tx_bytes; + stats->tx_packets =3D tx_packets; + stats->tx_errs =3D tx_errs; + stats->tx_drop =3D tx_drop; + fclose(fp); + return 0; + } + } + fclose(fp); + g_debug("/proc/net/dev: Interface not found"); + return -1; +} + /* * Build information about guest interfaces */ @@ -1654,6 +1713,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inte= rfaces(Error **errp) for (ifa =3D ifap; ifa; ifa =3D ifa->ifa_next) { GuestNetworkInterfaceList *info; GuestIpAddressList **address_list =3D NULL, *address_item =3D NULL; + GuestNetworkInterfaceStatList *interface_stat_item =3D NULL; char addr4[INET_ADDRSTRLEN]; char addr6[INET6_ADDRSTRLEN]; int sock; @@ -1770,9 +1830,20 @@ GuestNetworkInterfaceList *qmp_guest_network_get_int= erfaces(Error **errp) } else { (*address_list)->next =3D address_item; } - info->value->has_ip_addresses =3D true; =20 + if (!info->value->has_interface_statics) { + interface_stat_item =3D g_malloc0(sizeof(*interface_stat_item)= ); + interface_stat_item->value =3D g_malloc0( + sizeof(*interface_stat_item->value)); + if (guest_get_network_stats(info->value->name, + interface_stat_item->value) =3D=3D -1) { + error_setg_errno(errp, errno, "guest_get_network_stats fai= led"); + goto error; + } + info->value->interface_statics =3D interface_stat_item; + } + info->value->has_interface_statics =3D true; =20 } =20 diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index a02dbf2..44bcced 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -635,6 +635,31 @@ 'prefix': 'int'} } =20 ## +# @GuestNetworkInterfaceStat: +# +# @rx-bytes: received bytes of interface +# @rx-packets: received packets of interface +# @rx-errs: received error packets of interface +# @rx-drop: received drop packets of interface +# +# @tx-bytes: send bytes of interface +# @tx-packets: send packets of interface +# @tx-errs: send error packets of interface +# @tx-drop: send drop packets of interface +# Since: 2.10 +## +{ 'struct': 'GuestNetworkInterfaceStat', + 'data': {'rx-bytes': 'uint64', + 'rx-packets': 'uint64', + 'rx-errs': 'uint64', + 'rx-drop': 'uint64', + 'tx-bytes': 'uint64', + 'tx-packets': 'uint64', + 'tx-errs': 'uint64', + 'tx-drop': 'uint64' + } } + +## # @GuestNetworkInterface: # # @name: The name of interface for which info are being delivered @@ -648,7 +673,8 @@ { 'struct': 'GuestNetworkInterface', 'data': {'name': 'str', '*hardware-address': 'str', - '*ip-addresses': ['GuestIpAddress'] } } + '*ip-addresses': ['GuestIpAddress'], + '*interface-statics': ['GuestNetworkInterfaceStat'] } } =20 ## # @guest-network-get-interfaces: --=20 1.8.3.1