From patchwork Sun Aug 11 16:06:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 57612 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59AF04C6C; Sun, 11 Aug 2019 18:06:21 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 4F7AE326D for ; Sun, 11 Aug 2019 18:06:18 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id g2so48538129pfq.0 for ; Sun, 11 Aug 2019 09:06:18 -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=itcAe7gbH25+PGcARfohNVJsVQ7o9M2JsExjAHdF9Nc=; b=xtbx6gNQHTRzRjOlhN7dzYwqJzyoNquZfJVIbohsvAEDtMkWwthV3stRTcyKDK9jDN JK/B5H50iGq39+4YNTYOM9WuA4K2P0jpF1hI9pVVHGOCLe+NC7L+7ZoAIjgjlqcgcqFa 7KR6n5ueFKev3IWeagHUuh51KKj6ku4y0cPqLaCxZVvAJc+FoTmNAoywGLfxrFrgSSHi xjy/qe9ELjz1uY1YA63YpRjR8oX+1rdIbQniBGbUZfXOEvrJtWK456xAJ/oDJC8055Gn 6Gtz8tjPt31dFkfWxLms956oSLU6L19Gy1/Nj8m3rRb2xZGQVG1GNgtQ32OYOFNujIG3 nAEA== 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=itcAe7gbH25+PGcARfohNVJsVQ7o9M2JsExjAHdF9Nc=; b=iKoNbPbTnxvMiz8HkquBo7tpodWn9oy8WrPm54ttLocxrEq4DaIFIaxbw/DgCz9NHQ 9G1aAqZtIAbRqbKr4uV32lXakxY52p1+6XiS82XCSl6+JakRscEIcuGUM/JzZ8eC8C5m kZWd4lDpb1z4W40/emeDvfx7BgJps79vADry+M35amt7YXafk49iQHvOe2c94JsOAX4Q WvTqL4LrIDewhmQXgSmino3bY81/0OmQvLtQue8ekeZkuQsvqU7hT+8hT5jFc9TOYJ5m cAY/I9eS2y+bUb0oOlo16nZZY9GjewkKEGtyqSH/meOlYVWkTBF0Ys59QtQsxu0qIBYV WfiQ== X-Gm-Message-State: APjAAAXuzxQOCbmoQZitzR6Vf96eMO8s+22x3imhgY1n0/4bkm8JbkQC y85vMamh2TxcCOQlWKYpZxdkxR1sn1U= X-Google-Smtp-Source: APXvYqxuLJ7/aCWx1+FH4uubEx/kHsxet4pZvrdBZJYCVbpiHk3OobcdtyHotSTOFhcG9ZUz2HtIug== X-Received: by 2002:aa7:8189:: with SMTP id g9mr32203858pfi.143.1565539577263; Sun, 11 Aug 2019 09:06:17 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id v13sm116890936pfn.109.2019.08.11.09.06.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 11 Aug 2019 09:06:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gaetan Rivet Date: Sun, 11 Aug 2019 09:06:07 -0700 Message-Id: <20190811160607.16441-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190811160607.16441-1-stephen@networkplumber.org> References: <20190626222135.11368-1-stephen@networkplumber.org> <20190811160607.16441-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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,