From nobody Tue May 21 18:59:34 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.zohomail.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 1505206646521380.14238163208347; Tue, 12 Sep 2017 01:57:26 -0700 (PDT) Received: from localhost ([::1]:34335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drh0X-0003OY-P8 for importer@patchew.org; Tue, 12 Sep 2017 04:57:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drgzA-0002bC-UG for qemu-devel@nongnu.org; Tue, 12 Sep 2017 04:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drgz6-0005rv-5g for qemu-devel@nongnu.org; Tue, 12 Sep 2017 04:56:00 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:37544 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drgz5-0005nv-ID for qemu-devel@nongnu.org; Tue, 12 Sep 2017 04:55:56 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 088937DF0EDFC46D06CB; Tue, 12 Sep 2017 16:55:50 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v8C8tRCq038010; Tue, 12 Sep 2017 16:55:27 +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 2017091216553105-2260412 ; Tue, 12 Sep 2017 16:55:31 +0800 From: ZhiPeng Lu To: mdroth@linux.vnet.ibm.com Date: Tue, 12 Sep 2017 16:54:26 +0800 Message-Id: <1505206466-23361-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-09-12 16:55:31, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2017-09-12 16:55:23, Serialize complete at 2017-09-12 16:55:23 X-MAIL: mse01.zte.com.cn v8C8tRCq038010 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH v7 RESEND] 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 useful for us to monitor and analyze network traffic. Signed-off-by: ZhiPeng Lu --- v1->v2: - correct some spelling mistake and add the stats data to the guest-network-get-interfaces command instead of adding a new command. v2-v3: - optimize function implementation v3->v4: - modify compile error v4->v5: - rename some temporary variables and add str_trim_off function for calculating the space num in front of the string in guest_get_network_st= ats v5->v6: - use g_strchug instead of str_trim_off implemented by myself v6->v7: - add implementation for windows --- qga/commands-posix.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++= +++- qga/commands-win32.c | 48 +++++++++++++++++++++++++++++++++++ qga/qapi-schema.json | 38 ++++++++++++++++++++++++++- 3 files changed, 156 insertions(+), 2 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ab0c63d..da5dba0 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1643,6 +1643,65 @@ guest_find_interface(GuestNetworkInterfaceList *head, return head; } =20 +static int guest_get_network_stats(const char *name, + GuestNetworkInterfaceStat *stats) +{ + int name_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; + } + name_len =3D strlen(name); + 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_dropped; + long long tx_bytes; + long long tx_packets; + long long tx_errs; + long long tx_dropped; + char *trim_line; + trim_line =3D g_strchug(line); + if (trim_line[0] =3D=3D '\0') { + continue; + } + colon =3D strchr(trim_line, ':'); + if (!colon) { + continue; + } + if (colon - name_len =3D=3D trim_line && + strncmp(trim_line, name, name_len) =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_dropped, + &dummy, &dummy, &dummy, &dummy, + &tx_bytes, &tx_packets, &tx_errs, &tx_dropped, + &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_dropped =3D rx_dropped; + stats->tx_bytes =3D tx_bytes; + stats->tx_packets =3D tx_packets; + stats->tx_errs =3D tx_errs; + stats->tx_dropped =3D tx_dropped; + fclose(fp); + return 0; + } + } + fclose(fp); + g_debug("/proc/net/dev: Interface not found"); + return -1; +} + /* * Build information about guest interfaces */ @@ -1659,6 +1718,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; + GuestNetworkInterfaceStat *interface_stat =3D NULL; char addr4[INET_ADDRSTRLEN]; char addr6[INET6_ADDRSTRLEN]; int sock; @@ -1778,7 +1838,17 @@ GuestNetworkInterfaceList *qmp_guest_network_get_int= erfaces(Error **errp) =20 info->value->has_ip_addresses =3D true; =20 - + if (!info->value->has_statistics) { + interface_stat =3D g_malloc0(sizeof(*interface_stat)); + if (guest_get_network_stats(info->value->name, + interface_stat) =3D=3D -1) { + info->value->has_statistics =3D false; + g_free(interface_stat); + } else { + info->value->statistics =3D interface_stat; + info->value->has_statistics =3D true; + } + } } =20 freeifaddrs(ifap); diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 619dbd2..e891253 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1152,6 +1152,42 @@ out: } #endif =20 +static DWORD get_interface_index(const char *guid) +{ + ULONG index; + DWORD status; + wchar_t wbuf[512]; + snwprintf(wbuf, sizeof(wbuf), L"\\device\\tcpip_%s", guid); + wbuf[sizeof(wbuf) - 1] =3D 0; + status =3D GetAdapterIndex (wbuf, &index); + if (status !=3D NO_ERROR) { + return (DWORD)~0; + } else { + return index; + } +} +static int guest_get_network_stats(const char *name, + GuestNetworkInterfaceStat *stats) +{ + DWORD IfIndex =3D 0; + MIB_IFROW aMib_ifrow; + memset(&aMib_ifrow, 0, sizeof(aMib_ifrow)); + IfIndex =3D get_interface_index(name); + aMib_ifrow.dwIndex =3D IfIndex; + if (NO_ERROR =3D=3D GetIfEntry(&aMib_ifrow)) { + stats->rx_bytes =3D aMib_ifrow.dwInOctets; + stats->rx_packets =3D aMib_ifrow.dwInUcastPkts; + stats->rx_errs =3D aMib_ifrow.dwInErrors; + stats->rx_dropped =3D aMib_ifrow.dwInDiscards; + stats->tx_bytes =3D aMib_ifrow.dwOutOctets; + stats->tx_packets =3D aMib_ifrow.dwOutUcastPkts; + stats->tx_errs =3D aMib_ifrow.dwOutErrors; + stats->tx_dropped =3D aMib_ifrow.dwOutDiscards; + return 0; + } + return -1; +} + GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) { IP_ADAPTER_ADDRESSES *adptr_addrs, *addr; @@ -1159,6 +1195,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inte= rfaces(Error **errp) GuestNetworkInterfaceList *head =3D NULL, *cur_item =3D NULL; GuestIpAddressList *head_addr, *cur_addr; GuestNetworkInterfaceList *info; + GuestNetworkInterfaceStat *interface_stat =3D NULL; GuestIpAddressList *address_item =3D NULL; unsigned char *mac_addr; char *addr_str; @@ -1238,6 +1275,17 @@ GuestNetworkInterfaceList *qmp_guest_network_get_int= erfaces(Error **errp) info->value->has_ip_addresses =3D true; info->value->ip_addresses =3D head_addr; } + if (!info->value->has_statistics) { + interface_stat =3D g_malloc0(sizeof(*interface_stat)); + if (guest_get_network_stats(addr->AdapterName, + interface_stat) =3D=3D -1) { + info->value->has_statistics =3D false; + g_free(interface_stat); + } else { + info->value->statistics =3D interface_stat; + info->value->has_statistics =3D true; + } + } } WSACleanup(); out: diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 90a0c86..17884c7 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -643,6 +643,38 @@ 'prefix': 'int'} } =20 ## +# @GuestNetworkInterfaceStat: +# +# @rx-bytes: total bytes received +# +# @rx-packets: total packets received +# +# @rx-errs: bad packets received +# +# @rx-dropped: receiver dropped packets +# +# @tx-bytes: total bytes transmitted +# +# @tx-packets: total packets transmitted +# +# @tx-errs: packet transmit problems +# +# @tx-dropped: dropped packets transmitted +# +# Since: 2.11 +## +{ 'struct': 'GuestNetworkInterfaceStat', + 'data': {'rx-bytes': 'uint64', + 'rx-packets': 'uint64', + 'rx-errs': 'uint64', + 'rx-dropped': 'uint64', + 'tx-bytes': 'uint64', + 'tx-packets': 'uint64', + 'tx-errs': 'uint64', + 'tx-dropped': 'uint64' + } } + +## # @GuestNetworkInterface: # # @name: The name of interface for which info are being delivered @@ -651,12 +683,16 @@ # # @ip-addresses: List of addresses assigned to @name # +# @statistics: various statistic counters related to @name +# (since 2.11) +# # Since: 1.1 ## { 'struct': 'GuestNetworkInterface', 'data': {'name': 'str', '*hardware-address': 'str', - '*ip-addresses': ['GuestIpAddress'] } } + '*ip-addresses': ['GuestIpAddress'], + '*statistics': 'GuestNetworkInterfaceStat' } } =20 ## # @guest-network-get-interfaces: --=20 1.8.3.1