From patchwork Fri Nov 1 20:12:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 62343 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D2BECA00BE; Fri, 1 Nov 2019 21:13:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 455541E889; Fri, 1 Nov 2019 21:13:17 +0100 (CET) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 6F16F1E874 for ; Fri, 1 Nov 2019 21:13:15 +0100 (CET) Received: by mail-pg1-f195.google.com with SMTP id e10so7119856pgd.11 for ; Fri, 01 Nov 2019 13:13:15 -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=Ns0orEptOo9h3M8NLsvTPZrd4Ml1Mzguv5a6kzmryQc=; b=cVqTZrHtX7Oo7PhZTQfWGICYhEzqP0IFB67GX5sllQ+RNZ2ptCpQfOcOFx/xIwGyZg 9Z6ZedKJ/RkRUYMQQacdkeXXa26R6WEOdNLlhqpIUFNo/KvIKN2DCFSrhszBeyw4V9J1 c9jvVrxPz+b++Yh7FLr49eGg7SI0Dh7TH/VjRe53BB0SwJcEO+OzAbGHP/Azwe6zsHzj cqsh9FE+RvXboxnzkY/zbrbV3KEjvAJUe/rTxNZdNbkd6OOn7QVtEeyIWl64m9G+/Sz7 r0cHx13egGdL2g9Haaa55LzJZRLA15RUZ1+XXUce22Z7fbgkzA+Ax+lXMFGj9vCd1llU fm4w== 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=Ns0orEptOo9h3M8NLsvTPZrd4Ml1Mzguv5a6kzmryQc=; b=kgASgj2j1bUQGSITtBScsJekhv0YBJesh6GtS1WfUcNHx89AFOPYqzMvyCynUthnel meIJNZH+qorPggzPy7EWm26t4t7D0gr+VkMi+dlmTUxYTU7vt84Yrb2ytPqHA0KT+skC yYtzE73fUKnwOysfDlo/4ceULDBn+L+SlsJ3ryTc8CvjOIayYgVgMyQtkPrck7mAOmXh 8K+qDHPp1lbuKxWamC7wqHTCucHFEMOJBgzn+68rxE02gPZGqezZ1Wp6vzjWiTqcKOPx 3zRAPHLbMpLcncZgRyrLh1xhWocGRRprZnAavoVB50ipPixuh1T24D4+aFNWEJr04kS5 2xLg== X-Gm-Message-State: APjAAAXUCsdzwSJQh3zHtT1jBbDh3Y+OPApl2dUn+6zPis/wqw9WKQ4A VQTRyWIUQXIHuzYMLOnl7rtY/wHhkpqFYA== X-Google-Smtp-Source: APXvYqwQqHSsqwzffVZlUoMMdsulxTrDcayBuY2lfbF2po+bCRojK3zb+7prquv2BaqXT0QF1aBnCw== X-Received: by 2002:a17:90a:a384:: with SMTP id x4mr18175954pjp.116.1572639194138; Fri, 01 Nov 2019 13:13:14 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id x9sm9744588pje.27.2019.11.01.13.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 13:13:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 1 Nov 2019 13:12:55 -0700 Message-Id: <20191101201255.4853-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191101201255.4853-1-stephen@networkplumber.org> References: <20191101201255.4853-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] app/testpmd: block xstats for hidden ports 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" All the other testpmd commands block access to devices that are owned. Looks like xstat got overlooked. Fixes: bfd5051b43b5 ("app/testpmd: new command to get extended statistics") Signed-off-by: Stephen Hemminger Acked-by: Bernard Iremonger --- app/test-pmd/config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index efe2812a85ef..ad926d573b81 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -238,6 +238,10 @@ nic_xstats_display(portid_t port_id) int cnt_xstats, idx_xstat; struct rte_eth_xstat_name *xstats_names; + if (port_id_is_invalid(port_id, ENABLED_WARN)) { + print_valid_ports(); + return; + } printf("###### NIC extended statistics for port %-2d\n", port_id); if (!rte_eth_dev_is_valid_port(port_id)) { printf("Error: Invalid port number %i\n", port_id); @@ -295,6 +299,10 @@ nic_xstats_clear(portid_t port_id) { int ret; + if (port_id_is_invalid(port_id, ENABLED_WARN)) { + print_valid_ports(); + return; + } ret = rte_eth_xstats_reset(port_id); if (ret != 0) { printf("%s: Error: failed to reset xstats (port %u): %s", From patchwork Fri Nov 1 20:12:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 62344 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB6CAA00BE; Fri, 1 Nov 2019 21:13:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD3EA1E894; Fri, 1 Nov 2019 21:13:18 +0100 (CET) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 129E31E886 for ; Fri, 1 Nov 2019 21:13:16 +0100 (CET) Received: by mail-pg1-f193.google.com with SMTP id f19so7113975pgn.13 for ; Fri, 01 Nov 2019 13:13:16 -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=fYVEIUsb/9LJ9fq0NkuQdr4NGSRtZOiIhg/H2QJy6W4=; b=qaxnLuV/Ti91jc7tdcuVc1DNMFyyohHipikq7Di+2XuYfnH0oh0nMeGxMvtF7bb9td wGsx5hVS0v9BD+49PjrbvzanAJ2c9fNWr4shhkiSJASx5gKqih1e3ITpGYlxITveoTQP v2LEaZIzjaMzK+HP3e4lBo1g2Wi78Et0rI8DgYENxQmEEjp7Fl5sTXf5o4hFUKsHCKLR relKBMlctC4JAkaFiVuhBtm170S+Amz1maDrNmrugKEjU6IlLhkMEdGRIrdIjg7DXG7u P9Xu4lajhj8NJo7aSIwOeGSybvNKK9MhVYlsM2fhwYeBWOfnukYIaglvhsc4RMA12f+H T6ww== 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=fYVEIUsb/9LJ9fq0NkuQdr4NGSRtZOiIhg/H2QJy6W4=; b=qhM0C3ahDvQseLDlGHwEl4yqLlW8mKU3zmhZASsDP5uLm5UtEBzlN9CStY98eh+rmk PtZLdBt/ZaTIVQRaOM3mSbOpobi906fVYBpNzR1+b7kczwrtZZtTonpybdURrvkohWfe +AQcrAVjLBo9KA4Lh08oK4aGr+V9PT+N/6I064uevqz8XiL+aZ/L1gN8/jAVc8ft4Lyj Lvp1TnJVA7MKaafDkyOYJ5swqj1QxcEb6xaq5mxO8STs/eaR5XQ0WGWmn0rF68F9eU7A s9q0Nw4eXfTBcEqR+n205TrAzZXZF90RTtVICvYdHlxIvetYUSUwgxpMejP3RNmh3HsQ OAMQ== X-Gm-Message-State: APjAAAVFQEZA3JtA4jOHiYWxq3UBcbn2ELCDX5kXEBOIkFgWmFr5vM6G d+lI1wodGinsOvyePz7W234LeEgF1B5A0w== X-Google-Smtp-Source: APXvYqxRnKAkljQtk582Sx8/9ZH4Y3LhV/s5BnMoSRV9mp5w2OxZiedZDLYfIKsoegDpF0Eht9EHRA== X-Received: by 2002:a62:2a41:: with SMTP id q62mr15774009pfq.131.1572639195607; Fri, 01 Nov 2019 13:13:15 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id x9sm9744588pje.27.2019.11.01.13.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 13:13:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 1 Nov 2019 13:12:56 -0700 Message-Id: <20191101201255.4853-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191101201255.4853-1-stephen@networkplumber.org> References: <20191101201255.4853-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 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 detailed statistics for each sub device. Example: testpmd> show port xstats 1 rx_good_packets: 0 tx_good_packets: 0 rx_good_bytes: 0 tx_good_bytes: 0 rx_missed_errors: 0 rx_errors: 0 tx_errors: 0 rx_mbuf_allocation_errors: 0 rx_q0packets: 0 rx_q0bytes: 0 rx_q0errors: 0 tx_q0packets: 0 tx_q0bytes: 0 rx_sub0_good_packets: 0 tx_sub0_good_packets: 0 ... rx_sub1_good_packets: 0 tx_sub1_good_packets: 0 rx_sub1_good_bytes: 0 Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/failsafe/failsafe_ops.c | 152 ++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 0afae6c71feb..a87e49b97d33 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "failsafe_private.h" @@ -881,6 +882,154 @@ fs_stats_reset(struct rte_eth_dev *dev) return 0; } +static int +__fs_xstats_count(struct rte_eth_dev *dev) +{ + struct sub_device *sdev; + int count = 0; + uint8_t i; + int ret; + + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + ret = rte_eth_xstats_get_names(PORT_ID(sdev), NULL, 0); + if (ret < 0) + return ret; + count += ret; + } + + 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 = 0; + uint8_t i; + + /* Caller only cares about count */ + if (!xstats_names) + return __fs_xstats_count(dev); + + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + struct rte_eth_xstat_name *sub_names = xstats_names + count; + int j, r; + + if (count >= limit) + break; + + r = rte_eth_xstats_get_names(PORT_ID(sdev), + sub_names, limit - count); + if (r < 0) + return r; + + /* add subN_ prefix to names */ + for (j = 0; j < r; j++) { + char *xname = sub_names[j].name; + char tmp[RTE_ETH_XSTATS_NAME_SIZE]; + + if ((xname[0] == 't' || xname[0] == 'r') && + xname[1] == 'x' && xname[2] == '_') + snprintf(tmp, sizeof(tmp), "%.3ssub%u_%s", + xname, i, xname + 3); + else + snprintf(tmp, sizeof(tmp), "sub%u_%s", + i, xname); + + strlcpy(xname, tmp, RTE_ETH_XSTATS_NAME_SIZE); + } + count += r; + } + return count; +} + +static int +fs_xstats_get_names(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + unsigned int limit) +{ + int ret; + + fs_lock(dev, 0); + ret = __fs_xstats_get_names(dev, xstats_names, limit); + fs_unlock(dev, 0); + return ret; +} + +static int +__fs_xstats_get(struct rte_eth_dev *dev, + struct rte_eth_xstat *xstats, + unsigned int n) +{ + unsigned int count = 0; + struct sub_device *sdev; + uint8_t i; + int j, ret; + + ret = __fs_xstats_count(dev); + /* + * if error + * or caller did not give enough space + * or just querying + */ + if (ret < 0 || ret > (int)n || xstats == NULL) + return ret; + + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + ret = rte_eth_xstats_get(PORT_ID(sdev), xstats, n); + if (ret < 0) + return ret; + + if (ret > (int)n) + return n + count; + + /* add offset to id's from sub-device */ + for (j = 0; j < ret; j++) + xstats[j].id += count; + + xstats += ret; + n -= ret; + count += ret; + } + + return count; +} + +static int +fs_xstats_get(struct rte_eth_dev *dev, + struct rte_eth_xstat *xstats, + unsigned int n) +{ + int ret; + + fs_lock(dev, 0); + ret = __fs_xstats_get(dev, xstats, n); + fs_unlock(dev, 0); + + return ret; +} + + +static int +fs_xstats_reset(struct rte_eth_dev *dev) +{ + struct sub_device *sdev; + uint8_t i; + int r = 0; + + fs_lock(dev, 0); + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + r = rte_eth_xstats_reset(PORT_ID(sdev)); + if (r < 0) + break; + } + fs_unlock(dev, 0); + + return r; +} + static void fs_dev_merge_desc_lim(struct rte_eth_desc_lim *to, const struct rte_eth_desc_lim *from) @@ -1331,6 +1480,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,