From nobody Sun Jun 14 08:19:47 2026 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 4ECC2346E44 for ; Wed, 29 Apr 2026 03:49:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777434547; cv=none; b=btNPCrfp++NfF++z4jA2EsP0u9RRBuBI78Br/DDPN4bpaNtLTVpsjeO42Up32tw2WK3uzhbN5CVjA7JGgAtJDrs6DuGjogRJGTDTh8mCsax5xTdCQnbK4rYYw3+Dp8j9RbrE+59gVTFzWnqjGYjVpPbDYv4SurKQbTtJMP8X8Ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777434547; c=relaxed/simple; bh=0v25Za+7o8YkYnq2Rk8ediQfsgs4jUxwmLfDUCjvKws=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Cd4Z/gdvOi+eDRg620FX/i1eTX7hJyJt+RZ5Rk1Xu9qa0L2yWcLYXaK9AY5q11Uy+ZDtlnaMv8Jy2j57Zw/glWNphI+jzy9Ci5xRwZhwVNt6W1ldBWoqwT9tyRdKoVezCLtLxgk9sVQmuvEhmG/HyIG/5IOqDLj9jCyw/cZSnR0= 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=hEyG2d09; arc=none smtp.client-ip=185.125.188.123 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="hEyG2d09" Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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-1.canonical.com (Postfix) with ESMTPS id 0D6A13F9B3 for ; Wed, 29 Apr 2026 03:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1777434543; bh=9Poun78EQtztiC583t+elgVeEgGqZI6iTcp9LxQ5+sk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hEyG2d09G7F3nwwq3JcL22cHrylbq6oPiF6jeN7stsq4aCdaHdNfDZcha2xjs3EPf uxiVDTjyXNaPIGr9JmL9LLOOXuuXCz+KLcHmbE1o1IeLkn6c2jXc46ioUkbyjf4CbL CwBIQZ+hCu9jD43NfQup4sLANXuTy/lrrv5HOlYp8PV1sHtItmcyCdYo1B6cPOxmI1 jhON2cTnh7C16Qhp0LDWeXQtbV6gazYCEbrR/hgC8Zkja0Pbyu8Unxk19X961RRNyq 7Op29/sUlYhv0njlZt5Y0mTb1utIN9xN3URd5P6F6gdxFu8lLQEE/vpaQbUvMIkOkF /otdDYOxSGRv+TQvuQF+1dYfdqwcZpQK82S2lU3X6f9EyfmB1vFvnYhUrSnaiUZoYW PtNddyGOx+mIaiJhTJ+Mo9TO9oQcqVZsJForzauaOU1TRjyHlSJsOt87CBfgED3iMR +FPP+jE4OI0atBTWaKzWj52I3RpahSxl+joNDEMcpF0xe1hjX/IbaRosb1fjKWuhfU GTjGMufyH0F7JalH9DlXccMmaAy40wDUtzOVdsid3NCMeT8voCkOSaQmFaNTwy4GDf 208IGzSHTtpcIiB8k1ewT/qlFqKQ8uYTf2OP8RqVFaXgV8xyu+RANEDa5a4HqukuCE f6qvKecmgt/4SiZxI0Xbokl0= Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2b2d0c1ead1so221063075ad.0 for ; Tue, 28 Apr 2026 20:49:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777434541; x=1778039341; 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=9Poun78EQtztiC583t+elgVeEgGqZI6iTcp9LxQ5+sk=; b=Ujyami3VD05WZpOoWYodhkGpTqJvCP8lNjTQC1Wvk6gAqM0Uo8GmOXgQTW024Cvq/R j1fAS/x5cTPyEAchyK39PPY2MENGeZYSFMPWRdq5AYivIOA3e7KXGEb7ftMS1O/9KPjl 4GDmX9quCgED8hNZX4feQFcOcxyNmW2BNSJh6EsetQnsJq+1Mm+xUiT5jFYCpzhZYA6G xz9z94sk41xvZ/s00ZBhC7/vZTypZ+McMD+WEs5Xa6cx/mSloWIvFSVcLdqD4A+krUUd +mzy0BqqdJz4BRoRLPDglnOhGiYzlXdOy97Zqxolmv4V0CG4lVqMnUfiLY3FP6aR46lt 2Izg== X-Forwarded-Encrypted: i=1; AFNElJ9UQkqze7lJD+r3msQKQbv9xZ9YqcPZIijuVLWyaKJ/fMUdBCNoLQytZdc/A9F5z1hQh/OH4PYBh7sefWU=@vger.kernel.org X-Gm-Message-State: AOJu0YyQcf3AkcvaV8mSvVjgLSWyZAi+E5/R1Ecd7xrG5/oTg2KXFQDo yTzxzOg5A6kUFndJ0h6VWfc7aFD98+B9359RnoO+IP3rxwCN1fvDwy/a+7xGnsDmOCvdwYI8LDj 8iX4fdPU/ORKDT7vSKrgam4c323EZPrrZH3dDvy0pXaBppuaVkOsF7uTjD3ysjmz3jYrLK0R59/ 2+RKd0sg== X-Gm-Gg: AeBDiet/mRrxYhv8DQ3joVWe9Lz/bzfGWo5Yc/2+uHqOgJqFy8B+icFWDQSzhesep7A xIpY0jUYcwZxoZmwtRClikq34UzKNlZVy0O99QpZAE6pHUd8NkzxJlaPV+o/Y1WHFo5QU49Acoj fH9uT54M+0TF/P1om9LimoyQpYyJUyG74mzGWu7wNf0H7MT+juzdRKal32WoPA24V24iqKNWjLs soagdOtQOKckho5oasAOdW3n88Byfh4Ki0164o+OyLh5BQO7yn4zTIpvA+JdGqZjJzrS4xGrwjj bD2jE5InJSq2OgoeBKUE2kwx009W/d0IGMlMhlPmaLuRLVhnYClczUITqzYRYkfeobFcZT/qqEn 2Ebvwms1ublSamWg1eSGcKLPVzviPIpHDDuQ+to7m6/Tm3SjEWZNgTqBEq5gDzxmTPMuQh6ynp3 aI9xRq5wegQTtd+SKYIkLUsyeIe2uh X-Received: by 2002:a17:902:b7c9:b0:2ae:c529:a13f with SMTP id d9443c01a7336-2b97c4373camr40318335ad.14.1777434541569; Tue, 28 Apr 2026 20:49:01 -0700 (PDT) X-Received: by 2002:a17:902:b7c9:b0:2ae:c529:a13f with SMTP id d9443c01a7336-2b97c4373camr40318195ad.14.1777434541160; Tue, 28 Apr 2026 20:49:01 -0700 (PDT) Received: from localhost.localdomain ([103.155.100.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b98893f1d1sm6615585ad.48.2026.04.28.20.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 20:49:00 -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, aleksandr.loktionov@intel.com, kohei@enjuk.jp, Paul Menzel Subject: [PATCH v4] ice: wait for reset completion in ice_resume() Date: Wed, 29 Apr 2026 11:48:49 +0800 Message-ID: <20260429034849.1686650-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. ice 0000:81:00.0: can't open net device while reset is in progress Add a best-effort wait (10s timeout, matching ice_devlink_info_get()) for the reset to complete before returning from ice_resume(). In practice the reset completes in ~300ms. Fixes: 769c500dcc1e ("ice: Add advanced power mgmt for WoL") Cc: stable@vger.kernel.org Reviewed-by: Kohei Enju Reviewed-by: Aleksandr Loktionov Reviewed-by: Przemek Kitszel Signed-off-by: Aaron Ma --- v4: use secs_to_jiffies() instead of 10 * HZ (Przemek Kitszel) v3: add error message to commit message for searchability, mention timeout in dev_err (Paul Menzel) v2: reword comment to clarify best-effort semantics (Kohei Enju) v1: https://lore.kernel.org/intel-wired-lan/20260402024220.210466-1-aaron.m= a@canonical.com/ drivers/net/ethernet/intel/ice/ice_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethern= et/intel/ice/ice_main.c index 5f92377d4dfc2..5fce644dc658e 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5635,6 +5635,16 @@ 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, secs_to_jiffies(10)); + if (ret) + dev_err(dev, "Wait for reset timed out (10s) during resume: %d\n", + ret); + return 0; } =20 --=20 2.43.0