From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECCD4C3A5A6 for ; Thu, 19 Sep 2019 13:17:46 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 7FDA5217D6 for ; Thu, 19 Sep 2019 13:17:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="V8h8TYzD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FDA5217D6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E067D1F015; Thu, 19 Sep 2019 15:17:38 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id E182F1F00F for ; Thu, 19 Sep 2019 15:17:35 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id x2so4500863wmj.2 for ; Thu, 19 Sep 2019 06:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5e+KNvphZQf/O34q0pjNdu4cp7DnIhHMPoCcSIn/f18=; b=V8h8TYzD3uRbLupxfrMcv+oeuIap/dXU28pR5QzLpkyqoMf9lieNoRsEK3+BYGuIHb EPQTBtzI8xpdIo2qOf2uCuAXUU9FduUYmRvIN2f6eoIalIDvL2Cnmb5QaNCmy3Ghw9ym Lf3LWSjSesjENcr/VcepJqdGQ1MDqg2RuDLjvu7j7lOkCUYFqvL3xqyID9Cl6LFMrry2 IBFO+zrn4qovK7RKziV+YtWVdpnh4RWqL3qov0ji7E7s/YQ1k7lN3B33MFMfOhvuIxQo LTcGplU4k7GVkbuZSJu5Yq4B1tPvW/tp3bRsNMkzYGpYWNXArMRZKdDS9XqHjgHSVIIc 7ojA== 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:in-reply-to :references; bh=5e+KNvphZQf/O34q0pjNdu4cp7DnIhHMPoCcSIn/f18=; b=qVrrR5ff/2a4InQ4AceJTRxgF4e+l+XS/4SlK5dC7GgE9hpNBY1eDhs4wVXukZo+yF 3DauqRjTVypDCWoLlOAniXfOFQvbXF1ZIcvmqBXidUScwZKcTn4Evyk1fqy1ElM/tvdN sXBM7/2LWyHiw2Ab/iljXB5RfQwKqkNuaMUEHkg+mwreb9UA/dyf0il+tcK1/Bi9Yndd PEJTBE+PtOsadcY5p8CFnuZZktkQKydbYzxMJHpi9gVKKgLY53sJDkR/mRDD54z+MiLz JxXZYVune/iRXf2vNibrg3fhAwAJ8vsK9JbIqfX5dR8h9b9GLOO1PPBgLynJ0ie9N+PG BzhA== X-Gm-Message-State: APjAAAULtHp5zB78W4uz0QuH07uRhqrd8B6qDBtW1fy0hKLdKu1vSYxi N2jNUpaKay0xaRTm6GArLRvFBWSvtS8wLQ== X-Google-Smtp-Source: APXvYqysNgjKk4csEJ4pqGXl4hdC7VDFUiVYG0QywCr503hQ+JYb/pzqF1bHgnB/hGT9uSHj9GuV0w== X-Received: by 2002:a1c:1d8d:: with SMTP id d135mr2967445wmd.7.1568899055179; Thu, 19 Sep 2019 06:17:35 -0700 (PDT) Received: from localhost.localdomain (lmontsouris-657-1-167-187.w82-127.abo.wanadoo.fr. [82.127.205.187]) by smtp.gmail.com with ESMTPSA id b194sm9684643wmg.46.2019.09.19.06.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 06:17:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 19 Sep 2019 15:17:29 +0200 Message-Id: <20190919131729.28681-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190919131729.28681-1-stephen@networkplumber.org> References: <20190811160607.16441-1-stephen@networkplumber.org> <20190919131729.28681-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v5 2/2] net/failsafe: implement xstats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add support for extended statistics in failsafe driver. Reports basic statistics for the failsafe driver, and detailed statistics for each sub device. Signed-off-by: Stephen Hemminger Acked-by: Gaetan Rivet --- drivers/net/failsafe/failsafe_ops.c | 135 ++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 96e05d4dc4b1..711fdf302f4f 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -789,6 +789,138 @@ fs_stats_reset(struct rte_eth_dev *dev) fs_unlock(dev, 0); } +/* + * Count how many xstats in total + * Include basic stats for failsafe device + * plus xstats for each sub-device present. + */ +static int +fs_xstats_count(struct rte_eth_dev *dev) +{ + struct sub_device *sdev; + uint8_t i; + int count; + + count = rte_eth_basic_stats_count(dev); + + fs_lock(dev, 0); + FOREACH_SUBDEV(sdev, i, dev) { + count += rte_eth_xstats_get_names(PORT_ID(sdev), NULL, 0); + } + fs_unlock(dev, 0); + + return count; +} + +static int +fs_xstats_get_names(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + unsigned int limit) +{ + struct sub_device *sdev; + unsigned int count; + char tmp[RTE_ETH_XSTATS_NAME_SIZE]; + uint8_t i; + int r; + + /* Caller only cares about count */ + if (!xstats_names) + return fs_xstats_count(dev); + + r = rte_eth_basic_stats_get_names(dev, xstats_names); + if (r < 0) + return r; + + count = r; + + fs_lock(dev, 0); + FOREACH_SUBDEV(sdev, i, dev) { + struct rte_eth_xstat_name *sub_names = xstats_names + count; + + if (count >= limit) + break; + + r = rte_eth_xstats_get_names(PORT_ID(sdev), sub_names, + limit - count); + if (r < 0) { + fs_unlock(dev, 0); + return r; + } + + /* add sub_ prefix to names */ + for (i = 0; i < r; i++) { + snprintf(tmp, sizeof(tmp), "sub%u_%s", + i, sub_names[i].name); + memcpy(sub_names[i].name, tmp, + RTE_ETH_XSTATS_NAME_SIZE); + } + + count += r; + } + fs_unlock(dev, 0); + + return count; +} + +static int +fs_xstats_get(struct rte_eth_dev *dev, + struct rte_eth_xstat *xstats, + unsigned int n) +{ + unsigned int nstats, j, count, scount; + struct sub_device *sdev; + uint8_t i; + int ret; + + nstats = fs_xstats_count(dev); + if (n < nstats || xstats == NULL) + return nstats; + + ret = rte_eth_basic_stats_get(dev->data->port_id, xstats); + if (ret < 0) + return ret; + + count = ret; + for (j = 0; j < count; j++) + xstats[j].id = j; + + fs_lock(dev, 0); + FOREACH_SUBDEV(sdev, i, dev) { + ret = rte_eth_xstats_get(PORT_ID(sdev), + xstats + count, + n > count ? n - count : 0); + if (ret < 0) { + fs_unlock(dev, 0); + return ret; + } + scount = ret; + + /* add offset to id's from sub-device */ + for (j = 0; j < scount; j++) + xstats[count + j].id += count; + + count += scount; + } + fs_unlock(dev, 0); + + return count; +} + +static void +fs_xstats_reset(struct rte_eth_dev *dev) +{ + struct sub_device *sdev; + uint8_t i; + + rte_eth_stats_reset(dev->data->port_id); + + fs_lock(dev, 0); + FOREACH_SUBDEV(sdev, i, dev) { + rte_eth_xstats_reset(PORT_ID(sdev)); + } + fs_unlock(dev, 0); +} + static void fs_dev_merge_desc_lim(struct rte_eth_desc_lim *to, const struct rte_eth_desc_lim *from) @@ -1233,6 +1365,9 @@ const struct eth_dev_ops failsafe_ops = { .link_update = fs_link_update, .stats_get = fs_stats_get, .stats_reset = fs_stats_reset, + .xstats_get = fs_xstats_get, + .xstats_get_names = fs_xstats_get_names, + .xstats_reset = fs_xstats_reset, .dev_infos_get = fs_dev_infos_get, .dev_supported_ptypes_get = fs_dev_supported_ptypes_get, .mtu_set = fs_mtu_set, -- 2.17.1