{"id":807939,"url":"http://patchwork.ozlabs.org/api/patches/807939/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170830222110.15737-5-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830222110.15737-5-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-08-30T22:21:03","name":"[net,04/11] net/mlx5: Skip mlx5_unload_one if mlx5_load_one fails","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"aa67df69954a319c32b3390e2e6842a02df4e77e","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170830222110.15737-5-saeedm@mellanox.com/mbox/","series":[{"id":707,"url":"http://patchwork.ozlabs.org/api/series/707/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=707","date":"2017-08-30T22:21:00","name":"[net,01/11] net/mlx5e: Check for qos capability in dcbnl_initialize","version":1,"mbox":"http://patchwork.ozlabs.org/series/707/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807939/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807939/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjKjk1Wmrz9s8w\n\tfor ;\n\tThu, 31 Aug 2017 08:21:46 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751545AbdH3WVo (ORCPT );\n\tWed, 30 Aug 2017 18:21:44 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:53238 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751330AbdH3WVd (ORCPT\n\t); Wed, 30 Aug 2017 18:21:33 -0400","from Internal Mail-Server by MTLPINE1 (envelope-from\n\tsaeedm@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 31 Aug 2017 01:21:29 +0300","from sws.mtl.labs.mlnx (reg-l-vrt-045-015.mtl.labs.mlnx\n\t[10.135.45.15])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v7UMLSB1009018;\n\tThu, 31 Aug 2017 01:21:28 +0300"],"From":"Saeed Mahameed ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, Huy Nguyen ,\n\tSaeed Mahameed ","Subject":"[net 04/11] net/mlx5: Skip mlx5_unload_one if mlx5_load_one fails","Date":"Thu, 31 Aug 2017 01:21:03 +0300","Message-Id":"<20170830222110.15737-5-saeedm@mellanox.com>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170830222110.15737-1-saeedm@mellanox.com>","References":"<20170830222110.15737-1-saeedm@mellanox.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Huy Nguyen \n\nThere is an issue where the firmware fails during mlx5_load_one,\nthe health_care timer detects the issue and schedules a health_care call.\nThen the mlx5_load_one detects the issue, cleans up and quits. Then\nthe health_care starts and calls mlx5_unload_one to clean up the resources\nthat no longer exist and causes kernel panic.\n\nThe root cause is that the bit MLX5_INTERFACE_STATE_DOWN is not set\nafter mlx5_load_one fails. The solution is removing the bit\nMLX5_INTERFACE_STATE_DOWN and quit mlx5_unload_one if the\nbit MLX5_INTERFACE_STATE_UP is not set. The bit MLX5_INTERFACE_STATE_DOWN\nis redundant and we can use MLX5_INTERFACE_STATE_UP instead.\n\nFixes: 5fc7197d3a25 (\"net/mlx5: Add pci shutdown callback\")\nSigned-off-by: Huy Nguyen \nReviewed-by: Daniel Jurgens \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +---\n include/linux/mlx5/driver.h | 5 ++---\n 2 files changed, 3 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c\nindex c065132b956d..4cdb414aa2d5 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c\n@@ -1186,7 +1186,6 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,\n \t\t}\n \t}\n \n-\tclear_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state);\n \tset_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);\n out:\n \tmutex_unlock(&dev->intf_state_mutex);\n@@ -1261,7 +1260,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,\n \t\tmlx5_drain_health_recovery(dev);\n \n \tmutex_lock(&dev->intf_state_mutex);\n-\tif (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {\n+\tif (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {\n \t\tdev_warn(&dev->pdev->dev, \"%s: interface is down, NOP\\n\",\n \t\t\t __func__);\n \t\tif (cleanup)\n@@ -1270,7 +1269,6 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,\n \t}\n \n \tclear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);\n-\tset_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state);\n \n \tif (mlx5_device_registered(dev))\n \t\tmlx5_detach_device(dev);\ndiff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h\nindex df6ce59a1f95..918f5e644506 100644\n--- a/include/linux/mlx5/driver.h\n+++ b/include/linux/mlx5/driver.h\n@@ -673,9 +673,8 @@ enum mlx5_device_state {\n };\n \n enum mlx5_interface_state {\n-\tMLX5_INTERFACE_STATE_DOWN = BIT(0),\n-\tMLX5_INTERFACE_STATE_UP = BIT(1),\n-\tMLX5_INTERFACE_STATE_SHUTDOWN = BIT(2),\n+\tMLX5_INTERFACE_STATE_UP = BIT(0),\n+\tMLX5_INTERFACE_STATE_SHUTDOWN = BIT(1),\n };\n \n enum mlx5_pci_status {\n","prefixes":["net","04/11"]}