From patchwork Wed May 30 06:44:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Or Gerlitz X-Patchwork-Id: 10437681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DAD51601D3 for ; Wed, 30 May 2018 06:44:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9CA52887D for ; Wed, 30 May 2018 06:44:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE66A28885; Wed, 30 May 2018 06:44:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CB452887D for ; Wed, 30 May 2018 06:44:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964773AbeE3Gon (ORCPT ); Wed, 30 May 2018 02:44:43 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:60076 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935883AbeE3Gon (ORCPT ); Wed, 30 May 2018 02:44:43 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from ogerlitz@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 May 2018 09:46:45 +0300 Received: from r-vnc05.mtr.labs.mlnx (r-vnc05.mtr.labs.mlnx [10.208.0.115]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w4U6iduE028177; Wed, 30 May 2018 09:44:39 +0300 From: Or Gerlitz To: Jason Gunthorpe Cc: Leon Romanovsky , raeds@mellanox.com, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, Or Gerlitz Subject: [PATCH RESEND rdma-next] net/mlx5: Use flow counter pointer as input to the query function Date: Wed, 30 May 2018 09:44:34 +0300 Message-Id: <1527662674-16546-1-git-send-email-ogerlitz@mellanox.com> X-Mailer: git-send-email 1.7.1 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows to un-expose the details of struct mlx5_fc and keep it internal to the core driver as it used to be. Signed-off-by: Or Gerlitz --- Jason, As you asked, I am sending a fixup in case you intend to apply V2 of the flow counter series [1], if there's going to be V3, Leon, please apply it from the begining. Fixed Jason's address @ my git aliases, he's with MLNX by now.. Or. [1] https://marc.info/?l=linux-netdev&m=152759937829994&w=2 drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 15 ++++++-------- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 22 +++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 4 ++-- include/linux/mlx5/fs.h | 24 ++++------------------ 5 files changed, 32 insertions(+), 35 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index ac99125..4b09dcd 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -3151,7 +3151,7 @@ static int read_flow_counters(struct ib_device *ibdev, struct mlx5_fc *fc = read_attr->hw_cntrs_hndl; struct mlx5_ib_dev *dev = to_mdev(ibdev); - return mlx5_fc_query(dev->mdev, fc->id, + return mlx5_fc_query(dev->mdev, fc, &read_attr->out[IB_COUNTER_PACKETS], &read_attr->out[IB_COUNTER_BYTES]); } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 6cab1dd..f63dfbc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -2104,21 +2104,18 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev, struct mlx5_vport *vport = &esw->vports[vport_idx]; u64 rx_discard_vport_down, tx_discard_vport_down; u64 bytes = 0; - u16 idx = 0; int err = 0; if (!vport->enabled || esw->mode != SRIOV_LEGACY) return 0; - if (vport->egress.drop_counter) { - idx = vport->egress.drop_counter->id; - mlx5_fc_query(dev, idx, &stats->rx_dropped, &bytes); - } + if (vport->egress.drop_counter) + mlx5_fc_query(dev, vport->egress.drop_counter, + &stats->rx_dropped, &bytes); - if (vport->ingress.drop_counter) { - idx = vport->ingress.drop_counter->id; - mlx5_fc_query(dev, idx, &stats->tx_dropped, &bytes); - } + if (vport->ingress.drop_counter) + mlx5_fc_query(dev, vport->ingress.drop_counter, + &stats->tx_dropped, &bytes); if (!MLX5_CAP_GEN(dev, receive_discard_vport_down) && !MLX5_CAP_GEN(dev, transmit_discard_vport_down)) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h index 40992ae..0211d77 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h @@ -131,6 +131,25 @@ struct mlx5_flow_table { struct rhltable fgs_hash; }; +struct mlx5_fc_cache { + u64 packets; + u64 bytes; + u64 lastuse; +}; + +struct mlx5_fc { + struct rb_node node; + struct list_head list; + + u64 lastpackets; + u64 lastbytes; + + u32 id; + bool deleted; + bool aging; + struct mlx5_fc_cache cache ____cacheline_aligned_in_smp; +}; + struct mlx5_ft_underlay_qp { struct list_head list; u32 qpn; @@ -210,9 +229,6 @@ void mlx5_fc_queue_stats_work(struct mlx5_core_dev *dev, unsigned long delay); void mlx5_fc_update_sampling_interval(struct mlx5_core_dev *dev, unsigned long interval); -int mlx5_fc_query(struct mlx5_core_dev *dev, u16 id, - u64 *packets, u64 *bytes); - int mlx5_init_fs(struct mlx5_core_dev *dev); void mlx5_cleanup_fs(struct mlx5_core_dev *dev); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c index 10f4078..58af6be 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c @@ -314,10 +314,10 @@ void mlx5_cleanup_fc_stats(struct mlx5_core_dev *dev) } } -int mlx5_fc_query(struct mlx5_core_dev *dev, u16 id, +int mlx5_fc_query(struct mlx5_core_dev *dev, struct mlx5_fc *counter, u64 *packets, u64 *bytes) { - return mlx5_cmd_fc_query(dev, id, packets, bytes); + return mlx5_cmd_fc_query(dev, counter->id, packets, bytes); } EXPORT_SYMBOL(mlx5_fc_query); diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h index 4612e0a..ef2f3bf 100644 --- a/include/linux/mlx5/fs.h +++ b/include/linux/mlx5/fs.h @@ -185,30 +185,14 @@ int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler, struct mlx5_fc *mlx5_flow_rule_counter(struct mlx5_flow_handle *handler); struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging); void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter); + +struct mlx5_fc *counter; + void mlx5_fc_query_cached(struct mlx5_fc *counter, u64 *bytes, u64 *packets, u64 *lastuse); -int mlx5_fc_query(struct mlx5_core_dev *dev, u16 id, +int mlx5_fc_query(struct mlx5_core_dev *dev, struct mlx5_fc *counter, u64 *packets, u64 *bytes); -struct mlx5_fc_cache { - u64 packets; - u64 bytes; - u64 lastuse; -}; - -struct mlx5_fc { - struct rb_node node; - struct list_head list; - - u64 lastpackets; - u64 lastbytes; - - u32 id; - bool deleted; - bool aging; - struct mlx5_fc_cache cache ____cacheline_aligned_in_smp; -}; - int mlx5_fs_add_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn); int mlx5_fs_remove_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn);