From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44F9FA0487 for ; Wed, 3 Jul 2019 19:25:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E531374C; Wed, 3 Jul 2019 19:25:26 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 20F7C2956 for ; Wed, 3 Jul 2019 19:25:23 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id u17so1093744pgi.6 for ; Wed, 03 Jul 2019 10:25:23 -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 :mime-version:content-transfer-encoding; bh=nI7FVbuNuSvrOs499r4qw3w3PxyXN6f5D+ujLvtwxPM=; b=IiZo43efjpmMs9AdZGGbSAho/CtmgylToz2BEZdR5wlfmU46UAGNKu8XgdXlp212UV 7wx/VDl11fhUi8wuW+8c2UE6uiJDlFkOa66fuZJuKsqK2c8revL176kFyumvS7c8/+oX DrZTgFrKeDJGbDKqL/IYRva0esL5OrU1tCpeewxhad6XiK+if/3RvfJAOrPUFlCtkC2l MveztuoL+UVQTwnPMf27gvyztdYD6c2DLEcDePRkcBh0OkEdsVZFmkKR7SphlsBfQbst DksIAC9Zjt0MoUOCOrrJhm/vYCBaroKyRs5OJ5utU8sZJ0++tgDRp7pTvC6b+7pDNnZR uMPA== 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:mime-version:content-transfer-encoding; bh=nI7FVbuNuSvrOs499r4qw3w3PxyXN6f5D+ujLvtwxPM=; b=leCwlA9Sejpk+CnzZ0w+AWpWYJR1+RkAhic9BE/Hmb9TljOiD+fkQa55ylxjEKlgSL ZX1rC+wV6u+P/18ck/P6yupn5KE2nStloVPDQqG68FrYYtrsHYI0QJf5Xx13SGDT5LEz kDLCaEYDRveSvfD9/jyptBGOQZ1zoFNwC5wwoyD1ZB1q+GCwayzqMNeJWtXV3MyWuON8 rQintY9kWMr/RcDKQYxqQ7Y2CdtlrFZS99EF/huWfpFEzcm19Pj3p+Cy1RXbiKo396LI gp2WdZkWXRnxPxifyhT8g6btb/q7RZ6lviuWAivysAcrdWkgZj2BiqxrtcEN6Aubmi8x BiMg== X-Gm-Message-State: APjAAAUi1jZnSqHYl/3tSgcMSM5vfy9D+M8cLVnt/do6oCmnd0t/mvqv b57SyO2UNUim+yzHK5AlDoo= X-Google-Smtp-Source: APXvYqzd4/MrMPrI6ryWg/63J0F17gd1MJKNBktt2V3tRefRsayUpxrUrXG0VowG4Hj/ZiBBROC+0Q== X-Received: by 2002:a17:90a:b104:: with SMTP id z4mr14036313pjq.102.1562174722264; Wed, 03 Jul 2019 10:25:22 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j11sm4468831pfa.2.2019.07.03.10.25.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 03 Jul 2019 10:25:21 -0700 (PDT) From: Stephen Hemminger To: gaetan.rivet@6wind.com, arybchenko@solarflare.com Cc: dev@dpdk.org, Stephen Hemminger Date: Wed, 3 Jul 2019 10:25:12 -0700 Message-Id: <20190703172512.24909-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703172512.24909-1-stephen@networkplumber.org> References: <20190626222135.11368-1-stephen@networkplumber.org> <20190703172512.24909-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/2] 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 --- 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.20.1