From nobody Wed Jun 17 04:06:28 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 A28D43CF69E for ; Tue, 28 Apr 2026 08:20:26 +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=1777364430; cv=none; b=bP7e/K7X1OuJG9JgnDron41vTDlADuKVRpeTRcUVJ+ougsiI8tISA4z14TvkhmRNFiCeD9Pc8ETPSqAn+31V4PGaOZdxvXSZjJBK9AfAMbfyTxbS98dtWZtpahlRQzI2hzY0y1TQYneEPvINXzqH4YWDatjR8Rk4C5jbpudPyGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777364430; c=relaxed/simple; bh=a0TEc6WSZav2wock5/GID0t3gR+3qLjktNsuOTurOxI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=j/OhT9UO4a4FzyNrSlJvQ+8fIrU0usp1QPcwjPsU/3yaswYBD4VJOlcVSc/udGZFgI4H1QlYl70MgYCS4xms3S5dYi+2qf2gLTtFxg5cDnUipHjBxiI1MM6I94CaKd0YStzoDyKDjx8aTTrYA7qHLBrBuEs/PzcPEMmZsfVthRQ= 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=jJMD9yum; 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="jJMD9yum" Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 D2B403F29B for ; Tue, 28 Apr 2026 08:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1777364424; bh=FjJThp4I5WkrMZHH23Stv5s45vttZoJtLgvhqAh471A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jJMD9yumR5zEv0jkcLgxZSvMXOnHBOX+drLp44ak0Q6UVrOklQkqU8TMKxdZ5VaLK UkfzpS0wQXy0vNuQCGaZBDFlOOBojBHP9ddBv8hXjj+0v7odwPoSjn1Qa2T4L5vE0G RDu1ObhTqUfWx5erDkpgtBxsK7fnnmG9HMdpk9VD53yFLhPQPeHlJ8yHjgCPqUrQ2q 1ZX6GzVSTn60vZyN3lXLrih6XmHy/yT16fJueNWYHp0TamqWHAG4y4C24hVvzn9dKP A/RcfT/19lQDUrtM6NjU0CMkgWh79CIrxjtN0L5FYMQA0A/9xClOr9WJtip3xLGkAY q6u/EKSWzjpxGj/+CsLdPsE/cg6oXxPANhNlvb7aO+wRgiL88wN6vJEqjAJPhO5t5U bBTrwaUgpl+VQOa13YYjWKpRqyjoSZSUtCQapVzE5/gAISKLrzLWbzklcCBS4FREcE LTEZx1TQY7QEciBjG5sRk6Y8sP+DG7dvGTBBTXBvQVqmTjhgDAVCL/0XVXWosOLyza gn8JNV8yvUH83CGosu4iwfVn4rxpl4GmoO1tYgvLvvO0n7d1JneHjX1/y/M0/vkL5G LLAw06ynofY8NA8y3sOw5R6XYHz3J3fBZ2mp5qB8HxrbHBupbwV9NvYFQAaS+Va6YQ w9S/sM6veChkpZEqw4ZBM/4o= Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2b258636d16so111279575ad.2 for ; Tue, 28 Apr 2026 01:20:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777364423; x=1777969223; 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=FjJThp4I5WkrMZHH23Stv5s45vttZoJtLgvhqAh471A=; b=dtfC7oIjD1coKJUaxC3/gVZqXiBQeLKm80JLPOh/76m5apqvq1+9m+OueoAu/UfW5b uyUb5PjxU+EZVFmrqdWcnDnyEm37i/Xs9MIQi1115Je8u3ckkS3PQk5Lmj5mwJmFeHcx CX7wTR0Sv9Le8d3615QC0tqdHlj1DaEXXZUmaN9FSFHbipKUzWpyfTAYXMmr2MoS0bc5 /Sk1EXGO4q66cmsGEPHYdNlXMI7vFPlR3orp3bqtiH0BHc95utpgZVYgwPU1OCtHKJ9E JViQWMPU28bg9TEH2WSdlbDgn4KYUOPM3Zryyz0T/p8TrtfhmWfKXmmalCTzefHKmISQ EwoA== X-Forwarded-Encrypted: i=1; AFNElJ9Y6dZW4Ec4LTdKyvKFLlC8M3I/tV8NIESTcLslkZAOrBcGBSaHWqwdPyeLIif3/qvBsogtBvGjBcO7abA=@vger.kernel.org X-Gm-Message-State: AOJu0YxteJcJnuiX7+fADSxn0ViwuQFPF0L0jd36QEQz1I5sRfDQwXuM hn7ZifTW+yElxN63VbbiPLWN3QHvboIoTgZcfdqzjwJdJ8L+XPnDFmK3eutOCHXFBsjKFw1gX5h MRNWwm8jmBBCkPHZ3UzUjteDC58HBRiIQGNFyqpVi7KBcYpiBCo2+iCCJer+sqTr3IQKGqKyuxx Su8fnOjQ== X-Gm-Gg: AeBDietkVGpMiJSXDECS9/1pjdnONLGYNFignyo+MoH5I1X3YrEdX0/Zl/aXFgNG7GH U4pWu38BfOrnHDIiGLS+jiSx7dxa+TcpzoOHP+POKuGsu+dXzYumY9l88MGTpYWMALNoJFTEN+0 WitJpmTB/3vxvnLrbDE5vH01WnJ5TFkra6BuUS/ZxkEfDS5oldQ7aFBE14cPeFv9wOIOY9Uy0Ap YQ+JY0RTxppgYkMaym5kA5ZRILJCrOQj8sunLKvobelWJxqn4dr0a91EgzdQidEPe9BNuc9tmXE hPMS2zvcHQ+dUDsFJxMJonOMrXszwMd5UfXHHIT7Egvipxlv0HCfrw+UoYoJ7z636ullKE0k9Rw JAioBI9aIvhSS99THvlkUfukG9XVFHTJlVQ9c8X8q1CsKCuZhPhjU1/0tfhGXg0sSFFDbHeqcGg IQ4stpKcJebKedw6L50FqRsKVgo/hy X-Received: by 2002:a17:902:b689:b0:2ae:450c:951e with SMTP id d9443c01a7336-2b97c435bc1mr13505315ad.17.1777364423374; Tue, 28 Apr 2026 01:20:23 -0700 (PDT) X-Received: by 2002:a17:902:b689:b0:2ae:450c:951e with SMTP id d9443c01a7336-2b97c435bc1mr13504915ad.17.1777364422830; Tue, 28 Apr 2026 01:20:22 -0700 (PDT) Received: from localhost.localdomain ([103.155.100.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b97aca8328sm17881525ad.77.2026.04.28.01.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 01:20:22 -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 v3] ice: wait for reset completion in ice_resume() Date: Tue, 28 Apr 2026 16:17:33 +0800 Message-ID: <20260428081733.1615755-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) for the reset to complete before returning from ice_resume(). 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 --- 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..260cbd0d9ad90 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, 10 * HZ); + if (ret) + dev_err(dev, "Wait for reset timed out (10s) during resume: %d\n", + ret); + return 0; } =20 --=20 2.43.0