From patchwork Thu Sep 5 21:50:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158703 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="Td4GUUyV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBX5HwRz9sNx for ; Fri, 6 Sep 2019 07:51:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388329AbfIEVu7 (ORCPT ); Thu, 5 Sep 2019 17:50:59 -0400 Received: from mail-eopbgr140087.outbound.protection.outlook.com ([40.107.14.87]:28743 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730537AbfIEVu6 (ORCPT ); Thu, 5 Sep 2019 17:50:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=giarzjgRzVL80RW/3R1bKbtsklv5lJHA+HZTO2LO5NxKCKxxMvbAzFFPWAeMuHDHTvqFSRaa2XFnSklgNxQSj40uC2O0+lzhALM07HXqc1ZEHQu/Cq8IWXsmgyQJt17Xe5w4dVGiBv+lwfM4kbjr6s7Gvj/uybiokEhs1sEE0e7cWGyBqG4H2iyy9Vqki5pFD4CyYBa8Oc1+awqb/W8/crCd7J9GafkHEmk/l45iCaJoyCb5mpp5dZbI4j0/BOxVRDhkkRABqKX/h5PcHOnwhyLzSlzz3uSkJAMPqGh2tgW4nYVCntea6VNg2l5cdYAtNwa/SbvdmmUuzLhNndu3yA== 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=yss0tg/pyRpPrPRXZ3NtQtiSz3MYdDDD2xzy0D6HaCE=; b=EW/NGc+pJqVgLGt5xy872v8CwZmA4qU6jj1c+GAF/OMqVBZ5LkoKUG+J7gsC7H3ltgSG7qf7GotmAHPZyd1rZW7xKmamOBMELIwkDbNUr6xCMF+90HnSe+LGQBBLulB6e5st1QjBBqWcJZ/iM9UkHv2uFJc+E18m7kfTWrf3K+6XxJkdK5LXuix/My3YedM2CN/Dr+lGoMNjrvuh+Fe4MeJH+luyT8ZlCr0H501/PkfsniEsbQDlbjnTdIVxlvx4akAsfwSfXh+4cKNZKeUKSY8KcotzKqlobqt58SoM/CeFqkots7BYxqu7VPd1Sp1JqhndwTlXcnEY1L+hTKdFrQ== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yss0tg/pyRpPrPRXZ3NtQtiSz3MYdDDD2xzy0D6HaCE=; b=Td4GUUyV2xjGVezvC+mOnN9gsHZuuPMB3iNNAeFPWh6lxQ/WIADqhKxO79RrLPVA/AKeWWn2wh2+I3YksnXaOPhBDNvNCgYpZGZxP4ni0u+OID7wwyE7GNQH9l9Sh1/J9kRv4EQqj9WwgxdI3liyzMa4vDyL/gMktM5GlsaO8FI= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2191.eurprd05.prod.outlook.com (10.169.134.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Thu, 5 Sep 2019 21:50:54 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:50:54 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Eran Ben Elisha , Dan Carpenter , Saeed Mahameed Subject: [net-next 01/14] net/mlx5e: Fix static checker warning of potential pointer math issue Thread-Topic: [net-next 01/14] net/mlx5e: Fix static checker warning of potential pointer math issue Thread-Index: AQHVZDP9kFWnnQVo2Ua0Z8ntYMe8Kw== Date: Thu, 5 Sep 2019 21:50:54 +0000 Message-ID: <20190905215034.22713-2-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f8efd711-758c-44db-7d4d-08d7324b2050 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR0501MB2191; x-ms-traffictypediagnostic: VI1PR0501MB2191:|VI1PR0501MB2191: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(366004)(346002)(39860400002)(396003)(136003)(199004)(189003)(54906003)(316002)(2906002)(256004)(8936002)(8676002)(6486002)(305945005)(99286004)(7736002)(5660300002)(81156014)(81166006)(50226002)(1076003)(478600001)(6512007)(11346002)(26005)(25786009)(36756003)(86362001)(4326008)(14454004)(6436002)(53936002)(102836004)(486006)(6506007)(386003)(66066001)(2616005)(476003)(446003)(186003)(107886003)(71190400001)(6916009)(71200400001)(52116002)(6116002)(66446008)(64756008)(66556008)(66476007)(66946007)(3846002)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2191; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: CHQpF8dc399MfwCyfJJV0vRXkhiaOhJPEVziBD2Slb9gPtclqlGOGdxD9f0Ft1k52ugiRG1mjS6RHms5/S/ymUGO5lNvVo/WD6aDIIKyW6RHbWm21mU6RtLntvq3hDcXR1E2yKAPMxWsnrY6XfPJpFT1GRrtZ5rdsvo7aPjL6z7mX7gOx2mxzr3uxGlG3jARlMgElZIRmFrMVSdVrc+8bu7wON+tR6UlE3b1pBjXtCqbi3BjAE4ZE0mh+n36IOTR8pUIJhDrdd+alltLugyXZpPWxDTpPvEOEb53Ja02sLt4q7HOzyvHyFEBPyAAs3DicNuHIEfqe6fZRud+1EzaFbDM0WeMIKv8nQ4y/dSXLIPFR2KdrCpDnGsUvzGkmSOU0CUgojNJMPQv8s9HPQRFt3byvjnCz18EdXDCkk+GuZo= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8efd711-758c-44db-7d4d-08d7324b2050 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:50:54.4205 (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: VKPFUazTXPPo2NBYtl0m+DASLm/2XYsTEiovih0EIvIoE4fCs8XA6pq8nv33uPl2uCDFt3hYlMmFlPk3s7ljlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eran Ben Elisha Cited patch have an issue in WARN_ON_ONCE check, with wrong address ranges are compared. Fix that by changing pointer types from u64* to void*. This will also make code simpler to read. In addition mlx5e_hv_vhca_fill_ring_stats can get void pointer, so remove the unnecessary casting when calling it. Found by static checker: drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c:41 mlx5e_hv_vhca_fill_stats() warn: potential pointer math issue ('buf' is a u64 pointer) Fixes: cef35af34d6d ("net/mlx5e: Add mlx5e HV VHCA stats agent") Reported-by: Dan Carpenter Signed-off-by: Eran Ben Elisha Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c index c37b4acd9bd5..b3a249b2a482 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c @@ -30,22 +30,21 @@ mlx5e_hv_vhca_fill_ring_stats(struct mlx5e_priv *priv, int ch, } } -static void mlx5e_hv_vhca_fill_stats(struct mlx5e_priv *priv, u64 *data, +static void mlx5e_hv_vhca_fill_stats(struct mlx5e_priv *priv, void *data, int buf_len) { int ch, i = 0; for (ch = 0; ch < priv->max_nch; ch++) { - u64 *buf = data + i; + void *buf = data + i; if (WARN_ON_ONCE(buf + sizeof(struct mlx5e_hv_vhca_per_ring_stats) > data + buf_len)) return; - mlx5e_hv_vhca_fill_ring_stats(priv, ch, - (struct mlx5e_hv_vhca_per_ring_stats *)buf); - i += sizeof(struct mlx5e_hv_vhca_per_ring_stats) / sizeof(u64); + mlx5e_hv_vhca_fill_ring_stats(priv, ch, buf); + i += sizeof(struct mlx5e_hv_vhca_per_ring_stats); } } From patchwork Thu Sep 5 21:50:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158704 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="nnDkDrJg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBb63W0z9sNx for ; Fri, 6 Sep 2019 07:51:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388544AbfIEVvD (ORCPT ); Thu, 5 Sep 2019 17:51:03 -0400 Received: from mail-eopbgr140087.outbound.protection.outlook.com ([40.107.14.87]:28743 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728769AbfIEVvB (ORCPT ); Thu, 5 Sep 2019 17:51:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q+Blvr5Rd1LGIkwW21nA007OZIp3tcK4/yiPbEYCIpGMldweWFvb1c19scv8IH3nCR4hXd/Tm6soYi2EX7tN9nLRASu/OY/d8udGZihR1skD+oKx6Akyri2zNQIMBJAVNs4AXQOL1tzjYz/1wvxBYLl3z54PbhmPZnUY2v3x7+p1KqaLnCxRtLuB5z7t7obxWBVic91874kVwucsItE/9P34oFL7bwuwLntSdlRMZhUqqL5X5JciM1M8OW2ZOT++miJkH4CsihlkHKUkcljz7WNzHhG05LwHRl/CwEuVrTmsVdym8oZKaeN2jsh58fufqsJM5O71FMrQbqNDS6aO4Q== 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=gOiXpEByUVyZIcvOjrggLIadtIlzRsLpYyqHZJxVoNQ=; b=S2JpF7JdyZJ67QFofK7hyd3bHgtHHzzj9Akjo+gE0s8HDRhbM6i8MnV7IaTTaMgpdemmHkXSAv2vCd3SyKsox5d7vEd7XDoyki0TFXJ5mx2lbsSOAWZUL7g3h6AP0g6IU9FANHOOFh1YbykJ8rWNpJ5QcUEWtdPuf/DHheBD3R8xIQpDOnAktMFzC8Uud97glIjcrIMoAfmojpX8e2SWlp228zuPA4aQvcE5sxUdn5tAHZ6Sccu36mTdNed5SFKO3f4Z6Ehj9YC3sRLi/rHuuUjiZk6DG1Oo9jUNuqoeI4p9Paim+WplHjbFbMfu/2dAnl3DG/4b9yb2e4Ah+PPIdA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gOiXpEByUVyZIcvOjrggLIadtIlzRsLpYyqHZJxVoNQ=; b=nnDkDrJgpWyDznhKFUZWXphr3hguPLwx91Freq6qiTqokPAdM4qR3pD4HYXqouhkbcCWjzAW8KrGBtXWYzUBy15P3jGBzy4I3+0NNuQrbNhxhI7CzsN+OoEVGZJ9fPVwdexDUD+ZrnQd1Mlurp1i0GQKn/fCWKAGb49k7TlgyYU= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2191.eurprd05.prod.outlook.com (10.169.134.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Thu, 5 Sep 2019 21:50:56 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:50:56 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Mao Wenan , Saeed Mahameed Subject: [net-next 02/14] net/mlx5: Kconfig: Fix MLX5_CORE dependency with PCI_HYPERV_INTERFACE Thread-Topic: [net-next 02/14] net/mlx5: Kconfig: Fix MLX5_CORE dependency with PCI_HYPERV_INTERFACE Thread-Index: AQHVZDP+Q0VM7fzVG0+blIHjQTjoPQ== Date: Thu, 5 Sep 2019 21:50:56 +0000 Message-ID: <20190905215034.22713-3-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e0e030b7-0932-48cf-ac7b-08d7324b213b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR0501MB2191; x-ms-traffictypediagnostic: VI1PR0501MB2191:|VI1PR0501MB2191: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:949; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(366004)(346002)(39860400002)(396003)(136003)(199004)(189003)(54906003)(316002)(2906002)(256004)(8936002)(8676002)(6486002)(305945005)(99286004)(7736002)(5660300002)(81156014)(81166006)(50226002)(1076003)(478600001)(6512007)(11346002)(26005)(25786009)(36756003)(86362001)(4326008)(14454004)(6436002)(53936002)(102836004)(486006)(6506007)(386003)(66066001)(2616005)(476003)(446003)(186003)(107886003)(71190400001)(6916009)(71200400001)(52116002)(6116002)(66446008)(64756008)(66556008)(66476007)(66946007)(3846002)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2191; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: O9ixVujhOeK/eY0sb1F7BTDOx4leMhDV48JmjaXIscTbAl3Mz+jGeqOhEshphNkEEy5IlawC0WdmJ/aCtvxdtwB7/RY+PpVmEyY638YbvUqr5MK8dj+Ftvl+FF+oCQCrZfyR1OCyMrMAvPZzNCJdJkFCwwgTU+OMMvVsb3tKPzd3vTU6Umz0+bOxO9DKsAYcUOPskqXO+/MWizMHVTYKufVLU8yJYutUiPAdvpFWp5HrXOgDP70Sq43Nk91fctOC7zekSxAp3sMUYJLjej8AFOmK4UKxt0SORrtincrHVzwJLe6kh0Wk6FIUtzTzMN0me0YLXo1z3k9XxRfr/hf/fSqjA5fSb+IK6AQKyJUp1GnroRQYkSFOUKeL1H5HK1tqnkP0XWQhbGMSKZuNSjExkZ6Zfr+pl++df7/TSHdeJMg= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0e030b7-0932-48cf-ac7b-08d7324b213b X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:50:56.3107 (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: qdDRzqXaFfq+e60bUhnpkleLGVFubDXf1N0jaS8HbQ7Eb2RI7Tn77mwsrDW0SSwWZ2r/V+9ep0lp7fEzY7JS/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mao Wenan When MLX5_CORE=y and PCI_HYPERV_INTERFACE=m, below errors are found: drivers/net/ethernet/mellanox/mlx5/core/en_main.o: In function `mlx5e_nic_enable': en_main.c:(.text+0xb649): undefined reference to `mlx5e_hv_vhca_stats_create' drivers/net/ethernet/mellanox/mlx5/core/en_main.o: In function `mlx5e_nic_disable': en_main.c:(.text+0xb8c4): undefined reference to `mlx5e_hv_vhca_stats_destroy' Fix this by making MLX5_CORE imply PCI_HYPERV_INTERFACE. Fixes: cef35af34d6d ("net/mlx5e: Add mlx5e HV VHCA stats agent") Signed-off-by: Mao Wenan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index 0d8dd885b7d6..a496f2ac20b0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -10,6 +10,7 @@ config MLX5_CORE imply PTP_1588_CLOCK imply VXLAN imply MLXFW + imply PCI_HYPERV_INTERFACE default n ---help--- Core driver for low level functionality of the ConnectX-4 and From patchwork Thu Sep 5 21:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158707 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="fXgru99F"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBh1WqHz9sNx for ; Fri, 6 Sep 2019 07:51:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389252AbfIEVvH (ORCPT ); Thu, 5 Sep 2019 17:51:07 -0400 Received: from mail-eopbgr140087.outbound.protection.outlook.com ([40.107.14.87]:28743 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388381AbfIEVvF (ORCPT ); Thu, 5 Sep 2019 17:51:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IwS6Uk0FK8knwBIuIsyDQSiW6A6xtO0UZlAP9v+gnON5Jf/JAIakI6H+l/TKwoaVL+RI9SdFvXmcDOkC2ja517gebp+r+KBxdK3Mhp/pHfKJWfS4eWReNqC6c7IfzH8MlFLVLTBVDm57ib5oxuUC927Qkq97SqIFZvOpsoX7BufZ7QWv3/oi1drMeHkUILJsnU9R0YypcLt+n5YF3GE0YjBTl5qndciXO5yPP14+/Nuq0ByQ7RfraXd+ij/wlQ7aNNOylY+3s2w7HxoI8rV9UDTTphlGlem03F0NWRn6Ie/q84Ymq1D5LfH0jsQ+UwKOUKQjoVPltr+uuLMu7uUxfQ== 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=9l4tJXcF/R9oz9JrjAOs2B42CS2dVD9bREBCpxXdZ4U=; b=LxtDTRhuodHbTEc3+7QhLyhU/bDGfCpv/jDQb8TxFMtdpxfbiLi5oLjrf6co0fbhSs+P92dhRW0yEIymx6AL/DC2ilufgZ3RfoHs3GSS84ZIlmCWq6dJpnFr+Znk3UmjHv5SMHvV45ocrfuSYHiXlO0tPyOME0qvYZ8A4qlmBUjroch/TnvMnELR1hIA1mOjDLvhjWstALxfIVqflOkdBuXQWqbDX0ePQIEcTw9phlnhIM6AAHXBbNj1Qhp+7Vghtwnba/0PpgKIbVr6koNddsBWSbN8errzdg/n9dhlX+3szI4zXfWKVpsTjqUgjEtE+YZdj7QdP+GNAjlV6Ywl4Q== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9l4tJXcF/R9oz9JrjAOs2B42CS2dVD9bREBCpxXdZ4U=; b=fXgru99FAD+CE+bX6zeIUnlpaNkWpISwmkdndQbVbrxMmt4shihAdftolxOslLR/fb2J75rO9PydCN0jypX/PQOi4AzopSIZkPV0J1cTDisFl7/ecw/a5aFbzk86lm1Do84Hh0sBs6y25ntxF+yGjs10ugL1Bh+P3Hyc09wHwnM= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2191.eurprd05.prod.outlook.com (10.169.134.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Thu, 5 Sep 2019 21:50:58 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:50:58 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Saeed Mahameed , Walter Harms , Mark Bloch , Vlad Buslov Subject: [net-next 03/14] net/mlx5e: Use ipv6_stub to avoid dependency with ipv6 being a module Thread-Topic: [net-next 03/14] net/mlx5e: Use ipv6_stub to avoid dependency with ipv6 being a module Thread-Index: AQHVZDQAWGXJs33Yd0mFlxcvjY93uw== Date: Thu, 5 Sep 2019 21:50:58 +0000 Message-ID: <20190905215034.22713-4-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e955b3a4-2504-4d36-e510-08d7324b2283 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR0501MB2191; x-ms-traffictypediagnostic: VI1PR0501MB2191:|VI1PR0501MB2191: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:204; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(366004)(346002)(39860400002)(396003)(136003)(199004)(189003)(54906003)(316002)(2906002)(256004)(8936002)(14444005)(8676002)(6486002)(305945005)(99286004)(7736002)(5660300002)(81156014)(81166006)(50226002)(1076003)(478600001)(6512007)(11346002)(26005)(25786009)(36756003)(86362001)(4326008)(14454004)(6436002)(53936002)(102836004)(486006)(6506007)(386003)(66066001)(2616005)(476003)(446003)(186003)(107886003)(71190400001)(6916009)(71200400001)(52116002)(6116002)(66446008)(64756008)(66556008)(66476007)(66946007)(3846002)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2191; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5qfhkxROJFKJ7va2cD+3yo463uKeXeUpWeSP2FoxJ5WFMWnS8MGYcPZRow9SBBBYr4AsxeoRlcjmOcHnGCoVemS7WZppL378cfKphOzKL5MJ3S3wa69jsiBAgC/MevdT/YOGfBSSo8tc1xH7yYoLM4TUui4brmF3Q9NGLlwtdZ5ucjFy315yST7Ac+Xf7E9bcGJc+SppFBpT42oSJA5VJxcCYnTaD4X1Oe6TD6C4I3KaqYrHEx76/N5Ko9Swdy/VP20ZXfE+sT9BmpBlnwS9NjNsAz7z375yQL+muTojYx91ohDzkZgbz0pH36BqHE44EdlgY4tegP0jbW2Oc/VOVEw7xL0ozSdOrgrDJXsl02sbthcR5beOp/YLa8TbBwKcE2PCM9poT+K0jiaKHaumrD8rVxNtJ5ATWSI7aESlBw4= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: e955b3a4-2504-4d36-e510-08d7324b2283 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:50:58.4267 (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: 1VbFrjT+EXkAAqYJanftR0QVqEPD+TLuVP5ewgpMjsWA+YS05DEZ8zKjx8s3GL0IyRqUUNUyPQNUtoJdWzDI9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org mlx5 is dependent on IPv6 tristate since we use ipv6's nd_tbl directly, alternatively we can use ipv6_stub->nd_tbl and remove the dependency. Reported-by: Walter Harms Reviewed-by: Mark Bloch Reviewed-by: Vlad Buslov Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 - .../net/ethernet/mellanox/mlx5/core/en_rep.c | 23 +++++++++++-------- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index a496f2ac20b0..0dba272a5b2f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -33,7 +33,6 @@ config MLX5_FPGA config MLX5_CORE_EN bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support" depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE - depends on IPV6=y || IPV6=n || MLX5_CORE=m select PAGE_POOL select DIMLIB default n diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 1623cd32f303..95892a3b63a1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "eswitch.h" #include "en.h" @@ -499,16 +500,18 @@ void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv) mlx5e_sqs2vport_stop(esw, rep); } +static unsigned long mlx5e_rep_ipv6_interval(void) +{ + if (IS_ENABLED(CONFIG_IPV6) && ipv6_stub->nd_tbl) + return NEIGH_VAR(&ipv6_stub->nd_tbl->parms, DELAY_PROBE_TIME); + + return ~0UL; +} + static void mlx5e_rep_neigh_update_init_interval(struct mlx5e_rep_priv *rpriv) { -#if IS_ENABLED(CONFIG_IPV6) - unsigned long ipv6_interval = NEIGH_VAR(&nd_tbl.parms, - DELAY_PROBE_TIME); -#else - unsigned long ipv6_interval = ~0UL; -#endif - unsigned long ipv4_interval = NEIGH_VAR(&arp_tbl.parms, - DELAY_PROBE_TIME); + unsigned long ipv4_interval = NEIGH_VAR(&arp_tbl.parms, DELAY_PROBE_TIME); + unsigned long ipv6_interval = mlx5e_rep_ipv6_interval(); struct net_device *netdev = rpriv->netdev; struct mlx5e_priv *priv = netdev_priv(netdev); @@ -917,7 +920,7 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb, case NETEVENT_NEIGH_UPDATE: n = ptr; #if IS_ENABLED(CONFIG_IPV6) - if (n->tbl != &nd_tbl && n->tbl != &arp_tbl) + if (n->tbl != ipv6_stub->nd_tbl && n->tbl != &arp_tbl) #else if (n->tbl != &arp_tbl) #endif @@ -944,7 +947,7 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb, * done per device delay prob time parameter. */ #if IS_ENABLED(CONFIG_IPV6) - if (!p->dev || (p->tbl != &nd_tbl && p->tbl != &arp_tbl)) + if (!p->dev || (p->tbl != ipv6_stub->nd_tbl && p->tbl != &arp_tbl)) #else if (!p->dev || p->tbl != &arp_tbl) #endif diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 30d26eba75a3..98d1f7a48304 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1492,7 +1492,7 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe) tbl = &arp_tbl; #if IS_ENABLED(CONFIG_IPV6) else if (m_neigh->family == AF_INET6) - tbl = &nd_tbl; + tbl = ipv6_stub->nd_tbl; #endif else return; From patchwork Thu Sep 5 21:51:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158705 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="MR4IUQNG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBf0NHWz9sNx for ; Fri, 6 Sep 2019 07:51:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388666AbfIEVvF (ORCPT ); Thu, 5 Sep 2019 17:51:05 -0400 Received: from mail-eopbgr150049.outbound.protection.outlook.com ([40.107.15.49]:1505 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730537AbfIEVvD (ORCPT ); Thu, 5 Sep 2019 17:51:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C7+UPEOigjWdBLTRxD8kbdgNgogiZTdCpeM7dsxQiJjFr1NprmyWyGFd7Cr6sYMcQqFNqw0imT9xgaHmelkMYYmsGIc5NLVwCCztdZQymJjbQ/fhelPul0ip3c/4rYnwyaRXHavUzHzc+fC5mK0ia+Jn4tCo8jLQRyJTNKBXtvUlHWIhoRlpY0C/EdXjFPm9h896I4bhPlC+O+L/wJ5bQT2JVKQRjJnTwqF9KzreaHZ9TXLMsg5m/vyVGfD54cVxdDIQSeyAsdDE6fPvS1Mzdfn5HReEsLhwo/22mVDVXPRo8bNcwoLJRFOHNqy8bikV4g4nD4vjBs4oTjMVrSe85Q== 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=SzDRMWxPvjwz7g1H8TD4SQ2xXDFhdrpDpRM06cL7CY4=; b=OvHqB1+hFK/GI3zX+2CMSqlpnNqCc/YZ6bKRXUmjmUVK258tTGUFIMq9wjtkcGE3hOU8r+EEVAloiR3aHWsnVzZwFlCoj4Ov1dkDXFj3q95WTb8tyIOYTbn61IR3vCJOriPZI+vya3t1n2NbfgasJZ4VyLZarhz0iEJs+GtcAtbexLBW5PTq0yxk9d6pLYytOwLmM+cGBWVFvVr+SHt4Gq4PNZC/YV2BJNMi4E46VmVRbB1dY1rOV/5vl50Gvdof/i62F2/mackDGzjIAoS5rG2mSHkYgYudTOaalyifmfD6ixKO0MTC0yhCqmLk+LV0XKpCr4wA8asY0L/QPo6E3w== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SzDRMWxPvjwz7g1H8TD4SQ2xXDFhdrpDpRM06cL7CY4=; b=MR4IUQNGKblR1iPP1bahcoPI7ZkOz1UiUAXHFlhRh5pGVCxi9U7Z5bzowEAhZRQgv9kCHdRd/fp669llsdwn+0wqcwLLG92OjzOPZ3mE08SVhz21Jfqy9zqP1r3Y5RyKQLddSV5sOqJPI+bjG7zF4gTmzXG3T5qydTGLuX4ncWo= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:00 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:00 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Roi Dayan , Vlad Buslov , Saeed Mahameed Subject: [net-next 04/14] net/mlx5e: Remove leftover declaration Thread-Topic: [net-next 04/14] net/mlx5e: Remove leftover declaration Thread-Index: AQHVZDQBAUyk70RpvkulQ9IM+Hop9Q== Date: Thu, 5 Sep 2019 21:51:00 +0000 Message-ID: <20190905215034.22713-5-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0b8be197-790b-48cb-f3a0-08d7324b23a9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:206; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(4744005)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6MhROw6QHEX68bJZa67G3DW9XFY9kh9FlM/zvbfdpvDT6SAzZ7c9QWjSPATq4SqWworkrrPmiQL6Hrp415apMlJuWQ7Ovy4ZHOSkxW1pEtgnbX/k27XpuIAlQsa/4GhUe5/PB1WhdwKj+EaPJWLlm4ww4s7/D+i/Q9igZtsroiFDlkSbUPYy6CtxNb6BO1flo9uIEPUa/5e1rYcvWtcoaadd8qLAZi/b2rsAI9nlj6ilHvRT5s4G13etnQVXjYxOrxBOQLlwkOTZB36hXwchms44vj3t+I1U6W6s+bkV3gzZaRr7ZBc4QbRcFbTU4kin5xz0hCCfxT8O8Jif7ERBNbEE4dXaOED1ipNQ+fkpco5ff4wzq/1vfj27h/luRk8o961b1sFypFv/aqWhJV+jIJVw4uFifOafvwXi1x26ejc= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b8be197-790b-48cb-f3a0-08d7324b23a9 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:00.2449 (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: YcN54FwwEh1ZNtnNRGC5RN9bC3wMYpPIgotUHvUZ5vf4mX6ct7BvsRdeG77e9x2hAfji5QxX3Li6YDBlrZf4og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roi Dayan This function was removed in the cited commit below. Fixes: 13e509a4c194 ("net/mlx5e: Remove leftover code from the PF netdev being uplink rep") Signed-off-by: Roi Dayan Reviewed-by: Vlad Buslov Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h index 8e512216deb8..31f83c8adcc9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h @@ -183,7 +183,6 @@ struct mlx5e_rep_sq { struct list_head list; }; -void *mlx5e_alloc_nic_rep_priv(struct mlx5_core_dev *mdev); void mlx5e_rep_register_vport_reps(struct mlx5_core_dev *mdev); void mlx5e_rep_unregister_vport_reps(struct mlx5_core_dev *mdev); bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv); From patchwork Thu Sep 5 21:51:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158708 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="D7Gz3N9e"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBj5w75z9sNx for ; Fri, 6 Sep 2019 07:51:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389672AbfIEVvI (ORCPT ); Thu, 5 Sep 2019 17:51:08 -0400 Received: from mail-eopbgr150049.outbound.protection.outlook.com ([40.107.15.49]:1505 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728769AbfIEVvG (ORCPT ); Thu, 5 Sep 2019 17:51:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A1jekcGvmeLSSTqyWvnnjY5+df3ERdFS7hFmwn3DnfwoIBFTokXbGCS/tibp3drT5fNZyul9Cg7HjouYzZIIBD+Fr1BN6QQl/rn7Ik+su2KPIyKjLNhmPXAwFrAi3efj8KAXj/dkLZtB7v6M4XGkZdw4i/Oqc9uYu8ct8OGgqcq/D8t6AoFnQHLua/h0uV+FZHljmjtZr11hFjmQtZJPYGXNvjr4v2uErkAJFffZqAg0HHMPomcA9HoZ/7vCRfiUULnT3fk0WWzyz6rOICso6KOrlcG7dPi/cgcvkob++6gl0J3mfmYMNZr8bdhwKySk5jRMhbLLxzbaaDRrTpg5Eg== 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=jontaeld47CCL9L3Ah95kd0xnVRlNkdvbgeb6XWvJTU=; b=D494SN7KxG7Vs99Hg3lYR2wNDKi5NrJgEvhwfTvmdRPAXG5RO6EU8XyRAVegZq54r715ggdkaLnrghXPc0C/muj0UqT4LP6urJX1sDyJZwpyUthxdpCPjJSa+2W69inZZN7NLiAYqzk7ZhbxSREXIHVn3DwEZtIuIGAJCAIttGuCaaxewiAVJnmcGIzqllf0Id1Ddk/XVASvuix2gePV1XJarOBPqWXq0+2nmK7Mvz4PG9XmmEDJ6Enak8Z85CB9pEhoYKx7SOp2svUwJ0FUAVApDI8tkCryahlDMEqh+2gxmKpaPhXqGEW4YceMDX59j65XQlgB7BrHBMmj/6CP8Q== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jontaeld47CCL9L3Ah95kd0xnVRlNkdvbgeb6XWvJTU=; b=D7Gz3N9ef6dsrF+79Jf2/D2wa4cLSrBT7qZoBCw88cjZy/iMlhaUfqBB5isZNp8O02cj68nZp2iyTvLB76pdP6eiPndmL5zBL5jXngr3XSFeVT1CwONQSXPT3aYkwrL9t1n8ccSVVGQYIK392Uq9DJSYwjPcCdddJk0jCGQJZms= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:02 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:02 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Colin Ian King , Saeed Mahameed Subject: [net-next 05/14] net/mlx5: fix spelling mistake "offlaods" -> "offloads" Thread-Topic: [net-next 05/14] net/mlx5: fix spelling mistake "offlaods" -> "offloads" Thread-Index: AQHVZDQC2RtNE34F9kC+s8urhc10TA== Date: Thu, 5 Sep 2019 21:51:01 +0000 Message-ID: <20190905215034.22713-6-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f6fb7eef-429e-4539-8a5d-08d7324b24a4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2331; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(4744005)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: VyCbiIPIRijXqzqBdKQfZuzcFEj6HEAeIreOFW1Wq+qDtd2AQXoeKKOpdhufNHMSxV+s7WQvKvUsl1DxLiXBsTbCNZVTPJMqL/3GMfeeQn5tqTcjqQY62tnLKu4JHUlnMt0H8pn9Ssg5k2dhmAD5Svuox22ELIIMM+wf9nH2NY5t/dfrY6NZQY2TFMdwvAGUdlJ8LnktyjQkyypOgNQZh6lNhbvJpf7TcW+7IURrimDIwrqPozV1hhdMI/GqqVDcFwe+JJ4IGFqdnL+glGnmkl119JWnxp6mYowyOYeaOJoiItkkm8pyqRWjfLtAkgR0n+gqn3aZyo/MKIfEZ3bNyvoDzDGtCOMt+qDaORcem4BJbrllWsqbcN0DUCPVwr0xfG/45ZrfxDsgj5eafCu5F4e00y+PGWUZCWKr9JRaqv8= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6fb7eef-429e-4539-8a5d-08d7324b24a4 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:01.9991 (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: +hUrFNU+BnRe4+FZVNDOKqGJ573xoQZC0Ra6yg9TdS6glI2yL4QvQi7WMQ9rtSXJy8KasKLMr9hF2cYbdsQqEQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Colin Ian King There is a spelling mistake in a NL_SET_ERR_MSG_MOD error message. Fix it. Signed-off-by: Colin Ian King Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c index 7bf7b6fbc776..381925c90d94 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c @@ -133,7 +133,7 @@ static int mlx5_devlink_fs_mode_validate(struct devlink *devlink, u32 id, else if (eswitch_mode == MLX5_ESWITCH_OFFLOADS) { NL_SET_ERR_MSG_MOD(extack, - "Software managed steering is not supported when eswitch offlaods enabled."); + "Software managed steering is not supported when eswitch offloads enabled."); err = -EOPNOTSUPP; } } else { From patchwork Thu Sep 5 21:51:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158709 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="o+3F6K52"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBm2x1Vz9sNx for ; Fri, 6 Sep 2019 07:51:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730454AbfIEVvL (ORCPT ); Thu, 5 Sep 2019 17:51:11 -0400 Received: from mail-eopbgr150049.outbound.protection.outlook.com ([40.107.15.49]:1505 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388932AbfIEVvJ (ORCPT ); Thu, 5 Sep 2019 17:51:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f5oM36ikg9LDkKR0xvc8Vfde5qhhoXZwVG4T+1JVTseWA5QJAVW3rQAa03WZzAIZKI+KiIJ+98wUkVnHmpNYtMFZiTxEwLZP1LQySpP4OYWTNoU/gktawYJmWMkG6Rl5G6S4neE0lsMLN+bFws0mP3ZTOf7Wc8cMCMtnUlQy27vjgpRuHX7iDdAKxqILL+zWckCzbotHTcSoKEVJK3V16geopZZisJvepMY/3ooeIZAWzzwDzmqoXTzPmguFwyGeXEnexP5Va7dRroVQ8Vtg7KVUjwETeNMnT5EXTU0JQWxC+Iw+1w+3mv9CQNueB08cKO5OqNTsTSDPaKWkjxtjng== 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=JTe/lEkDddGEeFg35mPL7hmcH7yh4S+qS9x065Flas8=; b=jsRfiObJxhdHAefshc00bm2GwExMMuVYA3LlGNCfQHZZsg4f/S7iNUd70O5OA1GPxuzKeiQVdsCC2fkCxC+rtFGSk72FPtxOtucArIr5swGqCSAe9kzOge/jNxzLbWp8CqLXvAxuSR09yuP+sGqmBdhqD2/s9JgqKRZnLZStvEvqNDuCnzJusAf+tFLTHIga+51gfw1PA/5K/NQ4K/nOTyjIlGuShUso3HlpjAAZaR5laURTYqldpdSz7lb+Piakxe9Zx4EZe0ZAGE43oevt242VpGUJX5qw6TD9PnXEwu4BcXAMqVNItFKZWm7d5xLdYYEK5GNXyMg5kjnuXtbbxg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JTe/lEkDddGEeFg35mPL7hmcH7yh4S+qS9x065Flas8=; b=o+3F6K52fRu40r4hBSA3qTGY4GYJhKuWrwJt9/66Lr0ELgOt3HjjXeTOCpuK7fGX5FP9gSYG1UNWgS+j+nYmC/ENobesnYZr6C+kvt//hqV1iNne80HDjku4+tnQeUBUssqeIXs6S/+pfffjIV7bKfe72Fd9E1QpjwZOacNxK04= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:04 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:04 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Colin Ian King , Saeed Mahameed Subject: [net-next 06/14] net/mlx5: fix missing assignment of variable err Thread-Topic: [net-next 06/14] net/mlx5: fix missing assignment of variable err Thread-Index: AQHVZDQDgwucjjQiekWOYjLoSSZbSg== Date: Thu, 5 Sep 2019 21:51:03 +0000 Message-ID: <20190905215034.22713-7-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8e91b423-3938-4b2d-1452-08d7324b25d1 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: j7KZEVOqu+YLkYUxWznGYgrzwcVHvMOyponBLzn+VDl1Elkhi2mhSN6JuTcCdifK98eTM2Ts+CcXTg407qqHOEVPSPPSiFANAfJLL/WX4R2W4ElmEJAmeF6hH627mDN7M07d22qzjEyvx+VrKSaBNFtpmggY9A+ZdhCBx7pdpf2fmxQOXIs9LsAEQKtsUJXgnbQU5Basyr3fkZXiO9lABG1fMG9//vkNJFLoJQBn5+N4OsOSID3SXXgav3FFxTVfb/pQj/9mQ/Sa/Mn7LQr3nQgLi5ff+xwq2zOjWeXmu8O50W48bEInSaNC8EZfekl59GI7W3cRsm1l9NN5MZybcHeW5ks3w7i3jFHHmF+f3MGRONrwXpqN3suLHj3kNUDJY+WFKSD7OK0qyL4iFakb4sJ9FsybcdA+g36VjSn+0Wg= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e91b423-3938-4b2d-1452-08d7324b25d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:04.1521 (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: XErQfREtTdW42i3hd3cVw/u4Q0cepNJv7GRTWOjxVMErP6if9ULsQ+AJGNkyye3mUmgbkcQWxTCa8i5b5ykctQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Colin Ian King The error return from a call to mlx5_flow_namespace_set_peer is not being assigned to variable err and hence the error check following the call is currently not working. Fix this by assigning ret as intended. Addresses-Coverity: ("Logically dead code") Fixes: 8463daf17e80 ("net/mlx5: Add support to use SMFS in switchdev mode") Signed-off-by: Colin Ian King Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index afa623b15a38..00d71db15f22 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -1651,7 +1651,7 @@ static int mlx5_esw_offloads_set_ns_peer(struct mlx5_eswitch *esw, if (err) return err; - mlx5_flow_namespace_set_peer(peer_ns, ns); + err = mlx5_flow_namespace_set_peer(peer_ns, ns); if (err) { mlx5_flow_namespace_set_peer(ns, NULL); return err; From patchwork Thu Sep 5 21:51:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158710 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="W0RCqsGh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBq1vLJz9sNx for ; Fri, 6 Sep 2019 07:51:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390886AbfIEVvO (ORCPT ); Thu, 5 Sep 2019 17:51:14 -0400 Received: from mail-eopbgr150049.outbound.protection.outlook.com ([40.107.15.49]:1505 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728769AbfIEVvM (ORCPT ); Thu, 5 Sep 2019 17:51:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l6t0tMmpIOf1tcJHIX3ZIv+CCH9wu+GaIT+thF0eepu9T9wWemsG9aKvMPvTzeG17yZlB0eXrU6ly8VhBd2bNag6LcK4UP7OgsWO9vPWFyNGIZwd6CFheBu8aFYYcksW7trQ8Fy2XCTjA9vb0JAhisLL7UOt5eDPcmnjud47S3pQ961V9KpJrZ5OAGcO5wvKmoeIZ2oXw3xErJpsA/zJnqfL2gblR85E7aP6ihyQH+FJnNtL5yfSsIEGXvbL27j4O0gRI0dyPb7O/ZcTHRPKJKsJWMN7kN8DNCov+OaTj7Om8rj/AYaFu/B9Fy4LuenPQQXuCDXI6QthxVMnLxJKLA== 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=W1BwmCm/plx2SqlIxY9zcXsKRp4M1Ir0jKNjxQ8hJqY=; b=S1ekPpzGpRWchujqin85XD1Tt+k1BsR2qwYIFl5c1awBGAlJE4pvmmkg5IkAKjApt6AMvpiJa3aGACmjJiBRO4cEn20AyrqVDkvIUt9PG8Vb2iUfjHtyjgd20ZEy7jXelXYsaYRhXTCZqzx8lsitqWd2JrpMVDtEs9sQ2uH6MSWjzzvqitLRiruL7j4Uja7keSIDtACuWLnHaB86c1r1hak1nucBXKGRuMQIM0xWczNNrMi1EpC1D5swhEHyK2YvE+usCSoSvMhy4/51zJEeP8pVAupyNbr9hsw6QIm4k6KV9dxrA48iGPAqHuK02bqVtDCy+VjMq4HXxp89m2UWDA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W1BwmCm/plx2SqlIxY9zcXsKRp4M1Ir0jKNjxQ8hJqY=; b=W0RCqsGh0XAW8AmkIBVy44YGTJFrVpMlF2Wr8JwH9K3yLatO4mY0iCJM/SvVltgyKMOUx1v7mnK48DEkW5rn2AdZSEBWgxOLxQqj7FNU4o4WdAsmrU2ArclDNXy64vfQGsKacgp9/DyxfcsqaIZLULHOpuFOE4YE9COhdog5n/U= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:05 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:05 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , zhong jiang , Saeed Mahameed Subject: [net-next 07/14] net/mlx5: Use PTR_ERR_OR_ZERO rather than its implementation Thread-Topic: [net-next 07/14] net/mlx5: Use PTR_ERR_OR_ZERO rather than its implementation Thread-Index: AQHVZDQEpsjAARtBmUWJ+Uqimx33Ug== Date: Thu, 5 Sep 2019 21:51:05 +0000 Message-ID: <20190905215034.22713-8-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 00750d6a-4fa5-4f90-7b49-08d7324b2704 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:409; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(4744005)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ceFI8jrajUB3WPmzwJsqd1XF0MBM6fqoRt/g1X7fLVTNlKah0oZy7iEaljqh1Z2lxP3ZTIj1Fq1ONfu0uhyGY1nlIZ1FKkLBTgfvQ4UdBbIfdpsjnRFgFw78SAsI2FBqXghWvwaT8BmFRKl3wphjms+Rt0IglzsZR/dmh7TcjD3iqNdhoU3Kz1vBcWdMiLHFZUmkWMwnhfwhKKj76xaC60eOkpqfLfLeWTJJFUiqk5hGjCTjZ2iWFYWlhCJ6SLKWI7ziwEW8Lcr3Juuy6jHNQ2eiwJkb1cshv8/SVc5+UP0CrTXtJVEwij6vLgBPYLWXNC3kM8CEljvFlNBCKD8+67k0Av7gH/HrRPLfbeY6ytmM7boHwYCx7eg/GnAgfv/kvHPsz1jrHG0J9aQr3yHmTPVDjPS/TZf8sEc3jxdomGY= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00750d6a-4fa5-4f90-7b49-08d7324b2704 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:05.8468 (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: nYY9P4EQzgTjY+dKkXz0ebydHzPsX5fRnD8J/7K8lpPV/PopD2V8l6DGGgvpEeMXZfu2D4z7tCZu1HlHUym/Wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: zhong jiang PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. It is better to use it directly. hence just replace it. Signed-off-by: zhong jiang Acked-by: Saeed Mahameed Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 98d1f7a48304..da7555fdb4d5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -988,10 +988,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, &flow_act, dest, dest_ix); mutex_unlock(&priv->fs.tc.t_lock); - if (IS_ERR(flow->rule[0])) - return PTR_ERR(flow->rule[0]); - - return 0; + return PTR_ERR_OR_ZERO(flow->rule[0]); } static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, From patchwork Thu Sep 5 21:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158711 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="rm4t7Gw+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBs2sK6z9sNx for ; Fri, 6 Sep 2019 07:51:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390961AbfIEVvQ (ORCPT ); Thu, 5 Sep 2019 17:51:16 -0400 Received: from mail-eopbgr150049.outbound.protection.outlook.com ([40.107.15.49]:1505 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388932AbfIEVvO (ORCPT ); Thu, 5 Sep 2019 17:51:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EqihvT7yC13WJHhZ/95ESJgt+NTZFsQADTUVUFdJimZL7n3W8x+5snSNtOig08QTvAPCWvxTUYXcerPTKSLr4Anx8dXt0RbdGifM41XOtX+FhnRaiII2KVoKRV6wfOBDa7XueFeSy4r2l/ymu/BwtXD35HMvk/lOfAaz5iuiTqhJjCsqo0wM69bsIKrv0EwTDPI/xlaj1xY/O5DaLQevlYP53zZs/oadAHIi3PQh2nL4fjdbKYFH6/pXpQWdhsEHO+i6M8HeJQPQRDmV83E/Uz6Y+JPQLe/H47sKbgcZLjKe++a6goMQiwnvHI2HaLwQV70H84P1T09PuNWNaU7ylg== 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=iDjnPhq9//tfvdpiAoUvihH81Y94TjNGTpfOeH4Oz84=; b=KaqXMmCEYuJ8sSBDNq4cAzy9xsVMwPyt2cgaI5weJCXzK91WigyMZhEypxCfaYP1oENZXhxCr/zNs9iRd/hlza0/I+zpMzMPpanz2YLfomoOhoYbpuPOf1Y3Hav78mejRslJnJicjtVYfM77N5d66RcB3xxUPBLWtUW5NhM8PO5xPaB2jBg3JuhEZGnkKRPNi/No03fm3EXqYr68lG3WEJuO1K8iQCE5zveht0nH1dIOLB36Zyhs5ZQEZ39J2bvbijmWm9CJc/wPS+Tq70lCDS9gjDQ0Ned+azgUVYpit6bPiOYwKEFPPlPodJP8UJETmoE59afDfCOjejYMO3E4VA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iDjnPhq9//tfvdpiAoUvihH81Y94TjNGTpfOeH4Oz84=; b=rm4t7Gw+vLzNN6ZtCsdmh52wGhQTVsZx1PM2f0WBCIfFOT/XuoMiq4jtUmzawRX9rizmvPwTCFVTznCe7RT9qM4HwuT0kHlJXggw5zMZUie4gdzh4hcT95SiTatwT0vwBPJXFjYlQqEcpQ4eiJmtCMqbRFHb5EiERnVsX5yxiJE= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:08 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:07 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Tariq Toukan , Eran Ben Elisha , Saeed Mahameed Subject: [net-next 08/14] net/mlx5e: kTLS, Remove unused function parameter Thread-Topic: [net-next 08/14] net/mlx5e: kTLS, Remove unused function parameter Thread-Index: AQHVZDQFSjVQ5Fup1UC8ZZWQgHvQ/A== Date: Thu, 5 Sep 2019 21:51:07 +0000 Message-ID: <20190905215034.22713-9-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 324f5711-4cef-439b-f8ad-08d7324b2824 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3513; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: QA5K/ENHVUylF53sadM920HiPnMzW64zVwGj2uKaWQZqrr/QIHSCMaJZb3PWkAambh12QgS0eipYO+BCUskvcmP4ftdNUpAdyf/ym3jeFi3QSKlHOaJWK7TkdY2dMUkIsFFE/iAFE9G7s+g2aKYYCPUX+1zmczmIlRKfGYU/TVPYwfC+XhuO1L7/Cb7KDiRvU3D83XMCeuKQ48qrYkdt6ityNPppAHivugn/SU/Fp8++OwebPdSc5kMTP7Q9kZjtm/1HpuT5Mb1EzRNV3DMslj+8ltfs5gc481JUGFuDTFM4hmnsNjPPmcMrTd6XvY7v5q4/iyeJJLrMLrlxP9nA23BAj/dP+K1DEIKOd1+yi16/tbdFs1sv81I/xJoKFRAFinNf5JT1x776N3w/K73KcW1Q1lHh0XKs4bHRFJ0TBKQ= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 324f5711-4cef-439b-f8ad-08d7324b2824 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:07.6091 (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: hvpgIzqrlwTZ1gx6GniqiKsCtMQsLS66/66q/Ie9fhSz34X2YM1q7mO+sgxX/tYq0xAWYF5YLdHhDizD9OZ28Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tariq Toukan SKB parameter is no longer used in tx_post_resync_dump(), remove it. Signed-off-by: Tariq Toukan Reviewed-by: Eran Ben Elisha Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c index e5222d17df35..d195366461c9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c @@ -256,8 +256,7 @@ struct mlx5e_dump_wqe { }; static int -tx_post_resync_dump(struct mlx5e_txqsq *sq, struct sk_buff *skb, - skb_frag_t *frag, u32 tisn, bool first) +tx_post_resync_dump(struct mlx5e_txqsq *sq, skb_frag_t *frag, u32 tisn, bool first) { struct mlx5_wqe_ctrl_seg *cseg; struct mlx5_wqe_data_seg *dseg; @@ -371,8 +370,7 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx, tx_post_resync_params(sq, priv_tx, info.rcd_sn); for (i = 0; i < info.nr_frags; i++) - if (tx_post_resync_dump(sq, skb, info.frags[i], - priv_tx->tisn, !i)) + if (tx_post_resync_dump(sq, info.frags[i], priv_tx->tisn, !i)) goto err_out; /* If no dump WQE was sent, we need to have a fence NOP WQE before the From patchwork Thu Sep 5 21:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158714 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="Gsc/5TRL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZC306rSz9sNx for ; Fri, 6 Sep 2019 07:51:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391031AbfIEVv0 (ORCPT ); Thu, 5 Sep 2019 17:51:26 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2390949AbfIEVvZ (ORCPT ); Thu, 5 Sep 2019 17:51:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WhIVlNo9GkRT5M4bPAE9N8iU5v3095e8gpc2LyEITtZoDcx64qQYGlfwUF4UWsdfO/XRWf01kf0NjAWuRj9vdSufOId3h1XpdNOCCePPwQgUSooKLhiiF3PipmpZoBop91o+wASqbo5Xj4XE3e1Sqib8cBmNs5H8a6xYLY9tRWUjw4Ihexkho0wuZfvOLDWRka7cLip0GPmiWO/VFdpE2YSCfv8VclGZWgX4em8iT031uFQQ7GbFSyegDLSe2sfOyqVhJT6sKs7C25n/qdkF2Uijebn4ulhCUtG18jutLRh2EdEDAsMkyPg1CVdFzeArieImdd3AvNFjhxJ3zkATFA== 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=Mu4IaaH6P7GuY95SLG8x0/9lp+ouBn1ay1ravDCMrYM=; b=DR4rmsHyLhZmw/wmpTfOoOSOIDswXP/ovwCPhaYepHPnVmNoxRPx01WRSsRjYEa3zPvhfFktRm+c0cV2ME5VCxGTr+yt3xtWNbTQdTH5XK8M+dvUJSFEv4KC3bYMM3IthMMCFCYtbS8w6nDpfTF/JRjsK0hojhfyB7bg9RNUu6A4NCwLcvEFKM80hBThugcae31h8Slr2CrCWI9wP/OVNrxtEeqyz8HgFfyD7k7sm0mdqP6fjdArwv+q+dK8XJmfpKHZbyL+ZvroUJnkWgxqOylk+D4sJA+HXG6wTNDlQAO89tbICPvgpJ4XKle6iMGq2JC7DRIGr2VawRJOx/OREA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mu4IaaH6P7GuY95SLG8x0/9lp+ouBn1ay1ravDCMrYM=; b=Gsc/5TRL4lf5rYJURu5y5M7Gm1Gg4x5PqfnKtxLvYPJQGpZoU16d5yw4kvQ45nsRaLKLoXvMn3TffLIZ5Yjzg8EmnOghmlTnKi/I32IkX6S3lHnoEh3ScfHRZ47Q4ERolsWvdQ1GcdcliDOUnWMANvsd2DG0zMxZFK6OMvNwrcM= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:10 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:09 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Maxim Mikityanskiy , Saeed Mahameed Subject: [net-next 09/14] net/mlx5e: Remove unnecessary clear_bit()s Thread-Topic: [net-next 09/14] net/mlx5e: Remove unnecessary clear_bit()s Thread-Index: AQHVZDQH/cHkMqT3s0en7GEolFfrFA== Date: Thu, 5 Sep 2019 21:51:09 +0000 Message-ID: <20190905215034.22713-10-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 97e9c790-bab6-449e-70a7-08d7324b2962 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2150; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Zv4B/i9UIyK9wuMra+mJzUKNNsENTysxyQ11GejjGzeEq5v1d4/aLrOZSqIDAppJlJGcfRxqJ6fU+CIhQJovhmIWwWbl4+KhAVEM6cHEOIid9yxEINr9zSQRtyfzcHeFsFNZg2phbmf2TZMTaBOWSooLGKac3Vob/xibpQ48TVwMijxAdFxK7k0hx3YKbJCWFX7BQi7ekYbjSnSLuGP8+DZD0RDw5k8PfBuh9DylSlI/KpX9FB//OQOz2BuTvcxdouQlJ9qLUTKt45yhpS9KQLrp98OuqL4g06ROAgpQVPmoWkPtU30u0jjaZKmsqq2AUgK0lTici7YNXdzX6z9waFsQNJpDLBenN5bI14RE3AsZ9XYe/4RtZib5UzXtQq6f94P0m16CdX+CmsNutiXb4Htkb9+fDMEWKW4Tytl/VVc= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97e9c790-bab6-449e-70a7-08d7324b2962 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:09.8885 (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: aJrB1M9PyySqGmGN1vbyH+6P2yo4lO1G8WWY2WGmG/tQPNEwBDheICWXZaJa24v/jIT8eO0SOnJi1l1xWPQDzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maxim Mikityanskiy Don't clear MLX5E_SQ_STATE_ENABLED on error in mlx5e_open_txqsq and mlx5e_open_icosq, because it's not set there, and is 0 by default. Fixes: acc6c5953af1 ("net/mlx5e: Split open/close channels to stages") Fixes: 9d18b5144a0a ("net/mlx5e: Split open/close ICOSQ into stages") Signed-off-by: Maxim Mikityanskiy Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index dadadf221087..cd51cd56484b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1315,7 +1315,6 @@ static int mlx5e_open_txqsq(struct mlx5e_channel *c, return 0; err_free_txqsq: - clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); mlx5e_free_txqsq(sq); return err; @@ -1403,7 +1402,6 @@ int mlx5e_open_icosq(struct mlx5e_channel *c, struct mlx5e_params *params, return 0; err_free_icosq: - clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); mlx5e_free_icosq(sq); return err; From patchwork Thu Sep 5 21:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158712 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="FucXGYgc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZBw28Hrz9sNx for ; Fri, 6 Sep 2019 07:51:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390979AbfIEVvT (ORCPT ); Thu, 5 Sep 2019 17:51:19 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2390949AbfIEVvS (ORCPT ); Thu, 5 Sep 2019 17:51:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ga4OsUMTfaa7JJsEN6NHly9fWsdOYQWEBXPgFkB2WfTIh8qRKyMphf8B+fUwCqJJfxqc/MDi4SisJ4WJ8AbyCdVJAhnGUgDANHuywW1rkStcDUysy3NbsjjORf7KZDXcPNOpsM7Sq8lGUG+uLFggEMf/YfmoJsWCgKnPEJlWB8YP1ln9xF/X0xS1qbGq8Uqka8VsU9DJoQVxxE2LbSRZ21KkMnn/+DLSTpnb+TxseRAmPSB5UrFXmQ95+rAk8HmITN8Qw4I3G+RFs4MsWUuZPLO3xC9lgcevBdx6KP6CfRZlv//GZr5yQrfc2i0wABUAxR/9OP/pdh4k0jeA5fmSJA== 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=h75N/0RLK2qd2eIPV2De1B9mtaH1P0DHfJf1zKpZz2w=; b=XJPFYw4KmF1XuhQVFkqYJXS7QHhreXNYN1TipbPnLjJlCDAp/ECdV0tto9mOvt9u5cjXtj3X1rqDVy1u3VGZFLBKuJ6TzVDTcxEfWpKfOaekIfDXRGneG3UnpSVT1HIAx0fkvn++lZ6Ss5O2cPhqAakD7+QRsslNiTMhdnAF22vJU3DyBpU3EGkMIG22u7V31VPnsDNS3KK2dZqoByKLTcrmXWkBIx+pM6qCQiKDpZ34/hyVyWDQaxa4FNBJcwE8jIeK1gCwADpFuljj8FWgulTVC9/QiuLvtai2L9QS3FbcSl4U8/AAVH4lXt1uJmZw1X5YTmcUY+eCQTm8j/5IGg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h75N/0RLK2qd2eIPV2De1B9mtaH1P0DHfJf1zKpZz2w=; b=FucXGYgcQ+PuIqvc7hVQUSyzr3xH8lYe62/i+aYsxHNrBIFKvUl4AXiUqu7/nh3MpNgWreCEWyVOUMNY6+e2ACbl+u2/RhGLQK4p6FHZVQ1VPj745xTCD+Y3yZSQWp6VlV5J3xBY2zvWADfC06ixHiOEsQbqKkLsClVCvxF0qgo= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:15 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:15 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Wei Yongjun , Saeed Mahameed Subject: [net-next 10/14] net/mlx5: DR, Remove useless set memory to zero use memset() Thread-Topic: [net-next 10/14] net/mlx5: DR, Remove useless set memory to zero use memset() Thread-Index: AQHVZDQIJWtAIzGEo0KDeHvnq0ErYw== Date: Thu, 5 Sep 2019 21:51:11 +0000 Message-ID: <20190905215034.22713-11-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fddb4112-9189-434a-5fd8-08d7324b2a6a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:541; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6666004)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(4744005)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5lFlIeIw/Z+nQfgY9YzTMcCDDLj7pb/n+uAFXgI/1YQBRUdBB8kk3odNqHUnLZxkBejKQOCkuXSAW6Ft2djGinpDYlaH2PnhHsdaTvLfSItELBa5+FEYGZtLeq4ZI+MEoIiix3qepT5JGmqb3fcfj/O6mVDZxGRxos3v7c2DBgXHUq+helLumYZpNg7HdfF91SPcQW2Em049a2r1v4E/cBZgm+2n1/SvwPqhLVMUYZFAn7z344NPwM6/JFSJqTKdDAs5UK0zOscbKbyVUgd1OZhUkE6V26UjzV2uhKjzwu8q6qcm+SiYMrdhqruWihHfVuQCGzusbk9sDVJB83PKOUYJ/qOB9+S/A590WC+TgrAYP6OAyr8Z1GlMOyPdNiNMyKwJ10OY23njP8/We9DZZoQkgxa9Z5RyXFR4olr6l/E= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: fddb4112-9189-434a-5fd8-08d7324b2a6a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:11.7057 (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: 074F3G20s4dMiJhXaDVURmzAD79HhH8A9/b9ja5LVPQYzrY4zGvFTQEeLR9mQvR413+C2uVUUI10iFut7nxlXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun The memory return by kzalloc() has already be set to zero, so remove useless memset(0). Signed-off-by: Wei Yongjun Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c index ef0dea44f3b3..5df8436b2ae3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c @@ -899,7 +899,6 @@ int mlx5dr_send_ring_alloc(struct mlx5dr_domain *dmn) goto clean_qp; } - memset(dmn->send_ring->buf, 0, size); dmn->send_ring->buf_size = size; dmn->send_ring->mr = dr_reg_mr(dmn->mdev, From patchwork Thu Sep 5 21:51:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158713 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="APJ/vVdD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZC04y9vz9sNx for ; Fri, 6 Sep 2019 07:51:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391007AbfIEVvX (ORCPT ); Thu, 5 Sep 2019 17:51:23 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388932AbfIEVvU (ORCPT ); Thu, 5 Sep 2019 17:51:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YIqYNH3TOmeQwwK9Zt2GAaWbBWvOpAUESgxICfJ7D+CLaXVR6HzS4XZUz/FY/r3tYowOCS6SeYfNo84CKLY26/wex31S4CmYU08Hi7hgy8KrtsOcvics8drD4VlJ+GB3v8c0VxVUH82VCi4S0msOiEk6PMl5Tbkpzd82RRVssAb94GHjlGLMaAABGJzMEO3BcT8azo5rv/scLevoSH50nmTGDnw9PrVqt0JEdL73BexXgAGoijh5+XrmhPD0hoeZIMZXHxdSFiAKZC/I7f/gS0D6T/Y0vvAxLPkw/X61v/RAzeEofiTrC+VvNReIadPVzpcQDXgknqqUzjvKhKx7qg== 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=VrIDxSOclr8ie9mkH/v2MFOwlMxLPUUypns3HY6pV28=; b=FjGIbgkf1Q6+HBh6bSKYyzo6UHl0QUiBdFA7noke/7nQ/LzdtOeT0WaOFiGqYoz8NZpzx/svLt4ATkF37t6YcC0+WJi6TK2IeS9MHRKFyyuYRuGY8KO4Fheb79TSD56azVbHawUMd8kRkep1tREJS66ZL9n4BZocuyKdVL+yly+YrBiI5wzfJy5O+tXiDsguN74dxCeXfZIct07UbcEU6b64cfXbkUjK/K8NF5iK4fw/4Ry7toC/u1ccok7cfIIUjoBepxgRlrzot6L6XBLfoFVhRd/vQ8ATJjtOmOZsfYt9VRxXYsuzwx2RqvpDtUhPPf5e7QqYG0VCWURQZajp2g== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VrIDxSOclr8ie9mkH/v2MFOwlMxLPUUypns3HY6pV28=; b=APJ/vVdDwvQMzcF3YmmHC0F5PO+Wex+t6VQ+mKbqujkGYf/nv34V7I4HUdaf0KDBYyF0L1FSn7OOba0AOESs58/cd41DxHt3Y02xuOm+myidi0Ktjrk4TjIdbKN+r2UMkkAIxKiFqQL3lpmKEyImOWSKQ43jI7Y30caLL4YnBxw= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:15 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:15 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Wei Yongjun , Saeed Mahameed Subject: [net-next 11/14] net/mlx5: DR, Fix error return code in dr_domain_init_resources() Thread-Topic: [net-next 11/14] net/mlx5: DR, Fix error return code in dr_domain_init_resources() Thread-Index: AQHVZDQJuropgQ9o6Ey9b69H6r2atQ== Date: Thu, 5 Sep 2019 21:51:13 +0000 Message-ID: <20190905215034.22713-12-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7179e61d-d208-464e-8326-08d7324b2bdf x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:619; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: wRgqoChIGDs3L6A9HVKBWMuRCG1OIPMVQFHAamtdafedcwLt8D0WeEGnGE3tNJOOmagr95KovP3B8QtkNMTX1b/ngmHvDV+LDvLqDxhnWe5D6x9X6TeuC2TDmskmx8ldC1hnebLyJnCADDvUH+5nomB9/7tr/g0gxPOACHHJERZK5VkY2TGMdpx9bV/CFVwV4h/iOBErbKQ5OQoXrHeOSTIUQG3XWc8mOmLo9HzF0eZ9pokG9WiJKgrOQcCOtYHfmBq1zg30jw/0wUeTv8OPOQ5g09PAeD+jTYDb0r1pKF7lC6djtkYktgj656TwxgGo3VOL+NpcpxzQioTtofet8RfTZTcYqahu+RH2NrGxBVGGqDiYqxbjDVVMp75hZKsQKGCEW8lNEiLSzjdRXl+SmmOHrs0W1sfXU4axMMTVKVI= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7179e61d-d208-464e-8326-08d7324b2bdf X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:14.1961 (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: 8hhyHbmvoc4u81k5oBbzf8OD3lS9nbhvdieP9BZyO/NMWKkmsh4w+nOmvXbmzWjsEiv+L03BxmsTOvBQ5AVCPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Fixes: 4ec9e7b02697 ("net/mlx5: DR, Expose steering domain functionality") Signed-off-by: Wei Yongjun Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c index 3b9cf0bccf4d..461cc2c30538 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c @@ -66,6 +66,7 @@ static int dr_domain_init_resources(struct mlx5dr_domain *dmn) dmn->uar = mlx5_get_uars_page(dmn->mdev); if (!dmn->uar) { mlx5dr_err(dmn, "Couldn't allocate UAR\n"); + ret = -ENOMEM; goto clean_pd; } @@ -73,6 +74,7 @@ static int dr_domain_init_resources(struct mlx5dr_domain *dmn) if (!dmn->ste_icm_pool) { mlx5dr_err(dmn, "Couldn't get icm memory for %s\n", dev_name(dmn->mdev->device)); + ret = -ENOMEM; goto clean_uar; } @@ -80,6 +82,7 @@ static int dr_domain_init_resources(struct mlx5dr_domain *dmn) if (!dmn->action_icm_pool) { mlx5dr_err(dmn, "Couldn't get action icm memory for %s\n", dev_name(dmn->mdev->device)); + ret = -ENOMEM; goto free_ste_icm_pool; } From patchwork Thu Sep 5 21:51:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158715 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="hKfO78/o"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZC52wZHz9sNx for ; Fri, 6 Sep 2019 07:51:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391045AbfIEVv2 (ORCPT ); Thu, 5 Sep 2019 17:51:28 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2391022AbfIEVv1 (ORCPT ); Thu, 5 Sep 2019 17:51:27 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lZ3Mvk+q6+7cWWFHCzxzZA2lyCZpHetyway6qRQIBMtP1Dnimu0/CpaDwijWHuMZDxQAfsTuwz7HNX6wmwCQ3dNRGZIC/12dnpYGM2j9Ike9tc9G93gt3M1A6QXliwV2YRn9qmBuCi7/OGGxFrgQ+jUrFL5A/chuhpRw1OJ5h4/dTiaVSraA6Y+lgBFm95PY6nLxI3jqsSjx8XU85fmqt0sD72HYhTVrd/HjqKKsnjO8hlc3z0AM2ksL8JhXVtoi4U8FbpM8I4OxSjFEpkOsiTwC1X3at2T5OHa6/P/DopUnK+sIMYXvb2pcprqrruUkzCmPreZAM6xt0v2wlw0tqg== 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=wuncUR2OKm1nnv8m06+QxZIszuJQi/diDMP2bXWyfPY=; b=DZ1SN7V6oH2cMBjTWr6/lRz47yVbmE9ZiH1GP/87y3dJM6XTxIe6S5cmi5EDaik4EDfygm6BiITml4cliyq4nhvCiXUftUNb1M3ck8iESXDj25ecBV/WRqOBVSI7Yw3pdN2Jh/yZYKoh/YGbrjO7+T5x8X6m0aIqxb87II8ZcTGgdkCBW5pq6fYv0i9ZYkncqs3n9HG/hulY+OafaasDriOLYRNQyQQku4cs7O0XK3czZJVTOjdw+B4b/aBoDMXj7JBRGfhbgG1q7vOtqGPOCrGg1XX+nkLfVNhfe7GwRbgp5gg5hM4wpV2mkSer/tWwX8IhGrI+aHbPMBphw4TgMg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wuncUR2OKm1nnv8m06+QxZIszuJQi/diDMP2bXWyfPY=; b=hKfO78/o/0w8nAaoNEDOATyDyMgfdF95dOvWsayPdcsqu9pAIJc5ycGXXGrS0EOaKdu/IFZjClziiOpLyO+MXMtbg2s/HQ7qZIc8UnUNFVi7+6Q9dxbWE0lzniNxN7+U3CRB+o930blRDmoHFkJysQYEOyS+LdjUSsFXBZ6LtGs= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:17 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:16 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Saeed Mahameed Subject: [net-next 12/14] net/mlx5: DR, Remove redundant dev_name print from err log Thread-Topic: [net-next 12/14] net/mlx5: DR, Remove redundant dev_name print from err log Thread-Index: AQHVZDQKmEE5qZpjU0mzlSnvL6gE7A== Date: Thu, 5 Sep 2019 21:51:15 +0000 Message-ID: <20190905215034.22713-13-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ad2d0dfc-11de-455a-4526-08d7324b2d16 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:462; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: PWVFuQvgb94wKqB0hMezccGsuhDqvolS/2g5Ip5ftdV8GKY6w3Aox2BuebycDlrqpxP9dp9Mtlft8WqF2/dM8MD/EVgv5KNKxfykAnPvr8lbXfR0VFv8+uM5+N4rkytB+C8hdNdFiFIWHqlYpnw4Le9Ca+BKlvUAdkCEA3VPqVk/Ny6ZM0MSHMySUoeH9z1raH6LoUU17u3IyiOYoZZtTXsBTTGBGMr9m5bQKt7bfkqMR5iyBON+29lhM2ORocJE/Oa5crd9SHrrPQs6JJUvzOZ8N0XmPEHOUG3ZvN86ucF2Il4715WgsK79679gI+hZ6fWZhHcmr3dV6A43ByfHQ5Qie2zo51rz94ZuNryr8hIvQx0Usowyk/5BKIH2CE2l2MOXsraP6PSU8pVByUcFnaW4LwfVY2CeaOrn+cRFg8M= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad2d0dfc-11de-455a-4526-08d7324b2d16 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:16.6505 (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: E4JihQcwUzYR7dDlq9rRy/kxjknDWaWCYdShV9xfC5hrur9heooYy0nYXo0gznSQOSvT4PphVtfq2WzmhLusnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org mlx5_core_err already prints the name of the device. Signed-off-by: Saeed Mahameed --- .../mellanox/mlx5/core/steering/dr_domain.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c index 461cc2c30538..5b24732b18c0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c @@ -72,24 +72,21 @@ static int dr_domain_init_resources(struct mlx5dr_domain *dmn) dmn->ste_icm_pool = mlx5dr_icm_pool_create(dmn, DR_ICM_TYPE_STE); if (!dmn->ste_icm_pool) { - mlx5dr_err(dmn, "Couldn't get icm memory for %s\n", - dev_name(dmn->mdev->device)); + mlx5dr_err(dmn, "Couldn't get icm memory\n"); ret = -ENOMEM; goto clean_uar; } dmn->action_icm_pool = mlx5dr_icm_pool_create(dmn, DR_ICM_TYPE_MODIFY_ACTION); if (!dmn->action_icm_pool) { - mlx5dr_err(dmn, "Couldn't get action icm memory for %s\n", - dev_name(dmn->mdev->device)); + mlx5dr_err(dmn, "Couldn't get action icm memory\n"); ret = -ENOMEM; goto free_ste_icm_pool; } ret = mlx5dr_send_ring_alloc(dmn); if (ret) { - mlx5dr_err(dmn, "Couldn't create send-ring for %s\n", - dev_name(dmn->mdev->device)); + mlx5dr_err(dmn, "Couldn't create send-ring\n"); goto free_action_icm_pool; } @@ -312,16 +309,14 @@ mlx5dr_domain_create(struct mlx5_core_dev *mdev, enum mlx5dr_domain_type type) dmn->info.caps.log_icm_size); if (!dmn->info.supp_sw_steering) { - mlx5dr_err(dmn, "SW steering not supported for %s\n", - dev_name(mdev->device)); + mlx5dr_err(dmn, "SW steering is not supported\n"); goto uninit_caps; } /* Allocate resources */ ret = dr_domain_init_resources(dmn); if (ret) { - mlx5dr_err(dmn, "Failed init domain resources for %s\n", - dev_name(mdev->device)); + mlx5dr_err(dmn, "Failed init domain resources\n"); goto uninit_caps; } From patchwork Thu Sep 5 21:51:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158716 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="ZDf96AMR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZC771xhz9sNx for ; Fri, 6 Sep 2019 07:51:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391052AbfIEVvb (ORCPT ); Thu, 5 Sep 2019 17:51:31 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2390949AbfIEVv2 (ORCPT ); Thu, 5 Sep 2019 17:51:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=anPWYANOyCORqWN38PWjIHrm/j8e2zFOqd4Bll17sCkh/4AJ5MLgQk5cMXTfl3x2DOQdaUy/GdwGSw7N4RIleJ5f1AZILAkUflrm6yeh1aTMPclXTfjaNt7PV3bA9sabEIu3R3hcZeUw1EjAsuJVpvoVZxK23pRc7yPnpO3ivio6TuZgddBhgvT7538kIDyCQ6bNNKKk1to48kv27PBUHybneboFdQw0Th1Zd0SCH4xSToPbIknqly5DrXYAUbkE1cXNJkQq515cfeCcjMHkjCd9jE5Elq2F/ZBZ27FUKEmmUl8BUMXhASrabNF2B688jz76tuNmezz9Rm1EhWgXFA== 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=9Ppte+FYjzkLIK/um8eHkg04xR3ihyQw2GioCol8APA=; b=S8+9J1XmUjYjqSDfhPdOKFi5+PDH6m5+Wm4eOTpFVuzzMsZTc83d15PiMJmxetIiJnCZtB2yefH71ba+vfcbQSMDfZfHYe7DVTTY1R2C5qGkQqzCqtR6sXhsT1xieXC45DppDFbn9usDVqJyRhN3Vyx6CRAPRE3KG51QaAHS5jlZ7BH54RHxtXY9vW7i2/jgb5q9HM53XBoNnYYW+y4ROnudd+tDpHPirTTv4T53ycZ66fYBQd2NOoNSaBOP5caJsAXcej/wD9fAa/CO2UQQuFqpBskp74ZtnviyjrDcbsX0Hv4fctQoLz3YAMrcHOcbYcLMCNlHaGItrFlfhY70tg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9Ppte+FYjzkLIK/um8eHkg04xR3ihyQw2GioCol8APA=; b=ZDf96AMRT1/RMKA2BLriL94iHkSr9oiNq9/WAHKXTHuLFg2KVZEpS4tPr2vXP5mlh9xDrQLBHE76AmKpMplMe9q9bn8R+hR/MG3FEUBc88GOZr6SxyzAl0Bh5s7T9pbAgw9CF5BAPh+NPMASrRGbKorg53UkLhIkJ6L4+WxHjtY= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:18 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:18 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Aya Levin , Moshe Shemesh , Saeed Mahameed Subject: [net-next 13/14] net/mlx5: Expose HW capability bits for port buffer per priority congestion counters Thread-Topic: [net-next 13/14] net/mlx5: Expose HW capability bits for port buffer per priority congestion counters Thread-Index: AQHVZDQMDJ+uILItMk6CSCgz3VIBMQ== Date: Thu, 5 Sep 2019 21:51:18 +0000 Message-ID: <20190905215034.22713-14-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 842d2290-0358-468b-baa7-08d7324b2e92 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:935; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: TuvQrMJTcTIV/lAokDzBbOVuMXvXWGDuYwAbhUE/cmxiZjOCUGS78qgl+y2JH4NgZUIoXrh/yw9sEl/jrfX3GfksXNTsthSaqqqWr4/mngE3LJFa3XuGGKnIcSye4Cj06qrJuUMkGlP9veyZxDd5ktyOaagwXwLgw14RvvzNp+0JFKwd9E4aFl7mF0s3nvHX3u2SCVk+JJYVEZRJcddGeO50laL35pi1LjID46GyWMMbFE/02vp6GiRipt3NUpfywZShqbnRlGVo9YdwtXm0rQviWFLfcUVcBhfkz4zbDHnN5WebF8pLcFzmk2tkoLEvbrZRErzV0o9cF3Ls5tu3o3XgH2VW7vExi96A5BRbkCdk2z49kwkCf+fFL4InUisvq/rXDBSF4uGGmHSHtuj6WrL1Z0Dv3sFFStIE21ceEDE= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 842d2290-0358-468b-baa7-08d7324b2e92 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:18.4522 (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: 9RC1fsmaRY2L6NxsnuZ/H3uXeFadMy9FH2QriNCG17fJN2Ol4U6VWpBpzjbeiujqCYysNYISNq3VoRnEesdjww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Map capability bit indicating that HCA supports port buffer's congestion counters. Also map registers with the corresponding counters. Signed-off-by: Aya Levin Reviewed-by: Moshe Shemesh Signed-off-by: Saeed Mahameed --- include/linux/mlx5/device.h | 1 + include/linux/mlx5/mlx5_ifc.h | 29 ++++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 8dd081051a79..f3773e8536bb 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -1316,6 +1316,7 @@ enum { MLX5_PER_PRIORITY_COUNTERS_GROUP = 0x10, MLX5_PER_TRAFFIC_CLASS_COUNTERS_GROUP = 0x11, MLX5_PHYSICAL_LAYER_COUNTERS_GROUP = 0x12, + MLX5_PER_TRAFFIC_CLASS_CONGESTION_GROUP = 0x13, MLX5_PHYSICAL_LAYER_STATISTICAL_GROUP = 0x16, MLX5_INFINIBAND_PORT_COUNTERS_GROUP = 0x20, }; diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 7d65c0578ac9..a487b681b516 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -1196,7 +1196,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { u8 rts2rts_qp_counters_set_id[0x1]; u8 reserved_at_16a[0x2]; u8 vnic_env_int_rq_oob[0x1]; - u8 reserved_at_16d[0x2]; + u8 sbcam_reg[0x1]; + u8 reserved_at_16e[0x1]; u8 qcam_reg[0x1]; u8 gid_table_size[0x10]; @@ -1960,12 +1961,28 @@ struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits { u8 port_xmit_wait[0x20]; }; -struct mlx5_ifc_eth_per_traffic_grp_data_layout_bits { +struct mlx5_ifc_eth_per_tc_prio_grp_data_layout_bits { u8 transmit_queue_high[0x20]; u8 transmit_queue_low[0x20]; - u8 reserved_at_40[0x780]; + u8 no_buffer_discard_uc_high[0x20]; + + u8 no_buffer_discard_uc_low[0x20]; + + u8 reserved_at_80[0x740]; +}; + +struct mlx5_ifc_eth_per_tc_congest_prio_grp_data_layout_bits { + u8 wred_discard_high[0x20]; + + u8 wred_discard_low[0x20]; + + u8 ecn_marked_tc_high[0x20]; + + u8 ecn_marked_tc_low[0x20]; + + u8 reserved_at_80[0x740]; }; struct mlx5_ifc_eth_per_prio_grp_data_layout_bits { @@ -3642,7 +3659,8 @@ union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits { struct mlx5_ifc_eth_3635_cntrs_grp_data_layout_bits eth_3635_cntrs_grp_data_layout; struct mlx5_ifc_eth_extended_cntrs_grp_data_layout_bits eth_extended_cntrs_grp_data_layout; struct mlx5_ifc_eth_per_prio_grp_data_layout_bits eth_per_prio_grp_data_layout; - struct mlx5_ifc_eth_per_traffic_grp_data_layout_bits eth_per_traffic_grp_data_layout; + struct mlx5_ifc_eth_per_tc_prio_grp_data_layout_bits eth_per_tc_prio_grp_data_layout; + struct mlx5_ifc_eth_per_tc_congest_prio_grp_data_layout_bits eth_per_tc_congest_prio_grp_data_layout; struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits ib_port_cntrs_grp_data_layout; struct mlx5_ifc_phys_layer_cntrs_bits phys_layer_cntrs; struct mlx5_ifc_phys_layer_statistical_cntrs_bits phys_layer_statistical_cntrs; @@ -9422,7 +9440,8 @@ union mlx5_ifc_ports_control_registers_document_bits { struct mlx5_ifc_eth_802_3_cntrs_grp_data_layout_bits eth_802_3_cntrs_grp_data_layout; struct mlx5_ifc_eth_extended_cntrs_grp_data_layout_bits eth_extended_cntrs_grp_data_layout; struct mlx5_ifc_eth_per_prio_grp_data_layout_bits eth_per_prio_grp_data_layout; - struct mlx5_ifc_eth_per_traffic_grp_data_layout_bits eth_per_traffic_grp_data_layout; + struct mlx5_ifc_eth_per_tc_prio_grp_data_layout_bits eth_per_tc_prio_grp_data_layout; + struct mlx5_ifc_eth_per_tc_congest_prio_grp_data_layout_bits eth_per_tc_congest_prio_grp_data_layout; struct mlx5_ifc_lane_2_module_mapping_bits lane_2_module_mapping; struct mlx5_ifc_pamp_reg_bits pamp_reg; struct mlx5_ifc_paos_reg_bits paos_reg; From patchwork Thu Sep 5 21:51:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1158717 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="JgfxooOe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PZC96LgCz9sNx for ; Fri, 6 Sep 2019 07:51:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391061AbfIEVvd (ORCPT ); Thu, 5 Sep 2019 17:51:33 -0400 Received: from mail-eopbgr150045.outbound.protection.outlook.com ([40.107.15.45]:23041 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2391046AbfIEVvc (ORCPT ); Thu, 5 Sep 2019 17:51:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=id9C7GbVzBEPtekdA4TZ4cxqUR4KX8W6I5dRQmOJ6B4X00E9sCaSL/rUM02iiuRJDa62ykeNAqXm3NZg01YNQxOLC9BhR8vP0dqFDU8/d1ienwtG6DNaJZrgOsFl7gtw6uR8i6+OF67/PQaaU6rDV3VPqlG5qaRMKtMvOFRavDdzCecsSAlYcDCjd7OTcfO45urv8CF+fcLP95L8l7otJcfDjBWoyKCwpB8wd35cTD59GFPGgjG7blK4ZcsM4xQA7/tYAesY7plpWOCeFZdJrJbJfH+i5C5Mb5IhfqR9zI/nwBSIdYEe4W/u25F35ru8jA9ZzW5Mz4JT7cdv83oC9Q== 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=18Xhdq0mDNg/5XPLg9Fj7zJth8LOgMg8fIZyQ4bJknM=; b=gFFou8bHEqfImZsrMGmnXC7FCMGFXOWtceUhA8Gv1EoD5L5qBm3u1pikvwsZKe1G+NAuKNe64k8EJI9KQVAQYGbwpSOlsrdO0IrREXeiEMXe2AQDznTXoLOGZQcDA+TNoYII5rjSjTkMgBOEc+8Tvd8ziXuAZEljArsoVzyjl1liyUCRuHEouXGLvcgaW3QGXOF3Hl8X2aXlO2xuwaffxGcLHNww5cYMCytG4n5Qn43d/EcP/96ff1ZueBWbRSMhdCpxLDXjMc6NiZTH5PimMkGUDZwiizz4bVVAT3gZv20l1fFdjZMfBIOqveu6thkTO1YC4JQQz6Le3UrfxDXpZQ== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=18Xhdq0mDNg/5XPLg9Fj7zJth8LOgMg8fIZyQ4bJknM=; b=JgfxooOe3Bqmci6SY+WWxgZZjLlWs/8S3/9miWGmvkXxyCTfJEFlFa5+arEZomPDzdYcJUHX/e8GOLVuSUbb3aGZkMUy7fO5URaIcfkK0yDVNYFbdP3j3Ki1aduZKD+x5MEooYhnZCrFIuOvz4aNPEFmMacwn6Ld3Cz3YSIB2zw= Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com (10.172.11.140) by VI1PR0501MB2768.eurprd05.prod.outlook.com (10.172.81.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.20; Thu, 5 Sep 2019 21:51:20 +0000 Received: from VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9]) by VI1PR0501MB2765.eurprd05.prod.outlook.com ([fe80::c4f0:4270:5311:f4b9%5]) with mapi id 15.20.2220.022; Thu, 5 Sep 2019 21:51:20 +0000 From: Saeed Mahameed To: "David S. Miller" CC: "netdev@vger.kernel.org" , Aya Levin , Moshe Shemesh , Saeed Mahameed Subject: [net-next 14/14] net/mlx5e: Add port buffer's congestion counters Thread-Topic: [net-next 14/14] net/mlx5e: Add port buffer's congestion counters Thread-Index: AQHVZDQNJffO+StMg0WxHjGyGl+yvQ== Date: Thu, 5 Sep 2019 21:51:20 +0000 Message-ID: <20190905215034.22713-15-saeedm@mellanox.com> References: <20190905215034.22713-1-saeedm@mellanox.com> In-Reply-To: <20190905215034.22713-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [209.116.155.178] x-clientproxiedby: BYAPR06CA0023.namprd06.prod.outlook.com (2603:10b6:a03:d4::36) To VI1PR0501MB2765.eurprd05.prod.outlook.com (2603:10a6:800:9a::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 313a376d-e9c8-431c-84a4-08d7324b2fa2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0501MB2768; x-ms-traffictypediagnostic: VI1PR0501MB2768:|VI1PR0501MB2768: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:608; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(366004)(199004)(189003)(478600001)(86362001)(14454004)(446003)(486006)(2616005)(11346002)(7736002)(256004)(6916009)(305945005)(71190400001)(71200400001)(102836004)(476003)(6506007)(14444005)(66066001)(6512007)(386003)(2906002)(81156014)(52116002)(66476007)(66446008)(3846002)(36756003)(316002)(6436002)(53936002)(54906003)(107886003)(66946007)(8936002)(4326008)(64756008)(99286004)(81166006)(26005)(8676002)(186003)(5660300002)(50226002)(25786009)(6116002)(1076003)(6486002)(66556008)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2768; H:VI1PR0501MB2765.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: FAJQ2/qa66eS+pTosR/KUBQaAjrcmUEoO9u8Y6AUeSEkmqAq+4P86wZ/vdTQbjRfe9pKuVq0g2JX6qfLkK/QcMH3tZq6TIea3p4gnTGYsxR2p5l+V9K2sb6Jf9mtU12uy8+aD/ZKoiDYBpPdugXoKFMmARAcKK/rHY1IOnmgTrM/jx+/VdZBvL8mC7LslwjvtHHcsg7ZXTdmN1xMl6MBLBulBoIKChHpfDKfiKawFNIsOvigtFzWPY0L96J1dW98J9c6ckm4kv6Lr+SQGvYDnWnuOCVwIvoQNC3StLYsSkFgrhOGFe0tTGZCoVn/pefSWwT8NRhHf+hyeiLze12pvgttvzRgSQsm1YObSqjt9Ai2zl+5XlkYwSIiLfX2TPQ9phTa1QRTAE3Me1SsVlyiZ+UCEgk22bPozM7huGRQbrQ= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 313a376d-e9c8-431c-84a4-08d7324b2fa2 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 21:51:20.1164 (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: mg4Nw9gXs8oUp+iN8bF26SClmHRr1BeK3EWn9FXyee/T9JYALWVnCdpNQw7EXkGUJz2/D0/HR/aCX5HfSwwVgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2768 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Add 3 counters per priority to ethtool using PPCNT: 1) rx_prio[p]_buf_discard - the number of packets discarded by device due to lack of per host receive buffers 2) rx_prio[p]_cong_discard - the number of packets discarded by device due to per host congestion 3) rx_prio[p]_marked - the number of packets ECN marked by device due to per host congestion Signed-off-by: Aya Levin Reviewed-by: Moshe Shemesh Signed-off-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/en_stats.c | 149 +++++++++++++++++- .../ethernet/mellanox/mlx5/core/en_stats.h | 2 + 2 files changed, 150 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c index f1065e78086a..ac6fdcda7019 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c @@ -981,6 +981,147 @@ static void mlx5e_grp_pcie_update_stats(struct mlx5e_priv *priv) mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_MPCNT, 0, 0); } +#define PPORT_PER_TC_PRIO_OFF(c) \ + MLX5_BYTE_OFF(ppcnt_reg, \ + counter_set.eth_per_tc_prio_grp_data_layout.c##_high) + +static const struct counter_desc pport_per_tc_prio_stats_desc[] = { + { "rx_prio%d_buf_discard", PPORT_PER_TC_PRIO_OFF(no_buffer_discard_uc) }, +}; + +#define NUM_PPORT_PER_TC_PRIO_COUNTERS ARRAY_SIZE(pport_per_tc_prio_stats_desc) + +#define PPORT_PER_TC_CONGEST_PRIO_OFF(c) \ + MLX5_BYTE_OFF(ppcnt_reg, \ + counter_set.eth_per_tc_congest_prio_grp_data_layout.c##_high) + +static const struct counter_desc pport_per_tc_congest_prio_stats_desc[] = { + { "rx_prio%d_cong_discard", PPORT_PER_TC_CONGEST_PRIO_OFF(wred_discard) }, + { "rx_prio%d_marked", PPORT_PER_TC_CONGEST_PRIO_OFF(ecn_marked_tc) }, +}; + +#define NUM_PPORT_PER_TC_CONGEST_PRIO_COUNTERS \ + ARRAY_SIZE(pport_per_tc_congest_prio_stats_desc) + +static int mlx5e_grp_per_tc_prio_get_num_stats(struct mlx5e_priv *priv) +{ + struct mlx5_core_dev *mdev = priv->mdev; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return 0; + + return NUM_PPORT_PER_TC_PRIO_COUNTERS * NUM_PPORT_PRIO; +} + +static int mlx5e_grp_per_port_buffer_congest_fill_strings(struct mlx5e_priv *priv, + u8 *data, int idx) +{ + struct mlx5_core_dev *mdev = priv->mdev; + int i, prio; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return idx; + + for (prio = 0; prio < NUM_PPORT_PRIO; prio++) { + for (i = 0; i < NUM_PPORT_PER_TC_PRIO_COUNTERS; i++) + sprintf(data + (idx++) * ETH_GSTRING_LEN, + pport_per_tc_prio_stats_desc[i].format, prio); + for (i = 0; i < NUM_PPORT_PER_TC_CONGEST_PRIO_COUNTERS; i++) + sprintf(data + (idx++) * ETH_GSTRING_LEN, + pport_per_tc_congest_prio_stats_desc[i].format, prio); + } + + return idx; +} + +static int mlx5e_grp_per_port_buffer_congest_fill_stats(struct mlx5e_priv *priv, + u64 *data, int idx) +{ + struct mlx5e_pport_stats *pport = &priv->stats.pport; + struct mlx5_core_dev *mdev = priv->mdev; + int i, prio; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return idx; + + for (prio = 0; prio < NUM_PPORT_PRIO; prio++) { + for (i = 0; i < NUM_PPORT_PER_TC_PRIO_COUNTERS; i++) + data[idx++] = + MLX5E_READ_CTR64_BE(&pport->per_tc_prio_counters[prio], + pport_per_tc_prio_stats_desc, i); + for (i = 0; i < NUM_PPORT_PER_TC_CONGEST_PRIO_COUNTERS ; i++) + data[idx++] = + MLX5E_READ_CTR64_BE(&pport->per_tc_congest_prio_counters[prio], + pport_per_tc_congest_prio_stats_desc, i); + } + + return idx; +} + +static void mlx5e_grp_per_tc_prio_update_stats(struct mlx5e_priv *priv) +{ + struct mlx5e_pport_stats *pstats = &priv->stats.pport; + struct mlx5_core_dev *mdev = priv->mdev; + u32 in[MLX5_ST_SZ_DW(ppcnt_reg)] = {}; + int sz = MLX5_ST_SZ_BYTES(ppcnt_reg); + void *out; + int prio; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return; + + MLX5_SET(ppcnt_reg, in, pnat, 2); + MLX5_SET(ppcnt_reg, in, grp, MLX5_PER_TRAFFIC_CLASS_COUNTERS_GROUP); + for (prio = 0; prio < NUM_PPORT_PRIO; prio++) { + out = pstats->per_tc_prio_counters[prio]; + MLX5_SET(ppcnt_reg, in, prio_tc, prio); + mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0); + } +} + +static int mlx5e_grp_per_tc_congest_prio_get_num_stats(struct mlx5e_priv *priv) +{ + struct mlx5_core_dev *mdev = priv->mdev; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return 0; + + return NUM_PPORT_PER_TC_CONGEST_PRIO_COUNTERS * NUM_PPORT_PRIO; +} + +static void mlx5e_grp_per_tc_congest_prio_update_stats(struct mlx5e_priv *priv) +{ + struct mlx5e_pport_stats *pstats = &priv->stats.pport; + struct mlx5_core_dev *mdev = priv->mdev; + u32 in[MLX5_ST_SZ_DW(ppcnt_reg)] = {}; + int sz = MLX5_ST_SZ_BYTES(ppcnt_reg); + void *out; + int prio; + + if (!MLX5_CAP_GEN(mdev, sbcam_reg)) + return; + + MLX5_SET(ppcnt_reg, in, pnat, 2); + MLX5_SET(ppcnt_reg, in, grp, MLX5_PER_TRAFFIC_CLASS_CONGESTION_GROUP); + for (prio = 0; prio < NUM_PPORT_PRIO; prio++) { + out = pstats->per_tc_congest_prio_counters[prio]; + MLX5_SET(ppcnt_reg, in, prio_tc, prio); + mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0); + } +} + +static int mlx5e_grp_per_port_buffer_congest_get_num_stats(struct mlx5e_priv *priv) +{ + return mlx5e_grp_per_tc_prio_get_num_stats(priv) + + mlx5e_grp_per_tc_congest_prio_get_num_stats(priv); +} + +static void mlx5e_grp_per_port_buffer_congest_update_stats(struct mlx5e_priv *priv) +{ + mlx5e_grp_per_tc_prio_update_stats(priv); + mlx5e_grp_per_tc_congest_prio_update_stats(priv); +} + #define PPORT_PER_PRIO_OFF(c) \ MLX5_BYTE_OFF(ppcnt_reg, \ counter_set.eth_per_prio_grp_data_layout.c##_high) @@ -1610,7 +1751,13 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = { .get_num_stats = mlx5e_grp_channels_get_num_stats, .fill_strings = mlx5e_grp_channels_fill_strings, .fill_stats = mlx5e_grp_channels_fill_stats, - } + }, + { + .get_num_stats = mlx5e_grp_per_port_buffer_congest_get_num_stats, + .fill_strings = mlx5e_grp_per_port_buffer_congest_fill_strings, + .fill_stats = mlx5e_grp_per_port_buffer_congest_fill_stats, + .update_stats = mlx5e_grp_per_port_buffer_congest_update_stats, + }, }; const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h index c281e567711d..79f261bf86ac 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h @@ -207,6 +207,8 @@ struct mlx5e_pport_stats { __be64 phy_counters[MLX5_ST_SZ_QW(ppcnt_reg)]; __be64 phy_statistical_counters[MLX5_ST_SZ_QW(ppcnt_reg)]; __be64 eth_ext_counters[MLX5_ST_SZ_QW(ppcnt_reg)]; + __be64 per_tc_prio_counters[NUM_PPORT_PRIO][MLX5_ST_SZ_QW(ppcnt_reg)]; + __be64 per_tc_congest_prio_counters[NUM_PPORT_PRIO][MLX5_ST_SZ_QW(ppcnt_reg)]; }; #define PCIE_PERF_GET(pcie_stats, c) \