Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp980347ybt; Wed, 17 Jun 2020 19:48:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysCvWqBf+2EYvmQ4FEgWPZyTlWWG4JtYpsS7ZAl9Ta/kasAtWWnBOE+F9RmjPe/y0q+q+6 X-Received: by 2002:a17:906:2cd5:: with SMTP id r21mr1972738ejr.20.1592448517433; Wed, 17 Jun 2020 19:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448517; cv=none; d=google.com; s=arc-20160816; b=q2caNNExhksMrBZ6wb0eY4lgfHZHmtsH6sTMIzpBW52gzTi7q8iH1t5ekMYVjAYK3e AILEXfY4deQYqhLk9Krgk0NQb19I1vBfI8qkeL6EKs5xXxEhnBdUqG+Rfzfh0l+FDiCC rtasSe0YkmOamT7l96KyHYKM1o/qDYMuNgq7wXWIWEU/p5GVDZ0BmjEH0ZIHGtkoKRLY g1ebW8m8LO6LdIvy7ktz/Hxgo/kfHxBgapHF5SLNSLaPW/ZQ/3cuvZFzo7k+vhRQws0X sJ5TmKxBUfHP/kMjiK7k8kUnOk2mD12ub9tAY7tStn+W2DBumN5KQNEp3mqYOr41OHx3 h11Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f8LMV4+i8O78K/rDkLZicEro/KzC7VlOyDy03M3HPzA=; b=YTvFmrtoNJTffzTZHKoHGqke2eHymd238OgN7mAg/yxBKkZrTYzjS8oSL9H2ioSIoz ZU2dEUUH1IwdEUt+7uTkfeE0I0NwXphNK5YefHlyDG4CqurtnlRfjvN+Pz463JceGgEA X8T6b8OcBWTmcc6tlhh/XV+c8eKbytQmSPPORBUgPnReQWUta32DPTIitwzSNslfQtFr e5rOI1x6DkXaOt2QjFBfG39PBLoX1zk9sXSc9ia46j5RdlIy+rM2evFT2R34801lfwC8 QMs/L/J5INZS9VD8s6uBWVAKBMsB9CqjxWUITX5DCYsSTX/SwYU8nGmHr3amNBawAVuO GNyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SGHJLnTG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d2si976898ejw.702.2020.06.17.19.48.15; Wed, 17 Jun 2020 19:48:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SGHJLnTG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728554AbgFRBKh (ORCPT + 99 others); Wed, 17 Jun 2020 21:10:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:37808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727010AbgFRBKd (ORCPT ); Wed, 17 Jun 2020 21:10:33 -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 9284E21924; Thu, 18 Jun 2020 01:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442633; bh=QqpywQU4j7DlGriZrifQlD4J68J04/CqPP3jGYn/NXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SGHJLnTG+VUdw58PsvAaI3Dafr5ITIjHVO+aFe0KzHS9cVlduWCcJm3NjyO2VhPJO i8YahpdLBNS/3xbUIsQmFE1+h7IMHes8PxNew7esYv1Ljynee35QjccXZq48L9Qdxk 6KhTjS49LOJIu68+MpnRSH3N3K2CkXzGCW7G9Fjg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Falcon , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.7 110/388] ibmvnic: Flush existing work items before device removal Date: Wed, 17 Jun 2020 21:03:27 -0400 Message-Id: <20200618010805.600873-110-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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 6954a9e4192b86d778fb52b525fd7b62d51b1147 ] Ensure that all scheduled work items have completed before continuing with device removal and after further event scheduling has been halted. This patch fixes a bug where a scheduled driver reset event is processed following device removal. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 197dc5b2c090..1b4d04e4474b 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -5184,6 +5184,9 @@ static int ibmvnic_remove(struct vio_dev *dev) adapter->state = VNIC_REMOVING; spin_unlock_irqrestore(&adapter->state_lock, flags); + flush_work(&adapter->ibmvnic_reset); + flush_delayed_work(&adapter->ibmvnic_delayed_reset); + rtnl_lock(); unregister_netdevice(netdev); -- 2.25.1