From patchwork Fri Jul 3 04:08:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322090 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=oWTUhyKD; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhNz6pg2z9sQt for ; Fri, 3 Jul 2020 14:11:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725915AbgGCELr (ORCPT ); Fri, 3 Jul 2020 00:11:47 -0400 Received: from mail-eopbgr30041.outbound.protection.outlook.com ([40.107.3.41]:4299 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725779AbgGCELq (ORCPT ); Fri, 3 Jul 2020 00:11:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RYFYRLo0QdykM4fcMHkrroOdbpnfgu9OlSRPfZ0XpMpuyReOR/vVtOViCv7fOZSHlfK15XOSX08FIbYCe2vOsg9RIlPlatr/3OICnpC9T9D2bSHoG7xi4ASsoBBFSb1TKDNrtqAKB9g06SfGM5sqQUvHodngP4g+jnhYFWEWFxvKxm1y4ACAwoRSkpaHvlJj4e3Z3DMLcvOGlNcqOLOJOxEPa9PDGXc1xiV9frdf2PqgDmSdXAIvk+AiRWjtYxMbC8KqULJp8Seb/bBNmqTfuyInxeMMp1MkdtdtioX1ga9PgWwuJnHldXj0ryTQ8B4dHHE5GMfBAULi8QALz8FAiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G2gR9yzP1TSZwQwklW9NAFMLw59Pf6Y0JIfF561SH0k=; b=WmawRmvchwp2cgN5kxN6rH2Sdh0D8mD29M8pgN9U4Jgz5dvU3x9auCvkriOlKJubg2+Id5aLVmahmawHH8XZeeVnxVzuCoHi/gu6OgK434ESCOa7YqWzUNJSzZ3zo+VgoDmP4WQloR1hRxNDTi02R+mnbiVF44gAZAfgZdGWTgt9L5sZXOt5JblC0qGZAi7dLOB3WFejB2jId8c6iS2TWf6IPe+DP6iAqsGyQ0BaU/cICIZk8PcZfwD+/PAMjD2AB6qXGXbQLOmKC4y8bP/8pmtp3G3yZuf0M9puRQEqvmhf2xAjo+ElNAsMe5FwwsNHwifQTH19C+tUBBIsrqfNyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G2gR9yzP1TSZwQwklW9NAFMLw59Pf6Y0JIfF561SH0k=; b=oWTUhyKD4KeNiqpFxu9KKWNGx8OXlhacYDypmIOhER/13Cft1TyP9gHbfWJ7UwrxIE+t9tQCSmkcbujCvIWXvJNfrsPY8y5c8h9efVt9FjdcUeh86BrTiw0WDvGrm0ydFZbcHjgog7I+7uEcirQkB7MOHJk2yCIGNDN+fklsOHQ= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:06 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:06 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Eran Ben Elisha , Aya Levin , Saeed Mahameed Subject: [net-next 01/12] net/mlx5e: Change reporters create functions to return void Date: Thu, 2 Jul 2020 21:08:21 -0700 Message-Id: <20200703040832.670860-2-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:04 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d40bd333-d455-4695-ae9c-08d81f06d40e X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P8SIFHNoU06DMeaScYk3BB9X2gH8llb4+L2yK6GMDcI8L9O+4l4c+TyUeVYdGQ02h2kId4XS173zIqMyb61ue7sQSYShnuv2wUDjkbeOySfo7ksJ3/40VO0KZLg6E78E9Y39Nk+qnWIbV5e05k/+iDaxRYCqxTXwE+dLicvqOfO04pvG6lLXXj6ug57wDizRZlQsnLcMDPK3SDi1ZQwCl4ue6GIGvndqS7GEbNP31usCy/b+eHKH8chmD8PpaHT2/JwmmM5/a6Q5+11yJgxLyb9P0XyoHbqW1faucGXU8VTNvioXzdQDnEq6vqHMGOb+0YHkgUUJC31Ds/J7NUJuqLUW3csyyFF+cevclY6L/AyFmpMYsTAo+nwrQ8EXWZ9V X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ownEHVCd34wdQYZoHmqYDgRss3QMzyvvICOehBiI7teZPz2EOAX6jAzbr68N/BFbO2H11XTMnV/xDJhKeYOeQGWl4UrkQ5iXoybTY4TncAnUm8l50mDpPLZCRRwWJR/3sk1IP0BkW2A1IgGO+ka8FYBiNaJpb3/K2Nu9tfRI41EWtSQbLZRF40ZAHiU7ohsKRRbnW6ZxxmzgK3L71Xx5i33Biyy+VCxYcIkjIuAfd7crIJTO4GmX7sr3xPHuy8yRmL9RHmyg8IgSCT2MA04ssgatEQ69G5pj+vKFEb0DtIEVbXT5Bvpy+vf+QrcSZESFD979D7QOw3InbXPChus18uxL02ix81FcWNjF/BllVMs5iH1y6quBqh6dErhDHaeiJcRqb25HdtMwX85oc56zUEMGCDhdox6Bb4YSIcGy5ZE2UGmBccft5rhnisU/6k8VZoDQzfFvpO58xQ0v7XFPDxbD2/7ROqVouVQMwDtM6t4= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: d40bd333-d455-4695-ae9c-08d81f06d40e X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:06.4539 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2D/YPvjYCYjeilJ12qPwp0sIfYoecDxk67FCSoWWSPTs8YIIRRZQeissc67rOeW8+DuuSFiLd7BAYIO+pwuXsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eran Ben Elisha Creation of devlink health reporters is not fatal for mlx5e instance load. In case of error in reporter's creation, the return value is ignored. Change all reporters creation functions to return void. In addition, with this change, a failure in creating a reporter, will not prevent the driver from trying to create the next reporter in the list. Signed-off-by: Eran Ben Elisha Reviewed-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/health.c | 15 +++------------ .../net/ethernet/mellanox/mlx5/core/en/health.h | 6 +++--- .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 5 ++--- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 5 ++--- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c index 7283443868f3..d0625ee923d6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c @@ -97,19 +97,10 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg * return 0; } -int mlx5e_health_create_reporters(struct mlx5e_priv *priv) +void mlx5e_health_create_reporters(struct mlx5e_priv *priv) { - int err; - - err = mlx5e_reporter_tx_create(priv); - if (err) - return err; - - err = mlx5e_reporter_rx_create(priv); - if (err) - return err; - - return 0; + mlx5e_reporter_tx_create(priv); + mlx5e_reporter_rx_create(priv); } void mlx5e_health_destroy_reporters(struct mlx5e_priv *priv) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h index 38f97f79ef16..895d03d56c9d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h @@ -16,7 +16,7 @@ static inline bool cqe_syndrome_needs_recover(u8 syndrome) syndrome == MLX5_CQE_SYNDROME_WR_FLUSH_ERR; } -int mlx5e_reporter_tx_create(struct mlx5e_priv *priv); +void mlx5e_reporter_tx_create(struct mlx5e_priv *priv); void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv); void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq); int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq); @@ -26,7 +26,7 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg * int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name); int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg); -int mlx5e_reporter_rx_create(struct mlx5e_priv *priv); +void mlx5e_reporter_rx_create(struct mlx5e_priv *priv); void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv); void mlx5e_reporter_icosq_cqe_err(struct mlx5e_icosq *icosq); void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq); @@ -46,7 +46,7 @@ int mlx5e_health_recover_channels(struct mlx5e_priv *priv); int mlx5e_health_report(struct mlx5e_priv *priv, struct devlink_health_reporter *reporter, char *err_str, struct mlx5e_err_ctx *err_ctx); -int mlx5e_health_create_reporters(struct mlx5e_priv *priv); +void mlx5e_health_create_reporters(struct mlx5e_priv *priv); void mlx5e_health_destroy_reporters(struct mlx5e_priv *priv); void mlx5e_health_channels_update(struct mlx5e_priv *priv); int mlx5e_health_rsc_fmsg_dump(struct mlx5e_priv *priv, struct mlx5_rsc_key *key, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index c209579fc213..5161a1954577 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -563,7 +563,7 @@ static const struct devlink_health_reporter_ops mlx5_rx_reporter_ops = { #define MLX5E_REPORTER_RX_GRACEFUL_PERIOD 500 -int mlx5e_reporter_rx_create(struct mlx5e_priv *priv) +void mlx5e_reporter_rx_create(struct mlx5e_priv *priv) { struct devlink *devlink = priv_to_devlink(priv->mdev); struct devlink_health_reporter *reporter; @@ -575,10 +575,9 @@ int mlx5e_reporter_rx_create(struct mlx5e_priv *priv) if (IS_ERR(reporter)) { netdev_warn(priv->netdev, "Failed to create rx reporter, err = %ld\n", PTR_ERR(reporter)); - return PTR_ERR(reporter); + return; } priv->rx_reporter = reporter; - return 0; } void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 9805fc085512..b95dc15f23b9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -406,7 +406,7 @@ static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = { #define MLX5_REPORTER_TX_GRACEFUL_PERIOD 500 -int mlx5e_reporter_tx_create(struct mlx5e_priv *priv) +void mlx5e_reporter_tx_create(struct mlx5e_priv *priv) { struct devlink_health_reporter *reporter; struct mlx5_core_dev *mdev = priv->mdev; @@ -421,10 +421,9 @@ int mlx5e_reporter_tx_create(struct mlx5e_priv *priv) netdev_warn(priv->netdev, "Failed to create tx reporter, err = %ld\n", PTR_ERR(reporter)); - return PTR_ERR(reporter); + return; } priv->tx_reporter = reporter; - return 0; } void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv) From patchwork Fri Jul 3 04:08:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322079 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=AohvpjGm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLB4K01z9sRW for ; Fri, 3 Jul 2020 14:09:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726035AbgGCEJV (ORCPT ); Fri, 3 Jul 2020 00:09:21 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725294AbgGCEJV (ORCPT ); Fri, 3 Jul 2020 00:09:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIAoF3jXARaNj/BRsaA1I9K9K1eiRnO8XGmQhrxZFzAeQA8TFlba9rOeoXeCYxijppx3kvzqlB4sb0/RHSYClDPNrn0/LJjQyh29dDervtuh00l4KMNpeEGBJ6xiPFpEOyNsUjMAY6FN6rF8imqdI9WOOXL7fl+88TxgF3l9ejLAIXbf6rzUowUMrhpqatuQO+OgSjHLfAxprh/Zj6/9LDlashJSKTvQ63FxTFRYN87dlIcuFnEimU801oQYoFpCmFQwlvexsOceFBTIGtQ6d37MI79YwfEsdfC2u/KL5FDvk3WodXDRXQAWrQ5NtDUc/Q9LXxtlX41YeugltCSuzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0XRcmT/HSciG/AbwHXUhHaCXIXh/tnEQeWMLNnzQj1k=; b=GahV3QVN4Qj97EpPauMebD4JHHRo08QGpxaO/nLgDcGmrmfSpaUU3dAxv/9Pq72pELgUIxbsvBpNjMr6ADa0+32rKKhm8LRk3N0tqQ6OcQADae2SWJAorKK3NoV9Wa3RsLUBluWRF8Ofjp8HF9NvN5TPZ3pPMGoCmC9yRvIdpLV8APb222c9zeR0YsyHrqrWxuTKrEPC9xcPA9ENpXBLsyVriptn28STx0UYb8FzTw6Bt0bxYM0ipsekOOeogfNICtoJOP5hgEBKpBMPNHBAIAfCGh5A/a46HLP7VrzVTIh3l7U9pODWRo64XkTwDCXJ4lrz+yZXMz+WjLO8XQWPLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0XRcmT/HSciG/AbwHXUhHaCXIXh/tnEQeWMLNnzQj1k=; b=AohvpjGmKu2X7IRkKWD094LToI3PZeZlrpqzQ1ph3lz+5soh9N/VX9/3aSTZ+7OvKP2c15FAAjACN3mNRKu5ZAdws9/0DC33nu32eYabhdXn7hUFWpwclkElt+B0huJxzdWAkIpdBiCEH6KsHsnU9KaJIHSy2Tzzv1M62ZuNyQU= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:08 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:08 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 02/12] net/mlx5e: Add a flush timeout define Date: Thu, 2 Jul 2020 21:08:22 -0700 Message-Id: <20200703040832.670860-3-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:06 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cc373df1-8d49-465f-ed9f-08d81f06d557 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EOANVP8CfkvXzrgBfmfhfgkOWV0n1vvrQVgzMoeoJzojU8UKt1oGK4wm/RdEDGiyg6Vs5nqGsEjYH9t05KLvoWN8ALgOp9TYgbPmWjsMer8JAXNjQMghQcN8de9BhFynFF1M+rRFF6ICrbQOHQySUm+WKckIgMdWIKNl03J9NhoxapOcuQOD7kBO7cKf3oPMIjjXRyLEm0G/ZwEZskZKDamV83cxkb35pgUUMVj1wpOlOj/dAb3mMbeGmDM0mY4zCuDg29aZyNWq46dJqHYtHtLvkldM8GXxQMIxHGa0cCEQx8AUxQHxhTFtO54HnhPuwt/7MxaO9N/+Op8z+nmm1GpzGRtpa/MhsWs/JX7uapYHSQ7CqkSZcS7pyNrX9UQp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 0weVjXyZF/mfME3xMI+HllXi5QwqbTMLuM2VgXHhCLUnlELKIdM4T2od81LDkFnagujd9sVzO2EvlZERIvEotU1zZnLGRFKjZ/H8xy/Gmp8RBUb4KDg2zrv8Jo8Cp+Ml1oRtJHDVTQSpt9uLC2sVSfd5xu+isQePyB/BVCC3pEbR1LUrfHPbKlRH2ZpzIy9PjXAr7p/lMUv0wba64XsowI40unCAz1RJJRn/vIe3d2d6E9wNDPmVDE+X9zDIFgtHrPeU5eIkWR0WGQtNybcg1w9MpId3leMSGq9ZATuQFhPUp5W90e+GizuPyeMgSIC2AFAz1htOQESbkma1LdVpRRZLPsEBmKBjeufIIJ2hA3aH4SUauKOfvYpnG6duoHqg/jpiX87/iCUYFKaSRaFfratqQY67G03BO5ke5luCRpTvwTIquOj5tBWV1IxPZ31s+7xAQnpWMQ+VrkhWSWaH83/zR3BeH5wAcb2ONzokueY= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc373df1-8d49-465f-ed9f-08d81f06d557 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:08.4238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w+JY3BQUWo0BpuMZl28Xnl2bxgkWVlnfIMncNC7RWjugDwbgl/mnEPANLAWbwKubu2gWJlTkIt3aq6cWLeqz3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin During queue's recovery, driver waits for flush. The flush timeout is set to 2 seconds. Add a define for this value for the benefit of RX and TX reporters. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/health.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 3 ++- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h index 895d03d56c9d..2938553a7606 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h @@ -33,6 +33,7 @@ void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq); void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq); #define MLX5E_REPORTER_PER_Q_MAX_LEN 256 +#define MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC 2000 struct mlx5e_err_ctx { int (*recover)(void *ctx); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index 5161a1954577..495a3e6bf82b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -29,7 +29,8 @@ static int mlx5e_query_rq_state(struct mlx5_core_dev *dev, u32 rqn, u8 *state) static int mlx5e_wait_for_icosq_flush(struct mlx5e_icosq *icosq) { - unsigned long exp_time = jiffies + msecs_to_jiffies(2000); + unsigned long exp_time = jiffies + + msecs_to_jiffies(MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC); while (time_before(jiffies, exp_time)) { if (icosq->cc == icosq->pc) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index b95dc15f23b9..6eb2971231d8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -5,7 +5,8 @@ static int mlx5e_wait_for_sq_flush(struct mlx5e_txqsq *sq) { - unsigned long exp_time = jiffies + msecs_to_jiffies(2000); + unsigned long exp_time = jiffies + + msecs_to_jiffies(MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC); while (time_before(jiffies, exp_time)) { if (sq->cc == sq->pc) From patchwork Fri Jul 3 04:08:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322080 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=iCrp+sTk; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLF3crrz9sQt for ; Fri, 3 Jul 2020 14:09:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726074AbgGCEJY (ORCPT ); Fri, 3 Jul 2020 00:09:24 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEJY (ORCPT ); Fri, 3 Jul 2020 00:09:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DwJq+CDyLqARI4vA5cmMA6D+jxmlA2/ivAL46BRnpKqxikhpt4z4VJi/+CATfuaDZHuQp7hpPTIJ87sEFToszBGBNLbs80VvLeqk2Tg5IfaTh8nKrqk+0Zjayucew5gQ15J0aJgxvu56rfsb1EqcmrGWt8ixDHIphpkaGT63F0Yw2oYz3xDdVMAtqv1Hl1O8iQ8+S7IFvH+cWZ9IO5BxABkJherdZ+X71pzWaSHm+QuCSa8lavfNUXcwhzpQ7FNM6UdTC6KS2+AljnStGsFKXGu8tZNREct1DUF4GJHbFlwYsIt+RAMRyXjOHF5BVcPv9jt3mwj5wnLSPCXhf89Xbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxhrgmSeboazxEPOXsm6aMwrRQr3YLz9zCEfc6Lh2CM=; b=T4U8aetocyeo9xph9ix2/2Fjj8qo+qzqcAIoTZPoKi96V7WKvJMHYRd/uKYe1AgtbfNbUhJRnOMDBsWZT0kM1fyPVd8X47gCPBetQ8MegqOmJ2bHWxUR2VD35cIsfuToog9hdxXi+jauvdh5ifLwi7dY5Lri5jRoRmd1egwpvFXZB8WDbq7paxNutL88+/ga4x06xMqCwee4cSCg3TAFj3gb7pHi97frXsqUicfABydRaklf83U6HRdSy08I8MrXrOOOu+0d0FczvAI6RIv9G9pXpyMCSIqpK0ajHVUDNIiSFghswrQrjrz5N0h1VrBmdTapCySNAL8nXNqAotte8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxhrgmSeboazxEPOXsm6aMwrRQr3YLz9zCEfc6Lh2CM=; b=iCrp+sTk+VBGJ94OBFd74E2Q8dro8L/emxbuaJFpHHrDJvLo6/8NvfbpsIg21QY9o1DBEFix9llOoPt+XsAY95arJeZQAH+Ibt20jrxDtMaor56UoNXseubycxRaGmsitsVK/Rrzt8Qqm5a1OJanZchx/iONCQKyWtOyfSCpm4I= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:10 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:10 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 03/12] net/mlx5e: Remove redundant RQ state query Date: Thu, 2 Jul 2020 21:08:23 -0700 Message-Id: <20200703040832.670860-4-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:08 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5043e793-5aae-49a0-0eaa-08d81f06d660 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EFC+nLVLOyEL9Z0LJBvMFXpPkmhISw9L+Tb4/b/J4AGan74wDVNsZtRdLVLTOKuf7WRWzMQ5YVBOivbf982CDK9VmyKf3HvVNU4JZ3oKx+mP+oAHDjOB6hjV3vryM8shtWC6VbAImBaGR0ULUqwJS+a71t/9SLXv6AEwkcbEVXoYEXbKYa6wpW2aTqsl4XSRc5VpGaDcvT5+1nHEq/XDeAxFYZAdZluu6/WSqVj399XuugIhPWV9NZZzxnsEzAwAzretkkAaVIueAdS91rN7UrAWGgMXHxR5l7ORCSYUsJ37kzPSw+fZK0O/Dd8YTRyOTw/SPi5B16MvovqRwpeopOkUkVlQxAXO+67S/AvTcqAm371G0MfBoz+cKE8JIJh6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: jDUK5Bi0ch56it+Oh5c52+4bKAOBsmnUngVfTiow61ni8JJN9sYhtqNZe+p4iuBk5ZyOGXSrsVWY4nm96Iz9W92hq0Ty3kbzbzHUTRwP/pHVptETA33ZI8rJzgDdLWxP2zA8zHJMlblVONHG2behVY7Hq+1Ali1oVseuvv4HpLsUFfK8kqlpFp8soBmrlG538c9k/F0O+Qq6txPD6PJ/6cCi9yf9tu0D09qDbpXO1DJzt4JuhJXurudgmZFnXbjVQHXcv5KwqbZhkOAzoKVZVbLnYqelKUB0PA+1ilZRFcwSMGokLtbPp6Bddl1IBG3DxUyoSvIulOHbLa4/r0lJLFaeNUwVwvCU5z7ChkB1vf1lerL9y9zjdkAbEcuADLAUQWz7EhqdUlTua0v0FOZyPsfnvJEoPX1SSP+FcR3e+x15wJTdcrMWXt5S7VW43nJgdRxLqgfQXLDIfqxt9LdaEzqhsEd3c7d1SeCnUEAv67k= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5043e793-5aae-49a0-0eaa-08d81f06d660 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:10.1768 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yX1dojGarLG7sjWY8zELL5gRzzjzCJzSigjQx7oYzrJjw2+cPw5V6To/7LHGNI8dwT3yE/1eFJPpmn19pAquPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin When received a CQE error, the driver inspect the syndrome given by the firmware. RQ recovery is initiated only as a result of a fatal syndrome; syndrome which set the RQ into an error state. Hence no need to query the RQ state at the beginning of the recovery process. Add additional debug prints before recovering. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../mellanox/mlx5/core/en/reporter_rx.c | 18 +----------------- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 +++--- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +++- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index 495a3e6bf82b..b8b32aef1363 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -124,25 +124,9 @@ static int mlx5e_rq_to_ready(struct mlx5e_rq *rq, int curr_state) static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx) { - struct mlx5_core_dev *mdev; - struct net_device *dev; - struct mlx5e_rq *rq; - u8 state; + struct mlx5e_rq *rq = ctx; int err; - rq = ctx; - mdev = rq->mdev; - dev = rq->netdev; - err = mlx5e_query_rq_state(mdev, rq->rqn, &state); - if (err) { - netdev_err(dev, "Failed to query RQ 0x%x state. err = %d\n", - rq->rqn, err); - goto out; - } - - if (state != MLX5_RQC_STATE_ERR) - goto out; - mlx5e_deactivate_rq(rq); mlx5e_free_rx_descs(rq); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h index e9d4a61b6bbb..be7692897fc1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h @@ -268,7 +268,7 @@ static inline void mlx5e_rqwq_reset(struct mlx5e_rq *rq) } } -static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 sqn, +static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 qn, struct mlx5_err_cqe *err_cqe) { struct mlx5_cqwq *wq = &cq->wq; @@ -277,8 +277,8 @@ static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 sqn, ci = mlx5_cqwq_ctr2ix(wq, wq->cc - 1); netdev_err(cq->channel->netdev, - "Error cqe on cqn 0x%x, ci 0x%x, sqn 0x%x, opcode 0x%x, syndrome 0x%x, vendor syndrome 0x%x\n", - cq->mcq.cqn, ci, sqn, + "Error cqe on cqn 0x%x, ci 0x%x, qn 0x%x, opcode 0x%x, syndrome 0x%x, vendor syndrome 0x%x\n", + cq->mcq.cqn, ci, qn, get_cqe_opcode((struct mlx5_cqe64 *)err_cqe), err_cqe->syndrome, err_cqe->vendor_err_synd); mlx5_dump_err_cqe(cq->mdev, err_cqe); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 8b42f729a4f7..350f9c54e508 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -1187,8 +1187,10 @@ static void trigger_report(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) struct mlx5_err_cqe *err_cqe = (struct mlx5_err_cqe *)cqe; if (cqe_syndrome_needs_recover(err_cqe->syndrome) && - !test_and_set_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state)) + !test_and_set_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state)) { + mlx5e_dump_error_cqe(&rq->cq, rq->rqn, err_cqe); queue_work(rq->channel->priv->wq, &rq->recover_work); + } } void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) From patchwork Fri Jul 3 04:08:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322081 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=AuLGJ87Z; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLK4fJKz9sQt for ; Fri, 3 Jul 2020 14:09:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726106AbgGCEJ2 (ORCPT ); Fri, 3 Jul 2020 00:09:28 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725294AbgGCEJZ (ORCPT ); Fri, 3 Jul 2020 00:09:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ESWkUVYg5QLmO+xFs1+CiMmiwFia9URyPGGvtt0hO+hOuCQT3x91tpfv0wDePfGN6H4xe/SoXqAGKa7eSWDjOf8FP5a6UORTTs4KkLBhT+qsAFdga6s8UkiAD35d6AmpcTJ4nYhvdicWOumWeTCAoVkusHdMJGXiVyW0vy/dybHkyT7i2BepnRqkoqFSJN/gv013UEixD5vwy613I78d3RhW+SFBcRNleTSQtEbh7tOGp0HXQGXi5xYb69c1JzV8Fs0UUGx0qnjllZzOjZP73gT4fuT6DCLltFf+cbm6C1RAmhmKkskXNmZUIb804o24gOFeolVoEUCKh+v+BsM9Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BhmODa/ZLtNa4sAAWitjOocJXOHPMsxWmLh7hQJxgss=; b=OKUm97ua5M2VSjHHESqqd+AozAY1NOE6OAw23a2qai/Jce04fzKFaylDUvAi95b+z/1oi10duilPeEG3Gy9rI1L1jKwCUdhv7iCDBDnj+Rpoyb/yTUKoydgBwbJjTtlYgBtTU0WDXu50Qy/6yyabb80c4hQSW7ikhGPXLp1QJqiJinq40/Fn0gnXe0xzSj1xb15nvMr/frsjtzRmHw2NaD9KxA9PKco71VzZGppCrOQ15bIC5Q1pXGst3xMNbpbx3dtG5/sQE1zkagk1S4Ak93mfE0+FhXp95DaqkP6x9vctyX7IDcyk+EegcdrzOTSG979yreKNt3NPIoKllPwsdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BhmODa/ZLtNa4sAAWitjOocJXOHPMsxWmLh7hQJxgss=; b=AuLGJ87ZOfnZ0hI0Ilge9VcKufLfNU0b1H5etbldHNWYjgximnego6Ejk++jA0BDzwvMw1iHWMYG7bjDYpq3bcblAIDhHc4o743ActOtRLU92vgnO+eQ1qx8H7QZC2FVv0W8J92Hgmin0vz+9fCAm1XhfjQuYWFCa9T69i/hRGM= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:12 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:12 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 04/12] net/mlx5e: Align RX/TX reporters diagnose output format Date: Thu, 2 Jul 2020 21:08:24 -0700 Message-Id: <20200703040832.670860-5-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:10 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c8277c77-075d-433a-e383-08d81f06d789 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nCvTIgauT/G5ZA7TWnxBiT9DPXuTF1dGGaVQi7qyvYSSCtcqsmDVqKGrKviTx6wogsTynzEerPUv0Z5LEbebO2J68fvzAr5dT2N6mYk0Rm5q3iAZg2a+2q5FavmbtsIhtDMxY05V8fgZSNw8MKcIX3OOfYxMrbCua+H/W+eD2I0shJjfhjtxzQKM2ZoGpDU+W6qer481dqe1Is1nO3CoARp37TbmHEF2RBVT4tJ8ThCEmLFr6fEH9NI2tmMdWt150WXDBgC5Yo1+CIA/mY9UX5/5h9aZ95aP+Fa9E405fZLvaRYPTRQDkDoj7jPWiVjZ/0DZdcKuVK3W/mW1/z5GFzve8Wuj2qFg/WRAqg5EUmZD/iNNSZ6kqrWPoWadtxBp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: FLc+bnfvWkyQYh2BprD9HrfmACFlXfFf4l8QR2MHrv5tpnJViUFLfmO9PWQcuuv2Aofkv42DlojMIPVXTKxN+uyIBnRVrQKEOnMp9ER2SzCXNuGN6PEzOuU8g60waWprkw+D6gYhoDlv1ntoVQnw9WrW79UHn43XED37mgWTVEqEtM4DBtuCTpNeSFbi3PNjFt+FFn/3kW/tSyM+2fl5rZXDIFG1pC4MvfdCqQ+KUi70DOFBg68DZRXTaDF3A5+5wtJXo11qjDyc0xDnU8R+RgLpEZkCk6bh/O+hUe8VoOCx954lEQ0p1txTcFykPT0XTyCLIClWkhVyoXgv5+RwwQBQhSZhlUxlSuRmD0ecV/SZVNOsdtMAL3SdHIR+sVW9OaKPTSsCW9BuBRYmBKepUj83qUdsVJQz26MXrFAOKIaP6zHRYnnxYVeNgVx5N2B7SIIJemKi1rg7uyOg/Wqyx7maZIJfRMNLR5bC5Z4dS6w= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8277c77-075d-433a-e383-08d81f06d789 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:12.1227 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CiUGHOLnSIa0HoJr2R810YPjzInbMcBTKr14xw8TP9S/oub/TefOnPPopWb3dQyNaxw6ekMPuL43oYH5b5Aeyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Change the hierarchy of the RX reporter 'Common config' in the diagnose output to match the 'Common config' of the TX reporter which reflects that CQ is a helper to the traffic queues. Before: $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: ... After: $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: ... Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index b8b32aef1363..f1edde1ab8bc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -284,11 +284,11 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter, if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_reporter_cq_common_diagnose(&generic_rq->cq, fmsg); if (err) goto unlock; - err = mlx5e_reporter_cq_common_diagnose(&generic_rq->cq, fmsg); + err = mlx5e_reporter_named_obj_nest_end(fmsg); if (err) goto unlock; From patchwork Fri Jul 3 04:08:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322082 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=Dnc2SQHf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLM3P3Kz9sQt for ; Fri, 3 Jul 2020 14:09:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726118AbgGCEJa (ORCPT ); Fri, 3 Jul 2020 00:09:30 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEJ2 (ORCPT ); Fri, 3 Jul 2020 00:09:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hEQjME04i0cySULVwTIPjgj3YRTG1Aw3RkFmUP/76nRJYO/CLtp0Zpd29uifiEnrhfWpEmHpROK7TOKZyuZqJbvzWMiRAy60Ttc1tAtSATKN2f7Pa02hwF04YzHjo58kLIJZSpN0B2293wr8nZ1vYwrRCTQDKUYxeSJcJKkVWxOlTQmoFK51pbY9HZgDtcth9CA282F3sZlggcWtM+Rtxq6gHRFTJextNaww1OJHg3tvqwuJWlscUn9BRHGRDzvacmpXlwb7/AjUkl/LSTbtcGrIJPkls5MJj1FMaCBBA1pZHaWqhRxwQrIRCwSQLufUyFp5CcLhSj71K0DOIK+4CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d7ssqwSlXiSWUcZEx2uLIxVf7PgimnundSMaNmHwuog=; b=Oqr6JicbBJtqzMXLe3gjJlWpyfhyr76ZFXJ3PD07qYhOuJaCtItF4jcI0SGjGAFoaejqij/+QxuhjT4N1HDu5wSuGwr+eoSyHV0hNWSYfvqzB8UwmpbNiu/FVUi3tNKrdoZ1hIVkxhcMKZZKbfFsKBli/GqbGgD50MqdynOI2vXXBnkq3MRkX8WHyTW4VHG3ynBNtcZ3Uj8/PnXxdvdvQEz77CkJW/ydWBLNOf7/AsuxY4orjAx1MYSOurbvi619XayJsTVdE996wdlVcZpBKf3Z37y7tDaEZP5ImJo3RHMKvs/kqfAiWh60Zls7rbdAz+zyWysJmaLwfUkcb7h4UQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d7ssqwSlXiSWUcZEx2uLIxVf7PgimnundSMaNmHwuog=; b=Dnc2SQHfPoDLA98QjP/9UGLWFtDuBYiyVMA02Uqdm0f5Gq5qw8k5aCqJ3UrE/sU/PFMJploHba5dghm7QoJSxorG4v/K8ucBCOSx92roco8Ym3DFLJ/medI1/b5AuMVkpPPJLXhmOx80r8MAVyNScxxPA66C1xyXFC0D0G9Q7wQ= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:14 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:14 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 05/12] net/mlx5e: Move RQ helpers to txrx.h Date: Thu, 2 Jul 2020 21:08:25 -0700 Message-Id: <20200703040832.670860-6-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:12 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f97fb3d7-a19c-498e-a70b-08d81f06d8b2 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:901; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eGb8C8TWNONf5zxTUgVfEJnWCShqJX1c6+Ibd0F9KFl31EjnJZkqvxeY51Uexh1ukR+N5iTLyRhBK1BQVR3pS3GXvUJ5db/4cCdDEtt8CEpXdft/r6kRKdFLpRV4Y8CxHwMz8doY2uDmxYM/ex/XLxLlE2OcpLqS43p3qg7UB/1anyLeuC630owGwSVaU1HwhDW8yvLjCom7qQb5CN1fl47/ucMu09N3lq8O9v2w2ERwXEKM7rTp7CsZU2obwqAVItXIh0Fxo957cUmKwuto2VXuqEHq9F+Tp5nXNrtEka4QUmFt/Xb/5I6d9G3TsvvOHjfubYCzpt5wyRMFNMurWc8JzzgwkG8Sjfnu86xLwjzWs7F5mqF6g28ASqRc8hRK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hv7lMkkunXPJsmB+DunD8VUNs+9DSu/rWY5I4ohBOki4KkFObnfFscqB3CaWA0WC14WDpKZjtdXxkDmNgotrdbYoWJGpN4xxYihxZqw6MCOiOMq8ObtocvZ8YULh+QpyFVnbX27/aKENxugkiyT1s7BAszINM2BnvILi+47x8Bv5OW4WbnKL7X57eB6T6gSjSytThX1Ho4jAWS+55MsVJ+BLky8ZWflsIeZuhwbSVQgWJh4vay4jMIxHnFroGdjjK5q7aHLywRKeU7ZLEfzPL4tCAOCyzfLLhjoFBiZzolyQ73ivNtyf9Kr1OO9NVPNcApjzhU5shoXsyIzGJANXHkQ2rJYWTIVAnda9sZXeg8jhJuHYr5A/ynwkOqVnsylRZxvxnLxut/PKuhtGKOmYtFZceuOq3cTUSjx8PGsJAebtDUMgq33noZnz+toV+GpWrhrTRd3QqifXPQ/J9B3/hBtuF4SkzOyD4jebTDZLSLg= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f97fb3d7-a19c-498e-a70b-08d81f06d8b2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:14.0555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: unGqpYJk9KljYleyZXkpOaiOVpQKqvYWPoas6wRdxlQUqutx9dd8LQ+vUqovfD4ckRhLHcQZIDxaJDI7YHQDAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Use txrx.h to contain helper function regarding TX/RX. In the coming patches, I will add more RQ helpers. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 20 ------------------- .../mellanox/mlx5/core/en/reporter_rx.c | 1 + .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index 2957edb7e0b7..c44669102626 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -852,26 +852,6 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget); int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget); void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq); -static inline u32 mlx5e_rqwq_get_size(struct mlx5e_rq *rq) -{ - switch (rq->wq_type) { - case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: - return mlx5_wq_ll_get_size(&rq->mpwqe.wq); - default: - return mlx5_wq_cyc_get_size(&rq->wqe.wq); - } -} - -static inline u32 mlx5e_rqwq_get_cur_sz(struct mlx5e_rq *rq) -{ - switch (rq->wq_type) { - case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: - return rq->mpwqe.wq.cur_sz; - default: - return rq->wqe.wq.cur_sz; - } -} - bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev); bool mlx5e_striding_rq_possible(struct mlx5_core_dev *mdev, struct mlx5e_params *params); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index f1edde1ab8bc..bfdf9c185f02 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -3,6 +3,7 @@ #include "health.h" #include "params.h" +#include "txrx.h" static int mlx5e_query_rq_state(struct mlx5_core_dev *dev, u32 rqn, u8 *state) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h index be7692897fc1..ed9e0b8a6f9e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h @@ -284,6 +284,26 @@ static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 qn, mlx5_dump_err_cqe(cq->mdev, err_cqe); } +static inline u32 mlx5e_rqwq_get_size(struct mlx5e_rq *rq) +{ + switch (rq->wq_type) { + case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: + return mlx5_wq_ll_get_size(&rq->mpwqe.wq); + default: + return mlx5_wq_cyc_get_size(&rq->wqe.wq); + } +} + +static inline u32 mlx5e_rqwq_get_cur_sz(struct mlx5e_rq *rq) +{ + switch (rq->wq_type) { + case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: + return rq->mpwqe.wq.cur_sz; + default: + return rq->wqe.wq.cur_sz; + } +} + /* SW parser related functions */ struct mlx5e_swp_spec { From patchwork Fri Jul 3 04:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322083 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=JTX1XgwY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLP27J4z9sQt for ; Fri, 3 Jul 2020 14:09:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726140AbgGCEJc (ORCPT ); Fri, 3 Jul 2020 00:09:32 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725294AbgGCEJb (ORCPT ); Fri, 3 Jul 2020 00:09:31 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TuND2T4HjIw2a86FFktHzA4OcC7+UfL+iZ8LRD/ptaZuR8485hsRzM+mDW1ckNrmclNUSbE6vhEceRSAYz9nwqqhyQlZ+E4pMHAAM5vrn1aneJrs0w+KBF4qBvrgb/jV1O4n0W3DdlX3ZALfhyCK9GQ9sXQJ1SdmZsnahkpBinw+xVyiKXDWhVNyrEvjMCluCxqX43M34sPBSCjazp9a/BqUGeV09Wgl232WdmG9+rd9tB5TJ8nseUcHuOHfKpsC8zoUY71DKu8JkrnCDSEbpnSQwxFdQKUtzbXzKnYXxBynt970atgW3nRq5Fv+doBe3vHqgezZokZBA5esb7gyCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJriQAZqrXirNVjZg2tmSril3yBmZ2DXUDW4kjpJGRI=; b=oWZ3dAGYwAkyh9/ndZulLxMpOAzV+9BKBkTdhWYkjBenfQshJv/Id6mP7TGenlC7v30k+XVbljeMNx0BQHPHawStutTLrhTlD3g4yCx7m8shJL+0H1vofRefdU24AGys+jbW7hSm8o02J8fnCrid04loFVWHAO51grocAzsyZOYt/60tz1EIcS7I+ZEAUEifq8RVkJLNjdcc78KACLe22DaZxXQYIKiOq9YkHjK46xDdqpcgGf6DPHqKdw9tqm0PucivsdiJJsSBU/NNENiTU/GsF0GzjKsImFF83gg+Rvf4JKbFkMZ3v+bz8vPK69m1L4CWaOhPJX/V0pG3F9Umsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJriQAZqrXirNVjZg2tmSril3yBmZ2DXUDW4kjpJGRI=; b=JTX1XgwYQoHKHx9SPFGfEKbP3dY6jWIzkZfr3MSgijFZjpnuqN9MGCARrRWyY6zrD6y7DtQHBpkkHP7TmpcROeoQG1yPSkFGMpnS8GEh0d9gpPOYwF361qbl6MH+EK92d14kv/nt1rOhM0Rx3y8aKh5OyB4TVC6yma7AUffC6L0= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:16 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:16 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 06/12] net/mlx5e: Add helper to get RQ WQE's head Date: Thu, 2 Jul 2020 21:08:26 -0700 Message-Id: <20200703040832.670860-7-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:14 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f3b14d34-3b02-49cb-91a6-08d81f06d9db X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a2EeJPEIUJSzD7FF9hj89TYQv+2HTSraTeeXkV1ZCPr2xzlLwEFSxNpjdwmua+SC8xdC6O1JwZDWGRqeKyQ1cXlm8mNe0xAwvz+GJY2qNVbAPV6uvTOopLfokJhceEu6Ve9S2pBYRZ/fqIBZe5Iv+WLcPnwOnE/3sw2AKZYfOYaGJ07EXhIewkjA9QP7K16PS6bWHQSR2Hgn94ILj8EDWuE9cvg487SHPk8CxLxmvQEa91rdaYpEXsOKtZIJJobEylyAjwxFuxxAVz1SYeN1PictJwN5sI60EXJd13ULglyISnSjpOo63bdvEJy2hWaELQrZ/ivj/eWgf6hdUvgpnIIXRRf9yDvlLY1Go4GPBz1lCSCFvEnabW6sPBZ4jiD0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 5TH8G4a/0hDvjoGx5exF8pbcvZYvcqbR64jppEZKo7Xr/aAm62CzhG2uQ+FLXCL55utlEaYNj1RHtTdZPgC/gJH2M9NmzyquDKm9l2NuEc72lL3/2hRpMDHYee+PLs4ScGDGdT4IPKWmAerKXqXv7GKUKcVdWbxfOFiph2hkf6DRbg1yQxkTPwk0sdpI2y5Fu1Kc18lF0/k4ZMG0JAd66ILAcecZhcWqT+1KQhl11xib+bdfwLC8NOTwBxUT2iy9dppPJCk5ILSyuPmawigz+u2O8McHG6E01jLfWcMIpVq4WfONNsR6ql63hBGQl0SfKB3KLpGB3DNqkwtxAasiGgbsSDgjDfKduzp0Hk0Tt2YehnMSc+UjU0YeMJVsxOEwXn3eEDl8utTmWUDP4FBmJuF5t3whQMwUSpcM/zMNviJYlWYSuoec3y0s6VRgPCXZBZb4NmW64xc+jwk2fR/gG0weY9fmT4YAyzax3hk0oEo= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3b14d34-3b02-49cb-91a6-08d81f06d9db X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:16.0134 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: isX4HL+PWU5IwiNJfeDxzA+7J8mVkskcN487qPi4w9lTg1iNN6tECbdjXptNXKhwpPdbC56jhVqvdzv/o3XPIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Add helper which retrieves the RQ WQE's head. Use this helper in RX reporter diagnose callback. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 5 +---- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 10 ++++++++++ drivers/net/ethernet/mellanox/mlx5/core/wq.h | 4 ++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index bfdf9c185f02..f0e639ef4ec5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -181,7 +181,6 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, struct devlink_fmsg *fmsg) { struct mlx5e_priv *priv = rq->channel->priv; - struct mlx5e_params *params; struct mlx5e_icosq *icosq; u8 icosq_hw_state; int wqes_sz; @@ -189,7 +188,6 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, u16 wq_head; int err; - params = &priv->channels.params; icosq = &rq->channel->icosq; err = mlx5e_query_rq_state(priv->mdev, rq->rqn, &hw_state); if (err) @@ -200,8 +198,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, return err; wqes_sz = mlx5e_rqwq_get_cur_sz(rq); - wq_head = params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ? - rq->mpwqe.wq.head : mlx5_wq_cyc_get_head(&rq->wqe.wq); + wq_head = mlx5e_rqwq_get_head(rq); err = devlink_fmsg_obj_nest_start(fmsg); if (err) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h index ed9e0b8a6f9e..d787e8fc2e99 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h @@ -304,6 +304,16 @@ static inline u32 mlx5e_rqwq_get_cur_sz(struct mlx5e_rq *rq) } } +static inline u16 mlx5e_rqwq_get_head(struct mlx5e_rq *rq) +{ + switch (rq->wq_type) { + case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: + return mlx5_wq_ll_get_head(&rq->mpwqe.wq); + default: + return mlx5_wq_cyc_get_head(&rq->wqe.wq); + } +} + /* SW parser related functions */ struct mlx5e_swp_spec { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h index 4cadc336593f..27dece35df7e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h @@ -290,4 +290,8 @@ static inline void mlx5_wq_ll_update_db_record(struct mlx5_wq_ll *wq) *wq->db = cpu_to_be32(wq->wqe_ctr); } +static inline u16 mlx5_wq_ll_get_head(struct mlx5_wq_ll *wq) +{ + return wq->head; +} #endif /* __MLX5_WQ_H__ */ From patchwork Fri Jul 3 04:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322084 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=Som7qh2p; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLf4BPRz9sQt for ; Fri, 3 Jul 2020 14:09:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726150AbgGCEJp (ORCPT ); Fri, 3 Jul 2020 00:09:45 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEJp (ORCPT ); Fri, 3 Jul 2020 00:09:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAomLqEhS1t/wxTjA90+JXipW7GA4vbHbu5IEN2pbEIzl6dyMQYrI+1nuVQQY65fXtBEyg0pRLBmGK91EftONvR5wMoXmpNmwKF+yQIk5+6q4sH1Spg6gG7u28dDwqE2TnSXYXkZ6oCuh+e+n2RsHA2fO4f50+dfYCtwhEGxQ1qHVbx3IjngP3IxugrohrxjOpylojPMwL2itDEGLC8jVn1DBhflkyDQyPWeWhdM+FLHS0dzL4FimPiE/phN5pEWqvYZJ0GNOXgqIFW0M2nDhAq/qJmwACDHx0jVrkXRJtRRmVa80txUUtGJ/LNArswNizAWuCJ9XDgJuQ6vVuQspg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PO1cR2KLkCfppH66uYpbdhDIpkuQE1L1Rxkc2+pg5yI=; b=L+w5B8oJZPH0M6fSzaVWzsmFMM8VnK108cJkkNbUWiXCuZ8xBWyGcsaC50ZsZUWZJ5inkdGRkws+3I7cd2xts32Nd4xGtp0chDV0SgXIo+xcGdERiBmnjU4hqL2ZqXG9xotFeNKzSD95JgPlav2SMLqHny62EQs4CNUky7Glay8FIblT9FfCUgYcYpNJfXNAPIuprR4JjXrs7cY6Y0t5rCHRXk+RB6Sa6jLgr3Ee+QjERSOdwRzokgZEHyCdq+y/o8i0J/bjXinnw9pxi3jF+AnWrTbwqQAsfHpO1jQV02MzqjPm7ngDkKLc5E+UVnFwMS8WDJiWUElDmlh1WhCMmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PO1cR2KLkCfppH66uYpbdhDIpkuQE1L1Rxkc2+pg5yI=; b=Som7qh2p7GYprv4pka+iJeQZrcELTDi86jiVKwgvcMWKW8SQuGI1bEX0qkgZCnmzBZ+NXpWzwYCdZS3N2/2l2zE0DhLnYBKaMO2dSGRGPp291KbeXhbhqiHjB94cXS3VUQsRWJkPvannTajIhyNNHyDVk0nwO62nA+SnnvFmChk= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:18 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:18 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 07/12] net/mlx5e: Add helper to get the RQ WQE counter Date: Thu, 2 Jul 2020 21:08:27 -0700 Message-Id: <20200703040832.670860-8-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:16 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 892cf6ed-aba5-48be-2b01-08d81f06daf4 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2150; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SyEsIa6IuTug09xO26LgOiAuJZvuS96zrwWaUfHkpRlCZbxfPX8ujvEQc/0fWMFP/Gi0EnceWdHVceIAC19GpoCx4FWQWP7NPft/96QX68cmqV4m8HOb07afxDr3ZsPmq7JaWSz4Fpwk+KFg5HGvbYxXFg4xdOKgVLm5phJS0bxdvhgaREJIeNCePV2YvcP4GuxyRQ9xfEKtFto89AJqcc3THZ3ZJw8Od1ywldKcif06WjCegyTZeZ497A4X7jY7nt551LSYkBfqLi3VvCFW7eHw9vhKw0rh8VLfRxsAXxkh4Nae/PaqCM/hhe+3JpVt9+mzq1A1KGCIdMnXUixVaEAB602FBwQUh3dwDyx9y87qdkNAfIxZc4QBCAIeBrskPgrh949+GL7J6moHJOUsSQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002)(15583001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: UkgK+8xemD48b4uEehpzdpfx9xAOUgVQYr+DdzmL7ERkLVPCqXo5Zx58axu0/0w5BuXiq3+gvEarsJSGCO7ZOdBi/H/C2ekzLKtZBni1cXcAvEAhAwOlEyZ9m97bCy9HDLkv7KIXFx6AICqUiVcZxnQpuxyzvcnAXxuN/fJVh5nT0PjPa41xDvpR8GCnde4Oiw65clFw7USpRHoA0CSodR5688DzOLuFqS36wcJysMEOrtseFaOZGVRwxV5Ppv7G7JJIW25+DDvIlSBJTvxyTH0toF1zggElDOs+/wnJWfTxMGviFP1xPg4hw0DhT2iqn2cpzQdPOXt4DFMwEuNC5meTS3kEHiMS1q+Cdnh6KDkEXIFDmj9WP/76eZ3cPoe25gfjGAdiyRkpz5Vj3T0L+C2h/X5uL0EJzHbpDsdEHwSbhMd9rLQIlzc/Lj+xzWnpvJAonsSCzGH0b9oVQz33d24a9zPZ/ZFZlEkaWMM/12A= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 892cf6ed-aba5-48be-2b01-08d81f06daf4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:17.8493 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L8pjLyjKMXhB7c6kPtY0som3FvX/DaAslfpspK3MidxKLnJ36R34wV4S0GOEjPrbtJwFX0ufLPuXCIrgOHOpog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Add a helper which retrieves the RQ's WQE counter. Use this helper in the RX reporter diagnose callback. $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: channel ix: 0 rqn: 2113 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1032 HW status: 0 channel ix: 1 rqn: 2118 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1036 HW status: 0 Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 ++++++ drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 10 ++++++++++ drivers/net/ethernet/mellanox/mlx5/core/wq.h | 11 +++++++++++ 3 files changed, 27 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index f0e639ef4ec5..bec804295c52 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -183,6 +183,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, struct mlx5e_priv *priv = rq->channel->priv; struct mlx5e_icosq *icosq; u8 icosq_hw_state; + u16 wqe_counter; int wqes_sz; u8 hw_state; u16 wq_head; @@ -199,6 +200,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, wqes_sz = mlx5e_rqwq_get_cur_sz(rq); wq_head = mlx5e_rqwq_get_head(rq); + wqe_counter = mlx5e_rqwq_get_wqe_counter(rq); err = devlink_fmsg_obj_nest_start(fmsg); if (err) @@ -220,6 +222,10 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, if (err) return err; + err = devlink_fmsg_u32_pair_put(fmsg, "WQE counter", wqe_counter); + if (err) + return err; + err = devlink_fmsg_u32_pair_put(fmsg, "posted WQEs", wqes_sz); if (err) return err; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h index d787e8fc2e99..cf425a60cddc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h @@ -314,6 +314,16 @@ static inline u16 mlx5e_rqwq_get_head(struct mlx5e_rq *rq) } } +static inline u16 mlx5e_rqwq_get_wqe_counter(struct mlx5e_rq *rq) +{ + switch (rq->wq_type) { + case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: + return mlx5_wq_ll_get_counter(&rq->mpwqe.wq); + default: + return mlx5_wq_cyc_get_counter(&rq->wqe.wq); + } +} + /* SW parser related functions */ struct mlx5e_swp_spec { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h index 27dece35df7e..e5c4dcd1425e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h @@ -172,6 +172,11 @@ static inline int mlx5_wq_cyc_cc_bigger(u16 cc1, u16 cc2) return !equal && !smaller; } +static inline u16 mlx5_wq_cyc_get_counter(struct mlx5_wq_cyc *wq) +{ + return wq->wqe_ctr; +} + static inline u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq) { return wq->fbc.sz_m1 + 1; @@ -294,4 +299,10 @@ static inline u16 mlx5_wq_ll_get_head(struct mlx5_wq_ll *wq) { return wq->head; } + +static inline u16 mlx5_wq_ll_get_counter(struct mlx5_wq_ll *wq) +{ + return wq->wqe_ctr; +} + #endif /* __MLX5_WQ_H__ */ From patchwork Fri Jul 3 04:08:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322085 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=Cl22IKpH; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLm51Hvz9sQt for ; Fri, 3 Jul 2020 14:09:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726178AbgGCEJv (ORCPT ); Fri, 3 Jul 2020 00:09:51 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEJv (ORCPT ); Fri, 3 Jul 2020 00:09:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGc5BjtwydAcFQBqgprSEWC0gzCRD0k4MQGOLGrmwl6stNnvCQk42UIWC8Q5EwsQKSWmPerb1u+Lp7XerXKYN2jJpsv2EWZsyqnAJYyq4b8M1dRhK+dY92A7GquR59N2fLrhqSSd2YRANum6mVWh/s4527ltctNbdOgRT7ZdidmY0GmeAtcLUzSKOtX7gg9gOVM2N1wC5hx6BEiakp73F5YXwCbto7bxfFpxQNZDAeOHX+WtQEidez2V80bpzsZMDYPAA253m3uWT/+/o+lj05FiwSqxplvltk+9jpK/ru/Qr8RNppotLXz9UyGYGxVfAGMkAVORo8tFexWstrUkEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=61GfjUVaDKy7lRmMb57YdLHSAxvoTRuJlGWZ4PpI9jA=; b=luQANb5SanxpmOGCat6DfitD0j5Jpgv5JYN+JOfhdvktOIO0frOKreqWJQ5iheXpGt5nWD5Vut19+LhWPIx97o/EN3CPQALJ784aH6Z6Glbe39oOXGtrul6jF7qJZiJFOTHfvcALiVqei7TTakSNqgMLwVEJ/2DBPdiF1yQxKBzcE3kY2PEbx01QwVEv4QMUzmyXwA3xoqcHXTF1Ap1/RqhTSjHEsYNPJMe3jWaTu2ug2BlTLeW7K48ixJoFga1XU6MWEV751S9qyf7MH0sxtMomQlAVil0tNJpsIJmkXm5oCMvhvBh7ytcXz8qAg9qCkU06MDXkbr5o9sbNG8SJPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=61GfjUVaDKy7lRmMb57YdLHSAxvoTRuJlGWZ4PpI9jA=; b=Cl22IKpHUNXLuMusaqsOuD3VUmy0ag7xWAtxGrrWdyBt4JD6rv+dBHPDL+/4fj6b1INdKb4lUWxVKh16BRABKXGY3uFeElW17AfW8brgUUzchSEKNv0Q8fIuIxxi/iguuNzQKcs+EFoMLMerWYpL5gfE2AgXxvXrExZMAf1D9/0= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:20 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:20 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 08/12] net/mlx5e: Rename reporter's helpers Date: Thu, 2 Jul 2020 21:08:28 -0700 Message-Id: <20200703040832.670860-9-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:18 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 666e2c4c-1eec-48d4-dab2-08d81f06dc3f X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:23; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TOxLpAr6aU5UP9u/CDgzaZR9HfLf7rWM4k1+aV1IAdcw/G1liYLFf0HwaGcJtWlO3qVv0vlaHz9nXsJPfXnF5/6ZmrpKwCNBxSAN/T/hscXINztZl2sKVYPLQ+QW+tYCLz+3E5Bh0rFvhHkbUXgja0s5tgVmmjVeZtRXAvd4r4BnMyYppozG7PdEZhAGXCaLbzGRPSWoiOp9zSRe0p4akz89Wno/iB8HkzwDHw5ifwO83EVZvirV0rGKmyEtK8A9qhJwNG1dSO0VcR7l3imUsvjQSm4kelxBSiF9CQwnYntLrjoiFjQM5nyWMvyUT8ShaCk2so+2eGHEtP2kczr4UIIrAO1yja4QhBVSYf3YI3srxJTyTCl3eDxNjo8nOpM8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(30864003)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WmZz5f5ya7/k/pzFZAwoW0I++qjbxhwyHiSsEwjSoSmqSelFJqJN8qjcajhrPeS64lZWYlEMXHBb++YkKdm9BsfGSLbB3h4t0STcezEH1thrYzsEwEXgstecK9zcqFQu5o/oE+1D0EhNRf8T9Yf83dLL08eQWIN2Yn8YJlFhBv4Yy5tspw1Wqirs3vodsC3hkttF9WMRnmr4KK3ztRvovKoC4sTCrSUmPFjzzOSdWxiPWAHvbnVkR1kKAk2IExawHyETulhIAhEn7GeKPLZohJ6b1kMe6iV+G1IjP2grRXbkoTG4bPTbLL3+aNOFMpALVtpCar29ReqdtcbgHOI/gDh2sD5hJRKmHK2qQklKAel9re6srDR9qatmg9nwWQupMn1ZiBryKH4BiBcw50j1ztJ/Fu82xNyiGI98qGwzhdyO2+73yISm+jNiyiKOncxLE1oELZ3hQJWPMYvyPuIR+UKRN3N6qyLB0K5WK3/RQ30= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 666e2c4c-1eec-48d4-dab2-08d81f06dc3f X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:20.0191 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YEGnA4wFSdaa0b/Z1hx51iQ590nOlDGPedVGb7VX6cfj5lhCON+ROywjKR2wGnwnv3+FVoGHmRTni4fz0WnLBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Change prefix to match resident file: %s/mlx5e_reporter_cq_diagnose/mlx5e_health_cq_diag_fmsg %s/mlx5e_reporter_cq_common_diagnose/mlx5e_health_cq_common_diag_fmsg %s/mlx5e_reporter_named_obj_nest_start/mlx5e_health_fmsg_named_obj_nest_start %s/mlx5e_reporter_named_obj_nest_end/mlx5e_health_fmsg_named_obj_nest_end Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/en/health.c | 20 ++++---- .../ethernet/mellanox/mlx5/core/en/health.h | 8 ++-- .../mellanox/mlx5/core/en/reporter_rx.c | 48 +++++++++---------- .../mellanox/mlx5/core/en/reporter_tx.c | 32 ++++++------- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c index d0625ee923d6..1b735b54b3ab 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c @@ -5,7 +5,7 @@ #include "lib/eq.h" #include "lib/mlx5.h" -int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name) +int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name) { int err; @@ -20,7 +20,7 @@ int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name) return 0; } -int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg) +int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg) { int err; @@ -35,7 +35,7 @@ int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg) return 0; } -int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) +int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) { struct mlx5e_priv *priv = cq->channel->priv; u32 out[MLX5_ST_SZ_DW(query_cq_out)] = {}; @@ -50,7 +50,7 @@ int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) cqc = MLX5_ADDR_OF(query_cq_out, out, cq_context); hw_status = MLX5_GET(cqc, cqc, status); - err = mlx5e_reporter_named_obj_nest_start(fmsg, "CQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ"); if (err) return err; @@ -62,14 +62,14 @@ int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; return 0; } -int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) +int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) { u8 cq_log_stride; u32 cq_sz; @@ -78,7 +78,7 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg * cq_sz = mlx5_cqwq_get_size(&cq->wq); cq_log_stride = mlx5_cqwq_get_log_stride_size(&cq->wq); - err = mlx5e_reporter_named_obj_nest_start(fmsg, "CQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ"); if (err) return err; @@ -90,7 +90,7 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg * if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; @@ -282,7 +282,7 @@ int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg, if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, lbl); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, lbl); if (err) return err; @@ -294,7 +294,7 @@ int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg, if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h index 2938553a7606..6e48518d3d5b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h @@ -21,10 +21,10 @@ void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv); void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq); int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq); -int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); -int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); -int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name); -int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg); +int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); +int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); +int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name); +int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg); void mlx5e_reporter_rx_create(struct mlx5e_priv *priv); void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index bec804295c52..4e1a01d871b7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -238,7 +238,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, if (err) return err; - err = mlx5e_reporter_cq_diagnose(&rq->cq, fmsg); + err = mlx5e_health_cq_diag_fmsg(&rq->cq, fmsg); if (err) return err; @@ -268,11 +268,11 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter, rq_sz = mlx5e_rqwq_get_size(generic_rq); rq_stride = BIT(mlx5e_mpwqe_get_log_stride_size(priv->mdev, params, NULL)); - err = mlx5e_reporter_named_obj_nest_start(fmsg, "Common config"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common config"); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "RQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ"); if (err) goto unlock; @@ -288,15 +288,15 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter, if (err) goto unlock; - err = mlx5e_reporter_cq_common_diagnose(&generic_rq->cq, fmsg); + err = mlx5e_health_cq_common_diag_fmsg(&generic_rq->cq, fmsg); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) goto unlock; @@ -329,7 +329,7 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_ if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) return 0; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice"); if (err) return err; @@ -339,15 +339,15 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_ if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "ICOSQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "ICOSQ"); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC"); if (err) return err; @@ -359,11 +359,11 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_ if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "send_buff"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "send_buff"); if (err) return err; @@ -374,11 +374,11 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_ if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - return mlx5e_reporter_named_obj_nest_end(fmsg); + return mlx5e_health_fmsg_named_obj_nest_end(fmsg); } static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg, @@ -391,7 +391,7 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) return 0; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "RX Slice"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RX Slice"); if (err) return err; @@ -401,15 +401,15 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "RQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ"); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC"); if (err) return err; @@ -421,11 +421,11 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "receive_buff"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "receive_buff"); if (err) return err; @@ -435,11 +435,11 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - return mlx5e_reporter_named_obj_nest_end(fmsg); + return mlx5e_health_fmsg_named_obj_nest_end(fmsg); } static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv, @@ -451,7 +451,7 @@ static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv, if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) return 0; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "RX Slice"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RX Slice"); if (err) return err; @@ -461,7 +461,7 @@ static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv, if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 6eb2971231d8..9f712ff2faf9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -166,7 +166,7 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg, if (err) return err; - err = mlx5e_reporter_cq_diagnose(&sq->cq, fmsg); + err = mlx5e_health_cq_diag_fmsg(&sq->cq, fmsg); if (err) return err; @@ -195,11 +195,11 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter, sq_sz = mlx5_wq_cyc_get_size(&generic_sq->wq); sq_stride = MLX5_SEND_WQE_BB; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "Common Config"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common Config"); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "SQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SQ"); if (err) goto unlock; @@ -211,15 +211,15 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter, if (err) goto unlock; - err = mlx5e_reporter_cq_common_diagnose(&generic_sq->cq, fmsg); + err = mlx5e_health_cq_common_diag_fmsg(&generic_sq->cq, fmsg); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) goto unlock; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) goto unlock; @@ -257,7 +257,7 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) return 0; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice"); if (err) return err; @@ -267,15 +267,15 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "SQ"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SQ"); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC"); if (err) return err; @@ -287,11 +287,11 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "send_buff"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "send_buff"); if (err) return err; @@ -301,11 +301,11 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; - return mlx5e_reporter_named_obj_nest_end(fmsg); + return mlx5e_health_fmsg_named_obj_nest_end(fmsg); } static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv, @@ -317,7 +317,7 @@ static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv, if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) return 0; - err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice"); + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice"); if (err) return err; @@ -327,7 +327,7 @@ static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv, if (err) return err; - err = mlx5e_reporter_named_obj_nest_end(fmsg); + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; From patchwork Fri Jul 3 04:08:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322086 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=aPYMvQqi; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLq46fFz9sRW for ; Fri, 3 Jul 2020 14:09:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726228AbgGCEJy (ORCPT ); Fri, 3 Jul 2020 00:09:54 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726151AbgGCEJx (ORCPT ); Fri, 3 Jul 2020 00:09:53 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+/r+zdlQsdmTWD+KPg/yoF0vrlHljBEhJ+CRdOW4fQkmTKuWpH8onW8FZ6o3uba+CX+2WJErijJgNkpNl+Nz8Wh9/rp7tvrH2gOLNJUbc9GOkBrEZ+kVsRoucS818D3iFjMQxpjlYBqTXIF2isAmeNoWm6zWK7rM1AV015rGkQ907IAfCRuZxy6T0gndsYk5YuiDGdcCGN+LFTgUjNG7kSE3U2DUrkANyrN0ZBia5M6Oezlt0ClY1NnVldPGSDKQ4Dawu0oFNNX/McDl7DMDLjxZJ0I2lnQ6ZDtzC2kdpLN6ZHPrFsrkyFbodI/p/VyJqE3GBmJMhLzd62OGGN0lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4q8I8pWpXFOR4il7scDzxjx3d6+vo47b85vhmjV2nnY=; b=avmIA6C0wS3m8dXD40J7Y2opEO0y3Qzs6F5ZYplNaOTnGSAHNAtBTP4WOyc558w6v3s9TgCkjdatpw8+PkRYkKHGM2kD+sS/7Ds3Eh5IOejT/EPffLiFWzqNXNacS79mlfZWYWBE2FU+p+0b/CNa9bY0NzWf/eVSFqKJKHNEoiB3JQT9RtDq8MZ3kUHXaH9PEUIN8CQTMB7ZpZRLnju6cvIDJqYSX9mW+iNlH/4oT/skYzogwk8ijT0OlSlRcMwLAfrPVIzGFZbGVUCHOy83IFxFGvfnKsXcXb2gzEZCb0TD4psEgYj6QvUY+ucZQ6RE+RckxXYH/QO18+ZWWPAkxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4q8I8pWpXFOR4il7scDzxjx3d6+vo47b85vhmjV2nnY=; b=aPYMvQqiLgStJdVUgcC5wVlY5VWM39up1yz5+ih53o3i94Z2b0fXD9BYDtDBOHG+kLgj5hWzUWtgcdPfI4T2PygEm9hT6orEc/tSsJ1Kxi1j+8iGiab5SeDToHnhMiqtcj276nh2J+sz9Gzm2esc8J1ADDT4n/FNooFpcb1n1YY= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:21 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:21 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 09/12] net/mlx5e: Enhance CQ data on diagnose output Date: Thu, 2 Jul 2020 21:08:29 -0700 Message-Id: <20200703040832.670860-10-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:20 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4ab50e68-dc4b-4899-ba78-08d81f06dd4a X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1186; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7FDDMszC6WWSwEPL0L85ruFbc8g+XtM344gjiXpxgTeQPf+OV5xnInZkSTYZCSlry2SsM20ieQnFi5PfdZ9D57GWwPoPbmHG8pcZYHs+mEr4OKgf9gmyO8W3ssPxkRi4PQybrpCcyyqMcZtrNOQaA2UdlDHMIT195S5R5RockJq24Nv1F16Qn2IXyklkhArbo/xWPi72gHkvcqTxGC+HjaBJqwXy1Ws1BzaYiknicge4LjozhLo9nita/JTxxY/00Mz/B8N16jN7Lydx9OtBAkgusmsxoZqaoqNnpc227K8LCqvFwRFNI48mAab3zE5Vk9+8WbIzxxqNeKlwrgs1erECnKgtTng1dawSDY1mA40476lkwb9j7ucDAISSxF82 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: DLgrkdHOycja4ddMkzzqR47mqvhpBw2lL09RMHuTGVsGAv0h9cuo8+gpE9rSUqrOBeEOjj9audwoJYlb+Rh+ubb4psxegJYk9n0InSzGgg+vJbwp03T4JyAue/LPc/Q9eqP/ClBElCsQXfJEPUDlPMIT6uesWZSsD7Q5yQIvVX+PRuRsWaS6t+PAyD9IXyh7IleUvKEMZXvLf9emsCVPYqzlmJagGcJ5Oi6fvwoqF5KzllaqGgjYI0WcDyd4U69E5doZLiAEGUtks1Rgg96CJzAlRR0V5xb11xewBm3pSZUw1+aGZJO5Hub5BGdka+zcMWGiypDc9Vqy0GPiaPz4mDxhXz3fTnMRzbkQ4HUmTvCDSREmJSgIQKr8efl85Mttj3an1fSbTC/t3ixu8bfqEzbJdOD6Rs8eEjggc9ghQp7VYJIDSLl/zdLa1Gxn4sxfRWj3vXAu+q1KqRDElR3sPYnhAtoSY1cdRDx5WALXSMc= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ab50e68-dc4b-4899-ba78-08d81f06dd4a X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:21.7591 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lGupKWL81SvttuPzDTmIQAtb1wRo8XNrNjvBntL7Lg2d8viE0QiScFOm8zq2auf/tV8lo3Yk5rzG3lzUprMJsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Add CQ's consumer index and size to the CQ's diagnose output retruved on RX/TX reporter diadgnose. $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: channel ix: 0 rqn: 2413 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1032 HW status: 0 ci: 0 size: 1024 channel ix: 1 rqn: 2418 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1036 HW status: 0 ci: 0 size: 1024 $ devlink health diagnose pci/0000:00:0b.0 reporter tx Common Config: SQ: stride size: 64 size: 1024 CQ: stride size: 64 size: 1024 SQs: channel ix: 0 tc: 0 txq ix: 0 sqn: 2412 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 1030 HW status: 0 ci: 0 size: 1024 channel ix: 1 tc: 0 txq ix: 1 sqn: 2417 HW state: 1 stopped: false cc: 5 pc: 5 CQ: cqn: 1034 HW status: 0 ci: 5 size: 1024 Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/health.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c index 1b735b54b3ab..4bd46e109dbe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c @@ -62,6 +62,14 @@ int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) if (err) return err; + err = devlink_fmsg_u32_pair_put(fmsg, "ci", mlx5_cqwq_get_ci(&cq->wq)); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "size", mlx5_cqwq_get_size(&cq->wq)); + if (err) + return err; + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); if (err) return err; From patchwork Fri Jul 3 04:08:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322087 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=UBq1dbY1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLt10pLz9sQt for ; Fri, 3 Jul 2020 14:09:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726247AbgGCEJ5 (ORCPT ); Fri, 3 Jul 2020 00:09:57 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEJ4 (ORCPT ); Fri, 3 Jul 2020 00:09:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mpIVOQrndIapachyj8ObCyLMduwAeiE+tHhhbB8HASL5KXl+oj4uJI71rcMnPJLfQhdBLwyeguhyqeJRWJzhvea4VFk0Rh1lCIOasGbX0G2pU7haBoWieUG91dSbbrL/iSWmKaStLvRcnY8cHU3FyVtQ/OlZvyjW92kY1S/2P59xqLRqnYKjqxrVyhHXEV5WUUiEyrNe8IKwyLiTrWRhOCDcwn6KAjZqxLgSAG3spWje5SI+wmZGWRN1GBq2jW9HqnTkw+MqHNFsH/qNabRSIzcTsA17iWdqgiwBn+N6UPiCD3zxcEzuZKMekW6LeBvn53/rYO6jSjIQrMEhsSbW/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lvEjTX++H4yq1U7u/C484BPUuGlr2T+UALZgA7XfaW4=; b=Ta6HVy0UyZ9+rq9iYwwLAaJN55+HwPW4csz4mbM4GmsdQNBpYQWI2CkM9Tq1nri7PZDDCEx7fjD6pWexRmCcTa7sQrtZ+qKwRdaBRDA+j+6UBwooFt3kcmI8Fw9JHwTBN7H8D1/zd8DRY7h/tbNlMe5Myf+MjgG3Cw2M1afbGRvUfyAWr7QUgqIQS/+63w4UWIG2fjtl/xa89XxYutXJ0pwMQ6BCxTUd/GS9D6vp8jBohBteM2/MgH7XmCZhAMndwo0sShR1vm19J/6K+9gOwOYL15/9/HtJkpxMcaOW8AXwrmQ6diBxeS63NyGbmZpIZYltxsF1CCqCfypk62Pk4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lvEjTX++H4yq1U7u/C484BPUuGlr2T+UALZgA7XfaW4=; b=UBq1dbY1D+ffldycTYkW4utQClwJ3yFQTjxxIhWSmQWftiL4NzXaLOPaCzPUz2aHtZRVJYRgXXunsA2o/Sht+2Sue0uSSmJngE85ivHRlLBZmZUx81D5uBZro1qbMTDaSiroVZ+bqBL3Z65fQw9g+TQvvEY/YFkIdC5/MS7nXhk= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:24 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:24 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Tariq Toukan , Saeed Mahameed Subject: [net-next 10/12] net/mlx5e: Add EQ info to TX/RX reporter's diagnose Date: Thu, 2 Jul 2020 21:08:30 -0700 Message-Id: <20200703040832.670860-11-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:22 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e694aca-0471-4245-a325-08d81f06de8e X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1051; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wyLKTLDhFJguCSTQIF3k6STvSEbMezS3QjH7DIdf1shHNvwNP44IdKgt3ltnNg0gfQbodqAT30VmvM4VLLjR7Y0hivgMK9mr6BATdwUx7vRcrjkh9Ri4yuYHFenbzxclbSf5MGAt8wcLraqdrjaTZb+fbSZue7RdEcafznksJ7YIbYedkZsVmxLzvW3QyEbcmFIdahPfqRtJ9LOkiQJWnd7dOYNQazeMUOgzdksWJARnsP/GBlJkIyqVT9CyiRXtOiqKBK9/y+eN+9FIRO7UaAQh7vGtnbfwj0KOtCCWh1Tc3wEMyaQnf0ABCysKd741lAsk13gOyd9+SFsdTsRO7yH49mu/coSZWLgO+aMKUNH4fzBKkO2evyZmlMOtUN7l X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uHtzze2YLucQe53lEETsHiMt6xIRq0kgQbAEhYfTt9DNdaEh2lj5HaUy9JTqOy+1Fn/BzyqlBT5MSg41BC/tKvycuzuIf3LLTmKUfEiiawnuWXWBM45CGi5jum2R2aluWptNr3eLYST4T6d8ZUyMCHib8/RcxmNV9GlCG03Jea8fNJqG2LitSC3hoyRMmFnZe7OQ7C8FmDDmAZuuVoP9ZfYNF7LVCwpCd80Pm4o649TFEK7dD6KYsy57GGa07u8YQvTWK3fpxh94CTj8eOlE20RosrFNxlFGuwWpZLc88JUZYzyDvTdCgxcFneK/TqTz/Sy3sx2XoGVowN1jU85U2bDMRNcTDK75+LXHXUfXte/GduwsrNan6HZAiighhWEamSogAoGDJkTbyTHlcEYe4o72Q1qYXH0ApvIR3Hm4HDNmTOIzjQHFZgMVjFArBQ2kzrC3T2khowtKjI/gHjEqaIPT7ti297rvq8CUb6TnOw0= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e694aca-0471-4245-a325-08d81f06de8e X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:23.9978 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j6z3goliiK++t1vS5yX2/msKlpAXz/3EBNLB1++m3g7Meca+Y1G51w4mhiHnXQRXUZ+um1T9eXfpntYjjB7RpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Enhance TX/RX reporter's diagnose to include info about the corresponding EQ. $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: channel ix: 0 rqn: 1713 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1032 HW status: 0 ci: 0 size: 1024 EQ: eqn: 7 irqn: 42 vecidx: 1 ci: 93 size: 2048 channel ix: 1 rqn: 1718 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 ICOSQ HW state: 1 CQ: cqn: 1036 HW status: 0 ci: 0 size: 1024 EQ: eqn: 8 irqn: 43 vecidx: 2 ci: 2 size: 2048 $ devlink health diagnose pci/0000:00:0b.0 reporter tx Common Config: SQ: stride size: 64 size: 1024 CQ: stride size: 64 size: 1024 SQs: channel ix: 0 tc: 0 txq ix: 0 sqn: 1712 HW state: 1 stopped: false cc: 91 pc: 91 CQ: cqn: 1030 HW status: 0 ci: 91 size: 1024 EQ: eqn: 7 irqn: 42 vecidx: 1 ci: 93 size: 2048 channel ix: 1 tc: 0 txq ix: 1 sqn: 1717 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 1034 HW status: 0 ci: 0 size: 1024 EQ: eqn: 8 irqn: 43 vecidx: 2 ci: 2 size: 2048 Signed-off-by: Aya Levin Reviewed-by: Tariq Toukan Signed-off-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/en/health.c | 31 +++++++++++++++++++ .../ethernet/mellanox/mlx5/core/en/health.h | 1 + .../mellanox/mlx5/core/en/reporter_rx.c | 4 +++ .../mellanox/mlx5/core/en/reporter_tx.c | 4 +++ 4 files changed, 40 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c index 4bd46e109dbe..3dc200bcfabd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c @@ -105,6 +105,37 @@ int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *f return 0; } +int mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg) +{ + int err; + + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "EQ"); + if (err) + return err; + + err = devlink_fmsg_u8_pair_put(fmsg, "eqn", eq->core.eqn); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "irqn", eq->core.irqn); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "vecidx", eq->core.vecidx); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "ci", eq->core.cons_index); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "size", eq->core.nent); + if (err) + return err; + + return mlx5e_health_fmsg_named_obj_nest_end(fmsg); +} + void mlx5e_health_create_reporters(struct mlx5e_priv *priv) { mlx5e_reporter_tx_create(priv); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h index 6e48518d3d5b..b9aadddfd000 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h @@ -23,6 +23,7 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq); int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg); +int mlx5e_health_eq_diag_fmsg(struct mlx5_eq_comp *eq, struct devlink_fmsg *fmsg); int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name); int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index 4e1a01d871b7..5f7fba74cfd4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -242,6 +242,10 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, if (err) return err; + err = mlx5e_health_eq_diag_fmsg(rq->cq.mcq.eq, fmsg); + if (err) + return err; + err = devlink_fmsg_obj_nest_end(fmsg); if (err) return err; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 9f712ff2faf9..465c7cc8d909 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -170,6 +170,10 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg, if (err) return err; + err = mlx5e_health_eq_diag_fmsg(sq->cq.mcq.eq, fmsg); + if (err) + return err; + err = devlink_fmsg_obj_nest_end(fmsg); if (err) return err; From patchwork Fri Jul 3 04:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322088 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=KWeWDMVO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhLw6d5Hz9sQt for ; Fri, 3 Jul 2020 14:10:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726262AbgGCEKA (ORCPT ); Fri, 3 Jul 2020 00:10:00 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726236AbgGCEJ6 (ORCPT ); Fri, 3 Jul 2020 00:09:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YMhLvD2fDlduRvdiMcBcbpIeOUq2GovqtNSKhaaQqR90U7WQkFsuJwCJ3EqWM2hp0nm5/OzZIinU++l5ZEX+MndALmfipFJPCeWKR4DWkflC2f48/vxuvwgEV3OTblCpgwq+ay3Ye6X8uIURCMsxBvQz5W9WnR8dGjowQUmP/d9v+JsvHYm+zClCwslQfEhDZkG3ahrvWOHc8S3y5b4oDwe2iwcAOEnIB+J6AQLj0GONlz8iE7feP50XOZiznblqIpp84Bws3XBtEz7Rc+1x962gwRjnzDKcS1UzzRTXm9BQY80OT+2irMqcbq9/90lf/M/PPkvZfu47SKIlRUmeEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M/n+jGCFKR6XaO/coDdi4kXzn28AHuJ2sDK3FRctqTA=; b=Jwdik0MTsWrNKBzl13l+9CjAjv2z25LF87HikFxoNFmbLGJaoF/H3zNHNqiTC7yHHlC0R4VC+Q9kKAdtGjOfVkzDqEGePEMxmaWsCNkBYCaksMO3SVG8CizkCzGHuAFSnzJSzORqI4PWTF7FNjiNmFsGEq8ml0owiy4N/n4+9DIjWWzHw4ldpKIbWkjqDYCr86vz6aod330VuNTxkZh1D57jRBACG9aoASt+8R4F7CnScnM6pMnTBYUHa4NCpoBxH/L2fLfkWJMFfmoxBqntSfXFzIDcttGmvcg67+WsoQWnm4Ht7JSFJiA+cGYlfMQO1DM4lMEJekpT0aq8Sz5DsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M/n+jGCFKR6XaO/coDdi4kXzn28AHuJ2sDK3FRctqTA=; b=KWeWDMVOys5rqUchs/I0tVL5xt9MYbbhLsozps7uI4+xh0l9C5+q4wW+SlbbgVG2CTdStFaVmLFLZyEU5nOgnPWm9vrm6pJiFeSiuE5A2sIWNaPwtrXc4gcMPgA+WJIRQTbSOiIp8KCNOfZx3RgK2uADx32H4+pbstoThHmZZRs= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:26 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:26 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 11/12] net/mlx5e: Enhance ICOSQ data on RX reporter's diagnose Date: Thu, 2 Jul 2020 21:08:31 -0700 Message-Id: <20200703040832.670860-12-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:24 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f0b9aa7a-f7c1-40a5-0619-08d81f06dfc8 X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eFz0yR5ubJP20Z3l2J7B08ol2E9lEL2kKxpSsh1aLEtn5/hXH5PF8NOGo9/D0GTleI6YGMj9OG/u2tVU6VQJTyo4k214k/bO4PHjbQD5vGiOxkDoGb3phBp+4ffL+C9kgJ+ylip0N2ZqZy8XkSKV1ruM+spwuNDOp98BSwvOy2kDYvGaur41AL8w4rLh562bKDUn5gc8fxqhZxlVWDSnOWPDoZX8chnvyOLJtAo5yqBczjTTXwY6G0lHDUd4bS1rP8Bvq0+0UfKOox2wiiQB/E/52Ui+QEzzXEmP4X/0WVsoQBJn4yszxEDC1PNey5M1APT1oUOyp5s4LV5GwD0lw8YPFcwBVGCZo+m5buHkXD3fl7CZTH9l3qnXWM7fwIZs X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MjkiSDOHF/bzYkTID92kSiPetmq4vYyEtH+aozZBuVxVvonCMQ2GlA3VDofvujjEPWckjm+l2+AbAXKxV1y5dfmWkkfMkOOKNHJdHO9WGdezXiu/tj4A4JNbOj5t80twGbE9AfPUZff9IgE0aersW4FmH2j0kIoCUpf2pV1NNR+e+6OXmbi5q8wWWj8ZLJnqNQAPvNSJWn/HizypL2dCq1OVjdl1QgVEk9jOT6mvppJ51yvFHj0UgqZmb7y0n/y86fT+pypTRVkXcyL6HjOoVr+DRi4G5CfiBPfNxNRer3cHW09jXvyS7di+5WavMllHjuOvKQX79teAycQzqmB098qMCBwG+YOUX+ApCQLvDsv6ZnZokpbuigl+R/pRZRdN9zUwT1QxAamdhaHMv5GhKPJoLCpRu7s6Z348y8jz4/0lGYFFS+uHovx5djFeRyllOWXwqOjZlKMYCgtscptZoJVr2bCgKabEDu2PxRG6YGU= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0b9aa7a-f7c1-40a5-0619-08d81f06dfc8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:25.9237 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: g8anSYOnVd0dz+EwZFCOT/S1WzkuXklzhP7hVAKpMqBMJ8DHV+jfUaWp1qgIQ+m2R7kwCX172zYzYzm0Z6TQ+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin When the RQ is in striding RQ mode, it uses the ICOSQ as a helper queue. In this mode, RX reporter dumps more info about the ICOSQ and its related CQ. $ devlink health diagnose pci/0000:00:0b.0 reporter rx Common config: RQ: type: 2 stride size: 2048 size: 8 CQ: stride size: 64 size: 1024 RQs: channel ix: 0 rqn: 2413 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 CQ: cqn: 1032 HW status: 0 ci: 0 size: 1024 EQ: eqn: 7 irqn: 42 vecidx: 1 ci: 93 size: 2048 ICOSQ: sqn: 2411 HW state: 1 cc: 74 pc: 74 WQE size: 128 CQ: cqn: 1029 cc: 8 size: 128 channel ix: 1 rqn: 2418 HW state: 1 SW state: 5 WQE counter: 7 posted WQEs: 7 cc: 7 CQ: cqn: 1036 HW status: 0 ci: 0 size: 1024 EQ: eqn: 8 irqn: 43 vecidx: 2 ci: 2 size: 2048 ICOSQ: sqn: 2416 HW state: 1 cc: 74 pc: 74 WQE size: 128 CQ: cqn: 1033 cc: 8 size: 128 Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../mellanox/mlx5/core/en/reporter_rx.c | 59 ++++++++++++++++++- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c index 5f7fba74cfd4..32ed1067e6dc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c @@ -177,6 +177,59 @@ static int mlx5e_rx_reporter_recover(struct devlink_health_reporter *reporter, mlx5e_health_recover_channels(priv); } +static int mlx5e_reporter_icosq_diagnose(struct mlx5e_icosq *icosq, u8 hw_state, + struct devlink_fmsg *fmsg) +{ + int err; + + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "ICOSQ"); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "sqn", icosq->sqn); + if (err) + return err; + + err = devlink_fmsg_u8_pair_put(fmsg, "HW state", hw_state); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "cc", icosq->cc); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "pc", icosq->pc); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "WQE size", + mlx5_wq_cyc_get_size(&icosq->wq)); + if (err) + return err; + + err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ"); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "cqn", icosq->cq.mcq.cqn); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "cc", icosq->cq.wq.cc); + if (err) + return err; + + err = devlink_fmsg_u32_pair_put(fmsg, "size", mlx5_cqwq_get_size(&icosq->cq.wq)); + if (err) + return err; + + err = mlx5e_health_fmsg_named_obj_nest_end(fmsg); + if (err) + return err; + + return mlx5e_health_fmsg_named_obj_nest_end(fmsg); +} + static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, struct devlink_fmsg *fmsg) { @@ -234,15 +287,15 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, if (err) return err; - err = devlink_fmsg_u8_pair_put(fmsg, "ICOSQ HW state", icosq_hw_state); + err = mlx5e_health_cq_diag_fmsg(&rq->cq, fmsg); if (err) return err; - err = mlx5e_health_cq_diag_fmsg(&rq->cq, fmsg); + err = mlx5e_health_eq_diag_fmsg(rq->cq.mcq.eq, fmsg); if (err) return err; - err = mlx5e_health_eq_diag_fmsg(rq->cq.mcq.eq, fmsg); + err = mlx5e_reporter_icosq_diagnose(icosq, icosq_hw_state, fmsg); if (err) return err; From patchwork Fri Jul 3 04:08:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1322089 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=iYtmNrh1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yhM00pKRz9sQt for ; Fri, 3 Jul 2020 14:10:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726269AbgGCEKD (ORCPT ); Fri, 3 Jul 2020 00:10:03 -0400 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59]:59118 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725960AbgGCEKB (ORCPT ); Fri, 3 Jul 2020 00:10:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PO+CpIULh41t+XYOLjnW105XYDqvrh2uwb1ioJ6aGPzkblEK1OHiKQkuKWwLBgfzaIkGT1bC3LnrGXw5qQM3mEK5QE7g8S7mQ7CvJf7ACa0iBiunMwD8RJk/2zhemKqKYXYFaoJtOh9Puj5nz1H65TgPvRlRDnuWuqBWUF0vesnBo5MvzLWCyH+2rbWWB2w0LMj8ba5WST3SkqkMeovK4TACeZ8LKcmg3bqTWeFpcKpv0BJS/VF5NKVklgSy+PNWI0J8FXuE0VFPNpZdMgdB93LLaFuKev9DuJbv6a66qelq90cdovv3tDogE56+A9rDT7ShwICI9zqTGqxk0JDQ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eLgEeBOmcib3zBVEonTapZCBreb7k0QARFrRVqQrqGs=; b=oKNN7t5chp8m01LboyfjsoHBCxgbt0e7O9NloIMeKk6WAHBNLFK+gJRYCLwzMgVykwpmHpmoGtdqb+zwHgu64VWl/bFd7fFubkkkVc8ElcuLcieyMyzseKOEFE29xywU9mv3IN2KNsPGjUev/RUjWq/za5/57Nqc8tlOCslW6a/fQCzz6D2LCTKfLluwJfGOuJnzqj6Rm0fbiHeH8H4hu0b1mLbec8iFkQqG2/5QF9EsQdpsBgs1ZNNpvA7BQ926fOBZyM6Qgwiw+HdidWM2SSSWZQfKsxYPPzYGstXI7HgKBFEfAFz0KGDCBl5cSZonAsHwzidNHWcQ7NvJuMYvVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eLgEeBOmcib3zBVEonTapZCBreb7k0QARFrRVqQrqGs=; b=iYtmNrh1zPr3lZuv2k1QqlpmWRjImHIv24YRhGcqG0S7S9zP8aP/0+ST0R3pE+Fqa3vm8JqDj1Fe62ixlJMXMxDhY0KIE2auHvjM5+quxsC/fXjbfkDoBYd86sGgj0/q1sjtvMPgHM2RIhSgaawN9ft+tpyc1+NrPiuF/z0bzvk= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5534.eurprd05.prod.outlook.com (2603:10a6:803:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Fri, 3 Jul 2020 04:09:27 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3153.023; Fri, 3 Jul 2020 04:09:27 +0000 From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Aya Levin , Saeed Mahameed Subject: [net-next 12/12] net/mlx5e: Enhance TX timeout recovery Date: Thu, 2 Jul 2020 21:08:32 -0700 Message-Id: <20200703040832.670860-13-saeedm@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703040832.670860-1-saeedm@mellanox.com> References: <20200703040832.670860-1-saeedm@mellanox.com> X-ClientProxiedBy: BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BYAPR01CA0065.prod.exchangelabs.com (2603:10b6:a03:94::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Fri, 3 Jul 2020 04:09:26 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6b4dccc8-958e-446d-be2a-08d81f06e0db X-MS-TrafficTypeDiagnostic: VI1PR05MB5534: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 045315E1EE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7YZrvVE+NIfQNmnUthyqhrPrrEF/W0X34XAxVTSQycP6pD7r9TJ2qlbPhaW7g50Ihyo6pcLhjwrx96MX984/HI8ggV5+bjH7c6ojOJMgQUWK6MG3ZcW9TWigc+ttK24lQhLTbpI0sRooPIduOv1BCrtZdadZ4af0AkPKjsYAk8dHs+wUP4RjgscXTsJWMiciMzUwvs1NOd6V05vZN54FCMrYfthot4e5Kwbu9+eDxyKXjCOhdwPvUnXISkl0+PCbOKFdPNWf+8NIHeQGrV3obc3jLtZUO3FpOPSKnYyNfKQyWVJFlQx0NxUjhjV/nFU6FX4D9oxEn2gojtaN2amTXLwtV25kB7hzVv4+lh5R7bZl3OGjH2pt5wajIKAdYUxb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6486002)(107886003)(26005)(16526019)(186003)(2906002)(1076003)(6512007)(83380400001)(86362001)(66556008)(66476007)(36756003)(66946007)(956004)(2616005)(5660300002)(6666004)(478600001)(4326008)(8936002)(6506007)(8676002)(52116002)(110136005)(54906003)(316002)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 655snHJxBZb7GC+n0i0dWLsAS4DrJP/PC4KE3DSJrzhEN50P48f3fhMMvUvHkTwEbNfir6g/uSirJvJ92dch7w8l89wgZnPIY9si/TuxuPavHrTB+UqDuBGrdpeObkPdHSScNcRq0uHKSG7I4xo73VGjswjY+Ban0UWmM03Vmv7HyJCctc8HrVuZPlmzB58ZNGaEDwplabZ3Rc+GD7jgC/tuGwF23yKht0hS1ZXfyPz2fdOc6jgUfRivUHKeMItihSFCzfQZGEDmzlVs33uQWyjuf65TE6wyl0+lmZ35MtR6ZV4zAWs5mdDZMdzDvK8VMwB1Vs81tHNGtoCYu6cyBgoTUEN+kBlP9G7Ht1uF844bA6nbixXzVE3aeMKS+B0gHk729saIBsCMf2D31YpKWKjWU8QPGfY+uIcwkkE3zUkBpt6vuRc/hQl08QXc5uwRW38Y+CENqi6HaLWWCWrFj5y6Q03GK1rtvIOzEZZTwb4= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b4dccc8-958e-446d-be2a-08d81f06e0db X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5102.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2020 04:09:27.7496 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eQTh8Cv9eM2uFHWUIRD6RIOMgOC4cUTGFuvdqADWrpxLLgxWaIJ1EUf8qIwWhJnhsVFxOhbjA14jIkQ7etPlEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Upon a TX timeout handle, if the TX reporter was not able to recover from the error, reopen the channels. If tried to reopen channels, do not loop over TX queues for timeout. With that, the reporters state and separation will better expose the driver's state. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed --- .../mellanox/mlx5/core/en/reporter_tx.c | 36 ++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/en_main.c | 14 ++------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 465c7cc8d909..826584380216 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -83,17 +83,40 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx) return err; } +struct mlx5e_tx_timeout_ctx { + struct mlx5e_txqsq *sq; + signed int status; +}; + static int mlx5e_tx_reporter_timeout_recover(void *ctx) { + struct mlx5e_tx_timeout_ctx *to_ctx; + struct mlx5e_priv *priv; struct mlx5_eq_comp *eq; struct mlx5e_txqsq *sq; int err; - sq = ctx; + to_ctx = ctx; + sq = to_ctx->sq; eq = sq->cq.mcq.eq; + priv = sq->channel->priv; err = mlx5e_health_channel_eq_recover(eq, sq->channel); - if (err) - clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); + if (!err) { + to_ctx->status = 0; /* this sq recovered */ + return err; + } + + err = mlx5e_safe_reopen_channels(priv); + if (!err) { + to_ctx->status = 1; /* all channels recovered */ + return err; + } + + to_ctx->status = err; + clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); + netdev_err(priv->netdev, + "mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n", + err); return err; } @@ -389,9 +412,11 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq) { struct mlx5e_priv *priv = sq->channel->priv; char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN]; + struct mlx5e_tx_timeout_ctx to_ctx = {}; struct mlx5e_err_ctx err_ctx = {}; - err_ctx.ctx = sq; + to_ctx.sq = sq; + err_ctx.ctx = &to_ctx; err_ctx.recover = mlx5e_tx_reporter_timeout_recover; err_ctx.dump = mlx5e_tx_reporter_dump_sq; snprintf(err_str, sizeof(err_str), @@ -399,7 +424,8 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq) sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc, jiffies_to_usecs(jiffies - sq->txq->trans_start)); - return mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx); + mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx); + return to_ctx.status; } static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 046cfb0ea180..b04c8572adea 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4367,8 +4367,6 @@ static void mlx5e_tx_timeout_work(struct work_struct *work) { struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv, tx_timeout_work); - bool report_failed = false; - int err; int i; rtnl_lock(); @@ -4386,18 +4384,10 @@ static void mlx5e_tx_timeout_work(struct work_struct *work) continue; if (mlx5e_reporter_tx_timeout(sq)) - report_failed = true; + /* break if tried to reopened channels */ + break; } - if (!report_failed) - goto unlock; - - err = mlx5e_safe_reopen_channels(priv); - if (err) - netdev_err(priv->netdev, - "mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n", - err); - unlock: mutex_unlock(&priv->state_lock); rtnl_unlock();