From nobody Fri Jun 19 07:48:29 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47B4930E84F for ; Fri, 24 Apr 2026 03:04:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776999854; cv=none; b=pr3Mov8TtMwhxDtQ8cK4a6vG7upTV0w3WzmPL3X2C8SiMPAhDvw/1J7zc5rKRDOTLo6UDIrTmvWU4IKvSsf+HInY1EamglZuJtoDKerw0TUfC4He/F9TBmgx+shdsHjRt85PRJT1YGaHPZHpJ4YfDYVhMV3uGWYahraYuJGsQc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776999854; c=relaxed/simple; bh=hwtjZPe3kNPIuozWzzhgCt7AfHLeFa0m1BfVNrT8+ek=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uxmr8B4RHMzPVxN0+DgJJPjDWWQN1bndUTvqkDP0Wwh67psnEJltoh9aqvi/LKM7A4c6gk3x0ceBUYcH3xogWTKcy9pcfDpnBVngsmTDfBu94RGowrVm47h0JmeHwtkm+X2wUcsgZqtHcKP9NQ0h1pNCVDb9+/chSuRzJJ+BQ7w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b=eFBn2lKV; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b="eFBn2lKV" Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 766373FEB9 for ; Fri, 24 Apr 2026 03:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1776999849; bh=fE6/Ks26kVTyFQ0eNTbStdq7kzWJK58GKRv4GCZ9rSE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=eFBn2lKVreUFfWrnDbTwASagI0zYxXvEMBpF8AxQlaJDNqdlP+rsv+SFZxj7YV2qd INlS3eI0SmTGc+jEiOc119bfWdVY75w/T3vzW4zk2UY2zmRoSVD1zbXpPq6R0GYbAS toncHdfHEpo9F+kZwJvNucOe3uTpOgDuSG9N98Y/dSY3AhKgUb7eHzhw2pnCzTifbB nE2phv8ey3gfrpbD8HPvPL5c5fx0MfKGJFkJXygqkUOgnQjvsAUz1KnjazX3zf5YKi TuGt8FmFnNka7mbOaxgyqbl0yj1s9ZhIoZDlKCusppacNLC0qF2Cs08mLiIA8czdsr Nlyu1SanV1MPAkRtW5tNiW8ioNszq5DsPL7y9F2wEN/mQ1P4jwOTREsc+VtTQBg3+/ NN8v6eT8dJnBDVe9+bcB9w4qSdLLTU00KxJjR6gGQ+sHnnfecgW9t7YtMMYzJm/Hur IpYG3LHizyd7KgRyTj8fxwm62Qcb9jmMHnwO6OYCLVdpPMdoDbjwOv+HbSY4xkD7la gaddGyugrtVDk8AeKdUWLRR9MaiRXVtXqMjRHlGtMXECmSBV5CW+1Ufu6Lck0s/Esj /f3X5Jj6ymbQQoZz4cI+pl+6nivpQ0jehqNsaLGH1L1Ay50EvRRVi6VFk2DtWDGi+w NysMQ3q6HDnXiKxQkFaOH3YM= Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-35d9e67f6dcso7524200a91.1 for ; Thu, 23 Apr 2026 20:04:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776999848; x=1777604648; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fE6/Ks26kVTyFQ0eNTbStdq7kzWJK58GKRv4GCZ9rSE=; b=mDZBk8x3vva/H2lGKxHMv4dXWRSw7wx3SQDlD5EjucQA6zTRWMTFZnVW9+eFWmpDWI Wc7oyJuBpeFnszT15bCDVEsXJmIhZEPMxWO6JT0azfUOOeJq4aG9f3DPErLjKDjjOfTN rkVzt8GT7WHcpmueIizpSUWJcmsr3AmkcoXjrk5Zww6mRlSIeVjCFKU8EJBC0NEEp5lm WA8JFMB4SMkteyOl3bLAozCKS6eVA5IVdGMX9qX8J+uZ8zS17gXLwIliDopJthL5aTiM ZPqpEiWDKFz/GHmzZk9vAzT1ODd/74HrZIvWIQFiGW0Xb35LlyXqKFed3o1eYseKFPgf Favw== X-Forwarded-Encrypted: i=1; AFNElJ8VN97kJdZgsHgnh4bhmq0/b5M9pCRfdzBTvDnHwzwvBLba2L4Mbq+IrbHNSUcyuxP8hKAe9jLPYjeNesI=@vger.kernel.org X-Gm-Message-State: AOJu0YxME1HJ8LfAG71+r3WZkHizrIYaYtwI89FqdwhBBMLGvpZ0KW3z e9BMY4zAKsyQIFSJc2WrcrgoEdqvfhYk1KSamUULI7nCiXpGnyNaNwJHXpfSEQfRgHnf5lI4t24 5aMuxE87UHmrGp/uDuPaJmZIJM9JdRo4lps0XevDJxK5tcfUR4dl7n8agUOWUnPiuPLqthL6gZ4 ZuO7nX5A== X-Gm-Gg: AeBDiesRzSWIoOB6kpnbVrcNjhUfMH98of9fB68RIXgJ/r/lc2AxBqEUi32LBHpdjzI rTWaQkn0Ckv1+5UKM7zMmaWhvtlLlzBMfgbY4IYmekTeHxr6qNbVeWXryXa6sIsBl5GZv2MnJEV rllCLwQsVppoQ4B6v7266s8SntiMGnDxxqkNiBAlfh0aSr8iadNWFu4JyMyBkZD7lWe5Ck7zoEs t4E+TDqPbSk8+sh7dgL7VQFZOVBygnVbf2gjKgnCyaWQnIx6kppm58hwYovpVyEnrOObXogeEMf DuBSlD06MKgJI0QkIpDNRK6rSXayzZRZgFepc8Y212HjqzTqDluPqA6hBZHba4W7c0xsaM7HsGu 02NEIzXMlSy7gB/TJspBaJn9hO+rqaLSVwqDzXo19GhgX4UWb X-Received: by 2002:a17:902:ffce:b0:2b7:ade8:2407 with SMTP id d9443c01a7336-2b7ade826f8mr55540185ad.19.1776999848130; Thu, 23 Apr 2026 20:04:08 -0700 (PDT) X-Received: by 2002:a17:902:ffce:b0:2b7:ade8:2407 with SMTP id d9443c01a7336-2b7ade826f8mr55539845ad.19.1776999847810; Thu, 23 Apr 2026 20:04:07 -0700 (PDT) Received: from localhost.localdomain ([103.155.100.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab0caa9sm206428625ad.40.2026.04.23.20.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 20:04:07 -0700 (PDT) From: Aaron Ma To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Akeem G Abodunrin , Jesse Brandeburg , intel-wired-lan@lists.osuosl.org, Kohei Enju Subject: [PATCH v2] ice: wait for reset completion in ice_resume() Date: Fri, 24 Apr 2026 11:03:45 +0800 Message-ID: <20260424030345.1140665-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ice_resume() schedules an asynchronous PF reset and returns immediately. The reset runs later in ice_service_task(). If userspace tries to bring up the net device before the reset finishes, ice_open() fails with -EBUSY: ice_resume() ice_schedule_reset() # sets ICE_PFR_REQ, returns ... ice_open() ice_is_reset_in_progress() # ICE_PFR_REQ still set, -EBUSY ... ice_service_task() ice_do_reset() ice_rebuild() # clears ICE_PFR_REQ, too late Reproduced on E800 series NICs during suspend/resume with irdma enabled, where the aux device probe widens the race window. Wait for the reset to complete before returning from ice_resume(). Fixes: 769c500dcc1e ("ice: Add advanced power mgmt for WoL") Cc: stable@vger.kernel.org Signed-off-by: Aaron Ma Reviewed-by: Aleksandr Loktionov Reviewed-by: Kohei Enju Reviewed-by: Przemek Kitszel --- v2: reword comment to clarify best-effort semantics (Kohei Enju) drivers/net/ethernet/intel/ice/ice_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethern= et/intel/ice/ice_main.c index 5f92377d4dfc2..a81eb21ea87c1 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5635,6 +5635,15 @@ static int ice_resume(struct device *dev) /* Restart the service task */ mod_timer(&pf->serv_tmr, round_jiffies(jiffies + pf->serv_tmr_period)); =20 + /* Best-effort wait for the scheduled reset to finish so that the + * device is operational before returning. Without this, userspace + * (e.g. NetworkManager) may try to open the net device while the + * asynchronous reset is still in progress, hitting -EBUSY. + */ + ret =3D ice_wait_for_reset(pf, 10 * HZ); + if (ret) + dev_err(dev, "Wait for reset failed during resume: %d\n", ret); + return 0; } =20 --=20 2.43.0