Message ID | c57d900027881ae6cd2d77f52e57159392de06bb.1523449097.git.igor.russkikh@aquantia.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aquantia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="BODK6b8l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Ljrd3wNbz9s27 for <patchwork-incoming-netdev@ozlabs.org>; Wed, 11 Apr 2018 22:24:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753017AbeDKMX5 (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Wed, 11 Apr 2018 08:23:57 -0400 Received: from mail-by2nam03on0042.outbound.protection.outlook.com ([104.47.42.42]:29184 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752948AbeDKMXx (ORCPT <rfc822;netdev@vger.kernel.org>); Wed, 11 Apr 2018 08:23:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=yHfSbIN5ykUi/WGQFS5rf87cUhiCE9C7fsEdCtAVy9E=; b=BODK6b8lDhul5hqETPjmDe7s1dsscqx8vi0R0n6zAsHt7HZ9N1pISos06n9exE+2rpdRcJA8aOwDftdieElW3rFQn2h+GJnoXzWOEE995jUYeMoBHRdfQuySv2EBno53ZMdf6HWPfRJkYET3DrOV5XqXeEDsrsAJcI2MhjfEYlI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; Received: from ubuntubox.rdc.aquantia.com (95.79.108.179) by BLUPR0701MB1651.namprd07.prod.outlook.com (2a01:111:e400:58c6::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.675.10; Wed, 11 Apr 2018 12:23:49 +0000 From: Igor Russkikh <igor.russkikh@aquantia.com> To: "David S . Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, David Arcari <darcari@redhat.com>, Pavel Belous <pavel.belous@aquantia.com>, Igor Russkikh <igor.russkikh@aquantia.com> Subject: [PATCH net 2/2] net: aquantia: oops when shutdown on already stopped device Date: Wed, 11 Apr 2018 15:23:25 +0300 Message-Id: <c57d900027881ae6cd2d77f52e57159392de06bb.1523449097.git.igor.russkikh@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1523449097.git.igor.russkikh@aquantia.com> References: <cover.1523449097.git.igor.russkikh@aquantia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.79.108.179] X-ClientProxiedBy: HE1PR05CA0363.eurprd05.prod.outlook.com (2603:10a6:7:94::22) To BLUPR0701MB1651.namprd07.prod.outlook.com (2a01:111:e400:58c6::21) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:BLUPR0701MB1651; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1651; 3:fJzike7ciVJ21hfj9lmJhaRAEAzJB1JdEMg9ZQ44ViDFZtX0eMzl4ss5X6q98vfLJaun0UcAKyq6mijWRYhRAJKm5sOk4xoKweY3s8ScnSgQMABCOl93I4ttUuwKrLXBUoJe5t64PnA6V/V772UM6trn5LytrwaM/35xb9WVJ7HBfEwm0/LOdfCN1Od99//wcpQUbU+qxpR4IFU0emrPFErwshq+blBvr/0rsOdrROy/98QOtOJz9SR9zA0BNzVo; 25:h4D7q0uTZTocAzAlQSjblJPKW55NAyMK6wZfHEPyBK0SkPVw5IFwRGn3CUY1Oz++2J4LqgixoAsDCpSK4k20+iEy3WzkYZEhJoodgsJ4qHstkpKmXyiYm2HiDdlKxvqqZcK5FEHqIuO0D8kjRq7dcE3usGqtK+zt3epE+IgVCTA5ITIEBAn6/HMHdFR7Mrs5ChCXdGklEDonzuvFlT+r4ByonUtQMy8e5t+f8sN7CZvdxgqgVYoqXsBSy/PNgftIGJoUVdQHureM5bnsxTlZ0RPn/tEUUAgE6AdX4ExNwFBfIJW+3cksci55f/YTWTLsBAbSK+nYjT7DXzx17rfD9Ds7xT1eFhVHBIU2wsJVQkE=; 31:1HfO5HAcFyA30ZXjMIsj9PcZCreMf2Se7GrCfUXlmRS69nbtVlX3aKV9pkarKBwoV4v0oum+OTwngzWHYNLfp1xtM+KvD9w6Kq/YRJ5sd6ouGmm5sv1vs+KPVlV6xoV44EDjoXsfz6lx1G63nTMr1owrbtQAR6/nM4Zr9cnR4D/bERTEjo0PfGIx5ZPWQyeMPdtGHpXuflpsJ41EVk8Fi4VcamHsLeaVlRWBt7P/FQ8= X-MS-TrafficTypeDiagnostic: BLUPR0701MB1651: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1651; 20:JX3svaIoUhL1oxoTET1X0+T/ylGVR7SLEOYgFdPddNrY+Z8ehBcK5jKdOAC864G+pO83xh3Hzz4vkVEIckr7QpIRoq34tKfi97CRu7Wt2FYSxGzv2VExHKarAjlpdxZAahFSvgbZgP7HqMEfYoUkGqbv5BkOPRBM/MNLPYo7VV5bVR9QYWAJxjyFgc1iaFqXCtTpdxcdfwpwJOXN8Q3uiFRIl7K7G5baK6W1iNZPWWGQZV57R3aEKFig559VTtsnroG98js6ZjPcob+nc2iK7gSdx91eQjj4jVfBy9Kz8GXX2iy3XJgQnTeGxYzdXqYTfiLj/zp9ar8zQqcjkRDmfDZWqCSu0bvGt5esjucSFRA4V1gSo7cdNN8/mbI/bAx8xMv8boDWwiLspWfud9Vm8MLhHVw/nE7ejepDhBzSdHDqnSWdwfLOLw/xiBnRNwzZ5kpMAARkzoeq0M22w3TGJimcrBiat9zRaZ4ob0FhDtvvzQOGIF5VLibyYFxEW1f+; 4:KL+f3uIj+V9j5WUwDnoDTsrcqak+mu5fWbHedINdLEri7HGvThQJk/l0Riyhu42xPfbM8wqQqlwJhAR9/LqnMUO2bQNitKJjdpbHvTBWHNavdcttHEuviI9zFC/fbVN7mFr6BKAqR7tNc/HLuiCzlg0bEhty3Ib0279onUDRgisACTDn751/bPoFh/JlqisfXkjImlbuWSSnHNFKgl9zn/v1fbnH1W4ET84mD/rZam1xa7jYp/lu0PUbaSLqOmIV85DPO/V0I1Dfww7INiJyOA== X-Microsoft-Antispam-PRVS: <BLUPR0701MB1651B145F4178E7FAB6F1F3E98BD0@BLUPR0701MB1651.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041310)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(2016111802025)(6043046)(6072148)(201708071742011); SRVR:BLUPR0701MB1651; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1651; X-Forefront-PRVS: 0639027A9E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39850400004)(366004)(396003)(39380400002)(376002)(189003)(199004)(305945005)(6916009)(25786009)(5660300001)(105586002)(6116002)(3846002)(50226002)(86362001)(11346002)(7736002)(446003)(4326008)(486006)(2906002)(76176011)(956004)(118296001)(54906003)(47776003)(6666003)(16586007)(316002)(476003)(2616005)(66066001)(53936002)(59450400001)(386003)(97736004)(6486002)(186003)(107886003)(16526019)(50466002)(81156014)(81166006)(106356001)(68736007)(7696005)(52116002)(51416003)(36756003)(8936002)(26005)(478600001)(72206003)(8676002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1651; H:ubuntubox.rdc.aquantia.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1651; 23:ul1gQ52OVpyyKv9f5L9o73HjH2mORnNzyIaJJjb4zOkVRwrywvy1SOijkDpdZigwYzHy11bGEB0b/uTxsd/6vzApV7y0rlFrpeR/GNBZXoUMItxuWvndUlKF1/JDlWsAAlMHS0VS7uViLy7jCiZOuYu2Tui6aQmAMHfM+VUvrhuNUFo/QbMnZ7FtvGd5I1df576uzGAkhVtVy4RbrUBAlaHWhm0Fr7h1YuiVe0LEnRvvctKr0HI2sgzHn432yNb18NdeKpeM+a5+5QwplWu7/yu1x5bPYpx/3WmX9/HV9tgoMpm4MkOHVgqODJfW+qGzllOEA6KTmR3kvKEdhHR2bQ+s6fgYdGsS/FRtS845wX165SaBysWfNwiSE7qVf3i3Sarj3LAiZOvIaVwXeJGW19f5rZNp6z04UCwC3gtGg7oke3aHF948XVOK221DrkMoArdDdL8SqmqV1KzzXbYpZqFmwP0hJTmFHbKTX0SBRw6XW6MaDboExUq0TO5m1xl2SjwqGLrxJvYd7zyZ7k3NO+akt0IZRJRUQIuy5mhC0LA0XGjpcDPyBAaGCJtUMY/0OFbuXWGlQN9LwgD+d9EDiACwDlbppEtfO/sB6TU6Mv/vIorOXCAXSRcYRJmOO0H9GWyNMtiSRT1mp3rMc9S7rFTGu0zwJvma7Ln6f6p1skw+9STAQVNeDw/VtWdKw3Yg6a+iU7L+CkESRVUK6ERaMLamgKG9zPiSbCGCzKYVTkUtG9BNDvNnTDTsOBioGEg1Kd51oOSTENLYJ5TTUQChQhoDKVlhCvJtUvFKn/Fp+nQfOKZolAugI1OV0TX14Iek5+RtehBrDi0j+cPDTLL6HLu4vVKkZH3dfNZuduUMz1W/oYuKNtl2rj2X/0M6B3q0NjouNWT0WAsIX5XmJkgKeQz1CEm6GCHXve+HLeJx17Zt1/LkXbE2u05swYkSyzcGf10aCluZbimtNpXq0pSYtK1IYgeA3aOBPCDvjcznclYxiqSOTO1RYI0HPz7R3KN6PZnBUg6n49ONQxLxvU5mPGZ5bkHxVnnz+h6yMXjfOAULQ0xh6Tq/yMRs98gzY9j3D91qZXwNf6teHemdhrst9g0hzSZUyTyPbt1c/lzMRviXVSKTmAOyNrCf+A3aDSB0m+ZkLW0egrrn4GrTnBNrHHKQh4TCd7MCabonox97qm1ISvglDq9e0/5buWFeF843pzFeNkALF5LKCqsC/bIFv2Vur8ySnZizbiMO1Vljwi7nrFZ21QgJuohwQZTgApDZ X-Microsoft-Antispam-Message-Info: I/TtG19cgBvqO8HaGv9HOIULUGtLHUu30ZVqAuXF3xkAkJucGZgUNrwlvFxM6whoMylMr2PdiQ0QAsQ4vWSMjpJMyb/ymS+nrCO2NTTJCns8HlCLHdX1zaPtCr7WeJmyBm6wRKL5Wo2Fjgaf/xmGcr8WBDkQHkVtwmpkb7BZPrYEjl/cZuv+R0nMm1e0RfM7 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1651; 6:o9g+ITv0o/GBtyhxQ59oxYdreYzaRr7S9BPjinsq092Iv7oj0I9qPu96RwptOlQoN43Vi8taBcwuM9EwPlx9XVs/g/kVBUr/knQ/Ljl+9Vc4bdlwwouMs+Sr9tR6F3dldRIJ8T4Kq6xYyN8JhFWoqc9Y8pbAtaBZi1T/QE0yZHfiSD6hURRg+q43/ZXzzOOOoKpmLJiZDq98OKFY1mzRseYXueZNQ2IrvXfNeKvsgDJedDyiEv4AmKxk/Jl1Y4wlWDyTgx9yl39xUbDCIpU3cokNbeCjXx6ioPCK90FS5C4E7AZ+8kXQP5oWoSRLTXvMiIKEcxyzebD4Lx1xO0xApoUmGJUbY4SjOvR1TFEn89GHswVNUtU/ntD/+UWsbpQY1KWNKCeN0frLtkC0bDKWvT7jfRN3EWyrXEBK5baYLHyyzHkefH4HX/loDA+OkYFTqguJ3lGtYXynl1Ee/P8OWQ==; 5:FTOoLjl8GmXKliPTh/zQ1r3gLMvgyNq8OQn5TJdFDT1FHSaQEsKiU0gTY2IB0tx/WyfJY3CQsF5A9gRse1pjyYe0VCIrnIKmbOMjmp2uXnpY6j7tCJmi28MRIty0F3CJ+1UM7fNEpu95hUrwSZqRJ8IBVOWS5QjHVz4Ll0OxaZA=; 24:bcFXWWFEksLM4DrR6UfMLknsQYL61k0+HomxKxfuk9TBQZ99S/B1GM5uthjlXpJ1u1/EZgMW/FrW11hPB3uKvOyTW969aZMw9QH1az/zEow= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1651; 7:T3s6dspoGj/IRfh91pYZ76AYSLmkw8Na4wdebhXeE90M5zndDuA059Gh80wjVVBCgssJ3nBlg940pVdTycj6ZiGgx67iKxJYHoFWZGTsrTNLSVL8Oaxdqbh/1GSr1Iii9P8cbTY9xlC6ITb9rwRb/p3C5fbgqv8zgr/5x0zswhVukQJF8UX4WNtxboYtEPFGZrERA6jkq6mn2TSAQchUhcb8x4/2DfgyQXJGAJUsUYVB+HYpNDEd6nl+lignlMqt X-MS-Office365-Filtering-Correlation-Id: 6d614ea3-caf0-4072-099e-08d59fa7157c X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2018 12:23:49.7847 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d614ea3-caf0-4072-099e-08d59fa7157c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1651 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
Aquantia atlantic critical fixes 04/2018
|
expand
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index c96a921..32f6d2e 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -951,9 +951,11 @@ void aq_nic_shutdown(struct aq_nic_s *self) netif_device_detach(self->ndev); - err = aq_nic_stop(self); - if (err < 0) - goto err_exit; + if (netif_running(self->ndev)) { + err = aq_nic_stop(self); + if (err < 0) + goto err_exit; + } aq_nic_deinit(self); err_exit:
In case netdev is closed at the moment of pci shutdown, aq_nic_stop gets called second time. napi_disable in that case hangs indefinitely. In other case, if device was never opened at all, we get oops because of null pointer access. We should invoke aq_nic_stop conditionally, only if device is running at the moment of shutdown. Reported-by: David Arcari <darcari@redhat.com> Fixes: 90869ddfefeb ("net: aquantia: Implement pci shutdown callback") Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)