From patchwork Fri Jun 2 17:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asmaa Mnebhi X-Patchwork-Id: 1789798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=KSZ/sr+z; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXqB32sHkz20WV for ; Sat, 3 Jun 2023 03:04:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1q58Cq-000347-Vx; Fri, 02 Jun 2023 17:04:52 +0000 Received: from mail-bn7nam10on2053.outbound.protection.outlook.com ([40.107.92.53] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1q58Co-000334-HQ for kernel-team@lists.ubuntu.com; Fri, 02 Jun 2023 17:04:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yh2wvr1aH8I5C6gpvTYEp+zfF+fhVYDMHbaRdDffWFOrOCQIQ/vbdaAsDWhzWzF1aclvsOi1ZIQMG+gMel6ZRCDzbFqyEmkvwrqil+KxIbuZZczhQwH5P5+uQ9JyLXTxLHjL7CTOzX09ZaF36tCu3sbRs6W0BQAjkUovm+0Y5I/0WBYJdq76kyawg/q6oe+/W6QGdCWxyDv6EdoQlXCoL4rfrFe8GVczWt++WK+r8mJIzUIur6NzFhkurt/yMUX+plrHu7nY+RTh0CtwT5MhQ0r+x7dLzgAFms1ZdEZkeFrqUHTb9SM7kEiXR/31JIhwbSLykdilb6IrgEOxK7Mdzg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KUce38fvaaSFGL6zLxgx3E+jYGtQz+94yove13zk/ts=; b=hmBH4Xac6LKaPg0d7fjBySDFLn1AzAUWmlMo8YyZvM0u+u5e0PzibHMNv6aV8vevYHRNDZco9EZbFFbRA2XL0IGm7+CJAqT0FdTkIiJ8MIWM0kxJuU1KwcvHs+SsHQbzeQHQK1pVjPYMvpUwt8oofLKsfHb7ceOKL2w4t002LkAlxqfiLfZ7tcF5Mer1guEPcFD2rix2rNQ/W4zOy6N5c5JsyBGZz86KD9R2qDtLV/fVhxcJKCVN6Q8i5nfeNN+W3aWtW/sbtnh0lmFb7H/8vE1doX8GEzNkqGLYVoXO91AONKKuBciUKo2KDx4aoY81rTnaw6BqfrKtyH5CGZleqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KUce38fvaaSFGL6zLxgx3E+jYGtQz+94yove13zk/ts=; b=KSZ/sr+zMkFssA7CdF8EBK5Au+UYrSVRwkjdIV+pJZPQErDJrNDBt+4t7ytrxWUUwmY+QF0y2mm4WyfV73y6sDItAsPy8DqvN7OKFANq6wJb7gzl69jtblmtIyFNk7KHthGh/Co4E67H5n+P3YP0pu76nPx8b+EeF1cqOybHJAeomyvKSywqz0X3UIiEwBQ0W0NQCVx4214+PyQU1Dej7asAu2WqOmHhNqoQ+EPMjFcocHPCgDVfaw3xSf7kBeIKoiPPUnyJAAJQEVjPKDDg4QwsNgl7xGxoOdwHTkCyyWartZqmYA7fgcm1sDVIQRj64Y5o/+6R1xq4aR28sfKzvQ== Received: from DS7PR03CA0244.namprd03.prod.outlook.com (2603:10b6:5:3b3::9) by SA1PR12MB6774.namprd12.prod.outlook.com (2603:10b6:806:259::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.26; Fri, 2 Jun 2023 17:04:47 +0000 Received: from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b3:cafe::70) by DS7PR03CA0244.outlook.office365.com (2603:10b6:5:3b3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.23 via Frontend Transport; Fri, 2 Jun 2023 17:04:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.27 via Frontend Transport; Fri, 2 Jun 2023 17:04:46 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Fri, 2 Jun 2023 10:04:33 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Fri, 2 Jun 2023 10:04:33 -0700 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Fri, 2 Jun 2023 10:04:33 -0700 From: Asmaa Mnebhi To: Subject: [SRU][F/J:linux-bluefield][PATCH v1 1/1] UBUNTU: SAUCE: mlxbf-gige: Fix kernel panic at shutdown Date: Fri, 2 Jun 2023 13:04:25 -0400 Message-ID: <20230602170425.23239-2-asmaa@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230602170425.23239-1-asmaa@nvidia.com> References: <20230602170425.23239-1-asmaa@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT064:EE_|SA1PR12MB6774:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a5ea28f-b390-4e6d-d5e7-08db638b7825 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c7lR+2KwrBGOHkoo/bICkaIJ+Qz+6MO+XL9n8CfWb48HhRpyRpKaA30rzFk+WKRqRJdJUPndGDqO6ex2R32bnFHo8ci7utHhnOPYPQukD18XNsu+gF8VJadc91EMaAiH9j2SqbVhpqEqwiWoKCWA6mGYffOzzj7z20uE/uLAZidtVl1v0saASUOQfSEYQrghEAN2gFQQUFBcoDQPnOKhtf/ojHR73CrOZ27SOoG81pXnp7exgdmhtBy44fpQMS+VtnhS8sO97Z5kOZrij2cevtQZ1DZiaVSXELXCqB9KHyqGuNAWgQo04qBfcPMTQDBguoQ0N8rNQmtU3n1+KxSxst4qKz5I+0p5qe4CiG8tUyq+6eV7qqj4gELa4K9dSWeuPAIWsyMirwkK00tZ9ABi3eH6e1oIiUVrr139fb7/95p/fBPhCZTx7w+G79JlJ/CHI7rKtu1klC81oiU9BtHvYN6aG6psAjtUDXbUJDosUerJub9HcnBAnj7Yquf2kx8kgo03t+686Dd9HhQ6+wlq0fczYs4Yp0w2oLkuAhjN6RUZmKt06e75BnLT3DQJJ819fN7IGE9c4ODlWTUXkt5utRhx30zRUc0DzrvKu9k5ZwzWsUVRa767yJI6Ht0A3TnOKOKvMNYLkgwWd4g7VM3yAEwPVWZUAO3jtnWPqEXPxDGMm4OGpKTIOKWFuv9MP1G/0ginaIK3wCRGrXRrvsjEF8deznb8NMRp2C+a0GyJi0fiFjf9yS00OLfjdeo1+zIXtbIsNV+s5oOM30Gq3+JzO3cydkTR5LuM4gmBW7L9P7g= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(376002)(346002)(39860400002)(396003)(451199021)(36840700001)(46966006)(40470700004)(36756003)(2616005)(47076005)(40460700003)(83380400001)(426003)(336012)(2906002)(86362001)(82310400005)(40480700001)(36860700001)(7636003)(82740400003)(356005)(966005)(7696005)(41300700001)(316002)(6666004)(5660300002)(8676002)(8936002)(478600001)(4326008)(70206006)(6916009)(26005)(1076003)(70586007)(186003)(107886003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 17:04:46.9000 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a5ea28f-b390-4e6d-d5e7-08db638b7825 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6774 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: asmaa@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2022370 We occasionally see a race condition (once every 350 reboots) where napi is still running (mlxbf_gige_poll) while a shutdown has been initiated through "reboot". Since mlxbf_gige_poll is still running, it tries to access a NULL pointer and as a result causes a kernel panic. The fix is to explicitly disable napi and dequeue it during shutdown. mlxbf_gige_remove already calls: unregister_netdev->unregister_netdevice->unregister_netdev_queue-> rollback_registered->rollback_registered_many->dev_close_many-> __dev_close_many->ndo_stop->mlxbf_gige_stop which stops napi So use mlxbf_gige_remove in place of the existing shutdown logic. Signed-off-by: Asmaa Mnebhi --- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c index 7291ca6627f1..7de778bd2e2e 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c @@ -485,10 +485,7 @@ static int mlxbf_gige_remove(struct platform_device *pdev) static void mlxbf_gige_shutdown(struct platform_device *pdev) { - struct mlxbf_gige *priv = platform_get_drvdata(pdev); - - writeq(0, priv->base + MLXBF_GIGE_INT_EN); - mlxbf_gige_clean_port(priv); + mlxbf_gige_remove(pdev); } static const struct acpi_device_id __maybe_unused mlxbf_gige_acpi_match[] = {