From patchwork Wed Apr 29 22:54:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279765 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=q1I9D04+; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPP2WJhz9sSd for ; Thu, 30 Apr 2020 08:55:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727041AbgD2WzU (ORCPT ); Wed, 29 Apr 2020 18:55:20 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726921AbgD2WzT (ORCPT ); Wed, 29 Apr 2020 18:55:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TV66nJ6ieitJXLrjqWOl+uaBthEhdKpbgzDbg10s9tK8HKonqcokbr+uTKGhlCge4fErbIrG5DIiX55tDota2i/Y596D4XlP0bQqH+l0LlcC5IsJ4VXJIMtGy2vXqooTB22O0U+Ja2RlUqaQCOYJjc8fkaO4OCaQQI53Se8H/LfvYUy7swEK4ekg28+jKhJqcvJOyg/Hs3H7mZLOSbJyVfJn3kwKltytI+YHC1PsmzS0fTpGV/AKd5M7pfo29JEidixJCejbdSk+b1cWssWwzxjidPG73X20kd+jHK4iz93oiYGr4C2uW9CXN3o0fTUFGcd/b0N9dclTIHLmR0DExQ== 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=SvHeERn0eXqOMzXM7akpVNlcZYNngzJx4qJAga6mxKA=; b=lfocPlP9Y7NWl13mVWXKOSOgLNcDk3gnTfcZVN13s0CTzb77P9kHrPELie3yRtx/qrS7oeDuh7I8hF/gtyQOrLqOuQXRpT9ggBTwqDalWg8hBIS3oY1VHFxCYI6ksOkap70gzGS5TzQzakWMycy9rdiw299ggi98QOHPeRccQOJ+A5njToZNNfthEZqGh2rkcPFZdq1SVqzY+9pwdgti2QiQLNBSFaDUnorn1hLUKHNObdUErA8BQQveti22bHrNiL7Gbv46X14JEmNMGsDvenG338lSkPxlOXNh2X8gcQawASgOqKt08QI6Zs8Pr2jykUQLt8c971xelhLzepTlDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SvHeERn0eXqOMzXM7akpVNlcZYNngzJx4qJAga6mxKA=; b=q1I9D04+MmBFE4nrjly0yOKJrlpWFF/xAwzktGJmCNqtRB36/O7WZgd+HByXbv6lQwY79wG2iMIsydz9yWsXfJPTakOswTkePpEUI5+jjWgAG3jSQd/OJbO2FQ1vbW9HYQnRfCsXQ3qbcnJs4UPlquHgOJZXIuqiIM6o+4z/Af0= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:12 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:12 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Parav Pandit , Roi Dayan , Saeed Mahameed Subject: [net 1/8] net/mlx5: E-switch, Fix error unwinding flow for steering init failure Date: Wed, 29 Apr 2020 15:54:42 -0700 Message-Id: <20200429225449.60664-2-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:11 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d766c940-b92d-4193-a0cd-08d7ec905ff6 X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:304; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: owkiFY35RLEuj+QrTOXuk9mpb4g0l/ATgWJgQs1kLEo+t9cQgulJWlbwdecuJdji5sFWWQ8sGCuR9Dq20bU9xHeFQxTBNV4ob5OL9ns/NVktZQbaplyijkxGQPv5wNtcEdeM9JFNRa2dliy82Oex4DZ0I4+xyyV8Js+UR3zWR616cy1x++KtocEYjRn9dDGMaqGmIlB/5fydP2wOM3tHauiZX7O5SIzsM3wTAlVJ8IjBq96UHayMFFljH9gapsDdm7XFq2WK0mEivfybwvwIjrfgd48KnkvlLDbtE4SuitbyXzgnG2plBInpAiFFQau1QSGgjqX793lZC69pMS62CTS4ULZ0k5yqkgLX3u1mONCylDARe62RAo3rBdhetsjVd1o83yCDNaClTNFTyk2GFS2vZjQWVEkBp+AD57umCBS6gGMAY1HwBwJM67OXbj3BreOYH3EfLbJ1f6eccXxMNmDOvCLP/W0V9d1skIQ5XYbyEhDG/FvrXMR6VUXINGbe X-MS-Exchange-AntiSpam-MessageData: G4KfxygI/3A2+l6+G4/O+ar+kLOK/MiXLlhX0pQppbNmAR+NIB8sSCooUf27OoTwcjWU6/XC0jh1/WAbEpccicEu1+VRKyf0bEcEQr/3BGntFSa60prQFW8cjRWtKYiUcui/GUNQBnbsoVaNVPPBdkBRHINgcH79NiAWXF1/LWqcXZgPKoimqcjBx+jCwYJZCF7VRhl+WfL6e0pAf7KKRuSUIvHr5/fZ4M1xBU0sN5zMRXqZ2En8IvA2skHCFStvvz9/yiM+LBq/dimCj8mP3HqSC349grEHB4q9ELoHZ0QnqiAEkxTmb8378pl9nEVxKdrBQtEzZgym9d6Ay9w/1h9LTgtWw+qWYjtrwGJAAVuqGApXx1jDnkDABxG6xybRXN1GU1Rze7dFS77/yPHvXsY6FhDYMa7Nun0ESZw6wCjGXdv/YGXvcsGrPLVvE0GXaYE/m8RO6iDJfOTBKfEm6gQtMVS1dLFDie5ix7gwhRDgIWjdW2dUP5311oykqaXVy/EcxPT8GFAqiXFhtZUGgBFnv3PUwNzW89IfuwAVTxeUUVG4523X8m5EHenEneyyeSVnHakhQ/CCR9/sHcnFvtV60Hhn9DYudtT2NKC+Pw2cy3O743T6Bk6BKI2nfe7Q5IM+cd18IkObrki++NRNjXIJIKvzta3ffrF4VdKNfoJWLcw0VNIUW0WsmLvVz64Enz1SrKZAEK52Df7c0cCuGNJgjQY2pyndQUI4QYuryog0gXqDKLOkBS2KSwF18D/6x7m3Rz4s8bmLf/n+yvwYeJIPmgNADFrZq9gkdlDmXOQ= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: d766c940-b92d-4193-a0cd-08d7ec905ff6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:12.7987 (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: yPfSIj+4UDUMxkQdh+QCV09Z6Fkz719Zc5eJohl668cTqp7wUvBxS/FSUHflqwfw9bcdjmx7vG1At64YGlVBhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit Error unwinding is done incorrectly in the cited commit. When steering init fails, there is no need to perform steering cleanup. When vport error exists, error cleanup should be mirror of the setup routine, i.e. to perform steering cleanup before metadata cleanup. This avoids the call trace in accessing uninitialized objects which are skipped during steering_init() due to failure in steering_init(). Call trace: mlx5_cmd_modify_header_alloc:805:(pid 21128): too many modify header actions 1, max supported 0 E-Switch: Failed to create restore mod header BUG: kernel NULL pointer dereference, address: 00000000000000d0 [ 677.263079] mlx5_destroy_flow_group+0x13/0x80 [mlx5_core] [ 677.268921] esw_offloads_steering_cleanup+0x51/0xf0 [mlx5_core] [ 677.275281] esw_offloads_enable+0x1a5/0x800 [mlx5_core] [ 677.280949] mlx5_eswitch_enable_locked+0x155/0x860 [mlx5_core] [ 677.287227] mlx5_devlink_eswitch_mode_set+0x1af/0x320 [ 677.293741] devlink_nl_cmd_eswitch_set_doit+0x41/0xb0 [ 677.299217] genl_rcv_msg+0x1eb/0x430 Fixes: 7983a675ba65 ("net/mlx5: E-Switch, Enable chains only if regs loopback is enabled") Signed-off-by: Parav Pandit Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index b2e38e0cde97..94d6c91a8612 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -2377,9 +2377,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) err_vports: esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK); err_uplink: - esw_set_passing_vport_metadata(esw, false); -err_steering_init: esw_offloads_steering_cleanup(esw); +err_steering_init: + esw_set_passing_vport_metadata(esw, false); err_vport_metadata: mlx5_rdma_disable_roce(esw->dev); mutex_destroy(&esw->offloads.termtbl_mutex); From patchwork Wed Apr 29 22:54:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279766 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=m9Ct25Ay; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPS5KGJz9sSd for ; Thu, 30 Apr 2020 08:55:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727078AbgD2WzY (ORCPT ); Wed, 29 Apr 2020 18:55:24 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726164AbgD2WzW (ORCPT ); Wed, 29 Apr 2020 18:55:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hKwCU0K9V53R5qodstJqfD+lv/jW0if86a70XXygswTpBM7qrRASHTgiIbhzSdtPcT3yaS7ifGs3bKQAUDu56cNnSy6f6KyURiqWQNNvahvWKssbfVus4sjjKcKsB65cHl1Oes18p2eyh1E4X126hAxBClMzLyaoNh/THcMNszoqzWgLJJZP1DOwfUhym3n8DBfJ0I9+sXSD5RqOeEIx+d5nBcwNgd3FE9t6/QEKhewHDcPtk7+HpRjBpd3PeRe3l4VD2d1/dw1Mli/ZUVErCtopnK9ruYQGrBiTdoC07L/dyyg5pPw4IcjwvSgERnDT4QeSYRwJA7CxhHD95yZFDA== 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=yUUfQGm9dEFRtllrurkLra+TvryAZHLiXCxBc7Xzj4I=; b=TCRgjRJ11IWDsyMrfRemULXMkKyIvMShKNoiGjQY8z2c1YfsaeZiXWas+1a82WZjy2q5HDFo5P9jAzy9v6B9HtOjt5p+uJolj71oO17S59grxwLQSS385n6G/x58SW1HW4mCTMx4zwYhyTSYjLIkHtJFOD0YikHmJ3WsC8qnHangBTEMV5UbwVZ0Nty7yVnvZLZkOBLJVhFbLxLCgsBESqnBvZNPrpnW39A3XSaUfzP2fvKz/2/SklO5GDIT9514SlP/8hn+ZA8ipZG6odVf7Q+9JWchfm6xV8Vz2LCFSAMe/rzJzYV6Ca8CsYRoNw+ov3D1J5JNcHpEfoY6dQZdWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yUUfQGm9dEFRtllrurkLra+TvryAZHLiXCxBc7Xzj4I=; b=m9Ct25AynQgfdp7jt1eCQsoz5qipYF30KmGNBxWGcOWow842aJrwg+qO6rP6UExIhcKHTBt7vkTnLqKAVCIazwxI7KaDuWihhw3FcH7+ljpOCmcjvTHvtLFrznqn5RNd5ad3ETvrd34mWwF5uYbEt+hvlOglDBL/5zgQ6LNWN1Q= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:15 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:14 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Parav Pandit , Roi Dayan , Saeed Mahameed Subject: [net 2/8] net/mlx5: E-switch, Fix printing wrong error value Date: Wed, 29 Apr 2020 15:54:43 -0700 Message-Id: <20200429225449.60664-3-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:13 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6c00ca15-ba2b-4491-6e72-08d7ec906112 X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:247; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 237HhG5OiqSqSqDVkCq3X7rMKoJ9aRUigQvsuMoN9DYjngddpIyj6GXQsbRvvY4WYoMA1r6LoJYxIEd8g+/xF/+H9O6/zRiohONOhBW5yOufO72IrJ8m/op2V/6J8ZIoqoMwaDeBji2LaCqphCNbuBXUYWZKAm+XGhPyvmM90YEv6L188d2AmZoxPdKAstjm6X3yrRiVRt1Wsndq77j05daFhvj0NlDLglYGIWICbWmAFRav3JI3AnhTfNufrhySYywBM3zq6rEw1bS/wrecfHFyyWY0GhbmyY8HHDzEGYkcHfMatYX2xUtGLVWS6kS8UQmveBxv3xr1nYbNceRMRW3kqMucVWewp12GLcUJcW+qxknzIxnyg7Fr98cfDrGShzl42d/pRVgedJ41oeEtpSqanUuAD2kc84IlY8eDnKH+KZuxB0dtB1UisZvhdWKZAf+QYLbhk9Oozn1n2MSlEyOclMQrboZpj1GKrZILrcZK3TYpDboQKDFykEXImVvQ X-MS-Exchange-AntiSpam-MessageData: GCg9UgX1p4somihkmjmy0WWXXL7/LMseGMBaAxdg7BZtitT01nHxX+EHeCl/vRu1hG1pLTx6eo2MhYBSHqoAMxvZ/E7cX3o+odLeEjq0ola0qbnaa0zUHQs9QmZJpwgTjasE+4D7QaiKVIUigrViQBmYmzWgRX43dBiaS7+toBxgKegW4Vywdlx28E4OMPudRG/ZGvcm4x7IOfsWQcppa6WNz20JNwzdGbL45nS4BPvGueDqvuyUhtY7r4KSQNxV3s4RtHb5J2VFNhYZ3NQgqidGk3vEMn1YZifrW8D9h7mXYWktcvoKg694vWiW38GGVDNrTPfsMSXjL0kfUs6Qo+I0++p47KYcO/atz5WSoMrPoLkCBeE634208oCfGmhAFduB5Qdc1qnILmflx7jH+33+hABH0KAQInN0Il0HchkyuE9XEdOyu1Xhx++JTzC3m+tvzK4Owpk/aBgDI2nF4Al2DW3zu4ZE0Ipd4MpXXRkOb2cr5mSEO8qoHvXSY3hmcDQwSgPBeODj5Jyz8hhvITDlpygv6K0vzR3A20kAQdOEy+VoHoDynPJNIR+Cqidj+WMvzj/qRuCfmhDWPwjqJxCCben+Sa5HSFtvyNOQ+NJiDtzuqqSVE0UiciZaneE5OdtfBTCbCmJ9mQa2zh6oQVM94YGo3Yx/yjtht/bW6Weo3RgsJgRvAfYcPgVPIMTgLfFygmvs821duLnGTl1iXuEDjefp0mXxcdAhZnC4MRYkxlCYxxy8RkDfVZsqBm7z56Ta1s7triIcKpRbooKP7s+ytZgofo5ucdhEqaBi7uA= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c00ca15-ba2b-4491-6e72-08d7ec906112 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:14.8465 (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: lBiO+Mu44VeXp9Q5dHvz14svKErIhlzzfYcV0Bu4hAPQ6Ga039ZVf/f3jt9P2DzF26Qy89LSWrpRn7gWdbUUKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit When mlx5_modify_header_alloc() fails, instead of printing the error value returned, current error log prints 0. Fix by printing correct error value returned by mlx5_modify_header_alloc(). Fixes: 6724e66b90ee ("net/mlx5: E-Switch, Get reg_c1 value on miss") Signed-off-by: Parav Pandit Reviewed-by: Roi Dayan 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 94d6c91a8612..8289af360e8d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -1550,9 +1550,9 @@ static int esw_create_restore_table(struct mlx5_eswitch *esw) MLX5_FLOW_NAMESPACE_KERNEL, 1, modact); if (IS_ERR(mod_hdr)) { + err = PTR_ERR(mod_hdr); esw_warn(dev, "Failed to create restore mod header, err: %d\n", err); - err = PTR_ERR(mod_hdr); goto err_mod_hdr; } From patchwork Wed Apr 29 22:54:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279767 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=Kciuv5l0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPW377lz9sSd for ; Thu, 30 Apr 2020 08:55:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbgD2Wz0 (ORCPT ); Wed, 29 Apr 2020 18:55:26 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726921AbgD2WzZ (ORCPT ); Wed, 29 Apr 2020 18:55:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OFaxs+nHBb1AlIwJ2CaoNITP8yAt0NT8/iFh+1YFwbO70OMH7un/IU2qCAk5HQNuMMBzV2oMfnwf2LH9nvbc8FFa2hkPNO3AnWhXGvXxinijwSdPWx6yLn7RSK/UUQuqxjgbndSwcs26GvwFHAuC7eexYlYlB2NG7pR/qmruUOJH6ZQIWOLtVTEHe9JMwwFAsv4Q10TJi+rGn2mKcNaJBAe/QA1SUkV2MTaxCCxCzl5iFxngHzYAg5Fa6+UyDnhBuybUtopztZK5xi4S+PFJYQ81EUzkdckzSdE2pDc482lEFMKJi5qfSHrLGT9oQbfAjTO+S3J8ybDO3xvHjVT5nQ== 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=FnnRGl9JJjbJXFUaHUNhM5ruYj30IC5ttZn/9ec7tss=; b=nM8M4OTkD0zv6u0Ptlg3NZmDc+P8ayWJ9K9wXiqHevnKe6weZCogPxqUysIfAzStgzyQElyXn472ahj9c7CWuljMeKQOYSwveA2GqOirIQQQRt2zypcXf7MytUAdzm30ioawnQhDGcMkMwVDk9QLruOMGiXD+yLV0D1mAOr/eg2zQms119D+Ao8uYEkMbXfaSb/+cAnnpDKl7YPVVeHmQYKbdrLDxAaijwTiuBeqXwyaMCEs3l/XM8eDO4f63eBnA9c7YnaLyeIoC3qu3kuD2zAO6tnLWH2FaWNv7FhEGzST95cluzSTXq0KksQNZvfQSwY80nx86MG6gndhCfR0eQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FnnRGl9JJjbJXFUaHUNhM5ruYj30IC5ttZn/9ec7tss=; b=Kciuv5l0LTVSRRxyDhPbfB6AWuKT4/1oSOOTmBouZ69kmauh7soGoDJHASZEE1FCccuRin6V9Gi8yykcnHFzX7o2/iru0EAhHoHlUCsFDBv+D+G401lePY512Iui54UcoC8CovKnxuI7KGqGhvxwawx9OK9hPFnnnoToQCbDC4k= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:17 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:17 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Parav Pandit , Roi Dayan , Eli Cohen , Saeed Mahameed Subject: [net 3/8] net/mlx5: E-switch, Fix mutex init order Date: Wed, 29 Apr 2020 15:54:44 -0700 Message-Id: <20200429225449.60664-4-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:15 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: dde5075c-3e46-4e31-914c-08d7ec906282 X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L9XsMEJJIuNIRl/6/gPIIouJIlaYcDKwjcUngU6pDg47ucrh+SusWD6QEZ7t1RWugMCR08jv27New7WkUL7JZiv+UiW9rIfW6I12ETQ32bNfA61co1t1pNe2cqvgAEfjgqm0O9YZRNxnhzVtX3SHXpDB1/nmHDb0VFEwgDtcx0J+ZlonQNuHykZKGgFBFJYJPOAN2unY3c1VcPyMM6x9tw/07nJXSvqyvaCNn4cY6oo9IZQniK8nVMZusOyUppWIvZN5wP/YlUVolpPVObzP07c+J7ai7pTDZNru7pgX0JtZhY/93x9GsasnZaauH/PzbAApOzGSVQf4Te+7wfkoBwtxpfGDLTUbmAxw1Wn5BnbSnPWY8jXYLJMqO1FxnvFvGKIqmCyTGfl9WQJKOQkSZ/Y+XK9yVMmLoUA6qQtQ602mc0yUEy7+aPXU/cdw+TQujQx/yF/WjwwM3CVhP3MTRu575ADYKpQG49p6J77Eyzt8C+ZXXqhaGYSCitMxS0q1 X-MS-Exchange-AntiSpam-MessageData: a+YeogfRYlf+wzsFbxa6F+aZlH6x47uegrs9dwWi8CRQXCManF10GR3xZEOuGgloII3bPB67hYhOO4KklmcLM6dx68XEI4DCfj/YPNsMa/U2T6RlZiu819HGWWeL9SxLdgS+vs73uEK2iOoV25HSp1fmS9d+laq4sBZZLNDsJRi0jz9oqn4X1Z0dAzWmbrMEn9ykMfUa8S65fl7WOYWrE5zwdXapiJmb2jIz75vJGXRXiEhFcrb7TaMw+pTT3iuWOnNtr/MeTZvSpTUk3/+47b+GeEa0FAPM3jCTyfRyI6HtnV9Uz6L2wRGU2kaKIPPwmEVFYgiZpzxeeqg4VcZYY+qao38Rfi++GRoi4Ud1q/1tOUInLCAz3sTJa0fmmRJ8vNTq4rNyyeOx1+w6GtDtdfEAPNzJPu8JfkOUPZ6DLkYWGGwnSGiOe+5ziLg3EBurDeZ+9paxpJuBfuD0LNOx24QBkpqH8NBu39Oy962qaAF8fI8iEhtjfTZpM2fMHJckBzaTt8f/H8q+O6QsZ38LRf4exQKM/7Zu6McAHQYYtw3MLTIKbAOZmoKSxZpyjhD9Ypir7om4DRQNpgzXQ/U3CSf4hi/nQVICCLtICXkEdBRpUABbFpesRA/kd4UYp5hunxeckpLANw2oRf8l6HNe6kiAAcHnqHzn+b+7dDzPv58eOmISATzC1P2kpLrN35OBBV3yqo/3epy7S0TMXlR5yRe+yJ+ilqqwWtrRKn21dXSfrB4dFPekfGEs3KR7eeCEq5DAToJynvjnO0pRkyTaAx319RLQlCbIHja4ab9rt5A= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: dde5075c-3e46-4e31-914c-08d7ec906282 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:17.0483 (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: Setb+W4C81N+lU4xI4zKOF8FdoUk+NxIeBulDfL4Goy76v9E0uyJ1HsfwcWwQcGUQ6c3lu0/ko+CzBaBkEy+cw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit In cited patch mutex is initialized after its used. Below call trace is observed. Fix the order to initialize the mutex early enough. Similarly follow mirror sequence during cleanup. kernel: DEBUG_LOCKS_WARN_ON(lock->magic != lock) kernel: WARNING: CPU: 5 PID: 45916 at kernel/locking/mutex.c:938 __mutex_lock+0x7d6/0x8a0 kernel: Call Trace: kernel: ? esw_vport_tbl_get+0x3b/0x250 [mlx5_core] kernel: ? mark_held_locks+0x55/0x70 kernel: ? __slab_free+0x274/0x400 kernel: ? lockdep_hardirqs_on+0x140/0x1d0 kernel: esw_vport_tbl_get+0x3b/0x250 [mlx5_core] kernel: ? mlx5_esw_chains_create_fdb_prio+0xa57/0xc20 [mlx5_core] kernel: mlx5_esw_vport_tbl_get+0x88/0xf0 [mlx5_core] kernel: mlx5_esw_chains_create+0x2f3/0x3e0 [mlx5_core] kernel: esw_create_offloads_fdb_tables+0x11d/0x580 [mlx5_core] kernel: esw_offloads_enable+0x26d/0x540 [mlx5_core] kernel: mlx5_eswitch_enable_locked+0x155/0x860 [mlx5_core] kernel: mlx5_devlink_eswitch_mode_set+0x1af/0x320 [mlx5_core] kernel: devlink_nl_cmd_eswitch_set_doit+0x41/0xb0 Fixes: 96e326878fa5 ("net/mlx5e: Eswitch, Use per vport tables for mirroring") Signed-off-by: Parav Pandit Reviewed-by: Roi Dayan Reviewed-by: Eli Cohen Signed-off-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 8289af360e8d..5d9def18ae3a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -2219,10 +2219,12 @@ static int esw_offloads_steering_init(struct mlx5_eswitch *esw) total_vports = num_vfs + MLX5_SPECIAL_VPORTS(esw->dev); memset(&esw->fdb_table.offloads, 0, sizeof(struct offloads_fdb)); + mutex_init(&esw->fdb_table.offloads.vports.lock); + hash_init(esw->fdb_table.offloads.vports.table); err = esw_create_uplink_offloads_acl_tables(esw); if (err) - return err; + goto create_acl_err; err = esw_create_offloads_table(esw, total_vports); if (err) @@ -2240,9 +2242,6 @@ static int esw_offloads_steering_init(struct mlx5_eswitch *esw) if (err) goto create_fg_err; - mutex_init(&esw->fdb_table.offloads.vports.lock); - hash_init(esw->fdb_table.offloads.vports.table); - return 0; create_fg_err: @@ -2253,18 +2252,19 @@ static int esw_offloads_steering_init(struct mlx5_eswitch *esw) esw_destroy_offloads_table(esw); create_offloads_err: esw_destroy_uplink_offloads_acl_tables(esw); - +create_acl_err: + mutex_destroy(&esw->fdb_table.offloads.vports.lock); return err; } static void esw_offloads_steering_cleanup(struct mlx5_eswitch *esw) { - mutex_destroy(&esw->fdb_table.offloads.vports.lock); esw_destroy_vport_rx_group(esw); esw_destroy_offloads_fdb_tables(esw); esw_destroy_restore_table(esw); esw_destroy_offloads_table(esw); esw_destroy_uplink_offloads_acl_tables(esw); + mutex_destroy(&esw->fdb_table.offloads.vports.lock); } static void From patchwork Wed Apr 29 22:54:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279768 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=gq2O/TIf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPZ4myNz9sSd for ; Thu, 30 Apr 2020 08:55:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727109AbgD2Wza (ORCPT ); Wed, 29 Apr 2020 18:55:30 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726164AbgD2Wz2 (ORCPT ); Wed, 29 Apr 2020 18:55:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DXm1DwI7Kje+vKr/YGl7shnDnCSiVqpQ74acCQCgCl3Rf0R/krKiPlIx8XKpzfN7eiPR/57uoBjqtXVjg+nZYWPyB42LFpCZX7xkcLhoXYBjz2R+QuhAF+1lcps9Jg/hTAPMCm5EY1RkMl6dPBa8wTe7gFwG6a0GG0Sb+iOnqMqnfRpeQT0Gnp7em5tJDyvwtHUs/bthIl6pPxX1e8E6utJfWwAPM2KSSOcYa7P9ibHsHJe/W6iTtSgKG/AMrA/xPZhEsQsk7Tx3aYkULHas+00E2EfCUGsKjGKjjESH6LcXCKco3FT+J0d9XxDRKmqzAPAPLIp7g7CEL2Vw/UIAag== 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=Vq8h8/3OAdogrgGDTEaFalKljXpjv0MY1fxQWeDsi7Q=; b=aFMiRxmYFQJnwag9TGLFiogv1Gg/L5q3y6udlnK2nincgk4rXPCjsrlNFxtnFTn7koEtPivwPVoH5SykU6Lka17cdF1/27Se70Y5xOdz7G+CINdMj/xwJH2DO9a1e+w03ZahkOxz7aHqm5iWz2r2ic9Y94dqMWbjN/am70vNOKJZZp3vWefZ9l7A/l+SzyF10kvJAiwSPALxJAOibtOqTW2sRPgSln8AJIFvMyjP32XkElktFJF0w+ax+wKazCwV9prYxUA7nWMssRdK7Jn7jWye89XNirbFyzX6Mkl6J9Rd8+zS8hBp3AQLrBzTLm00OuU9xZ66PqyqMKOAcjIylg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vq8h8/3OAdogrgGDTEaFalKljXpjv0MY1fxQWeDsi7Q=; b=gq2O/TIfEOVxJC9N3JQwcVrlm1EsYodcMkISd9qC/8pq8+F6rECLIRZGeKQcTTQlxyoY3JmAfP6WDMTrHJVXZLfeKUAgHN1ac5jTUQzby6fQNYvy3nhqficQqi47JLEBwNEgd7eo86w9O4qZ0cbPEQZaaE68Y/CCWo7TN0ENtVo= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:19 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:19 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Erez Shitrit , Tariq Toukan , Alex Vesker , Saeed Mahameed Subject: [net 4/8] net/mlx5: DR, On creation set CQ's arm_db member to right value Date: Wed, 29 Apr 2020 15:54:45 -0700 Message-Id: <20200429225449.60664-5-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:17 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7eb2b8e2-0a29-4097-4a82-08d7ec9063ca X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /lxaO02q3i1fdyb6W3wHZblpiOAAMFgJMn1xqHIDh/baeJfLm2aGzV1gF62RR9ywX35aDqvzLj2mh4RPDr042heFnRE4AeCZUTDjwUC65huoRVgsw5TLnnuDhQQRQVtsHSaBQI34oS3jBo7rew+kc97zZ/cdHLqqLLQ3VdjGjVYBFyoiQomwJemjfcNJuvpfUgY8iQGwnbNI2BzR68v6SaXi7Odhb4+T+IhajuaWAIBmrLOTaO1OnZJPvz+oKSd1/qJMm5wt4kd77fRMyrVsLdWevfip/++1AGpkg8GDzqneBTDav1Ntbofrvx29u+AmKT8KAyGGfQWWHkuZq2sMk4W7yTSlxPnKH7PpCs5jmkEsH2l+25soTkpnlhwNn3TJCQeTZdCEtTyrDRfPIa/6Oa2CVps0KISQMmDefdYdLdOGqJkIW5iHATmnvp04VwrLrnrEo7tWKE/JlqDX8Zk3K+oOqAcH2Fk6qDvN0SFQXWj4YPMn1r7qSGifMd6ZV2fS X-MS-Exchange-AntiSpam-MessageData: YGwBWRdovs2azqUR2S4p6H5jqJu75yK7VH1gpqEP/3q6ToLp4SOFWLnqkADPKM7MjznPGmQXAXqRzZPkxeN5MA14YDgKy7GqrIqZ7SNA5TkgppaMHy3hFkygmqVPKf9f3uBQhAtrOGzXK01MZ3PgjLdE6lFhzF2xWzoFE4BXEQ1SnfkxgB4LQu1TaK54cgvD29jXZjaQQhtw0W73rTQ3Nd2DYZwGd7K8hNOmMSFhfQQ6av0xkZwcetDcOorZuRcfb9ZDZ/tkObSeHnxSFHusk2/gyLA234jF4SGoqHWcJdEQa0hm0OPv3+IqxtWZ8jOiuv/gjIHMTLME6qhe2U5ONdzYwut/K5UyMPx2M8pjp3OGtEM/G18lgllDgLP4DLEgNWklYMQslQCxd/4jSkuYWvlCC6oZZZ09VQBXRHgkEFJ83ffAMGoAVyIIEYJ396hBhhpmZpdxvWOG05701T0aojfBHZfmM0MEqdnoCivFNGvNBmQtzSKvYVs4ycA36jBefuI/nX1kb1hGv3EXMW1F+RPYXs2j0Ek3F65/uvk76aqTNeRzUv1ZpAIWQRFGs0p0Ll0gmkVkCaR4OZIhXtQKcuPxnGyZO+8l5bib0J0OiSKM/4W+bKYsEKwsov69i7rGthl17yK7jZXGjimKx6GwWWSPXqd2zDOGmP4cacua9O4DgWVV3eMkOIEsTCwO+LcaK323p86MEobLT96VYwOFonyQ7Xc7tU1BNQ86iLbjov5zxgvGrj3769h3pWUPn1FIM7R0FRjI/prDENrX5W7YAPpY2HET7ShRbo+QPHLk4H4= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7eb2b8e2-0a29-4097-4a82-08d7ec9063ca X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:19.1860 (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: TcO44r2IxTy0383FhKISxZwwOrhACUpmB+8kexXfQl9waidWuz+crucJP61MN2x4CSHWGXyZIfRM/5KZ9NL4Uw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Erez Shitrit In polling mode, set arm_db member to a value that will avoid CQ event recovery by the HW. Otherwise we might get event without completion function. In addition,empty completion function to was added to protect from unexpected events. Fixes: 297cccebdc5a ("net/mlx5: DR, Expose an internal API to issue RDMA operations") Signed-off-by: Erez Shitrit Reviewed-by: Tariq Toukan Reviewed-by: Alex Vesker Signed-off-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 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 c0ab9cf74929..18719acb7e54 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c @@ -695,6 +695,12 @@ static void dr_cq_event(struct mlx5_core_cq *mcq, pr_info("CQ event %u on CQ #%u\n", event, mcq->cqn); } +static void dr_cq_complete(struct mlx5_core_cq *mcq, + struct mlx5_eqe *eqe) +{ + pr_err("CQ completion CQ: #%u\n", mcq->cqn); +} + static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev, struct mlx5_uars_page *uar, size_t ncqe) @@ -756,6 +762,7 @@ static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev, mlx5_fill_page_frag_array(&cq->wq_ctrl.buf, pas); cq->mcq.event = dr_cq_event; + cq->mcq.comp = dr_cq_complete; err = mlx5_core_create_cq(mdev, &cq->mcq, in, inlen, out, sizeof(out)); kvfree(in); @@ -767,7 +774,12 @@ static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev, cq->mcq.set_ci_db = cq->wq_ctrl.db.db; cq->mcq.arm_db = cq->wq_ctrl.db.db + 1; *cq->mcq.set_ci_db = 0; - *cq->mcq.arm_db = 0; + + /* set no-zero value, in order to avoid the HW to run db-recovery on + * CQ that used in polling mode. + */ + *cq->mcq.arm_db = cpu_to_be32(2 << 28); + cq->mcq.vector = 0; cq->mcq.irqn = irqn; cq->mcq.uar = uar; From patchwork Wed Apr 29 22:54:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279769 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=LWW9DIH2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPd5JlMz9sSd for ; Thu, 30 Apr 2020 08:55:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727119AbgD2Wzd (ORCPT ); Wed, 29 Apr 2020 18:55:33 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726921AbgD2Wzc (ORCPT ); Wed, 29 Apr 2020 18:55:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B6k7hikvIsSsIp8jDl9FKukCSmX1Ad0FS8qWtEtFntpJcrK+h8t8kqX/r/9I0EXCd6wzYghjAi48CxXgiO0PLnAqS9AY6slJOCSIz5qGJV2SEwSl+OQNdPeOKEFOMSzBN5UPvuhz5kZ6ET3gbkFL7o5ps9boaW3CvDAF6iFE5Vh1FomJaXumSbj1IAAwzfQ+C41TtHEH18J2Yr9XYua89pmvUsguWbGxz2ivt4vtawpxyszpF9/b6z9hycu2RcSL6N2eIHtJAeRVPuR/28SkC0AHqeqCDJz8i1GjtyXqY3B2FjFxwAcY4qlDSdmoEOtz61RvtfYshQAEI8vMXSjjqA== 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=jDTnDYg6sA4HUMMHwJEE5tyBd3AUT5vrm+p3jaCPNVM=; b=h31457/oL9tR+s7Me/Mym5+Q31r2LoLrjy19KRdnf5Sn1eCeKUbaNeJ0nAox6JhCuCn7DMkRMT5Vh84UcxQKbujSy+qrdmiooUWf4c73G0lrInPXxP+WiMp5cGnhIIKD0ZwAQlsI19l7SA05zdYJy0nDCpF8jktL/hH7CzjBnK7MSqDmIX8QUlHsQU3PHDZTDSMmqIxc0A9CvBSL1i6qGnpNd+TNLcO7D/qmpHiHrJ0aULarGBX01iu5UIfKaR30u935R+Jto/caEfFQJm/aI1FljXidkE8XpekPv/R+1OJinkQ/Bm9pnsj6mfl6sHAbat4ClMK2wuyk8cSGDqu5ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jDTnDYg6sA4HUMMHwJEE5tyBd3AUT5vrm+p3jaCPNVM=; b=LWW9DIH27mfpz5VHb0zMBdIfCL8mZABpL4giDispn71vNaadb6N7lSc0IfT/mq6ADILo7KZcUiv2PIFrxjGvWn3jfcvPiUtYKx9kWxzDJXSr/x2kYQwfHonJGmHBv4RS5Gm+QIjGB8mcUtHXpxdEeB0K+SBJ3GDZEo4B+0d8EgY= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:21 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:21 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Moshe Shemesh , Eran Ben Elisha , Saeed Mahameed Subject: [net 5/8] net/mlx5: Fix forced completion access non initialized command entry Date: Wed, 29 Apr 2020 15:54:46 -0700 Message-Id: <20200429225449.60664-6-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:19 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 414020ef-9050-4e1f-eac1-08d7ec906502 X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nIViieUlXOLdOMwMpprid5hLTf0ZhbE+SWhNae4NqVoPDz6bWxiFaT78uFJkFpKVq49EUPK9kt2eZoyGNR+T199IbypbrXsPifNqUPhKS4MwufeEoxBDdXkKFXXKHivXjJFH5vYCs1tCEMzM7yInnEgR/ZhydgEVZOTTqznANfstGJo0PYCiy2XV8FOaZs3ycMyS6lWrXC2wFmJ/T22oLye8Nzl5LHtfswDdzSKlXJkrRH8f37bD5lqdF4+MMNsXx86PQfUkblpw+LKKTZCmo21L0blz9I1B6XFaznQ01a1YKYtgPmZ1yjkUWJNOs+bGi1mJQkPO8VAzf96goYWOamJpSoVOuAWSZuXPh6FJXGgram2nloEF68acfi37zb1XkhuviB41c+XDC42ZChGP04QQw2Ys3Eci5oU3vxMZSAFD/9obwaHZ/hGGaHCY2Uv8yJtUmB7NqVmLjyYuqMnplbiypJdUuclhDqpI/WkEXnwKv0M3b55ckzR/zStEejVi X-MS-Exchange-AntiSpam-MessageData: ++pmPzQ7RDASESVWHqxQaAAmRMA8KtXrAvCUEl0Cnm6MvmMEQTaei3CMN8XhexMG88reZ5bDMJG5AZky6jpGkoCZZBU/Ay+c4mvqTLxiKtL+baTRjx6Z61i4OxeS4EfkOUcE292hX6uT3x4RBeLwSBOiXLNSAERibpFD51KLRk3gFjZwi7obnpKW21dHs/a2rh8zy02uokhhdpEGwHEf/46BgbkVzZxL/9PN4r3FYh87qRCgoQa7Bg9Vm7/Ndg9QqOaPnGAjHeSfrRKN7v7RH9M2HOZUvW2eZbXlVmwmky6Rp3DsJMJ8LMT5JisOA/C9TWqwKRPnDFsyUCfR5i4TK1faKR15kTEs1EtgoBlaZpdPWRZrQ9kWQmJP7tVh3estTUoJ5U2GYqD573N3tVwxRcqfvOaMGbV6XEfYkNKM30NZXxwWumW+sf1WqFE0Y8FuglHIihrx17WtPZWdg3gBXZzQqWiSsZDOFxWM6YlLZBBykGqicaxeqCUFZSCzrNMJFRrFYKYq7ZNMmXCKAUWZHqoE6c8miHOv+aZ81CIElW95D4sVYh9ND5pY72nhjFBgCvCJcNOFxb3Comm0SUnYy/q6OMayePO6786FSTx1d7vliUKe2z/jW+aNgracojPgdZ3B9axLUBMEhzOvoDN0AGG+MHB8NZ7jIi/KC8GgDpNgp3HzFM/BDm3yuf646kB4Bl68IPi+8zVISmSSaB8mWKPaFxTEtONb8mb9zBJ6kMxf9F3zWOAKlodjYD3nKcGIEXhiRxsPLINmouwXEsnn4lM8JulFiKDrzdhVsZOkxWg= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 414020ef-9050-4e1f-eac1-08d7ec906502 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:21.2329 (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: UqoqYLuxlIbiF0RmVXO78YFcymp8P5BnSW5LgmQnkqH8mSuz2134WEGYeTwaGIU3nh8/3mdQ4UIgYLSPp4bVTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Moshe Shemesh mlx5_cmd_flush() will trigger forced completions to all valid command entries. Triggered by an asynch event such as fast teardown it can happen at any stage of the command, including command initialization. It will trigger forced completion and that can lead to completion on an uninitialized command entry. Setting MLX5_CMD_ENT_STATE_PENDING_COMP only after command entry is initialized will ensure force completion is treated only if command entry is initialized. Fixes: 73dd3a4839c1 ("net/mlx5: Avoid using pending command interface slots") Signed-off-by: Moshe Shemesh Signed-off-by: Eran Ben Elisha Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 34cba97f7bf4..d7470f8d355e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -888,7 +888,6 @@ static void cmd_work_handler(struct work_struct *work) } cmd->ent_arr[ent->idx] = ent; - set_bit(MLX5_CMD_ENT_STATE_PENDING_COMP, &ent->state); lay = get_inst(cmd, ent->idx); ent->lay = lay; memset(lay, 0, sizeof(*lay)); @@ -910,6 +909,7 @@ static void cmd_work_handler(struct work_struct *work) if (ent->callback) schedule_delayed_work(&ent->cb_timeout_work, cb_timeout); + set_bit(MLX5_CMD_ENT_STATE_PENDING_COMP, &ent->state); /* Skip sending command to fw if internal error */ if (pci_channel_offline(dev->pdev) || From patchwork Wed Apr 29 22:54:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279770 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=BY9MDLxj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPj0Pqrz9sSd for ; Thu, 30 Apr 2020 08:55:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727772AbgD2Wzg (ORCPT ); Wed, 29 Apr 2020 18:55:36 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726164AbgD2Wzf (ORCPT ); Wed, 29 Apr 2020 18:55:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RWeZo4vbUHZRxO12qV1no7cQmpjlhsggDcmX7hqS/50XP9Z2c05Vh3eToqoUFuIs5HHfhjpGuwcxajfvTcd+tLe2aVE2f5zOztMnLNJ+w2/xb21Onhx9QJr9p4lxqeMkgRS04xrMWeIrZhpzTFBFZ2Vyuz2d4vkwt3dNHxAfNtG9cYgMZHHXvvuxWAvUkGrq2S2YSfNdA80UaLBjcmmfXXuKeONTrpX8zjMzIGyYYo8Va7SjjSIJ10hTQlxO6TvEBy9lH1IgWtjNkKrC36Kd2GUezrBbi3mXkKi2Q/Cmz8od9j/eydaB7/bB3UF+WYK50pQ/SfngeW+be4sTkirj5w== 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=7OTtUiRkkxCXZot63MFRXM8FIhhj7QEossWMro4dok4=; b=hYoyP2xuCZUMZ79bsOBndrGU+EXwI5LPZkHP2XZcoYBd9osp4t7GuMaEPahsrNAFGCkRrI7tS9Sh2suGVbzGKXwRYOaludKAMiLJ7g8adoafZXFmX5KKabUEbJNwSYFosF4UAVvs+nl0Zk303PBC6k+iSIMdAdZ+dBCuV/bgd2VcFs7Gzpgx6DkznmPsCAdoy03zO1agos0htVs4puuHVdjj7MyYvQ6h6lp+/LhTZgr5RmpDuQ+LLuI3zdiCfq+1mBccRCEvvG8LnvSCBh4oaeTfQYi1TmieFKT76RykOmB9q1GOBZb1X1e7JfjV1f3dhfwQXjuBzHR0iWfPNN4+ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7OTtUiRkkxCXZot63MFRXM8FIhhj7QEossWMro4dok4=; b=BY9MDLxjXpeSL5+FrDPdYWkY5a8e5fDjNP5kDX0pg6cttBwAEm4rw54OFtvRoCpuD8ngUi5gzPscNpHfDZyWglfA4fmeIhEMgGOgqzgsS+nruQIdn0xB1pkVDa8h10bMYj9Wc11K16tzRzb/1dw6rJms6zyb89eK4JAPMTTnzro= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:23 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:23 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Moshe Shemesh , Eran Ben Elisha , Saeed Mahameed Subject: [net 6/8] net/mlx5: Fix command entry leak in Internal Error State Date: Wed, 29 Apr 2020 15:54:47 -0700 Message-Id: <20200429225449.60664-7-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:21 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2bb2418b-e79c-42da-0f72-08d7ec90661b X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: um66TF8KCwn3cxqp6BLFdOZOUKg6ed0nxY5btZ52jFy5JdNUVtBKL55i4bUQV9B+FkzU0u+NPPUqPeEpYpI1VpCzB8RS2MTI+zWpY55Mo5Sb3Fqgxbp9Vzo+k1rKa2TDFjIlIQdQY/OvKl0TKftoEAwV1g4fC4+BMw1uURmrOGwfpjMqYaariYdAIAroPMvxXc03DuB5RLzaRUGsu7dwe6WtLPJzatezvGsTfZbg7/OKB0YShDQt5BKR56cgNgePq7GUGczsOqbs4bUKaabKTgleU/7UhcHkyfcQPC77GQJpFIsSyGHwTt2pCH3NEEPgo+MtJHcodFkwtxU0uNf7LbBlPZBUqDxqjdGp7Mb/iZEK4/Jekfu9ACVy8lt2eBAGo97vL3zJRyX+R4VgtJU/HcF16MuWHZl0/fuPYg9+pr18ofk+GA0/pu+otGCgj7Wtx/A+RDdEr0NXYcXzvw+eo9lqCXPVUFtROSrmp989AvHNmRE8oLflNM4CihRU5+f/ X-MS-Exchange-AntiSpam-MessageData: jv/5Kn4UHWyLPzXhQBNVEFvTiIY+h/DkKAxXbatJpA9te5v2BjI4NaqgnM4KXHKJ/rcwgPI9HC3JBOFi8NMDQk+kP1jTH5YEF+1zUnN/ED/fDq740lMWHFDUKdo//WzX5Hmc7GxWVQ7bAv67bzdack4ndXo1jpAxWiQTG+jBLPEFkbnWRew4oUgtXpyekTt9oI7feJh1RwBbvwpNccCak5e0pgifxkir4UtD+vVcEs5KBi79rcV0gKNACoNguxv5OH9/uAWvURE4tXbSeU26dQPEq8/YqI7k+cKk0ZbZCVvH8fumcOrhTz0JB347ChyEbCGQOZX4s4o78s8VeMlOf5fs3+VV8Aa2BVYRe3ljHdFd458d4FAD6M2YFTt/amwZSObpXxcO6LVkbPwB//Mgqfkd+HeUYfCbb1WkEW5MZLiZ4ELvI4qMtul5ax9NgrJjYLnOaLlZv8PEF+L+8+X53Z5++dOI7Nq0h/jRFRY5gKsw+WsAA92KA5NuQ4OMIiNHZ7xzAyUQzFONPCCLxZEpesbFWHaKWxS6OanB0kIGczRITV9tWk2QLi8L+fsUgEgxxvKHSqWZEdJFIgX0YYr8RNMWq7chUVO/krUCh1veVU4H0HMXXSwo24nAzsO/MVyO4bHSAiurgGNAP5BE8HpzJIhkGwxV3WXnbz6G7kCJLAqBa7yT8M6qfCaO8jjwHDVmK8HlqI598wLtw3Of/BegVh/JpPC3Ji4VmoIHejnnrv+L7w7l1v+kyZpyCQmjaKFCnQw8gQzUjqzqHbuR5mDKNqQD3LNaquygD9Xsgisrt0Y= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb2418b-e79c-42da-0f72-08d7ec90661b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:23.2797 (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: 2TcOF8gTr40VsR8O5AE9OVb1m11ciSpOV6G75O2YODLN1GSZwCTUFtKDKdKu72DcZnhwaz/+imjk1ra1YO3zGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Moshe Shemesh Processing commands by cmd_work_handler() while already in Internal Error State will result in entry leak, since the handler process force completion without doorbell. Forced completion doesn't release the entry and event completion will never arrive, so entry should be released. Fixes: 73dd3a4839c1 ("net/mlx5: Avoid using pending command interface slots") Signed-off-by: Moshe Shemesh Signed-off-by: Eran Ben Elisha Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index d7470f8d355e..cede5bdfd598 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -922,6 +922,10 @@ static void cmd_work_handler(struct work_struct *work) MLX5_SET(mbox_out, ent->out, syndrome, drv_synd); mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true); + /* no doorbell, no need to keep the entry */ + free_ent(cmd, ent->idx); + if (ent->callback) + free_cmd(ent); return; } From patchwork Wed Apr 29 22:54:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279771 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=WjZfglOW; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPm3jpSz9sSd for ; Thu, 30 Apr 2020 08:55:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727780AbgD2Wzj (ORCPT ); Wed, 29 Apr 2020 18:55:39 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727122AbgD2Wzi (ORCPT ); Wed, 29 Apr 2020 18:55:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mAkxO5bza//HO3JuVksKmSUh7uZXOULEhcwf2WtqBYc9S9wXeyxOsciPLae9t7jVWvp8Iws2pVPxvBYLI7ixBjb/GBCw0uj0SvL4I3voHzzoKd/2FUmlKdwrEfV7aEF2jm6YJMpnYyXbfhFAXgRx8NdK7fpf6F1z5tVpSvFHOyovuLMvAd6yEaXtBUAhhZUAa72wiLJDyVtsRtIJzDYcE2RwwB6w9cgj2v4bGBcrv3QkhQEnXqx/eg3YMoaCW8Z6Ln0Z4ZNP3COu0dCHgQHYcq4QquoFM+Cxjv+V/JcNekOM/DAaKBKI6tnLXvY5FC5OffrDc+HHSDQtAYCP9FWJKg== 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=2AAhFgVc2ZVICs48Ge6eX4rh1r93rthSxi81KUUQU30=; b=MLibtTc9nixrLQjd891b4td7D+5XleSSO8rp1sYODWtJ4EHY2WHvy01cjByNO5Gjc1kAHnWQKnZ+l8VobXO7O9OQqSGmMNfW1nCMuMMAJS58M3NP97/zUZUTW9+J7DQlBnfLIGI/QSHaOkqNLLfWJos8VMBz6zi9xlu9Yss70bfXvWx/abKMMU3s6bSEKKobfY2/0sz+PKgIvvJPu0yJbgoXY+2MC0TEcpwdKJDdV+vbQ1eSuwcak/ruPKx8wdUBMD3fTtyv8IUfiBccF0sIyWZNUdzn88BZzGvyNUkRmz3do89fRnV/ic7Bkg8PFADxjSDkSKw258PVEQoym9ZM+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2AAhFgVc2ZVICs48Ge6eX4rh1r93rthSxi81KUUQU30=; b=WjZfglOW0BJE/5sodhoif6PIbiAfSrBqp7nbWhGK5dmbbi6mDLcQVL7sHVKf6V2wgo9ZINms8M6JbNgJYjyncb1kLXq3B26jBZht+1kDRvTY7AoVH5fZMx45ixDhhGfEKl6cvh+HL/8WSzgOrNWyYhrK2FNqlsVuL0n9GYGtVfc= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:25 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:25 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Roi Dayan , Vlad Buslov , Saeed Mahameed Subject: [net 7/8] net/mlx5e: Fix q counters on uplink representors Date: Wed, 29 Apr 2020 15:54:48 -0700 Message-Id: <20200429225449.60664-8-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:23 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a4d07e70-57bb-4a6f-e765-08d7ec90675d X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:514; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rejNYiKxWrCoIba7QXntTxhZBWqoq+Y0kKqJk4MqkT9o1k93zMrLkgUX1g9qhYslLe6R19Gxw+Tikl+QbHfJRUbo4otl75cfteSqOW4UZLqSmIzZanngXxRGWDsiIfkx9wto+F3HdZVJM/6PtHn9aKsqWEvsTHsCAS3ixHKH2vz35vbFk4ziT/4xSjedQAwZHYX1TKg1F5VBfcbcMO6yz/mA90Ea8HOhke+I682rie7Bfq1Lz9XBuQQIQi+ogemEcYBWCp+BYkbgzvnuY7oN4tb0CugMTYVSZAxnv4XF4AsJ0twgHBhPpOj77FdkFdesY4JZekGMvZis6CeGjo4mA++WkEgra5Dn8Nlyprvtej/hApbMDgFYfJvjldURYlGq0ypNRGO8wCj4F5oL3e0O/+qZQ86EYxw8hEjzfn+1/Hh0TCaNPt1a+CM/urFUy7EVuJJJ52KnGrX8p8W3K+L8wk2NtgcyVAL9lzMrKixFlPTdEKdQwwYwSkFsAdT3ul9S X-MS-Exchange-AntiSpam-MessageData: A98w95YJ1VmTYRZucQWvSU46U/bEKPHowKYlOtn8a4AicKiD3VmkdQKBNbhKg6nGgEyiXn3Pz+zYLXe8tRxwDhDY+KJfp+91CkAG6xFOnX1Tp+aZIsu56vymJWLzrePPw56jlDgtGG7/g502O3Vk1jjYpY4B0Zy5cYWCGScAU0NrNu4zC+ht67SqOzLQLxbCq83GopX3GawN5gQjutpEUUc8d5IoEeRozcPj4+lrNRs0y/BrybKN6qeV84twexIWyTVHoTh+u9rCIuaUwiajGTTi7e1ZmjSP0by4HuTcZWrDeLsgWEACN8Fx/QkYv+c3BtWZaGU22pc3+5QZ4+6ietrbEjCg/MfwrAty2RfhdEgj/ng8L+M7aLcxmigVAYX4ySH0RmImF2xyeqsGrMxQDxNQpKX+TB06LKFIMIe8f16zfSjQBJn+DJaaw10oqWY4V5j/THTi/jXN0wTQQ7brV2qwWNxfU7OU/uONDmsJ18GMpZNZ2QrnrtqaKCDdUkIAqnfd3uPFYxX+LEd52d38qDxGzks3J37pSkFXIKQi6FLpSKIFceZG0F9WcSy0FLjOURwtWTTuXgRWK5lBdIoMHSbYs9FmSQeqk2n+0XFEP+WdxyGszs2mwR1TwkC/o/rkuNqqc+I/cJiGpYQDhMwl8tZ3tZIAfmxqXEf3/LAelzg4lqhvIlIf2liZ3GnRvu2mhi6SkuOLm1MNW5jpndLtA0TugZtp0Ol8zyNVOIAdPvUKjcEATPjk7gyd55VjfZ43+r7SMPjX6HqF7pbNmB403xj4Z0Naak9HxnRmS75mIvE= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4d07e70-57bb-4a6f-e765-08d7ec90675d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:25.3455 (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: Wfgn8MwDIGpMUOpY9pQmCq/QuYhMZ0TgnXK7KB5N6ArLOpIDq968CYFCPoy6LcLoiRB4NC5wbv/y49Z81RAkqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roi Dayan Need to allocate the q counters before init_rx which needs them when creating the rq. Fixes: 8520fa57a4e9 ("net/mlx5e: Create q counters on uplink representors") Signed-off-by: Roi Dayan Reviewed-by: Vlad Buslov Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 55457f268495..f372e94948fd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -1773,19 +1773,14 @@ static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv) static int mlx5e_init_ul_rep_rx(struct mlx5e_priv *priv) { - int err = mlx5e_init_rep_rx(priv); - - if (err) - return err; - mlx5e_create_q_counters(priv); - return 0; + return mlx5e_init_rep_rx(priv); } static void mlx5e_cleanup_ul_rep_rx(struct mlx5e_priv *priv) { - mlx5e_destroy_q_counters(priv); mlx5e_cleanup_rep_rx(priv); + mlx5e_destroy_q_counters(priv); } static int mlx5e_init_uplink_rep_tx(struct mlx5e_rep_priv *rpriv) From patchwork Wed Apr 29 22:54:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 1279772 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=dFNsHYw9; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49CDPq4t5Mz9sSd for ; Thu, 30 Apr 2020 08:55:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727784AbgD2Wzn (ORCPT ); Wed, 29 Apr 2020 18:55:43 -0400 Received: from mail-eopbgr10044.outbound.protection.outlook.com ([40.107.1.44]:62734 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726164AbgD2Wzm (ORCPT ); Wed, 29 Apr 2020 18:55:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oW2pITneufMF/ez4pykpQcznOkWUgkm3/qVnDKUlMiD8NRqP3lhk9xHEnj7j/IkD4ZODNK4VU8ECwWs3VYIqviLS3FLAX+dM3W032GLDu8nV/XmpZeYX4NGWa7kctb95tGFQOF3p/ngCppczbmRY+d4N3BovaQN9wEquGUWC3ug9Kl82MVAzHZg3W8Ez7JeFQOTCovND1zxfGiFucYIsRHJPe/mCpa6P5SmFkZhgNrnHkqc6ahtTrOsPxsrwmAwJG0e2YPrOMjRJkn5r3dB0OMkcvq/hP5kbZrQeWfpAWAydTAkT80nuIeKV44mWMtrCQSukk2nXw44xkhqLzvxkJw== 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=Gx1kWX0BhQfyEAdayO9WZjmrGJSzQkJ899m0BqlYtlA=; b=Lab5VJbljWW6Y42KdihwBvAgftSs/X55S4OJVuto1d67Z/7s3zcT0ztkkTale2vilUTYiuEcPq0Zx2HL2BIwV3A5TX4asnqS7ChUkaKQXGNQ9QdMB/U8cRbYLWBFhOXqr1D04KeoeGMdguP73YTd7xlzWK9L/8k6Xkp3dPDbhLLb5ranvbmN1zM8Gp8qV5xb8h22BKvpeqe7Rtt11YPADojyiMyinCZqXWDeTAi0jBIkNLlsQN/OOehDav4j6nm0BWczPDx1F4aGGorxxuTb8HwZAp1SbGeThs1jXAYAWU0k+ZU13gdEtvHdFBQNQkLqfllsZ6fwmfxFLkquMmYkJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Gx1kWX0BhQfyEAdayO9WZjmrGJSzQkJ899m0BqlYtlA=; b=dFNsHYw9BUMWAro0PQRj3R9kN344SqY+oCGGbScE/JXFaT/kvlaoG3NR9lBA7aYriIi0OYdrJSXdpWo9hf0/0Lpg5jcGiE9J25lFiKixYs6G5fU5BQsK+0h6aG2xbxgO4d9CetFtW7k+X5A3YhtcYHLJNTG83/xZEH3Hx29dWUU= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) by VI1PR05MB5247.eurprd05.prod.outlook.com (2603:10a6:803:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 22:55:27 +0000 Received: from VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19]) by VI1PR05MB5102.eurprd05.prod.outlook.com ([fe80::9d19:a564:b84e:7c19%7]) with mapi id 15.20.2937.028; Wed, 29 Apr 2020 22:55:27 +0000 From: Saeed Mahameed To: "David S. Miller" Cc: netdev@vger.kernel.org, Tariq Toukan , Boris Pismenny , Saeed Mahameed Subject: [net 8/8] net/mlx5e: kTLS, Add resiliency to zero-size record frags in TX resync flow Date: Wed, 29 Apr 2020 15:54:49 -0700 Message-Id: <20200429225449.60664-9-saeedm@mellanox.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200429225449.60664-1-saeedm@mellanox.com> References: <20200429225449.60664-1-saeedm@mellanox.com> X-ClientProxiedBy: BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) To VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smtp.office365.com (73.15.39.150) by BY5PR04CA0022.namprd04.prod.outlook.com (2603:10b6:a03:1d0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 22:55:25 +0000 X-Mailer: git-send-email 2.25.4 X-Originating-IP: [73.15.39.150] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: dbe0e1fb-5e7b-4f8d-d097-08d7ec9068a1 X-MS-TrafficTypeDiagnostic: VI1PR05MB5247:|VI1PR05MB5247: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(54906003)(478600001)(6512007)(2906002)(66556008)(6916009)(66476007)(316002)(107886003)(6486002)(52116002)(6506007)(66946007)(6666004)(2616005)(186003)(8676002)(16526019)(26005)(86362001)(8936002)(36756003)(1076003)(5660300002)(4326008)(956004)(54420400002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uuNQCh1dlkiNGN6ZWSmLPW6gI1lU5MIthBS+gBfJ18qt8UiUo7QDOpS31Jzo/hc1ADlfltG0EfmwcyhZCD8fZq0L6cL75sA9622q2azfjQOOX1rqtM1a2BnxexK6oVKl57UbaF21xbEkjD6UavhDrd9KJLKLq5M4gBx+bdFnKH0nbE4QESuTqFgaAJQswvQxs/zzEjVMMm8iWx4+cI7r47UChz80CCme110rjEuHO15VflwrBydoUhuI+2l0CybOUsPTKjBcA41aT5nsMu0/zoqDH3fQ6AsOuTpkYPmRQeWBv5xDrGuiBWHWFfK8j+/e5v33SlWUpmYh8Izdm0q55J42YetwTxcpcviEv4lEwkOFGsjmianoyp8O2u+kLOoXP9wIGVOyrsIXcpkFb/EK1caw6HmQaJMH1LLN6GHZ/CVJQPlR/YMVYKKnpPTzLm6GBhreszae5RoHLHd5zKlSNK1TW0ledXmCKMaiPpElYNH4tQom1f/Iwk8LaNklJVCf X-MS-Exchange-AntiSpam-MessageData: K5ZtdhmnQRzc1ya++ocWS4p6O+e9IY/LLrofugoy88hk3AWEqlu4dW+V7xGyIGXZZkL1SmE79hbtmwZZDXWP74Rj63x54h68vv2fF7dZnxhvEiEmMthVa4C+Lq3emVg4mvp/zdJslF4ygVj65TwxEBcQjeo59mbO8aWFYmsOFRGC5Uv4J4HbZxl3hgNDjuzazeMoE+Bso10g5AmzrdqqpZH2i5nkRvMyqp2PEql9Z3Ti6DPbdXOomNNDP0ndEKjfFLlAEJ+JGcsoFfHa1eICJp1ZZlBO48npzDWh+6w8ZA+TugxPZqHUWLejD9yoX5lgscuVO4VE5emVFnMc9SvsvtMlhWCDQwkXYHh/TsDnjBnhv2eJJgR/5zn84QIvtHbIaqs99FJxFQcunHpeDTFZ/uGeWSRksgUnptxdV2GyyPrtjAjU2w8kh8Y6Zh2wv0VWkLMRIpbpFR3av8Y+ILs2UB8wObAVig6bWBTd/R60+hWw7bTHuGiNmz/AspFhnDk6ZHrweFhwDGSM84xfO8xWqJ62lCdHJUeJdwepEKqTgHe9ELcMaUYBknW8OOfU2WjBSw0ggoyXo0IghtMFV9iL87ph6QyutRGEbkVsQGgJIL6IlOrT6HoZFQ9wXw4e5f1TwRZVfJ9CKVheywm4gTIzgikquzYcsXtogT5+MWytzfwMZkblt2nZ0yUj+vNlHN94S5KbT6QTOIRDPNAVvTOCHC8Z79Sc+UC6q0WAf4sotVMEtWeKzW7f/XruxH+yZy/tNBOi7EGIWoPWMOF0fIIUGAhbe9ZD3NYQdS+dr1d7n7o= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbe0e1fb-5e7b-4f8d-d097-08d7ec9068a1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 22:55:27.4813 (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: vlOowgRJW/3H8maNJenWkvud8vKokPCRGfd3QYp/SCLcxx0ZyKTjEA/btbQ3cebaw6q+zJ+BlDYYvKHEpZH2cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5247 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tariq Toukan SKBs of TLS records might have empty zero-sized frags. Posting a DUMP WQE for such frag would result an error completion. Add in-driver resiliency and skip such frags. Fixes: d2ead1f360e8 ("net/mlx5e: Add kTLS TX HW offload support") Signed-off-by: Tariq Toukan Reviewed-by: Boris Pismenny Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 52a56622034a..a04fa23e1a53 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 @@ -232,9 +232,14 @@ tx_sync_info_get(struct mlx5e_ktls_offload_context_tx *priv_tx, remaining = info->sync_len; while (remaining > 0) { skb_frag_t *frag = &record->frags[i]; + unsigned int fsz; + + fsz = skb_frag_size(frag); + if (unlikely(!fsz)) + continue; get_page(skb_frag_page(frag)); - remaining -= skb_frag_size(frag); + remaining -= fsz; info->frags[i++] = *frag; } /* reduce the part which will be sent with the original SKB */