From nobody Wed May 8 17:00:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=bytedance.com ARC-Seal: i=1; a=rsa-sha256; t=1600935537; cv=none; d=zohomail.com; s=zohoarc; b=KSxYDlTYQ6QNQOgU/xaZ26VLMmMqWA9Qfxqx3d9kgCKpe9QK6pqNBkMdi9/HyAn+0wuhe+4yH+YjCbXnXZ8sNy1Pusr93XxckcXBaUHm1RigAb5xGaifdT7da+kn8yAukffzMm2h2kKqGca29u9/5+nWI++8N7fUCv7taBp0wpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600935537; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=HOIn438r+3/5bFb1M+SECpsy0q0gi9mufxqUvF9nOXg=; b=YpStCKiyNz1k60RzWAZc4WGtGKPInOGCSU1LcSkydLhejOT9TVxK4NRt1Hz44JS/vXNisAfH9wEzV/3WTZnAf+usVOjdBh44zUnh2P+hKY0F0UPz36o+A1UrV6nfYglHHrQDj/8hFlDX99EwiRap5VZhJHKyFSJkSyy//7LQ2FI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600935537652940.5005679380903; Thu, 24 Sep 2020 01:18:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-_lBOX8uoM52Z-OHPWuMTww-1; Thu, 24 Sep 2020 04:18:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7835410A7AF3; Thu, 24 Sep 2020 08:18:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31AAC60C04; Thu, 24 Sep 2020 08:18:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BD22C8C7A1; Thu, 24 Sep 2020 08:18:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08O8IhGb013898 for ; Thu, 24 Sep 2020 04:18:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 304D720244F7; Thu, 24 Sep 2020 08:18:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B9862028DC0 for ; Thu, 24 Sep 2020 08:18:40 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CEA1101A56E for ; Thu, 24 Sep 2020 08:18:40 +0000 (UTC) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-12ssrZnxO26LuyT1NxsNMA-1; Thu, 24 Sep 2020 04:18:38 -0400 Received: by mail-pj1-f67.google.com with SMTP id b17so1219169pji.1 for ; Thu, 24 Sep 2020 01:18:38 -0700 (PDT) Received: from libai.bytedance.net ([61.120.150.71]) by smtp.gmail.com with ESMTPSA id u10sm1970380pfn.122.2020.09.24.01.18.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 01:18:36 -0700 (PDT) X-MC-Unique: _lBOX8uoM52Z-OHPWuMTww-1 X-MC-Unique: 12ssrZnxO26LuyT1NxsNMA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HOIn438r+3/5bFb1M+SECpsy0q0gi9mufxqUvF9nOXg=; b=qe6QUAimMgIYsRP6jc27B3h2z8yHzeNgGbva2l862TwB0LC1368akVMuKwnH+EzXgq ZbqQecpKd7rtPe2qyxWnZzBZRRBblq0GN68/TA/+FNs4rsVSlN6+OBq1UGMiCVRoZF7K 4VClEHl+r9/wz3Lk4DgnvrDaXWKilB2jLY3uhaKkutj5AQOpBcch1kWCzTmA7xn7SCp/ MRgJA1eMotfYrkprr+8PB4Yg0J2aq4y46PH/G+PpNXWd5Cu71HcZ/9eq4JufiSyuSjwr L55xGHuOBZLxKyJH6V5MHN+1M6o5y7LGmJc8E3TQZsG8k60U7DMUn7hhTHZ5BRG/TZR8 I1wQ== X-Gm-Message-State: AOAM531hiy4st+8kEGodONvy0/hU96OmWC4CBm/a2u5MCnED+aYR9qT+ uDDgdr/YGCyJRpVO5X1sYfgeHw== X-Google-Smtp-Source: ABdhPJwZOneeJyhyGEPG6JYe3HZbEYpbvKKavVR4XaWfU+/DSUc0d0SNFMLTYvFM0n5kONYH6ASoIw== X-Received: by 2002:a17:90b:3409:: with SMTP id kg9mr3086982pjb.122.1600935517181; Thu, 24 Sep 2020 01:18:37 -0700 (PDT) From: zhenwei pi To: laine@redhat.com, berrange@redhat.com Subject: [PATCH v3] util: support PCI passthrough net device stats collection Date: Thu, 24 Sep 2020 16:18:30 +0800 Message-Id: <20200924081830.544759-1-pizhenwei@bytedance.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, zhenwei pi X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Collect PCI passthrough net device stats from kernel by netlink API. Currently, libvirt can not get PCI passthrough net device stats, run command: #virsh domifstat instance --interface=3D52:54:00:2d:b2:35 error: Failed to get interface stats instance 52:54:00:2d:b2:35 error: internal error: Interface name not provided The PCI device(usually SR-IOV virtual function device) is detached while it's used in PCI passthrough mode. And we can not parse this device from /proc/net/dev any more. In this patch, libvirt check net device is VF of not firstly, then query virNetDevVFInterfaceStats(new API). virNetDevVFInterfaceStats parses VFs info of all PFs, compares MAC address until the two MAC addresses match. '#ip -s link show' can get the same result. Instead of parsing the output result, implement this feature by libnl API. Notice that this feature deponds on driver of PF. Test on Mellanox ConnectX-4 Lx, it works well. Also test on Intel Corporation 82599ES, it works, but only get 0. (ip-link command get the same result). IFLA_VF_STATS is supported since Linux-4.2, suggested by Laine, just using defined(__linux__) && WITH_LIBNL is enough. Signed-off-by: zhenwei pi --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++ src/util/virnetdev.c | 121 +++++++++++++++++++++++++++++++++++++++++++= ++++ src/util/virnetdev.h | 5 ++ 4 files changed, 130 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bdbe3431b8..bcc40b8d69 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2585,6 +2585,7 @@ virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevSysfsFile; virNetDevValidateConfig; +virNetDevVFInterfaceStats; =20 =20 # util/virnetdevbandwidth.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae715c01d7..f554010c40 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10196,6 +10196,9 @@ qemuDomainInterfaceStats(virDomainPtr dom, if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSE= R) { if (virNetDevOpenvswitchInterfaceStats(net->ifname, stats) < 0) goto cleanup; + } else if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_H= OSTDEV) { + if (virNetDevVFInterfaceStats(&net->mac, stats) < 0) + goto cleanup; } else { if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net= )) < 0) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e1a4cc2bef..3d54d07606 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1489,6 +1489,7 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1= ] =3D { .maxlen =3D sizeof(struct ifla_vf_mac) }, [IFLA_VF_VLAN] =3D { .type =3D NLA_UNSPEC, .maxlen =3D sizeof(struct ifla_vf_vlan) }, + [IFLA_VF_STATS] =3D { .type =3D NLA_NESTED }, }; =20 =20 @@ -2265,6 +2266,116 @@ virNetDevSetNetConfig(const char *linkdev, int vf, return 0; } =20 +static struct nla_policy ifla_vfstats_policy[IFLA_VF_STATS_MAX+1] =3D { + [IFLA_VF_STATS_RX_PACKETS] =3D { .type =3D NLA_U64 }, + [IFLA_VF_STATS_TX_PACKETS] =3D { .type =3D NLA_U64 }, + [IFLA_VF_STATS_RX_BYTES] =3D { .type =3D NLA_U64 }, + [IFLA_VF_STATS_TX_BYTES] =3D { .type =3D NLA_U64 }, + [IFLA_VF_STATS_BROADCAST] =3D { .type =3D NLA_U64 }, + [IFLA_VF_STATS_MULTICAST] =3D { .type =3D NLA_U64 }, +}; + +static int +virNetDevParseVfStats(struct nlattr **tb, virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +{ + int ret =3D -1, len; + struct ifla_vf_mac *vf_lladdr; + struct nlattr *nla, *t[IFLA_VF_MAX+1]; + struct nlattr *stb[IFLA_VF_STATS_MAX+1]; + + if (tb =3D=3D NULL || mac =3D=3D NULL || stats =3D=3D NULL) { + return -1; + } + + if (!tb[IFLA_VFINFO_LIST]) + return -1; + + len =3D nla_len(tb[IFLA_VFINFO_LIST]); + + for (nla =3D nla_data(tb[IFLA_VFINFO_LIST]); nla_ok(nla, len); + nla =3D nla_next(nla, &len)) { + ret =3D nla_parse(t, IFLA_VF_MAX, nla_data(nla), nla_len(nla), + ifla_vf_policy); + if (ret < 0) + return -1; + + if (t[IFLA_VF_MAC] =3D=3D NULL) { + continue; + } + + vf_lladdr =3D nla_data(t[IFLA_VF_MAC]); + if (virMacAddrCmpRaw(mac, vf_lladdr->mac)) { + continue; + } + + if (t[IFLA_VF_STATS]) { + ret =3D nla_parse_nested(stb, IFLA_VF_STATS_MAX, + t[IFLA_VF_STATS], + ifla_vfstats_policy); + if (ret < 0) + return -1; + + stats->rx_bytes =3D nla_get_u64(stb[IFLA_VF_STATS_RX_BYTES]); + stats->tx_bytes =3D nla_get_u64(stb[IFLA_VF_STATS_TX_BYTES]); + stats->rx_packets =3D nla_get_u64(stb[IFLA_VF_STATS_RX_PACKETS= ]); + stats->tx_packets =3D nla_get_u64(stb[IFLA_VF_STATS_TX_PACKETS= ]); + } + return 0; + } + + return ret; +} + +/** + * virNetDevVFInterfaceStats: + * @mac: MAC address of the VF interface + * @stats: returns stats of the VF interface + * + * Get the VF interface from kernel by netlink. + * Returns 0 on success, -1 on failure. + */ +int +virNetDevVFInterfaceStats(virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +{ + int rc =3D -1; + void *nlData =3D NULL; + struct nlattr *tb[IFLA_MAX + 1] =3D {NULL, }; + char *sysfsDevicePath =3D NULL; + DIR *dirp =3D NULL; + struct dirent *dp; + + if (virDirOpen(&dirp, SYSFS_NET_DIR) < 0) + return -1; + + /* get all PCI net devices, and parse VFs list from netlink API. + * compare MAC address, collect device stats if matching. + */ + while (virDirRead(dirp, &dp, SYSFS_NET_DIR) > 0) { + if (virNetDevSysfsFile(&sysfsDevicePath, dp->d_name, "device") < 0) + break; + + if (virNetDevIsPCIDevice(sysfsDevicePath)) { + rc =3D virNetlinkDumpLink(dp->d_name, -1, &nlData, tb, 0, 0); + if (rc < 0) { + rc =3D -1; + goto cleanup; + } + + rc =3D virNetDevParseVfStats(tb, mac, stats); + VIR_FREE(nlData); + if (rc =3D=3D 0) + goto cleanup; + } + VIR_FREE(sysfsDevicePath); + } + + cleanup: + VIR_FREE(sysfsDevicePath); + VIR_DIR_CLOSE(dirp); + return rc; +} =20 #else /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX= ) */ =20 @@ -2309,6 +2420,16 @@ virNetDevSetNetConfig(const char *linkdev G_GNUC_UNU= SED, } =20 =20 +int +virNetDevVFInterfaceStats(virMacAddrPtr mac G_GNUC_UNUSED, + virDomainInterfaceStatsPtr stats G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to get VF net device stats on this plat= form")); + return -1; +} + + #endif /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX= ) */ =20 VIR_ENUM_IMPL(virNetDevIfState, diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 5f581323ed..ff59d9d341 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -312,4 +312,9 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, int virNetDevRunEthernetScript(const char *ifname, const char *script) G_GNUC_NO_INLINE; =20 +int virNetDevVFInterfaceStats(virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevRxFilter, virNetDevRxFilterFree); --=20 2.11.0