From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCDC9C3A5A8 for ; Wed, 4 Sep 2019 16:16:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A6652053B for ; Wed, 4 Sep 2019 16:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613809; bh=agH5+U3fXKJyCeEab3jPzf+6QiPNlR+qYEGA4l7+8So=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HnTdf85o2pTymul4+Nevboa7jf6S7HE97/aUJ5vEolh1feC/vvGwOcLyI1Rl2i+pl ddWZF7Nkd0uCLW0JO8RdbURMQYCZAdxRiEjkyWof6avKocv2o7Y6Q2jObfOLG2qzOm bfM/QkmjlzG8Cx1C++h9ODnld1o/y6rSV4XgYooM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732397AbfIDP73 (ORCPT ); Wed, 4 Sep 2019 11:59:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:33866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731505AbfIDP7Y (ORCPT ); Wed, 4 Sep 2019 11:59:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B11FA2087E; Wed, 4 Sep 2019 15:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612763; bh=agH5+U3fXKJyCeEab3jPzf+6QiPNlR+qYEGA4l7+8So=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GH+G2rJxoA/JGwP+3GkXVP4FdPd5sJW7Td7V0vF1xe4aEGZNG10UPZwHnjUObp56C RWkr7ajmLXxAuw9HF0XE4PP5vk9M6A3PQt6wmf6/7HhQV5C+HCDV1hD1yx6DEYgCYd f9Eh5MHq0bqnyhQyMTVzK6i0tV85Zb2TjUPkHr8A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Falcon , Abdul Haleem , "David S . Miller" , Sasha Levin , linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 67/94] ibmvnic: Do not process reset during or after device removal Date: Wed, 4 Sep 2019 11:57:12 -0400 Message-Id: <20190904155739.2816-67-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Falcon [ Upstream commit 36f1031c51a2538e5558fb44c6d6b88f98d3c0f2 ] Currently, the ibmvnic driver will not schedule device resets if the device is being removed, but does not check the device state before the reset is actually processed. This leads to a race where a reset is scheduled with a valid device state but is processed after the driver has been removed, resulting in an oops. Fix this by checking the device state before processing a queued reset event. Reported-by: Abdul Haleem Tested-by: Abdul Haleem Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 3da6800732656..d103be77eb406 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1981,6 +1981,10 @@ static void __ibmvnic_reset(struct work_struct *work) rwi = get_next_rwi(adapter); while (rwi) { + if (adapter->state == VNIC_REMOVING || + adapter->state == VNIC_REMOVED) + goto out; + if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; rc = do_hard_reset(adapter, rwi, reset_state); @@ -2005,7 +2009,7 @@ static void __ibmvnic_reset(struct work_struct *work) netdev_dbg(adapter->netdev, "Reset failed\n"); free_all_rwi(adapter); } - +out: adapter->resetting = false; if (we_lock_rtnl) rtnl_unlock(); -- 2.20.1