From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1D85356754 for ; Sun, 30 Aug 2026 23:22:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788132151; cv=none; b=UXZteFyGz091mjJqCODgunZ9vFQcgrIGxLpNZYbGokk5eiD+xOWKYcj+VS7wOvmwACabuk42fv+rvg1I6tDr940PE386gj6SZPvt9aoLCRS3nNwaAXTNLmOIEzH/vzk3+0Uy3en82KAnh0aocf//CWh3UuwKjWX0GPLtTTpecB8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788132151; c=relaxed/simple; bh=i2wCKpYfmJRZYMcu671/cz07L/pWSr8Quj12tbY6/lc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oTEmQQnv55Aia3L3x1SYxJQq6qle9wbqk5yHvVgkgvOHw9QN5Shw6Tak8cxp/k0d9gfUi8kmJLPxEv7T+v20pj9F7JFLqxoGY/wkHKdfBjE2ct9aXTB2o6Qs3YL45nlsULuBR3UnjXKT2/UJPJuhe6bM/QzvTxy97UvfBCmSFs8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QGACnzyh; arc=none smtp.client-ip=209.85.128.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QGACnzyh" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-86162c086f8so13802477b3.1 for ; Sun, 30 Aug 2026 16:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788132149; x=1788736949; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=l1d2o7Bv+elIT7N1ffI/14l1K9kWTm1+Hxafq5ZWY3U=; b=QGACnzyhRC4A5f+CZiaBYXIL8g5FZJyveQSty0Aps5wF6F4MbxkyQHWuaOCp6LVCcy J8Rwu/wY4eK7JfUeaa70ImGYWVLeshiAis1DdIfvnvzGcAK5MqbqMkVnURh94ySlkgCD JC/wJ9KAAtRziRAIRCIE3Yxk7jZwuMKnRxuyobiCS9yu1txof4MHtoVknYf1Mh/YxSKo aCViUvdhKq5v1I5Y6Z+Uk/90MtvZT9YmloAzIGbDVSg30vehilEgJwc0WS3oB2ozdNqq Tsh3mrjGMP2sUtUyHN8R4FIfnle0vPFeScrm5r0aBYSFwmHN1CFN0i+t9y1RdOpSEiar jbTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788132149; x=1788736949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=l1d2o7Bv+elIT7N1ffI/14l1K9kWTm1+Hxafq5ZWY3U=; b=OJDXFoKh2iAaDb+myQjOCjZkCvofU2fz2oLoKoED2xXza/eksiFKU/WW+EzhuiHEH/ ClXF8zkhsIa4BP1HfrrjOVTRvCXd5C7iZf8Mgb0iyW0YWEshyy3hmWh8KLd3V2+Ho2fo IL8ONuP0XYQ+LAG9XafxefocrhA12Ke2M8Lxqb7i1cFhfJGY6Db8ZyqJCW0Id8MqHUrE +RtyaijVr1pKTDBTM7eu8pUkNm0OlIP0Tsfk4aVTTXsswbDZ2IOyPHn6DSHnvoZ5oMj+ Eovn6I2wmAC1sy+WPPRQRqOipHEMjCNdzuBGb0B7FibdJUpaF2kAwo6/yXCb8W4vB55t mcBA== X-Forwarded-Encrypted: i=1; AKwUvBzoQOD2dbAKv9GWznlVp86+ygYQPeXDUptwo/XMKWYiej5VIC//h43TzZIEwiptDjNU6EKKh7Kv1mQ4NEU=@vger.kernel.org X-Gm-Message-State: AFuF++k15VwHaBltUGR4E/jjjhoXzDlMiPqhWpPctGjD/0vwVtVntvhl 26DoBDo2FQw44GNpFsmGLHHBNzbh6FcXpKOwsNkCD6WcOlLR4uIvGoIc X-Gm-Gg: AYBFou3L/Jgj8qVr16PaA7s1VUSWp36fVPnFyLkul8MK9BpQpq5Ylh9xVOX05e9y7b0 Qo1G74NM94RynjRLim+o0uGsV6L/5V9LwLHNIXHsRDkdY5jOEuFUO+vVrv+hiT8Owa6HkGEVbpp AMo8wLitzOAZ+l8ZDuZxWfUbBhvqAFf82i5qMe54kon9TA0ukbFdGqRqpk1fWnUMTxqLSSGXS2T hsdLhF7b93lsMHwfwzoJcvECvSxf77x9DX+FGCIXDh/qADeu/NC1bGO3sH3QsxJ8kwY+M1MJY2E uVWaMTNyPQXVaUcyhcTC80pQa2CfPCWNI3caoml6wh1tdzM1q3NpYAQ+SSLxJ5Pu/yookPqrqPc 5pONVc2gJXMOkgqHyeso+XwUADtm6E9p9YJXW6xhsETVY7j0nDigs4KeOQING190WrUxiVQ6o/N vgSYx84/dPC5H3zLTCneOUhkKWz9U6UEznillbsDzj3g== X-Received: by 2002:a05:690c:e3ca:b0:858:bf8e:d0a4 with SMTP id 00721157ae682-864f634fffbmr13982757b3.18.1788132148676; Sun, 30 Aug 2026 16:22:28 -0700 (PDT) Received: from devobuntu.lan ([2600:6c5c:6b00:316::23]) by smtp.gmail.com with ESMTPSA id 00721157ae682-85e677606aesm39025937b3.45.2026.08.30.16.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 16:22:28 -0700 (PDT) From: Matt Vollrath To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Tony Nguyen , Przemek Kitszel , Alexander Lobakin , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Vollrath , stable@vger.kernel.org Subject: [PATCH iwl-next 3/8] e1000e: prevent race between PM and reset task Date: Sun, 30 Aug 2026 19:21:41 -0400 Message-ID: <20260830232146.36948-4-tactii@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260830232146.36948-1-tactii@gmail.com> References: <20260830232146.36948-1-tactii@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit e1000e_down could be entered simultaneously by the reset task and the runtime PM suspend callback. Prevent this by acquiring a runtime PM reference in the reset task. The intention is that: * A reset attempted during runtime suspend should drop silently; the interface is already going down. * A runtime suspend attempted during a reset will be retried later. * All callers of e1000e_down are now serialized. Signed-off-by: Matt Vollrath Fixes: 23606cf5d119 ("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-5-fable --- drivers/net/ethernet/intel/e1000e/netdev.c | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 47ff3c6ab451..4c15ca307b08 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6004,20 +6004,37 @@ static void e1000_tx_timeout(struct net_device *netdev, unsigned int __always_un static void e1000_reset_task(struct work_struct *work) { struct e1000_adapter *adapter; + struct device *dev; + int rc; + adapter = container_of(work, struct e1000_adapter, reset_task); + dev = &adapter->pdev->dev; rtnl_lock(); + + /* Runtime suspend downs the device without holding rtnl. Hold a + * runtime PM reference so it cannot start underneath the reset, and + * skip the reset if the device is already suspending or suspended: + * resuming resets the hardware anyway. + */ + rc = pm_runtime_get_if_active(dev); + if (!rc) + goto out_unlock; + /* don't run the task if already down */ - if (test_bit(__E1000_DOWN, &adapter->state)) { - rtnl_unlock(); - return; - } + if (test_bit(__E1000_DOWN, &adapter->state)) + goto out_put; if (!(adapter->flags & FLAG_RESTART_NOW)) { e1000e_dump(adapter); e_err("Reset adapter unexpectedly\n"); } e1000e_reinit_locked(adapter); + +out_put: + if (rc > 0) + pm_runtime_put(dev); +out_unlock: rtnl_unlock(); } -- 2.43.0