Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2694035ybg; Mon, 28 Oct 2019 00:22:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMlam7pubqKQfHsa3fVXkJ6OVRq+Pjm+822BqjT8Zhuako3SLDrem4ROjxdhjlw7cEzHEn X-Received: by 2002:a50:8859:: with SMTP id c25mr17623915edc.253.1572247362153; Mon, 28 Oct 2019 00:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572247362; cv=none; d=google.com; s=arc-20160816; b=JVPfi8jyRP+lnq3g5WgJTPwesOq3r0u6UfZhbLydedrs+T0m1BWXgtYI7j9Gf6xapZ 1m/zM4OwFjik7623+2zj9Yf44wrEXvqghcdWCJNVDh1b8DoVa0JsYVb6SU6wEV1wZis5 Z0lkCAAghAbyTBwHCNHtMr0xfnNfvRx1FZoE37iDQdpkK7n/RV4VhvfwARb8EYzyniXT sG8Q8h+ULG1w+DIpW06+StOQjLipuMnwaV7aSxjEysDjeon08iDeQj8ayKFT7eoHVZ/P n91L5sE56RjzLUYzQrM+F1HtJFWuYmF2WS3nRygMuGLS2bRuaZn+dl0T6SWpBnbvIpVC RmRg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IytQ8gcoLrQIzc7qRg0Y96JLhl8ed88oSpjEZqxczzo=; b=kMWCbJkV/MJeVMq0V0tsJbF9996x8LF5oHK845W48UsCg/nYSIL2XfkN5+XFlMLa+7 0sjR8InvYKrXx30NedU+RGYA2lWw04kDBuOuNewVa70Qa4D0am8JbXu+l4dsqIfbHRuJ y1A74ByFjFH4uewrsRDpuMJ8BHC5yoWCCwsvqCiRayGgwyO3twQp/HDY89Z5ohF/1xmd begJqOxiNqBHURpjNYUJ4S+D7mPg5gp64agy1XtlpsPDYm6CrXvtiUxsYvKwjage13xj LwuhfGpsJiq2KkC4BrIumEDhYN+m4ixYKTaFPml6kzZXFehaa5qJo8nQgBlACsut/0HJ s45g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WYxczeVh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e21si4663616ejb.147.2019.10.28.00.22.18; Mon, 28 Oct 2019 00:22:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WYxczeVh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731414AbfJ0VTL (ORCPT + 99 others); Sun, 27 Oct 2019 17:19:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:39458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731395AbfJ0VTH (ORCPT ); Sun, 27 Oct 2019 17:19:07 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF2B5214E0; Sun, 27 Oct 2019 21:19:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211146; bh=rR/tHFx4pomAVWweAo1Zmziuu9yLjxENE/5tcvMBfd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WYxczeVh6fu2xv0Ou9DLKZ6oWaIhHIBhwPNVYBka5CG2CeN/YGCBUJpj+RDBPV2oJ JLuqwnBRh35d0QhbKyUYyaZN70PXZHd9nFNAeC7qYCi8uAQcSYFkjZZ2d4gbb3qGM+ vV3KCgiJUPupwvd1FBlBiLevXgGdHiduLpiZpQxw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bitan Biswas , Thierry Reding , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 049/197] net: stmmac: Avoid deadlock on suspend/resume Date: Sun, 27 Oct 2019 21:59:27 +0100 Message-Id: <20191027203354.341058811@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding [ Upstream commit 134cc4cefad34d8d24670d8a911b59c3b89c6731 ] The stmmac driver will try to acquire its private mutex during suspend via phylink_resolve() -> stmmac_mac_link_down() -> stmmac_eee_init(). However, the phylink configuration is updated with the private mutex held already, which causes a deadlock during suspend. Fix this by moving the phylink configuration updates out of the region of code protected by the private mutex. Fixes: 19e13cb27b99 ("net: stmmac: Hold rtnl lock in suspend/resume callbacks") Suggested-by: Bitan Biswas Signed-off-by: Thierry Reding Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 69cc9133336fc..8d5ec73e02d34 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4454,10 +4454,10 @@ int stmmac_suspend(struct device *dev) if (!ndev || !netif_running(ndev)) return 0; - mutex_lock(&priv->lock); - phylink_mac_change(priv->phylink, false); + mutex_lock(&priv->lock); + netif_device_detach(ndev); stmmac_stop_all_queues(priv); @@ -4471,9 +4471,11 @@ int stmmac_suspend(struct device *dev) stmmac_pmt(priv, priv->hw, priv->wolopts); priv->irq_wake = 1; } else { + mutex_unlock(&priv->lock); rtnl_lock(); phylink_stop(priv->phylink); rtnl_unlock(); + mutex_lock(&priv->lock); stmmac_mac_set(priv, priv->ioaddr, false); pinctrl_pm_select_sleep_state(priv->device); @@ -4565,6 +4567,8 @@ int stmmac_resume(struct device *dev) stmmac_start_all_queues(priv); + mutex_unlock(&priv->lock); + if (!device_may_wakeup(priv->device)) { rtnl_lock(); phylink_start(priv->phylink); @@ -4573,8 +4577,6 @@ int stmmac_resume(struct device *dev) phylink_mac_change(priv->phylink, true); - mutex_unlock(&priv->lock); - return 0; } EXPORT_SYMBOL_GPL(stmmac_resume); -- 2.20.1