Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4719332iob; Sun, 8 May 2022 23:09:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXMnkHVz/sdtTHyGxMoONvF3zQmi6zJUUPsCjm/fkj/y7tHY3FvcetwiDbweWYorrBcRwb X-Received: by 2002:a65:6657:0:b0:381:1b99:3f04 with SMTP id z23-20020a656657000000b003811b993f04mr11761119pgv.512.1652076575157; Sun, 08 May 2022 23:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652076575; cv=none; d=google.com; s=arc-20160816; b=tEqxNvtWmOzP+jbUYaOUKOLCNEBe/ZNNotgY4xdZzNAdorhV0gC1S6tB7dlh4fz+WR xEdSqOFVGbEvzrbS+h9T+TNKDgzPOVeY10SakewPLcG5wYT1aKqVFaLsLU32YobBL4dm BQPhsAWd8qm0irYKmHlkp1Vzi7XvBt2UKYCn6yRuGzfGW0B4dI+vb9eX8e1E9Azxkrwo sL0WbVeSYCo6KDndt7QhtmCfeC2/hvb6JdG2Lf3pgGOmXsmPJVlKH0XpFjNaaC38vuRI rubJ/vWf11UJaAuQo6O855FEzvgU+FghRA7ufFPzL1vOK18KGldsnRarK0nhxR/VcHDC FoTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=bcklNyNQA48oL1x3Q02R9pzQ9z2EuniDSFgXzXZNQ+Y=; b=fmCFkj0YqAdxuDEDckW1BtiF7f8mVe0gdyGzELTmB3fqUdQli/5lWuXO/mqxbpTnuV Du9sVvzdUfPnaQjdnqwuHgaQZLTA9id+SzADc8lMLP21EyItbQrLKLEnxLdpi3cY01fB FwHHfA6F06BPyG8ermJFVRdazUv0vbzorxCKoKI0os+fsfLzAakpHDI7JY2B+GTta3Fk jikCbNluVq/oN3s99WMoOmI74ncIZfubHxdVJlAuAD7I38GC2g0BuuBS2BpXnGxxKobo zeFVllzy/K7eCGFkUkxkQCr3JsDjXXJBrK6CcM6Og17LfqQ6u+phOePvP14dIQ4s3WCF AMrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@posteo.de header.s=2017 header.b="aJNPHx1/"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.de Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id l190-20020a633ec7000000b003ab106d8db4si13187910pga.801.2022.05.08.23.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 23:09:35 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@posteo.de header.s=2017 header.b="aJNPHx1/"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6D2D95F90; Sun, 8 May 2022 23:09:20 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1446968AbiEGUSA (ORCPT + 99 others); Sat, 7 May 2022 16:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234125AbiEGUR5 (ORCPT ); Sat, 7 May 2022 16:17:57 -0400 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3DB9255A7 for ; Sat, 7 May 2022 13:14:08 -0700 (PDT) Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 476E924002D for ; Sat, 7 May 2022 22:14:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1651954446; bh=SRuGjTpb0KWkEDEofC5Ly6FHVIAsobmM0kLjf3d6gpU=; h=From:To:Cc:Subject:Date:From; b=aJNPHx1/71wptf4GpJrbEGNVnpINKT5ku0ynWfqglBtATOB0kbwB+PFXZ9pxClbPu rdKBK0TsKv1pgKTlN4W65JxV6Ce5JiaM7+Sp1oWgb7URrSnOLg1TxoQOCW1GUbYvCS X74/Nn/Njg2rhCe6/tjBR62oooIsx3OS3QLH3rQ5bZZ3Opeg92jyPtZYNmoOW7pnCG B8VsLrN+zYSTahLULVn5wUPZM00V15GSOf+JBCNRA5xgVNB2ybgkT8+SoZxzU9CXIT Ys2afAUd+G6NOAxOD1m0XPexNSSgD6HH4f3JaG/R9o94CxG61aE5UrBWqoQC/r89DS y+qzeEua3FZCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Kwdth5SJ5z9rxG; Sat, 7 May 2022 22:14:04 +0200 (CEST) From: Manuel Ullmann To: Igor Russkikh Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, regressions@lists.linux.dev, davem@davemloft.net, ndanilov@marvell.com, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, Jordan Leppert , Holger =?utf-8?Q?Hoffst=C3=A4tte?= , koo5 Subject: [PATCH net-next v5] net: atlantic: always deep reset on pm op, fixing up my null deref regression Date: Sat, 07 May 2022 16:27:48 +0000 Message-ID: <87fsllcd80.fsf@posteo.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From 18dc080d8d4a30d0fcb45f24fd15279cc87c47d5 Mon Sep 17 00:00:00 2001 Date: Wed, 4 May 2022 21:30:44 +0200 The impact of this regression is the same for resume that I saw on thaw: the kernel hangs and nothing except SysRq rebooting can be done. Fixes regression in commit cbe6c3a8f8f4 ("net: atlantic: invert deep par in pm functions, preventing null derefs"), where I disabled deep pm resets in suspend and resume, trying to make sense of the atl_resume_common() deep parameter in the first place. It turns out, that atlantic always has to deep reset on pm operations. Even though I expected that and tested resume, I screwed up by kexec-rebooting into an unpatched kernel, thus missing the breakage. This fixup obsoletes the deep parameter of atl_resume_common, but I leave the cleanup for the maintainers to post to mainline. Suspend and hibernation were successfully tested by the reporters. Fixes: cbe6c3a8f8f4 ("net: atlantic: invert deep par in pm functions, preventing null derefs") Link: https://lore.kernel.org/regressions/9-Ehc_xXSwdXcvZqKD5aSqsqeNj5Izco4MYEwnx5cySXVEc9-x_WC4C3kAoCqNTi-H38frroUK17iobNVnkLtW36V6VWGSQEOHXhmVMm5iQ=@protonmail.com/ Reported-by: Jordan Leppert Reported-by: Holger Hoffstätte Tested-by: Jordan Leppert Tested-by: Holger Hoffstätte CC: # 5.10+ Signed-off-by: Manuel Ullmann --- I’m very sorry for this regression. It would be nice, if this could reach mainline before 5.18 release, if applicable. This restores the original suspend behaviour, while keeping the fix for hibernation. The fix for hibernation might not be the root cause, but still is the most simple fix for backporting to stable while the root cause is unknown to the maintainers. Changes in v2: Patch formatting fixes – Fix Fixes tag – Simplify stable Cc tag – Fix Signed-off-by tag Changes in v3: – Prefixed commit reference with "commit" aka I managed to use checkpatch.pl. – Added Tested-by tags for the testing reporters. – People start to get annoyed by my patch revision spamming. Should be the last one. Changes in v4: – Moved patch changelog to comment section – Use unicode ndash for patch changelog list to avoid confusion with diff in editors – Expanded comment – Targeting net-next by subject Changes in v5: – Changed my MTA transfer encoding to 8 bit instead of quoted-printable. Git should like this a bit more. drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c index 3a529ee8c834..831833911a52 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c @@ -449,7 +449,7 @@ static int aq_pm_freeze(struct device *dev) static int aq_pm_suspend_poweroff(struct device *dev) { - return aq_suspend_common(dev, false); + return aq_suspend_common(dev, true); } static int aq_pm_thaw(struct device *dev) @@ -459,7 +459,7 @@ static int aq_pm_thaw(struct device *dev) static int aq_pm_resume_restore(struct device *dev) { - return atl_resume_common(dev, false); + return atl_resume_common(dev, true); } static const struct dev_pm_ops aq_pm_ops = { base-commit: 672c0c5173427e6b3e2a9bbb7be51ceeec78093a -- 2.35.1