From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Subject: [PATCH net-next 14/14] nfp: abm: report correct MQ stats Date: Fri, 25 May 2018 21:53:38 -0700 Message-ID: <20180526045338.10993-15-jakub.kicinski@netronome.com> References: <20180526045338.10993-1-jakub.kicinski@netronome.com> Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, john.fastabend@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, alexei.starovoitov@gmail.com, nogahf@mellanox.com, yuvalm@mellanox.com, gerlitz.or@gmail.com, Jakub Kicinski To: davem@davemloft.net Return-path: Received: from mail-qk0-f182.google.com ([209.85.220.182]:46130 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031091AbeEZEzr (ORCPT ); Sat, 26 May 2018 00:55:47 -0400 Received: by mail-qk0-f182.google.com with SMTP id k86-v6so5644325qkh.13 for ; Fri, 25 May 2018 21:55:46 -0700 (PDT) In-Reply-To: <20180526045338.10993-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: Report the stat diff to make sure MQ stats add up to child stats. Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe --- drivers/net/ethernet/netronome/nfp/abm/main.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c index 21d5af1fb061..1561c2724c26 100644 --- a/drivers/net/ethernet/netronome/nfp/abm/main.c +++ b/drivers/net/ethernet/netronome/nfp/abm/main.c @@ -279,6 +279,28 @@ nfp_abm_setup_tc_red(struct net_device *netdev, struct nfp_abm_link *alink, } } +static int +nfp_abm_mq_stats(struct nfp_abm_link *alink, struct tc_mq_qopt_offload *opt) +{ + struct nfp_alink_stats stats; + unsigned int i; + int err; + + for (i = 0; i < alink->num_qdiscs; i++) { + if (alink->qdiscs[i].handle == TC_H_UNSPEC) + continue; + + err = nfp_abm_ctrl_read_q_stats(alink, i, &stats); + if (err) + return err; + + nfp_abm_update_stats(&stats, &alink->qdiscs[i].stats, + &opt->stats); + } + + return 0; +} + static int nfp_abm_setup_tc_mq(struct net_device *netdev, struct nfp_abm_link *alink, struct tc_mq_qopt_offload *opt) @@ -292,6 +314,8 @@ nfp_abm_setup_tc_mq(struct net_device *netdev, struct nfp_abm_link *alink, if (opt->handle == alink->parent) nfp_abm_reset_root(netdev, alink, TC_H_ROOT, 0); return 0; + case TC_MQ_STATS: + return nfp_abm_mq_stats(alink, opt); default: return -EOPNOTSUPP; } -- 2.17.0