From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo2-f38.google.com (mail-oo2-f38.google.com [74.125.231.166]) (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 CF16E3CEB8D for ; Sun, 27 Sep 2026 21:59:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.166 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790546394; cv=none; b=owOS+yM3+BS8MllcTpS02sehFEZRTvZTcdaz7BaUQDfV0wCwPl7wk73QUYXvxv0AQwJ4nltHAptSRIQqjVoxXfKPMnq0h/EKIYIGNCKEdJBSL93uG/1HveveAElAduNqmgfE22UiOG7q6IYTssYHI6kmV6AcCdUo7IonTgOyzlI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790546394; c=relaxed/simple; bh=kRWe3zJ18nPwnbV8Vp/GoUZKSkrJS4rO4y9k1SLXFfM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B6kmiD169WcOurSykYRD0Q1COsTTyzs4nwCFbkk78S0Q+Lyvh4pOm//1x+17f9Ht6I8kHkLkM6QOVceSu/Igk05cfC4d0LbkS83HNW2AKmepP72dBae8B1eC+3EoG5iw/KqK5i9NM9AZU5refJXFvZrfHSUcNNaiZ4ZPCzjIa7Q= 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=H9Cy4ggc; arc=none smtp.client-ip=74.125.231.166 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="H9Cy4ggc" Received: by mail-oo2-f38.google.com with SMTP id 46e09a7af769-80a71781323so1412738a34.1 for ; Sun, 27 Sep 2026 14:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790546388; x=1791151188; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=wMTK91isCtW7K3W3fSl1Ctwz86tx7+iRah3Eev0qMBA=; b=H9Cy4ggc5TpXyWJhhmM2LN5DQpgz+tnnoNGH2grUgzEEVtj4a8l49p0u0Qfm9aNIcq sjcvZyEnWyI/xR/k7ZeYogd+oDYkOPlOiV/PTPBniOrdZQbXUSzCqZ/hlSX0AbAR1Xxh htfftGb4jWcb3Vkgppy/JKQaNf/adGn8CUyvBtR7ISF++gULFE1m//c02BniDbP+u2wj K5nCHHjwLilsmnbS54aJFjHNaJAXKe27z18/Lw1kwts8F8BaPgIEJSO5jNvo3/FUQRhh RIRMHLyeKKRBOC3epFDLFc3omp6mhlzq72Jf2dkEw2n2YJPUfce32Xil05kZY681vllk zVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790546388; x=1791151188; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=wMTK91isCtW7K3W3fSl1Ctwz86tx7+iRah3Eev0qMBA=; b=WXL4v8xmpgSkBcLm4sqgd214O7kkbt8CRNoY+rdlfIxvxRxHyDNbFqT6r/8AjTOaiz 9uZdPBbmZFXSYsYcdybFRlNa1XMyzSrEYS/eGNyI2oNchZhVnAt8xmSwYTfISMEV0gds pc8c+0D1Ofvggn4F95vZiwZLhdvFQrhhbsie/bo53x02JU4W0dO8YuteLEYK/bUVu1Zz oBcOO0CCMZm8WXSjFZSnGdjvUqiWEtBezQC7QYtFj6AhQ3+3AcntmCnyjPr21IZgf7VQ +2PdparLdjazM7CiciRp89/SnFvOanv1d099WwhzTMGwCrFyH0ReKmjgKmhEntqZFVzq 9prw== X-Forwarded-Encrypted: i=1; AKwUvBz7WY4H/iTABUaGxLz/KWa6c/CLMFWULodsoYzci+wWDPS0VToRBt3YUqxTHN49Zh+m2LMLanQ=@vger.kernel.org X-Gm-Message-State: AFuF++k9hvt1x4i3AOeWIkCq3COX79XRKnkP5NLq6KddbWD932jBMuaA HlFZBIsvUuxhIp3qVb3dPQfL+W8WIWY9adGarn7nPiU9TqD4wFBdn95e X-Gm-Gg: AYBFou3PYKFS+GPgEwuDZpTIZK37oNFKS9IBssdiuSczu8KenpzZXXq8tN35v0QToD8 sE0mlBB3g2C4J60j/5Zl8TY7fC3Qi/0nNPFTyKSSx+kVRkCcIOQN8PIyRS5GPwVCcPardKZ6qWt Sj9LlRP1m+ASMKlrh61dqL01VSRzsPH1Oeuw2CQtgf/XBKnNR2oiAgzaBOP9SXNtYUd1NRgCBKZ 2zcvbjOwXkFAll7bH7Uv3ahM9ji7+zNGH/lojFt/sd8PEnLd1AuI7jrBWH261jpM4T0VH0F418F 5VuQ5XwUi4QExq7Qw7JOWFlS5ulj95NIB50Hcf5D829upGCWrzCO+aoW8I3/F8K09rDtmwAkS1H cPgaSeHZbiN2PcgBpojvE3QERiY33UouiUWi3d+tiEe9n1fTAckvtVanzzowz99lAzFYpDrlgRM kNvoCTZj+bos3oFFR1aLwBENZQ1/Hh1S8ToAGq2tnhQArYVAzhe4PyeLMevI/a9S2n3GO20FJXT q+3ibMTdL/hDM6bcccelFm1Ge5yN7xH/haMK7MYpb1xf7DvGHsR6AXX/1r0VMPbiHN1AzKXCKWn g2TSwOAA86rET8nipUzgmgOmV3EIJEiFCdzxKOwMw2Sq9oRuqlt2jCOwuqIDXYNYOgjGG92qe/6 pTmUdWudaBA2bvGCZTxVQD1JfTfriWGs= X-Received: by 2002:a05:6820:81cf:b0:6b9:8413:89b8 with SMTP id 006d021491bc7-6d4411d2841mr11892599eaf.57.1790546388198; Sun, 27 Sep 2026 14:59:48 -0700 (PDT) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-81b3de6f7e1sm4874147a34.22.2026.09.27.14.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2026 14:59:47 -0700 (PDT) From: James Hilliard Date: Sun, 27 Sep 2026 15:59:36 -0600 Subject: [PATCH net-next v5 01/19] net: stmmac: unwind the WoL IRQ after a safety IRQ request failure Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260927-submit-stmmac-reset-fixes-v1-v5-1-feec6c14dd06@gmail.com> References: <20260927-submit-stmmac-reset-fixes-v1-v5-0-feec6c14dd06@gmail.com> In-Reply-To: <20260927-submit-stmmac-reset-fixes-v1-v5-0-feec6c14dd06@gmail.com> To: Russell King , Andrew Lunn , Heiner Kallweit , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Russell King (Oracle)" , Maxime Chevallier , Andrew Lunn , Maxime Coquelin , Alexandre Torgue , Christian Marangi , Tiezhu Yang , Huacai Chen , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Serge Semin , Suraj Jaiswal , Richard Cochran , Joao Pinto , Vladimir Oltean , Ong Boon Leong , Voon Weifeng , "Song, Yoong Siang" , Linus Walleij , Martin Blumenstingl , Magnus Karlsson , Maciej Fijalkowski , Simon Horman , =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , Thierry Reding , Jonathan Hunter , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Jose Abreu , Yao Zi , Philipp Zabel Cc: Richard Genoud , Alastair D'Silva , Maxime Ripard , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, ZhaoJinming , Lorenzo Bianconi , Ding Hui , Linkui Xiao , Linkui Xiao , linux-tegra@vger.kernel.org, linux-sunxi@lists.linux.dev, James Hilliard X-Mailer: b4 0.15.2 The IRQ setup paths request the MAC IRQ, then the optional WoL IRQ, then the common safety IRQ. If requesting the safety IRQ fails, cleanup must release the WoL and MAC IRQs, but not the failed safety IRQ. The REQ_IRQ_ERR_SFTY case instead frees the safety IRQ and skips the WoL IRQ. Allocation fault injection during live XDP reopening reproduces a "Trying to free already-free IRQ" warning and leaves the WoL handler registered after the datapath resources have been released. A subsequent open can then fail to request that still-owned IRQ. Move safety IRQ cleanup before REQ_IRQ_ERR_SFTY and WoL IRQ cleanup after it. This restores reverse acquisition order for both shared and MSI IRQ setup, including unwind after failures in later per-queue IRQ requests. Fixes: 5c2215167d12 ("net: stmmac: Add driver support for common safety IRQ") Signed-off-by: James Hilliard --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3ad9252bf6ae..894de213b92f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3828,13 +3828,13 @@ static void stmmac_free_irq(struct net_device *dev, free_irq(msi->sfty_ce_irq, dev); fallthrough; case REQ_IRQ_ERR_SFTY_CE: - if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) - free_irq(priv->wol_irq, dev); - fallthrough; - case REQ_IRQ_ERR_SFTY: if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) free_irq(priv->sfty_irq, dev); fallthrough; + case REQ_IRQ_ERR_SFTY: + if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) + free_irq(priv->wol_irq, dev); + fallthrough; case REQ_IRQ_ERR_WOL: free_irq(dev->irq, dev); fallthrough; -- 2.53.0